ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved race related files into new subdir 'race'.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-06-03 01:36:48 +00:00
parent 83a032a27e
commit 96805cfc71
43 changed files with 285 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

273
src/Makefile.am
View File

@ -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 = \

4
src/challenges/challenge.cpp
View File

@ -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"

4
src/challenges/challenge_data.cpp
View File

@ -21,12 +21,12 @@
#include <stdexcept>
#include <sstream>
#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"

2
src/challenges/challenge_data.hpp
View File

@ -25,7 +25,7 @@
#include <stdio.h>
#include "challenges/challenge.hpp"
#include "race_manager.hpp"
#include "race/race_manager.hpp"
class ChallengeData : public Challenge
{

2
src/challenges/unlock_manager.cpp
View File

@ -23,10 +23,10 @@
#include <string>
#include <stdio.h>
#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;

2
src/graphics/camera.cpp
View File

@ -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"

2
src/gui/race_gui.cpp
View File

@ -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"

2
src/gui/race_gui.hpp
View File

@ -30,11 +30,11 @@ using namespace irr;
#include <vector>
#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;

27
src/gui/state_manager.cpp
View File

@ -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 <vector>

108
src/ide/vc9/supertuxkart.vcproj
View File

@ -193,26 +193,6 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\grand_prix_data.cpp"
>
</File>
<File
RelativePath="..\..\grand_prix_manager.cpp"
>
</File>
<File
RelativePath="../../../src\highscore_manager.cpp"
>
</File>
<File
RelativePath="../../../src\highscores.cpp"
>
</File>
<File
RelativePath="../../../src\history.cpp"
>
</File>
<File
RelativePath="../../../src\main.cpp"
>
@ -221,10 +201,6 @@
RelativePath="..\..\main_loop.cpp"
>
</File>
<File
RelativePath="../../../src\race_manager.cpp"
>
</File>
<File
RelativePath="../../../src\stk_config.cpp"
>
@ -685,24 +661,40 @@
>
</File>
</Filter>
<Filter
Name="race"
>
<File
RelativePath="..\..\race\grand_prix_data.cpp"
>
</File>
<File
RelativePath="..\..\race\grand_prix_manager.cpp"
>
</File>
<File
RelativePath="..\..\race\highscore_manager.cpp"
>
</File>
<File
RelativePath="..\..\race\highscores.cpp"
>
</File>
<File
RelativePath="..\..\race\history.cpp"
>
</File>
<File
RelativePath="..\..\race\race_manager.cpp"
>
</File>
</Filter>
</Filter>
<Filter
Name="Headerdateien"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="../../../src\constants.hpp"
>
</File>
<File
RelativePath="..\..\grand_prix_data.hpp"
>
</File>
<File
RelativePath="..\..\grand_prix_manager.hpp"
>
</File>
<File
RelativePath="..\..\gui\help_page_one.hpp"
>
@ -715,18 +707,6 @@
RelativePath="../../../src\herring_manager.hpp"
>
</File>
<File
RelativePath="../../../src\highscore_manager.hpp"
>
</File>
<File
RelativePath="../../../src\highscores.hpp"
>
</File>
<File
RelativePath="../../../src\history.hpp"
>
</File>
<File
RelativePath="..\..\main_loop.hpp"
>
@ -747,10 +727,6 @@
RelativePath="..\..\position.hpp"
>
</File>
<File
RelativePath="../../../src\race_manager.hpp"
>
</File>
<File
RelativePath="../../../src\ssg_help.hpp"
>
@ -1299,6 +1275,34 @@
>
</File>
</Filter>
<Filter
Name="race"
>
<File
RelativePath="..\..\race\grand_prix_data.hpp"
>
</File>
<File
RelativePath="..\..\race\grand_prix_manager.hpp"
>
</File>
<File
RelativePath="..\..\race\highscore_manager.hpp"
>
</File>
<File
RelativePath="..\..\race\highscores.hpp"
>
</File>
<File
RelativePath="..\..\race\history.hpp"
>
</File>
<File
RelativePath="..\..\race\race_manager.hpp"
>
</File>
</Filter>
</Filter>
<Filter
Name="Ressourcendateien"

4
src/input/input_device.cpp
View File

@ -1,9 +1,9 @@
#include "gui/state_manager.hpp"
#include "input/input.hpp"
#include "input/input_device.hpp"
#include "race_manager.hpp"
#include "modes/world.hpp"
#include "gui/state_manager.hpp"
#include "race/race_manager.hpp"
InputDevice::InputDevice()
{

5
src/input/input_manager.cpp
View File

@ -25,12 +25,9 @@
#include <sstream>
#include <algorithm>
#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;

2
src/items/flyable.cpp
View File

@ -21,7 +21,6 @@
#include <math.h>
#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"

2
src/items/plunger.cpp
View File

@ -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"

2
src/items/powerup.cpp
View File

@ -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"
//-----------------------------------------------------------------------------

2
src/items/rubber_band.cpp
View File

@ -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

4
src/karts/kart_properties.hpp
View File

@ -23,10 +23,10 @@
#include <string>
#include <vector>
#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;

2
src/karts/player_kart.cpp
View File

@ -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"

12
src/main.cpp
View File

@ -39,19 +39,17 @@
#include <algorithm>
#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

6
src/main_loop.cpp
View File

@ -21,18 +21,18 @@
#include <assert.h>
#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;

9
src/modes/world.cpp
View File

@ -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 <assert.h>
#include <sstream>
#include <stdexcept>
#include <algorithm>
#include <ctime>
#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"

4
src/modes/world.hpp
View File

@ -22,12 +22,12 @@
#include <vector>
#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;

2
src/network/character_selected_message.hpp
View File

@ -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

2
src/network/network_manager.cpp
View File

@ -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;

2
src/network/race_result_message.cpp
View File

@ -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.

6
src/network/race_start_message.hpp
View File

@ -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
{

10
src/network/race_state.hpp
View File

@ -22,14 +22,14 @@
#include <vector>
#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.

4
src/grand_prix_data.cpp → src/race/grand_prix_data.cpp
View File

@ -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 <iostream>
#include <stdexcept>
#include "grand_prix_data.hpp"
#include "io/file_manager.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"

0
src/grand_prix_data.hpp → src/race/grand_prix_data.hpp
View File

2
src/grand_prix_manager.cpp → src/race/grand_prix_manager.cpp
View File

@ -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 <set>

3
src/grand_prix_manager.hpp → src/race/grand_prix_manager.hpp
View File

@ -22,7 +22,8 @@
#include <vector>
#include <string>
#include "grand_prix_data.hpp"
#include "race/grand_prix_data.hpp"
class GrandPrixManager
{

4
src/highscore_manager.cpp → src/race/highscore_manager.cpp
View File

@ -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 <stdexcept>
#include <sstream>
#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"

6
src/highscore_manager.hpp → src/race/highscore_manager.hpp
View File

@ -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 <string>
#include <vector>
#include <map>
#include "highscores.hpp"
#include "race/highscores.hpp"
#include "lisp/lisp.hpp"
const unsigned int CURRENT_HSCORE_FILE_VERSION = 1;

4
src/highscores.cpp → src/race/highscores.cpp
View File

@ -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 <stdexcept>
#include <sstream>
#include "race_manager.hpp"
#include "race/race_manager.hpp"
// -----------------------------------------------------------------------------
HighscoreEntry::HighscoreEntry(const HighscoreEntry::HighscoreType highscore_type,

6
src/highscores.hpp → src/race/highscores.hpp
View File

@ -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 <string>
#include <vector>
#include <map>
#include "lisp/lisp.hpp"
#include "lisp/writer.hpp"
#include "race_manager.hpp"
#include "race/race_manager.hpp"
/**
* Represents one highscore entry.

6
src/history.cpp → src/race/history.cpp
View File

@ -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 <stdio.h>
#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;

1
src/history.hpp → src/race/history.hpp
View File

@ -23,6 +23,7 @@
#include <vector>
#include "LinearMath/btQuaternion.h"
#include "karts/kart_control.hpp"
#include "utils/vec3.hpp"

8
src/race_manager.cpp → src/race/race_manager.cpp
View File

@ -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 <iostream>
#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;

6
src/race_manager.hpp → src/race/race_manager.hpp
View File

@ -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 <vector>
#include <algorithm>
#include <string>
#include "grand_prix_data.hpp"
#include "network/remote_kart_info.hpp"
#include "race/grand_prix_data.hpp"
class World;
class Track;

2
src/robots/default_robot.cpp
View File

@ -38,10 +38,10 @@
#include <ctime>
#include <cstdio>
#include <iostream>
#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"

4
src/tracks/terrain_info.cpp
View File

@ -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 <math.h>
#include "race_manager.hpp"
#include "race/race_manager.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"

2
src/tracks/track.cpp
View File

@ -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"

3
src/user_config.cpp
View File

@ -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"