forked from 0ad/0ad
gcc warning fixes
This was SVN commit r702.
This commit is contained in:
parent
4c1ef2df21
commit
7bef7160ca
@ -36,7 +36,6 @@
|
||||
using namespace std;
|
||||
|
||||
CParticleEmitter::CParticleEmitter() :
|
||||
m_particles(NULL),
|
||||
m_origin(0.0f, 0.0f, 0.0f),
|
||||
m_originSpread(0.0f, 0.0f, 0.0f),
|
||||
m_velocity(0.0f, 0.0f, 0.0f),
|
||||
|
@ -229,7 +229,7 @@ private:
|
||||
// mark it as the most recently used line.
|
||||
Line* find_line(u64 id)
|
||||
{
|
||||
Map::const_iterator i = idx.find(id);
|
||||
typename Map::const_iterator i = idx.find(id);
|
||||
// not found
|
||||
if(i == idx.end())
|
||||
return 0;
|
||||
|
@ -43,7 +43,7 @@ public:
|
||||
|
||||
// accessor for character data
|
||||
const CharData& chardata(char c) const {
|
||||
assert(c>=0 && c<128);
|
||||
assert( !(c&0x80) ); // only allow 7-bit ASCII
|
||||
return _chars[c];
|
||||
}
|
||||
|
||||
|
@ -107,7 +107,8 @@ JSBool JSI_Entity::construct( JSContext* cx, JSObject* obj, unsigned int argc, j
|
||||
}
|
||||
|
||||
HEntity* handle = new HEntity( g_EntityManager.create( baseEntity, position, orientation ) );
|
||||
(*handle)->dispatch( &CMessage( CMessage::EMSG_INIT ) );
|
||||
CMessage message( CMessage::EMSG_INIT );
|
||||
(*handle)->dispatch( &message );
|
||||
JSObject* entity = JS_NewObject( cx, &JSI_Entity::JSI_class, NULL, NULL );
|
||||
JS_SetPrivate( cx, entity, handle );
|
||||
*rval = OBJECT_TO_JSVAL( entity );
|
||||
|
Loading…
Reference in New Issue
Block a user