From 96805cfc71482f4cd99d7e060b3c681f6b0e1ddc Mon Sep 17 00:00:00 2001 From: hikerstk Date: Wed, 3 Jun 2009 01:36:48 +0000 Subject: [PATCH] Moved race related files into new subdir 'race'. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3581 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/Makefile.am | 273 ++++++++++----------- src/challenges/challenge.cpp | 4 +- src/challenges/challenge_data.cpp | 4 +- src/challenges/challenge_data.hpp | 2 +- src/challenges/unlock_manager.cpp | 2 +- src/graphics/camera.cpp | 2 +- src/gui/race_gui.cpp | 2 +- src/gui/race_gui.hpp | 2 +- src/gui/state_manager.cpp | 27 +- src/ide/vc9/supertuxkart.vcproj | 108 ++++---- src/input/input_device.cpp | 4 +- src/input/input_manager.cpp | 5 +- src/items/flyable.cpp | 2 +- src/items/plunger.cpp | 2 +- src/items/powerup.cpp | 2 +- src/items/rubber_band.cpp | 2 +- src/karts/kart_properties.hpp | 4 +- src/karts/player_kart.cpp | 2 +- src/main.cpp | 12 +- src/main_loop.cpp | 6 +- src/modes/world.cpp | 9 +- src/modes/world.hpp | 4 +- src/network/character_selected_message.hpp | 2 +- src/network/network_manager.cpp | 2 +- src/network/race_result_message.cpp | 2 +- src/network/race_start_message.hpp | 6 +- src/network/race_state.hpp | 10 +- src/{ => race}/grand_prix_data.cpp | 4 +- src/{ => race}/grand_prix_data.hpp | 0 src/{ => race}/grand_prix_manager.cpp | 2 +- src/{ => race}/grand_prix_manager.hpp | 3 +- src/{ => race}/highscore_manager.cpp | 4 +- src/{ => race}/highscore_manager.hpp | 6 +- src/{ => race}/highscores.cpp | 4 +- src/{ => race}/highscores.hpp | 6 +- src/{ => race}/history.cpp | 6 +- src/{ => race}/history.hpp | 1 + src/{ => race}/race_manager.cpp | 8 +- src/{ => race}/race_manager.hpp | 6 +- src/robots/default_robot.cpp | 2 +- src/tracks/terrain_info.cpp | 4 +- src/tracks/track.cpp | 2 +- src/user_config.cpp | 3 +- 43 files changed, 285 insertions(+), 278 deletions(-) rename src/{ => race}/grand_prix_data.cpp (98%) rename src/{ => race}/grand_prix_data.hpp (100%) rename src/{ => race}/grand_prix_manager.cpp (98%) rename src/{ => race}/grand_prix_manager.hpp (97%) rename src/{ => race}/highscore_manager.cpp (99%) rename src/{ => race}/highscore_manager.hpp (94%) rename src/{ => race}/highscores.cpp (99%) rename src/{ => race}/highscores.hpp (96%) rename src/{ => race}/history.cpp (99%) rename src/{ => race}/history.hpp (99%) rename src/{ => race}/race_manager.cpp (99%) rename src/{ => race}/race_manager.hpp (99%) diff --git a/src/Makefile.am b/src/Makefile.am index 95ffabfc7..ceb078f15 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,35 +10,12 @@ AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \ supertuxkart_SOURCES = \ main.cpp \ - network/network_manager.cpp \ - network/network_manager.hpp \ - network/network_kart.cpp \ - network/network_kart.hpp \ - network/message.cpp \ - network/message.hpp \ - network/race_info_message.hpp \ - network/race_info_message.cpp \ - network/race_result_ack_message.hpp \ - network/remote_kart_info.hpp \ - network/character_selected_message.hpp \ - network/race_start_message.hpp \ - network/character_confirm_message.hpp \ - network/connect_message.hpp \ - network/connect_message.cpp \ - network/num_players_message.hpp \ - network/world_loaded_message.hpp \ - network/connect_message.hpp \ - network/character_info_message.hpp \ - network/kart_update_message.hpp \ - network/kart_update_message.cpp \ - network/kart_control_message.hpp \ - network/kart_control_message.cpp \ - network/flyable_info.hpp \ - network/item_info.hpp \ - network/race_state.hpp \ - network/race_state.cpp \ - network/race_result_message.hpp \ - network/race_result_message.cpp \ + main_loop.cpp \ + main_loop.hpp \ + stk_config.cpp \ + stk_config.hpp \ + user_config.cpp \ + user_config.hpp \ audio/music.hpp \ audio/music_information.cpp \ audio/music_information.hpp \ @@ -51,20 +28,12 @@ supertuxkart_SOURCES = \ audio/sfx_openal.hpp \ audio/sound_manager.cpp \ audio/sound_manager.hpp \ - utils/constants.hpp \ - utils/coord.hpp \ - utils/no_copy.hpp \ - utils/ptr_vector.hpp \ - utils/random_generator.hpp \ - utils/random_generator.cpp \ - utils/string_utils.cpp \ - utils/string_utils.hpp \ - utils/translation.cpp \ - utils/translation.hpp \ - utils/vec3.cpp \ - utils/vec3.hpp \ - grand_prix_manager.cpp \ - grand_prix_manager.hpp \ + challenges/challenge.cpp \ + challenges/challenge.hpp \ + challenges/challenge_data.cpp \ + challenges/challenge_data.hpp \ + challenges/unlock_manager.cpp \ + challenges/unlock_manager.hpp \ graphics/camera.cpp \ graphics/camera.hpp \ graphics/explosion.cpp \ @@ -75,22 +44,51 @@ supertuxkart_SOURCES = \ graphics/material.hpp \ graphics/material_manager.cpp \ graphics/material_manager.hpp \ - graphics/mesh_tools.hpp \ graphics/mesh_tools.cpp \ + graphics/mesh_tools.hpp \ + graphics/moving_texture.cpp \ + graphics/moving_texture.hpp \ graphics/nitro.cpp \ graphics/nitro.hpp \ - graphics/moving_texture.hpp \ - graphics/moving_texture.cpp \ graphics/particle_system.cpp \ graphics/particle_system.hpp \ - graphics/scene.hpp \ graphics/scene.cpp \ + graphics/scene.hpp \ graphics/shadow.cpp \ graphics/shadow.hpp \ graphics/skid_marks.cpp \ graphics/skid_marks.hpp \ graphics/smoke.cpp \ graphics/smoke.hpp \ + gui/credits.cpp \ + gui/credits.hpp \ + gui/engine.cpp \ + gui/engine.hpp \ + gui/font.cpp \ + gui/font.hpp \ + gui/my_button.cpp \ + gui/my_button.hpp \ + gui/options_screen.cpp \ + gui/options_screen.hpp \ + gui/race_gui.cpp \ + gui/race_gui.hpp \ + gui/screen.cpp \ + gui/screen.hpp \ + gui/screen_loader.cpp \ + gui/skin.cpp \ + gui/skin.hpp \ + gui/state_manager.cpp \ + gui/state_manager.hpp \ + gui/widget.cpp \ + gui/widget.hpp \ + input/device_manager.cpp \ + input/device_manager.hpp \ + input/input.cpp \ + input/input.hpp \ + input/input_device.cpp \ + input/input_device.hpp \ + input/input_manager.cpp \ + input/input_manager.hpp \ io/file_manager.cpp \ io/file_manager.hpp \ io/xml_node.cpp \ @@ -99,32 +97,32 @@ supertuxkart_SOURCES = \ items/attachment.hpp \ items/attachment_manager.cpp \ items/attachment_manager.hpp \ + items/bowling.cpp \ + items/bowling.hpp \ + items/bubblegumitem.cpp \ + items/bubblegumitem.hpp \ + items/cake.cpp \ + items/cake.hpp \ items/flyable.cpp \ items/flyable.hpp \ - items/powerup.cpp \ - items/powerup.hpp \ - items/powerup_manager.cpp \ - items/powerup_manager.hpp \ items/item.cpp \ items/item.hpp \ items/item_manager.cpp \ items/item_manager.hpp \ - items/projectile_manager.cpp \ - items/projectile_manager.hpp \ - items/bubblegumitem.cpp \ - items/bubblegumitem.hpp \ items/plunger.cpp \ items/plunger.hpp \ + items/powerup.cpp \ + items/powerup.hpp \ + items/powerup_manager.cpp \ + items/powerup_manager.hpp \ + items/projectile_manager.cpp \ + items/projectile_manager.hpp \ items/rubber_band.cpp \ items/rubber_band.hpp \ - items/cake.cpp \ - items/cake.hpp \ - items/bowling.cpp \ - items/bowling.hpp \ karts/auto_kart.hpp \ - karts/kart_control.hpp \ karts/kart.cpp \ karts/kart.hpp \ + karts/kart_control.hpp \ karts/kart_model.cpp \ karts/kart_model.hpp \ karts/kart_properties.cpp \ @@ -135,116 +133,117 @@ supertuxkart_SOURCES = \ karts/moveable.hpp \ karts/player_kart.cpp \ karts/player_kart.hpp \ - input.hpp \ - input/device_manager.cpp \ - input/device_manager.hpp \ - input/input.cpp \ - input/input.hpp \ - input/input_device.cpp \ - input/input_device.hpp \ - input/input_manager.cpp \ - input/input_manager.hpp \ - user_config.cpp \ - user_config.hpp \ - grand_prix_data.cpp \ - grand_prix_data.hpp \ - stk_config.cpp \ - stk_config.hpp \ - highscores.cpp \ - highscores.hpp \ - highscore_manager.cpp \ - highscore_manager.hpp \ - race_manager.cpp \ - race_manager.hpp \ - main_loop.cpp \ - main_loop.hpp \ - user_pointer.hpp \ - history.cpp \ - history.hpp \ - player.hpp \ - challenges/challenge.hpp \ - challenges/challenge.cpp \ - challenges/challenge_data.hpp \ - challenges/challenge_data.cpp \ - challenges/unlock_manager.cpp \ - challenges/unlock_manager.hpp \ - lisp/lisp.cpp \ - lisp/lisp.hpp \ lisp/lexer.cpp \ lisp/lexer.hpp \ + lisp/lisp.cpp \ + lisp/lisp.hpp \ lisp/parser.cpp \ lisp/parser.hpp \ lisp/writer.cpp \ lisp/writer.hpp \ - gui/credits.cpp \ - gui/credits.hpp \ - gui/widget.cpp \ - gui/widget.hpp \ - gui/race_gui.cpp \ - gui/race_gui.hpp \ - gui/font.hpp \ - gui/font.cpp \ - gui/engine.cpp \ - gui/engine.hpp \ - gui/my_button.cpp \ - gui/my_button.hpp \ - gui/options_screen.cpp \ - gui/options_screen.hpp \ - gui/screen.cpp \ - gui/screen.hpp \ - gui/screen_loader.cpp \ - gui/skin.cpp \ - gui/skin.hpp \ - gui/state_manager.cpp \ - gui/state_manager.hpp \ - modes/follow_the_leader.cpp \ - modes/follow_the_leader.hpp \ - modes/standard_race.cpp \ - modes/standard_race.hpp \ modes/clock.cpp \ modes/clock.hpp \ - modes/world.cpp \ - modes/world.hpp \ + modes/follow_the_leader.cpp \ + modes/follow_the_leader.hpp \ modes/linear_world.cpp \ modes/linear_world.hpp \ + modes/standard_race.cpp \ + modes/standard_race.hpp \ modes/three_strikes_battle.cpp \ modes/three_strikes_battle.hpp \ + modes/world.cpp \ + modes/world.hpp \ + network/character_confirm_message.hpp \ + network/character_info_message.hpp \ + network/character_selected_message.hpp \ + network/connect_message.cpp \ + network/connect_message.hpp \ + network/connect_message.hpp \ + network/flyable_info.hpp \ + network/item_info.hpp \ + network/kart_control_message.cpp \ + network/kart_control_message.hpp \ + network/kart_update_message.cpp \ + network/kart_update_message.hpp \ + network/message.cpp \ + network/message.hpp \ + network/network_kart.cpp \ + network/network_kart.hpp \ + network/network_manager.cpp \ + network/network_manager.hpp \ + network/num_players_message.hpp \ + network/race_info_message.cpp \ + network/race_info_message.hpp \ + network/race_result_ack_message.hpp \ + network/race_result_message.cpp \ + network/race_result_message.hpp \ + network/race_start_message.hpp \ + network/race_state.cpp \ + network/race_state.hpp \ + network/remote_kart_info.hpp \ + network/world_loaded_message.hpp \ physics/btKart.cpp \ physics/btKart.hpp \ physics/btUprightConstraint.cpp \ physics/btUprightConstraint.hpp \ - physics/physical_object.hpp \ + physics/kart_motion_state.hpp \ physics/physical_object.cpp \ + physics/physical_object.hpp \ physics/physics.cpp \ physics/physics.hpp \ - physics/kart_motion_state.hpp \ physics/triangle_mesh.cpp \ physics/triangle_mesh.hpp \ + physics/user_pointer.hpp \ + player.hpp \ + race/grand_prix_data.cpp \ + race/grand_prix_data.hpp \ + race/grand_prix_manager.cpp \ + race/grand_prix_manager.hpp \ + race/highscore_manager.cpp \ + race/highscore_manager.hpp \ + race/highscores.cpp \ + race/highscores.hpp \ + race/history.cpp \ + race/history.hpp \ + race/race_manager.cpp \ + race/race_manager.hpp \ + replay/replay_base.cpp \ + replay/replay_base.hpp \ + replay/replay_buffer_tpl.hpp \ + replay/replay_buffers.cpp \ + replay/replay_buffers.hpp \ + replay/replay_player.cpp \ + replay/replay_player.hpp \ + replay/replay_recorder.cpp \ + replay/replay_recorder.hpp \ robots/default_robot.cpp \ robots/default_robot.hpp \ - tracks/graph_node.hpp\ tracks/graph_node.cpp\ - tracks/quad.hpp \ + tracks/graph_node.hpp\ tracks/quad.cpp \ - tracks/quad_graph.hpp \ + tracks/quad.hpp \ tracks/quad_graph.cpp \ - tracks/quad_set.hpp \ + tracks/quad_graph.hpp \ tracks/quad_set.cpp \ + tracks/quad_set.hpp \ tracks/terrain_info.cpp \ tracks/terrain_info.hpp \ tracks/track.cpp \ tracks/track.hpp \ tracks/track_manager.cpp \ tracks/track_manager.hpp \ - replay/replay_buffer_tpl.hpp \ - replay/replay_buffers.hpp \ - replay/replay_buffers.cpp \ - replay/replay_base.hpp \ - replay/replay_base.cpp \ - replay/replay_player.hpp \ - replay/replay_player.cpp \ - replay/replay_recorder.hpp \ - replay/replay_recorder.cpp + utils/constants.hpp \ + utils/coord.hpp \ + utils/no_copy.hpp \ + utils/ptr_vector.hpp \ + utils/random_generator.cpp \ + utils/random_generator.hpp \ + utils/string_utils.cpp \ + utils/string_utils.hpp \ + utils/translation.cpp \ + utils/translation.hpp \ + utils/vec3.cpp \ + utils/vec3.hpp # Link in the specific gcc 4.1 bug work around supertuxkart_LDADD = \ diff --git a/src/challenges/challenge.cpp b/src/challenges/challenge.cpp index db06b2a73..3c460b7d4 100644 --- a/src/challenges/challenge.cpp +++ b/src/challenges/challenge.cpp @@ -19,10 +19,10 @@ #include "challenges/challenge.hpp" -#include "race_manager.hpp" -#include "grand_prix_manager.hpp" #include "karts/kart_properties_manager.hpp" #include "karts/kart_properties.hpp" +#include "race/grand_prix_manager.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" #include "utils/translation.hpp" diff --git a/src/challenges/challenge_data.cpp b/src/challenges/challenge_data.cpp index 20eeaa2ca..295f33265 100644 --- a/src/challenges/challenge_data.cpp +++ b/src/challenges/challenge_data.cpp @@ -21,12 +21,12 @@ #include #include -#include "grand_prix_data.hpp" -#include "grand_prix_manager.hpp" #include "karts/kart.hpp" #include "lisp/lisp.hpp" #include "lisp/parser.hpp" #include "modes/linear_world.hpp" +#include "race/grand_prix_data.hpp" +#include "race/grand_prix_manager.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" diff --git a/src/challenges/challenge_data.hpp b/src/challenges/challenge_data.hpp index b4e8ce0a6..dd6ce0aa2 100644 --- a/src/challenges/challenge_data.hpp +++ b/src/challenges/challenge_data.hpp @@ -25,7 +25,7 @@ #include #include "challenges/challenge.hpp" -#include "race_manager.hpp" +#include "race/race_manager.hpp" class ChallengeData : public Challenge { diff --git a/src/challenges/unlock_manager.cpp b/src/challenges/unlock_manager.cpp index d35c86534..a927f5f11 100644 --- a/src/challenges/unlock_manager.cpp +++ b/src/challenges/unlock_manager.cpp @@ -23,10 +23,10 @@ #include #include -#include "race_manager.hpp" #include "user_config.hpp" #include "challenges/challenge_data.hpp" #include "io/file_manager.hpp" +#include "race/race_manager.hpp" #include "utils/string_utils.hpp" UnlockManager* unlock_manager=0; diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp index d647f0b71..90d3bd637 100644 --- a/src/graphics/camera.cpp +++ b/src/graphics/camera.cpp @@ -25,7 +25,7 @@ #include "graphics/irr_driver.hpp" #include "karts/player_kart.hpp" #include "modes/world.hpp" -#include "race_manager.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" #include "utils/coord.hpp" diff --git a/src/gui/race_gui.cpp b/src/gui/race_gui.cpp index b0ccdd22b..d2855ad47 100644 --- a/src/gui/race_gui.cpp +++ b/src/gui/race_gui.cpp @@ -21,13 +21,13 @@ #include "gui/race_gui.hpp" #include "user_config.hpp" -#include "race_manager.hpp" #include "audio/sound_manager.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material_manager.hpp" #include "gui/font.hpp" #include "input/input.hpp" #include "input/input_manager.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" #include "utils/translation.hpp" diff --git a/src/gui/race_gui.hpp b/src/gui/race_gui.hpp index 03ca60442..844083374 100644 --- a/src/gui/race_gui.hpp +++ b/src/gui/race_gui.hpp @@ -30,11 +30,11 @@ using namespace irr; #include #include "player.hpp" -#include "race_manager.hpp" #include "graphics/material.hpp" #include "karts/kart.hpp" #include "karts/player_kart.hpp" #include "modes/world.hpp" +#include "race/race_manager.hpp" class InputMap; class RaceSetup; diff --git a/src/gui/state_manager.cpp b/src/gui/state_manager.cpp index 47d7ba8a2..9fc65bd64 100644 --- a/src/gui/state_manager.cpp +++ b/src/gui/state_manager.cpp @@ -1,19 +1,20 @@ -#include "audio/sound_manager.hpp" #include "gui/state_manager.hpp" -#include "gui/engine.hpp" -#include "gui/widget.hpp" -#include "gui/screen.hpp" -#include "gui/credits.hpp" -#include "gui/options_screen.hpp" -#include "input/input_manager.hpp" -#include "input/device_manager.hpp" -#include "graphics/irr_driver.hpp" -#include "race_manager.hpp" -#include "network/network_manager.hpp" + #include "main_loop.hpp" -#include "karts/kart_properties_manager.hpp" -#include "karts/kart.hpp" #include "user_config.hpp" +#include "audio/sound_manager.hpp" +#include "graphics/irr_driver.hpp" +#include "gui/credits.hpp" +#include "gui/engine.hpp" +#include "gui/options_screen.hpp" +#include "gui/screen.hpp" +#include "gui/widget.hpp" +#include "input/device_manager.hpp" +#include "input/input_manager.hpp" +#include "karts/kart.hpp" +#include "karts/kart_properties_manager.hpp" +#include "network/network_manager.hpp" +#include "race/race_manager.hpp" #include diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj index 653a41d6e..ff064fea7 100644 --- a/src/ide/vc9/supertuxkart.vcproj +++ b/src/ide/vc9/supertuxkart.vcproj @@ -193,26 +193,6 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - - - - - @@ -221,10 +201,6 @@ RelativePath="..\..\main_loop.cpp" > - - @@ -685,24 +661,40 @@ > + + + + + + + + + + + + + + - - - - - - @@ -715,18 +707,6 @@ RelativePath="../../../src\herring_manager.hpp" > - - - - - - @@ -747,10 +727,6 @@ RelativePath="..\..\position.hpp" > - - @@ -1299,6 +1275,34 @@ > + + + + + + + + + + + + + + #include -#include "history.hpp" #include "main_loop.hpp" #include "player.hpp" #include "user_config.hpp" -#include "race_manager.hpp" - #include "graphics/irr_driver.hpp" #include "gui/options_screen.hpp" #include "gui/state_manager.hpp" @@ -42,6 +39,8 @@ #include "items/projectile_manager.hpp" #include "karts/kart.hpp" #include "modes/world.hpp" +#include "race/history.hpp" +#include "race/race_manager.hpp" InputManager *input_manager; diff --git a/src/items/flyable.cpp b/src/items/flyable.cpp index 6b4ece572..0bc544b18 100644 --- a/src/items/flyable.cpp +++ b/src/items/flyable.cpp @@ -21,7 +21,6 @@ #include -#include "race_manager.hpp" #include "graphics/irr_driver.hpp" #include "graphics/mesh_tools.hpp" #include "graphics/scene.hpp" @@ -30,6 +29,7 @@ #include "modes/world.hpp" #include "modes/linear_world.hpp" #include "network/flyable_info.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" diff --git a/src/items/plunger.cpp b/src/items/plunger.cpp index 79fb3d397..ce10f6ef2 100644 --- a/src/items/plunger.cpp +++ b/src/items/plunger.cpp @@ -19,7 +19,6 @@ #include "items/plunger.hpp" -#include "race_manager.hpp" #include "graphics/irr_driver.hpp" #include "graphics/scene.hpp" #include "items/rubber_band.hpp" @@ -27,6 +26,7 @@ #include "karts/player_kart.hpp" #include "modes/world.hpp" #include "physics/physical_object.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" diff --git a/src/items/powerup.cpp b/src/items/powerup.cpp index cba651cd1..d3fae566e 100644 --- a/src/items/powerup.cpp +++ b/src/items/powerup.cpp @@ -20,7 +20,6 @@ #include "items/powerup.hpp" #include "user_config.hpp" -#include "race_manager.hpp" #include "stk_config.hpp" #include "audio/sfx_base.hpp" #include "audio/sfx_manager.hpp" @@ -30,6 +29,7 @@ #include "modes/world.hpp" #include "network/network_manager.hpp" #include "network/race_state.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" //----------------------------------------------------------------------------- diff --git a/src/items/rubber_band.cpp b/src/items/rubber_band.cpp index 95211ffc3..28d9ff760 100644 --- a/src/items/rubber_band.cpp +++ b/src/items/rubber_band.cpp @@ -19,7 +19,6 @@ #include "rubber_band.hpp" -#include "race_manager.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material_manager.hpp" #include "graphics/scene.hpp" @@ -28,6 +27,7 @@ #include "karts/kart.hpp" #include "modes/world.hpp" #include "physics/physics.hpp" +#include "race/race_manager.hpp" /** RubberBand constructor. It creates a simple quad and attaches it to the * root(!) of the graph. It's easier this way to get the right coordinates diff --git a/src/karts/kart_properties.hpp b/src/karts/kart_properties.hpp index 25589918a..5920d1d35 100644 --- a/src/karts/kart_properties.hpp +++ b/src/karts/kart_properties.hpp @@ -23,10 +23,10 @@ #include #include -#include "race_manager.hpp" +#include "audio/sfx_manager.hpp" #include "karts/kart_model.hpp" #include "lisp/lisp.hpp" -#include "audio/sfx_manager.hpp" +#include "race/race_manager.hpp" #include "utils/vec3.hpp" class Material; diff --git a/src/karts/player_kart.cpp b/src/karts/player_kart.cpp index 10b2c7cea..d75305a89 100644 --- a/src/karts/player_kart.cpp +++ b/src/karts/player_kart.cpp @@ -20,7 +20,6 @@ #include "karts/player_kart.hpp" -#include "history.hpp" #include "player.hpp" #include "input/input_manager.hpp" #include "audio/sfx_manager.hpp" @@ -30,6 +29,7 @@ #include "gui/race_gui.hpp" #include "items/item.hpp" #include "modes/world.hpp" +#include "race/history.hpp" #include "utils/constants.hpp" #include "utils/translation.hpp" diff --git a/src/main.cpp b/src/main.cpp index 03cb63a1c..3cb58e881 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,19 +39,17 @@ #include #include "user_config.hpp" -#include "race_manager.hpp" #include "main_loop.hpp" -#include "history.hpp" #include "stk_config.hpp" -#include "highscore_manager.hpp" -#include "grand_prix_manager.hpp" #include "audio/sound_manager.hpp" #include "audio/sfx_manager.hpp" #include "challenges/unlock_manager.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material_manager.hpp" #include "graphics/scene.hpp" +#include "gui/engine.hpp" #include "gui/font.hpp" +#include "gui/state_manager.hpp" #include "io/file_manager.hpp" #include "input/input_manager.hpp" #include "items/attachment_manager.hpp" @@ -60,11 +58,13 @@ #include "karts/kart_properties_manager.hpp" #include "karts/kart.hpp" #include "network/network_manager.hpp" +#include "race/grand_prix_manager.hpp" +#include "race/highscore_manager.hpp" +#include "race/history.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" #include "utils/translation.hpp" -#include "gui/engine.hpp" -#include "gui/state_manager.hpp" // Only needed for bullet debug! #ifdef HAVE_GLUT diff --git a/src/main_loop.cpp b/src/main_loop.cpp index e1b587708..56688b01a 100644 --- a/src/main_loop.cpp +++ b/src/main_loop.cpp @@ -21,18 +21,18 @@ #include -#include "history.hpp" -#include "race_manager.hpp" #include "user_config.hpp" #include "audio/sound_manager.hpp" #include "graphics/irr_driver.hpp" #include "graphics/material_manager.hpp" #include "graphics/scene.hpp" #include "gui/engine.hpp" +#include "gui/state_manager.hpp" #include "input/input_manager.hpp" #include "modes/world.hpp" #include "network/network_manager.hpp" -#include "gui/state_manager.hpp" +#include "race/history.hpp" +#include "race/race_manager.hpp" MainLoop* main_loop = 0; diff --git a/src/modes/world.cpp b/src/modes/world.cpp index e8affc49e..50276d487 100644 --- a/src/modes/world.cpp +++ b/src/modes/world.cpp @@ -17,16 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include "modes/world.hpp" + #include #include #include #include #include -#include "race_manager.hpp" #include "user_config.hpp" -#include "history.hpp" -#include "highscore_manager.hpp" #include "audio/sound_manager.hpp" #include "audio/sfx_manager.hpp" #include "audio/sfx_base.hpp" @@ -40,9 +39,11 @@ #include "karts/auto_kart.hpp" #include "karts/player_kart.hpp" #include "karts/kart_properties_manager.hpp" -#include "modes/world.hpp" #include "network/network_manager.hpp" #include "network/race_state.hpp" +#include "race/highscore_manager.hpp" +#include "race/history.hpp" +#include "race/race_manager.hpp" #include "robots/default_robot.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" diff --git a/src/modes/world.hpp b/src/modes/world.hpp index fa7565769..962098f62 100644 --- a/src/modes/world.hpp +++ b/src/modes/world.hpp @@ -22,12 +22,12 @@ #include -#include "highscores.hpp" #include "karts/kart.hpp" #include "karts/player_kart.hpp" -#include "physics/physics.hpp" #include "modes/clock.hpp" #include "network/network_kart.hpp" +#include "physics/physics.hpp" +#include "race/highscores.hpp" #include "utils/random_generator.hpp" class SFXBase; diff --git a/src/network/character_selected_message.hpp b/src/network/character_selected_message.hpp index 38d891738..14c694900 100644 --- a/src/network/character_selected_message.hpp +++ b/src/network/character_selected_message.hpp @@ -21,8 +21,8 @@ #define HEADER_CHARACTER_SELECTED_MESSAGE_H #include "network/message.hpp" -#include "race_manager.hpp" #include "network/remote_kart_info.hpp" +#include "race/race_manager.hpp" /** This message is send contains information about selected karts. It is send * from the client to the server to indicate a selected kart, and from the diff --git a/src/network/network_manager.cpp b/src/network/network_manager.cpp index 5f40df0b1..68223bed5 100644 --- a/src/network/network_manager.cpp +++ b/src/network/network_manager.cpp @@ -21,7 +21,6 @@ #include "stk_config.hpp" #include "user_config.hpp" -#include "race_manager.hpp" #include "karts/kart_properties_manager.hpp" #include "modes/world.hpp" #include "network/connect_message.hpp" @@ -35,6 +34,7 @@ #include "network/character_confirm_message.hpp" #include "network/race_result_message.hpp" #include "network/race_result_ack_message.hpp" +#include "race/race_manager.hpp" NetworkManager* network_manager = 0; diff --git a/src/network/race_result_message.cpp b/src/network/race_result_message.cpp index e1c7129f3..408432904 100644 --- a/src/network/race_result_message.cpp +++ b/src/network/race_result_message.cpp @@ -19,9 +19,9 @@ #include "network/race_result_message.hpp" -#include "race_manager.hpp" #include "karts/kart.hpp" #include "modes/world.hpp" +#include "race/race_manager.hpp" /** Creates a message containing the finishing time and rank of each kart. * This message is serialised so that it can be sent. diff --git a/src/network/race_start_message.hpp b/src/network/race_start_message.hpp index 2ff36fa14..40e5f305e 100644 --- a/src/network/race_start_message.hpp +++ b/src/network/race_start_message.hpp @@ -17,12 +17,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef HEADER_RACE_START_MESSAGE_H -#define HEADER_RACE_START_MESSAGE_H +#ifndef HEADER_RACE_START_MESSAGE_HPP +#define HEADER_RACE_START_MESSAGE_HPP #include "network/message.hpp" -#include "race_manager.hpp" #include "network/remote_kart_info.hpp" +#include "race/race_manager.hpp" class RaceStartMessage : public Message { diff --git a/src/network/race_state.hpp b/src/network/race_state.hpp index d2591f06e..ccd01c13d 100644 --- a/src/network/race_state.hpp +++ b/src/network/race_state.hpp @@ -22,14 +22,14 @@ #include -#include "race_manager.hpp" -#include "karts/kart.hpp" -#include "karts/kart_control.hpp" #include "items/flyable.hpp" #include "items/item.hpp" -#include "network/message.hpp" -#include "network/item_info.hpp" +#include "karts/kart.hpp" +#include "karts/kart_control.hpp" #include "network/flyable_info.hpp" +#include "network/item_info.hpp" +#include "network/message.hpp" +#include "race/race_manager.hpp" /** This class stores the state information of a (single) race, e.g. the position and orientation of karts, collisions that have happened etc. diff --git a/src/grand_prix_data.cpp b/src/race/grand_prix_data.cpp similarity index 98% rename from src/grand_prix_data.cpp rename to src/race/grand_prix_data.cpp index 742ac52fd..97273c2c9 100644 --- a/src/grand_prix_data.cpp +++ b/src/race/grand_prix_data.cpp @@ -18,9 +18,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include "race/grand_prix_data.hpp" + #include #include -#include "grand_prix_data.hpp" + #include "io/file_manager.hpp" #include "lisp/parser.hpp" #include "lisp/lisp.hpp" diff --git a/src/grand_prix_data.hpp b/src/race/grand_prix_data.hpp similarity index 100% rename from src/grand_prix_data.hpp rename to src/race/grand_prix_data.hpp diff --git a/src/grand_prix_manager.cpp b/src/race/grand_prix_manager.cpp similarity index 98% rename from src/grand_prix_manager.cpp rename to src/race/grand_prix_manager.cpp index e4e816771..0c7ad3c76 100644 --- a/src/grand_prix_manager.cpp +++ b/src/race/grand_prix_manager.cpp @@ -17,7 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "grand_prix_manager.hpp" +#include "race/grand_prix_manager.hpp" #include diff --git a/src/grand_prix_manager.hpp b/src/race/grand_prix_manager.hpp similarity index 97% rename from src/grand_prix_manager.hpp rename to src/race/grand_prix_manager.hpp index 4ccf5e19b..29778adc6 100644 --- a/src/grand_prix_manager.hpp +++ b/src/race/grand_prix_manager.hpp @@ -22,7 +22,8 @@ #include #include -#include "grand_prix_data.hpp" + +#include "race/grand_prix_data.hpp" class GrandPrixManager { diff --git a/src/highscore_manager.cpp b/src/race/highscore_manager.cpp similarity index 99% rename from src/highscore_manager.cpp rename to src/race/highscore_manager.cpp index 55b614565..9b8c33032 100644 --- a/src/highscore_manager.cpp +++ b/src/race/highscore_manager.cpp @@ -17,16 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "highscore_manager.hpp" +#include "race/highscore_manager.hpp" #include #include -#include "race_manager.hpp" #include "user_config.hpp" #include "io/file_manager.hpp" #include "lisp/parser.hpp" #include "lisp/writer.hpp" +#include "race/race_manager.hpp" #include "utils/string_utils.hpp" #include "utils/translation.hpp" diff --git a/src/highscore_manager.hpp b/src/race/highscore_manager.hpp similarity index 94% rename from src/highscore_manager.hpp rename to src/race/highscore_manager.hpp index 345e6669f..eb8f43489 100644 --- a/src/highscore_manager.hpp +++ b/src/race/highscore_manager.hpp @@ -17,14 +17,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef HEADER_HIGHSCORE_MANAGER_H -#define HEADER_HIGHSCORE_MANAGER_H +#ifndef HEADER_HIGHSCORE_MANAGER_HPP +#define HEADER_HIGHSCORE_MANAGER_HPP #include #include #include -#include "highscores.hpp" +#include "race/highscores.hpp" #include "lisp/lisp.hpp" const unsigned int CURRENT_HSCORE_FILE_VERSION = 1; diff --git a/src/highscores.cpp b/src/race/highscores.cpp similarity index 99% rename from src/highscores.cpp rename to src/race/highscores.cpp index 20b699c60..5ca497134 100644 --- a/src/highscores.cpp +++ b/src/race/highscores.cpp @@ -17,12 +17,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "highscores.hpp" +#include "race/highscores.hpp" #include #include -#include "race_manager.hpp" +#include "race/race_manager.hpp" // ----------------------------------------------------------------------------- HighscoreEntry::HighscoreEntry(const HighscoreEntry::HighscoreType highscore_type, diff --git a/src/highscores.hpp b/src/race/highscores.hpp similarity index 96% rename from src/highscores.hpp rename to src/race/highscores.hpp index 7135b771f..3c4b1ec34 100644 --- a/src/highscores.hpp +++ b/src/race/highscores.hpp @@ -17,15 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef HEADER_HIGHSCORES_H -#define HEADER_HIGHSCORES_H +#ifndef HEADER_HIGHSCORES_HPP +#define HEADER_HIGHSCORES_HPP #include #include #include #include "lisp/lisp.hpp" #include "lisp/writer.hpp" -#include "race_manager.hpp" +#include "race/race_manager.hpp" /** * Represents one highscore entry. diff --git a/src/history.cpp b/src/race/history.cpp similarity index 99% rename from src/history.cpp rename to src/race/history.cpp index 8535330a1..199594759 100644 --- a/src/history.cpp +++ b/src/race/history.cpp @@ -17,13 +17,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "history.hpp" +#include "race/history.hpp" #include -#include "race_manager.hpp" -#include "karts/kart.hpp" #include "modes/world.hpp" +#include "karts/kart.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" History* history = 0; diff --git a/src/history.hpp b/src/race/history.hpp similarity index 99% rename from src/history.hpp rename to src/race/history.hpp index bf4995af3..10cdbcb93 100644 --- a/src/history.hpp +++ b/src/race/history.hpp @@ -23,6 +23,7 @@ #include #include "LinearMath/btQuaternion.h" + #include "karts/kart_control.hpp" #include "utils/vec3.hpp" diff --git a/src/race_manager.cpp b/src/race/race_manager.cpp similarity index 99% rename from src/race_manager.cpp rename to src/race/race_manager.cpp index e3b1cd505..bc85cf3b3 100644 --- a/src/race_manager.cpp +++ b/src/race/race_manager.cpp @@ -17,20 +17,20 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "race_manager.hpp" +#include "race/race_manager.hpp" #include -#include "modes/world.hpp" #include "user_config.hpp" #include "stk_config.hpp" #include "challenges/unlock_manager.hpp" #include "graphics/scene.hpp" #include "karts/kart_properties_manager.hpp" -#include "network/network_manager.hpp" -#include "modes/standard_race.hpp" #include "modes/follow_the_leader.hpp" +#include "modes/standard_race.hpp" +#include "modes/world.hpp" #include "modes/three_strikes_battle.hpp" +#include "network/network_manager.hpp" #include "tracks/track_manager.hpp" RaceManager* race_manager= NULL; diff --git a/src/race_manager.hpp b/src/race/race_manager.hpp similarity index 99% rename from src/race_manager.hpp rename to src/race/race_manager.hpp index b6f9ac984..b5d1add4f 100644 --- a/src/race_manager.hpp +++ b/src/race/race_manager.hpp @@ -17,15 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef HEADER_RACEMANAGER_H -#define HEADER_RACEMANAGER_H +#ifndef HEADER_RACEMANAGER_HPP +#define HEADER_RACEMANAGER_HPP #include #include #include -#include "grand_prix_data.hpp" #include "network/remote_kart_info.hpp" +#include "race/grand_prix_data.hpp" class World; class Track; diff --git a/src/robots/default_robot.cpp b/src/robots/default_robot.cpp index 04664ced1..a831f0541 100644 --- a/src/robots/default_robot.cpp +++ b/src/robots/default_robot.cpp @@ -38,10 +38,10 @@ #include #include #include -#include "race_manager.hpp" #include "graphics/scene.hpp" #include "modes/linear_world.hpp" #include "network/network_manager.hpp" +#include "race/race_manager.hpp" #include "tracks/quad_graph.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" diff --git a/src/tracks/terrain_info.cpp b/src/tracks/terrain_info.cpp index ab4dc3836..4b29be834 100644 --- a/src/tracks/terrain_info.cpp +++ b/src/tracks/terrain_info.cpp @@ -17,11 +17,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "terrain_info.hpp" +#include "tracks/terrain_info.hpp" #include -#include "race_manager.hpp" +#include "race/race_manager.hpp" #include "tracks/track.hpp" #include "utils/constants.hpp" diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index abf64f91a..a5788421e 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -41,7 +41,7 @@ #include "modes/world.hpp" #include "physics/physical_object.hpp" #include "physics/triangle_mesh.hpp" -#include "race_manager.hpp" +#include "race/race_manager.hpp" #include "tracks/quad_graph.hpp" #include "tracks/quad_set.hpp" #include "utils/string_utils.hpp" diff --git a/src/user_config.cpp b/src/user_config.cpp index 9289cef98..1fb878d82 100644 --- a/src/user_config.cpp +++ b/src/user_config.cpp @@ -35,13 +35,12 @@ #endif #include "stk_config.hpp" -//#include "actionmap.hpp" -#include "race_manager.hpp" #include "challenges/unlock_manager.hpp" #include "io/file_manager.hpp" #include "lisp/lisp.hpp" #include "lisp/parser.hpp" #include "lisp/writer.hpp" +#include "race/race_manager.hpp" #include "utils/translation.hpp" #include "utils/string_utils.hpp"