diff --git a/src/hub/postMission.h b/src/hub/postMission.h index b71b557..1c69cb8 100644 --- a/src/hub/postMission.h +++ b/src/hub/postMission.h @@ -37,6 +37,7 @@ extern void clearControls(void); extern void restoreGameState(void); extern void initWorld(void); extern void initTitle(void); +extern void awardTrophy(char *id); extern App app; extern Colors colors; diff --git a/src/test/atlasTest.c b/src/test/atlasTest.c index 111e8b6..836b7d6 100644 --- a/src/test/atlasTest.c +++ b/src/test/atlasTest.c @@ -24,6 +24,7 @@ void initAtlasTest(void) { int test; + dev.debug = 1; dev.cheatStatic = 0; dev.cheatBlind = 0; dev.cheatNoEnemies = 0; @@ -34,6 +35,8 @@ void initAtlasTest(void) loadGame(); + saveGame(); + test = 1; switch (test) diff --git a/src/test/atlasTest.h b/src/test/atlasTest.h index a64a774..3d61a55 100644 --- a/src/test/atlasTest.h +++ b/src/test/atlasTest.h @@ -23,9 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void initWorld(void); extern void initHub(void); extern void loadGame(void); +extern void saveGame(void); extern void initOptions(void); -extern void initPostMission(void); -extern void stopMusic(void); +extern App app; extern Dev dev; extern Game game; diff --git a/src/world/player.c b/src/world/player.c index fe8126f..8f73f79 100644 --- a/src/world/player.c +++ b/src/world/player.c @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "player.h" static void doDebugControls(void); -static void compareQuadtree(void); -static int last = 0; void doPlayer(void) { @@ -67,31 +65,4 @@ static void doDebugControls(void) app.keyboard[SDL_SCANCODE_0] = 0; } - - if (last < SDL_GetTicks()) - { - compareQuadtree(); - - last = SDL_GetTicks() + 1000; - } -} - -static void compareQuadtree(void) -{ - Entity **candidates, *e; - int numCandidates, numEnts; - - candidates = getAllEntsWithin(0, 0, MAP_WIDTH * MAP_TILE_SIZE, MAP_HEIGHT * MAP_TILE_SIZE, NULL); - - numEnts = 0; - - /* counting entities to draw */ - for (numCandidates = 0, e = candidates[numCandidates] ; e != NULL ; e = candidates[++numCandidates]) {}; - - for (e = world.entityHead.next ; e != NULL ; e = e->next) {numEnts++;} - - if (numCandidates > numEnts) - { - printf("WARNING: numEnts=%d, numCandidates=%d\n", numEnts, numCandidates); - } }