[Super-tux-commit] supertux/src gameloop.cpp,1.55,1.56 gameloop.h,1.32,1.33 gameobjs.cpp,1.3,1.4 lev
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src gameloop.cpp,1.55,1.56 gameloop.h,1.32,1.33 gameobjs.cpp,1.3,1.4 leveleditor.cpp,1.35,1.36 special.cpp,1.8,1.9 world.cpp,1.14,1.15 world.h,1.16,1.17
|
From: Ingo R. <gr...@us...> - 2004-04-11 13:19:15
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9780 Modified Files: gameloop.cpp gameloop.h gameobjs.cpp leveleditor.cpp special.cpp world.cpp world.h Log Message: - renamed 'world' to 'global_world' to emphasis that it is mainly a temporary hack - moved some 'world' to 'World::current()' Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- world.h 11 Apr 2004 13:00:00 -0000 1.16 +++ world.h 11 Apr 2004 13:05:35 -0000 1.17 @@ -100,7 +100,8 @@ void trybumpbadguy(float x, float y); }; -extern World world; +/** FIMXE: Workaround for the leveleditor mainly */ +extern World global_world; #endif /*SUPERTUX_WORLD_H*/ Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- leveleditor.cpp 11 Apr 2004 11:52:29 -0000 1.35 +++ leveleditor.cpp 11 Apr 2004 13:05:35 -0000 1.36 @@ -244,7 +244,7 @@ le_level_subset.load(level_subsets.item[i-2]); leveleditor_menu->item[3].kind = MN_GOTO; le_level = 1; - world.arrays_free(); + global_world.arrays_free(); loadshared(); le_current_level = new Level; if(le_current_level->load(le_level_subset.name.c_str(), le_level) != 0) @@ -254,7 +254,7 @@ } le_set_defaults(); le_current_level->load_gfx(); - world.activate_bad_guys(); + global_world.activate_bad_guys(); show_menu = true; } break; @@ -275,7 +275,7 @@ le_level_subset.load(subset_new_menu->item[2].input); leveleditor_menu->item[3].kind = MN_GOTO; le_level = 1; - world.arrays_free(); + global_world.arrays_free(); loadshared(); le_current_level = new Level; if(le_current_level->load(le_level_subset.name.c_str(), le_level) != 0) @@ -285,7 +285,7 @@ } le_set_defaults(); le_current_level->load_gfx(); - world.activate_bad_guys(); + global_world.activate_bad_guys(); menu_item_change_input(&subset_new_menu->item[2],""); show_menu = true; break; @@ -544,7 +544,7 @@ void le_goto_level(int levelnb) { - world.arrays_free(); + global_world.arrays_free(); le_current_level->cleanup(); if(le_current_level->load(le_level_subset.name.c_str(), levelnb) != 0) @@ -561,7 +561,7 @@ le_current_level->free_gfx(); le_current_level->load_gfx(); - world.activate_bad_guys(); + global_world.activate_bad_guys(); } void le_quit(void) @@ -597,7 +597,7 @@ { le_current_level->free_gfx(); le_current_level->cleanup(); - world.arrays_free(); + global_world.arrays_free(); unloadshared(); } } @@ -729,12 +729,12 @@ } /* Draw the Bad guys: */ - for (i = 0; i < world.bad_guys.size(); ++i) + for (i = 0; i < global_world.bad_guys.size(); ++i) { /* to support frames: img_bsod_left[(frame / 5) % 4] */ scroll_x = pos_x; - world.bad_guys[i].draw(); + global_world.bad_guys[i].draw(); } @@ -1123,16 +1123,16 @@ xx = ((int)x / 32); /* if there is a bad guy over there, remove it */ - for(i = 0; i < world.bad_guys.size(); ++i) - if(xx == world.bad_guys[i].base.x/32 && yy == world.bad_guys[i].base.y/32) - world.bad_guys.erase(static_cast<std::vector<BadGuy>::iterator>(&world.bad_guys[i])); + for(i = 0; i < global_world.bad_guys.size(); ++i) + if(xx == global_world.bad_guys[i].base.x/32 && yy == global_world.bad_guys[i].base.y/32) + global_world.bad_guys.erase(static_cast<std::vector<BadGuy>::iterator>(&global_world.bad_guys[i])); if(c == '0') /* if it's a bad guy */ - world.add_bad_guy(xx*32, yy*32, BAD_BSOD); + global_world.add_bad_guy(xx*32, yy*32, BAD_BSOD); else if(c == '1') - world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP); + global_world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP); else if(c == '2') - world.add_bad_guy(xx*32, yy*32, BAD_MONEY); + global_world.add_bad_guy(xx*32, yy*32, BAD_MONEY); break; case SQUARE: @@ -1163,10 +1163,10 @@ y2 /= 32; /* if there is a bad guy over there, remove it */ - for(i = 0; i < world.bad_guys.size(); ++i) - if(world.bad_guys[i].base.x/32 >= x1 && world.bad_guys[i].base.x/32 <= x2 - && world.bad_guys[i].base.y/32 >= y1 && world.bad_guys[i].base.y/32 <= y2) - world.bad_guys.erase(static_cast<std::vector<BadGuy>::iterator>(&world.bad_guys[i])); + for(i = 0; i < global_world.bad_guys.size(); ++i) + if(global_world.bad_guys[i].base.x/32 >= x1 && global_world.bad_guys[i].base.x/32 <= x2 + && global_world.bad_guys[i].base.y/32 >= y1 && global_world.bad_guys[i].base.y/32 <= y2) + global_world.bad_guys.erase(static_cast<std::vector<BadGuy>::iterator>(&global_world.bad_guys[i])); for(xx = x1; xx <= x2; xx++) for(yy = y1; yy <= y2; yy++) @@ -1174,11 +1174,11 @@ le_current_level->change(xx*32, yy*32, tm, c); if(c == '0') // if it's a bad guy - world.add_bad_guy(xx*32, yy*32, BAD_BSOD); + global_world.add_bad_guy(xx*32, yy*32, BAD_BSOD); else if(c == '1') - world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP); + global_world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP); else if(c == '2') - world.add_bad_guy(xx*32, yy*32, BAD_MONEY); + global_world.add_bad_guy(xx*32, yy*32, BAD_MONEY); } break; default: @@ -1195,10 +1195,10 @@ session.run(); Menu::set_current(leveleditor_menu); - world.arrays_free(); + global_world.arrays_free(); le_current_level->load_gfx(); loadshared(); - world.activate_bad_guys(); + global_world.activate_bad_guys(); } void le_showhelp() Index: gameloop.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- gameloop.h 11 Apr 2004 01:36:22 -0000 1.32 +++ gameloop.h 11 Apr 2004 13:05:35 -0000 1.33 @@ -65,8 +65,7 @@ std::string slotinfo(int slot); -bool rectcollision(base_type* one, base_type* two); -void drawshape(float x, float y, unsigned int c, Uint8 alpha = 255); +bool rectcollision(base_type* one, base_type* two); void bumpbrick(float x, float y); #endif /*SUPERTUX_GAMELOOP_H*/ Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gameobjs.cpp 11 Apr 2004 12:43:35 -0000 1.3 +++ gameobjs.cpp 11 Apr 2004 13:05:35 -0000 1.4 @@ -38,7 +38,7 @@ base.ym += 0.1 * frame_ratio; if (base.ym >= 0) - world.bouncy_distros.erase(static_cast<std::vector<BouncyDistro>::iterator>(this)); + World::current()->bouncy_distros.erase(static_cast<std::vector<BouncyDistro>::iterator>(this)); } void @@ -70,7 +70,7 @@ base.y = base.y + base.ym * frame_ratio; if (!timer_check(&timer)) - world.broken_bricks.erase(static_cast<std::vector<BrokenBrick>::iterator>(this)); + World::current()->broken_bricks.erase(static_cast<std::vector<BrokenBrick>::iterator>(this)); } void @@ -115,7 +115,7 @@ /* Stop bouncing? */ if (offset >= 0) - world.bouncy_bricks.erase(static_cast<std::vector<BouncyBrick>::iterator>(this)); + World::current()->bouncy_bricks.erase(static_cast<std::vector<BouncyBrick>::iterator>(this)); } void @@ -171,7 +171,7 @@ base.y = base.y - 2 * frame_ratio; if(!timer_check(&timer)) - world.floating_scores.erase(static_cast<std::vector<FloatingScore>::iterator>(this)); + World::current()->floating_scores.erase(static_cast<std::vector<FloatingScore>::iterator>(this)); } void Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- special.cpp 10 Apr 2004 22:37:13 -0000 1.8 +++ special.cpp 11 Apr 2004 13:05:35 -0000 1.9 @@ -72,7 +72,7 @@ issolid(pbullet->base.x + 4, pbullet->base.y + 2) || issolid(pbullet->base.x, pbullet->base.y + 2)) { - world.bullets.erase(static_cast<std::vector<bullet_type>::iterator>(pbullet)); + World::current()->bullets.erase(static_cast<std::vector<bullet_type>::iterator>(pbullet)); } } @@ -92,9 +92,9 @@ if(c_object == CO_BADGUY) { std::vector<bullet_type>::iterator i; - for(i = world.bullets.begin(); i != world.bullets.end(); ++i) { + for(i = World::current()->bullets.begin(); i != World::current()->bullets.end(); ++i) { if(& (*i) == pbullet) { - world.bullets.erase(i); + World::current()->bullets.erase(i); return; } } @@ -144,9 +144,9 @@ /* Off the screen? Kill it! */ if (pupgrade->base.x < scroll_x - pupgrade->base.width) - world.upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade)); + World::current()->upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade)); if (pupgrade->base.y > screen->h) - world.upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade)); + World::current()->upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade)); if (issolid(pupgrade->base.x + 1, pupgrade->base.y + 32.) || issolid(pupgrade->base.x + 31., pupgrade->base.y + 32.)) @@ -234,7 +234,7 @@ /* p_c_object is CO_PLAYER, so assign it to pplayer */ pplayer = (Player*) p_c_object; - world.upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade)); + World::current()->upgrades.erase(static_cast<std::vector<upgrade_type>::iterator>(pupgrade)); /* Affect the player: */ Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- world.cpp 11 Apr 2004 13:00:00 -0000 1.14 +++ world.cpp 11 Apr 2004 13:05:35 -0000 1.15 @@ -32,7 +32,7 @@ World* World::current_ = 0; -World world; +World global_world; World::World() { Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- gameloop.cpp 11 Apr 2004 13:00:00 -0000 1.55 +++ gameloop.cpp 11 Apr 2004 13:05:35 -0000 1.56 @@ -78,7 +78,7 @@ { current_ = this; - world = &::world; + world = &::global_world; timer_init(&fps_timer, true); timer_init(&frame_timer, true); @@ -90,7 +90,7 @@ { current_ = this; - world = &::world; + world = &::global_world; timer_init(&fps_timer, true); timer_init(&frame_timer, true); @@ -648,7 +648,7 @@ /* Bounce a brick: */ void bumpbrick(float x, float y) { - world.add_bouncy_brick(((int)(x + 1) / 32) * 32, + World::current()->add_bouncy_brick(((int)(x + 1) / 32) * 32, (int)(y / 32) * 32); play_sound(sounds[SND_BRICK], SOUND_CENTER_SPEAKER); |
