1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-10 16:19:59 +00:00

Misc fixes and cleanups; fixed variadic Lua calls to self.

Script interface:
- entity_msg() will no longer corrupt the Lua stack if sending messages to itself.
- added more info to non-critical Lua errors ("attempt to call a nil value", etc)
- replaced many lua_tostring() with getString(), which does never return NULL.
  This prevents possible crashes when a non-string parameter is passed to functions
  expecting a string.

Misc:
- Removed classes BoxElement, DFSprite, Datafile, and related references.
  They were essentially unused.
- Removed unused Element class member variables.
- Show more lines in the in-game console.
This commit is contained in:
fgenesis 2012-03-14 00:58:59 +01:00
parent bd9648aa60
commit 273b608214
15 changed files with 95 additions and 213 deletions

View file

@ -165,7 +165,7 @@ bool Entity::canSetBoneLock()
return true;
}
Entity::Entity() : StateMachine(), DFSprite()
Entity::Entity()
{
addType(SCO_ENTITY);
poison = 0.0f;
@ -1266,7 +1266,7 @@ void Entity::update(float dt)
//skeletalSprite.setFreeze(true);
if (frozenTimer == 0 || getState() == STATE_PUSH)
DFSprite::update(dt);
AnimatedSprite::update(dt);
onAlwaysUpdate(dt);
// always, always update:
@ -1873,7 +1873,7 @@ void Entity::onUpdate(float dt)
}
}
DFSprite::onUpdate(dt);
AnimatedSprite::onUpdate(dt);
Vector v = position - lastPos;
lastMove = v;
@ -2971,7 +2971,7 @@ void Entity::render()
blurShader.bind();
set = true;
}
DFSprite::render();
AnimatedSprite::render();
//if (beautyFlip && blurShader.isLoaded() && flipScale.isInterpolating())
if (set)
blurShader.unbind();