diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index 0b31178..6271c78 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -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); } -void Game::initEntities() -{ - FOR_ENTITIES(i) - { - Entity *e = *i; - if (e) - { - e->init(); - } - } -} - EntitySaveData *Game::getEntitySaveDataForEntity(Entity *e, Vector pos) { diff --git a/Aquaria/Game.h b/Aquaria/Game.h index 1153ac4..faccc4f 100644 --- a/Aquaria/Game.h +++ b/Aquaria/Game.h @@ -481,7 +481,6 @@ protected: void warpPrep(); bool shuttingDownGameState; Quad *image; - void initEntities(); float controlHintTimer; bool cameraConstrained; diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp index 118d002..ca2a34c 100644 --- a/Aquaria/ScriptInterface.cpp +++ b/Aquaria/ScriptInterface.cpp @@ -102,7 +102,6 @@ static const char * const interfaceFunctions[] = { "lightFlare", "msg", "postInit", - "preUpdate", "shiftWorlds", "shotHitEntity", "song", @@ -11066,10 +11065,10 @@ static const struct { luaConstant(EP_BLOCKER), // ACTIVATION TYPES - {"AT_NONE", -1}, - {"AT_NORMAL", 0}, - {"AT_CLICK", 0}, - {"AT_RANGE", 1}, + {"AT_NONE", Entity::ACT_NONE}, + {"AT_NORMAL", Entity::ACT_CLICK}, + {"AT_CLICK", Entity::ACT_CLICK}, + {"AT_RANGE", Entity::ACT_RANGE}, luaConstant(WT_NORMAL), luaConstant(WT_SPIRIT),