[Super-tux-commit] supertux/src gameloop.cpp,1.52,1.53 gameloop.h,1.31,1.32 leveleditor.cpp,1.33,1.3
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src gameloop.cpp,1.52,1.53 gameloop.h,1.31,1.32 leveleditor.cpp,1.33,1.34 world.cpp,1.9,1.10 world.h,1.11,1.12
|
From: Ingo R. <gr...@us...> - 2004-04-11 01:49:56
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31878 Modified Files: gameloop.cpp gameloop.h leveleditor.cpp world.cpp world.h Log Message: - moved some activate_bad_guy stuff into the world, where it belongs Index: gameloop.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- gameloop.h 11 Apr 2004 01:24:58 -0000 1.31 +++ gameloop.h 11 Apr 2004 01:36:22 -0000 1.32 @@ -63,8 +63,6 @@ void start_timers(); }; -void activate_bad_guys(Level* plevel); - std::string slotinfo(int slot); bool rectcollision(base_type* one, base_type* two); Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- world.h 11 Apr 2004 00:05:35 -0000 1.11 +++ world.h 11 Apr 2004 01:36:22 -0000 1.12 @@ -124,6 +124,7 @@ int load(const std::string& filename); void activate_particle_systems(); + void activate_bad_guys(); void add_score(float x, float y, int s); void add_bouncy_distro(float x, float y); Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- world.cpp 11 Apr 2004 01:24:58 -0000 1.9 +++ world.cpp 11 Apr 2004 01:36:22 -0000 1.10 @@ -64,6 +64,16 @@ particle_systems.clear(); } +void +World::activate_bad_guys() +{ + for (std::vector<BadGuyData>::iterator i = level->badguy_data.begin(); + i != level->badguy_data.end(); + ++i) + { + add_bad_guy(i->x, i->y, i->kind); + } +} void World::activate_particle_systems() Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- gameloop.cpp 11 Apr 2004 01:24:58 -0000 1.52 +++ gameloop.cpp 11 Apr 2004 01:36:22 -0000 1.53 @@ -119,7 +119,8 @@ world->get_level()->load_gfx(); loadshared(); - activate_bad_guys(world->get_level()); + + world->activate_bad_guys(); world->activate_particle_systems(); world->get_level()->load_song(); @@ -169,16 +170,6 @@ update_time = st_get_ticks(); } -void activate_bad_guys(Level* plevel) -{ - for (std::vector<BadGuyData>::iterator i = plevel->badguy_data.begin(); - i != plevel->badguy_data.end(); - ++i) - { - world.add_bad_guy(i->x, i->y, i->kind); - } -} - void GameSession::process_events() { @@ -370,8 +361,9 @@ world->get_level()->free_gfx(); world->get_level()->cleanup(); world->get_level()->free_song(); - unloadshared(); world->arrays_free(); + + unloadshared(); return(0); } tux.level_begin(); @@ -392,19 +384,21 @@ if (score > hs_score) save_hs(score); } + world->get_level()->free_gfx(); world->get_level()->cleanup(); world->get_level()->free_song(); - unloadshared(); world->arrays_free(); + + unloadshared(); return(0); } /* if (lives < 0) */ } /* Either way, (re-)load the (next) level... */ - tux.level_begin(); set_defaults(); + world->get_level()->cleanup(); if (st_gl_mode == ST_GL_LOAD_LEVEL_FILE) @@ -419,7 +413,7 @@ } world->arrays_free(); - activate_bad_guys(world->get_level()); + world->activate_bad_guys(); world->activate_particle_systems(); world->get_level()->free_gfx(); @@ -844,10 +838,11 @@ set_defaults(); world->get_level()->cleanup(); + world->arrays_free(); + if(world->get_level()->load(level_subset,level) != 0) exit(1); - world->arrays_free(); - activate_bad_guys(world->get_level()); + world->activate_bad_guys(); world->activate_particle_systems(); world->get_level()->free_gfx(); Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- leveleditor.cpp 11 Apr 2004 01:24:58 -0000 1.33 +++ leveleditor.cpp 11 Apr 2004 01:36:22 -0000 1.34 @@ -252,7 +252,7 @@ } le_set_defaults(); le_current_level->load_gfx(); - activate_bad_guys(le_current_level); + world.activate_bad_guys(); show_menu = true; } break; @@ -283,7 +283,7 @@ } le_set_defaults(); le_current_level->load_gfx(); - activate_bad_guys(le_current_level); + world.activate_bad_guys(); menu_item_change_input(&subset_new_menu->item[2],""); show_menu = true; break; @@ -559,7 +559,7 @@ le_current_level->free_gfx(); le_current_level->load_gfx(); - activate_bad_guys(le_current_level); + world.activate_bad_guys(); } void le_quit(void) @@ -595,8 +595,8 @@ { le_current_level->free_gfx(); le_current_level->cleanup(); - unloadshared(); world.arrays_free(); + unloadshared(); } } @@ -1196,7 +1196,7 @@ world.arrays_free(); le_current_level->load_gfx(); loadshared(); - activate_bad_guys(le_current_level); + world.activate_bad_guys(); } void le_showhelp() |
