mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-18 02:34:57 +00:00
Code Issues Releases Wiki Activity

tiny cleanup

Browse source
This commit is contained in:
fgenesis 2019-09-06 02:58:06 +02:00
parent 5fff755c1e
commit 988db94b72
3 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Aquaria/Game.cpp
View file

@ -1035,18 +1035,6 @@ Entity *Game::createEntity(const std::string &t, int id, Vector position, int ro
return establishEntity(e, id, position, rot, createSaveData, name, et, doPostInit); return establishEntity(e, id, position, rot, createSaveData, name, et, doPostInit);
} }
void Game::initEntities()
{
FOR_ENTITIES(i)
{
Entity *e = *i;
if (e)
{
e->init();
}
}
}
EntitySaveData *Game::getEntitySaveDataForEntity(Entity *e, Vector pos) EntitySaveData *Game::getEntitySaveDataForEntity(Entity *e, Vector pos)
{ {

1
Aquaria/Game.h
View file

@ -481,7 +481,6 @@ protected:
void warpPrep(); void warpPrep();
bool shuttingDownGameState; bool shuttingDownGameState;
Quad *image; Quad *image;
void initEntities();
float controlHintTimer; float controlHintTimer;
bool cameraConstrained; bool cameraConstrained;

9
Aquaria/ScriptInterface.cpp
View file

@ -102,7 +102,6 @@ static const char * const interfaceFunctions[] = {
"lightFlare", "lightFlare",
"msg", "msg",
"postInit", "postInit",
"preUpdate",
"shiftWorlds", "shiftWorlds",
"shotHitEntity", "shotHitEntity",
"song", "song",
@ -11066,10 +11065,10 @@ static const struct {
luaConstant(EP_BLOCKER), luaConstant(EP_BLOCKER),
// ACTIVATION TYPES // ACTIVATION TYPES
{"AT_NONE", -1}, {"AT_NONE", Entity::ACT_NONE},
{"AT_NORMAL", 0}, {"AT_NORMAL", Entity::ACT_CLICK},
{"AT_CLICK", 0}, {"AT_CLICK", Entity::ACT_CLICK},
{"AT_RANGE", 1}, {"AT_RANGE", Entity::ACT_RANGE},
luaConstant(WT_NORMAL), luaConstant(WT_NORMAL),
luaConstant(WT_SPIRIT), luaConstant(WT_SPIRIT),