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

Moved more files into subdirs.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-01-22 22:27:13 +00:00
parent bd383f0240
commit 6ce3803165
79 changed files with 241 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile.am
View File

@ -55,11 +55,14 @@ supertuxkart_SOURCES = \
audio/sfx_openal.hpp \
audio/sound_manager.cpp \
audio/sound_manager.hpp \
utils/constants.hpp \
utils/coord.hpp \
utils/random_generator.hpp \
utils/random_generator.cpp \
utils/ssg_help.cpp \
utils/ssg_help.hpp \
utils/string_utils.cpp \
utils/string_utils.hpp \
utils/vec3.cpp \
utils/vec3.hpp \
material_manager.cpp \
@ -70,6 +73,10 @@ supertuxkart_SOURCES = \
graphics/nitro.hpp \
graphics/particle_system.cpp \
graphics/particle_system.hpp \
graphics/scene.hpp \
graphics/scene.cpp \
graphics/shadow.cpp \
graphics/shadow.hpp \
graphics/skid_marks.cpp \
graphics/skid_marks.hpp \
graphics/smoke.cpp \
@ -78,6 +85,8 @@ supertuxkart_SOURCES = \
items/attachment.hpp \
items/attachment_manager.cpp \
items/attachment_manager.hpp \
items/flyable.cpp \
items/flyable.hpp \
items/powerup.cpp \
items/powerup.hpp \
items/powerup_manager.cpp \
@ -115,8 +124,6 @@ supertuxkart_SOURCES = \
input.hpp \
isect.cpp \
isect.hpp \
track.cpp \
track.hpp \
explosion.cpp \
explosion.hpp \
user_config.cpp \
@ -137,15 +144,11 @@ supertuxkart_SOURCES = \
loader.hpp \
race_manager.cpp \
race_manager.hpp \
string_utils.cpp \
string_utils.hpp \
callback.hpp \
moving_texture.hpp \
moving_texture.cpp \
callback_manager.cpp \
callback_manager.hpp \
shadow.cpp \
shadow.hpp \
main_loop.cpp \
main_loop.hpp \
camera.cpp \
@ -157,14 +160,9 @@ supertuxkart_SOURCES = \
terrain_info.hpp \
triangle_mesh.cpp \
triangle_mesh.hpp \
flyable.cpp \
flyable.hpp \
history.cpp \
history.hpp \
scene.hpp \
scene.cpp \
no_copy.hpp \
constants.hpp \
translation.cpp \
translation.hpp \
player.hpp \
@ -265,6 +263,8 @@ supertuxkart_SOURCES = \
robots/default_robot.hpp \
robots/track_info.cpp \
robots/track_info.hpp \
tracks/track.cpp \
tracks/track.hpp \
tracks/track_manager.cpp \
tracks/track_manager.hpp \
replay/replay_buffer_tpl.hpp \

4
src/audio/music_information.cpp
View File

@ -21,14 +21,14 @@
#include <stdexcept>
#include "string_utils.hpp"
#include "translation.hpp"
#include "user_config.hpp"
#include "track.hpp"
#include "audio/music_ogg.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#include "utils/string_utils.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf

2
src/audio/sound_manager.cpp
View File

@ -36,11 +36,11 @@
#endif
#include "user_config.hpp"
#include "string_utils.hpp"
#include "file_manager.hpp"
#include "translation.hpp"
#include "audio/music_ogg.hpp"
#include "audio/sfx_openal.hpp"
#include "utils/string_utils.hpp"
SoundManager* sound_manager= NULL;

4
src/camera.cpp
View File

@ -21,13 +21,13 @@
#define _WINSOCKAPI_
#include <plib/ssg.h>
#include "modes/world.hpp"
#include "track.hpp"
#include "camera.hpp"
#include "user_config.hpp"
#include "constants.hpp"
#include "race_manager.hpp"
#include "audio/sound_manager.hpp"
#include "karts/player_kart.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
#include "utils/coord.hpp"
Camera::Camera(int camera_index, const Kart* kart)

15
src/challenges/challenge.cpp
View File

@ -20,10 +20,10 @@
#include "translation.hpp"
#include "challenges/challenge.hpp"
#include "race_manager.hpp"
#include "track.hpp"
#include "grand_prix_manager.hpp"
#include "karts/kart_properties_manager.hpp"
#include "karts/kart_properties.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
@ -31,7 +31,7 @@
#endif
//-----------------------------------------------------------------------------
void Challenge::addUnlockTrackReward(std::string track_name)
void Challenge::addUnlockTrackReward(const std::string &track_name)
{
UnlockableFeature feature;
feature.name = track_name;
@ -40,7 +40,8 @@ void Challenge::addUnlockTrackReward(std::string track_name)
}
//-----------------------------------------------------------------------------
void Challenge::addUnlockModeReward(std::string internal_mode_name, std::string user_mode_name)
void Challenge::addUnlockModeReward(const std::string &internal_mode_name,
const std::string &user_mode_name)
{
UnlockableFeature feature;
feature.name = internal_mode_name;
@ -50,7 +51,7 @@ void Challenge::addUnlockModeReward(std::string internal_mode_name, std::string
}
//-----------------------------------------------------------------------------
void Challenge::addUnlockGPReward(std::string gp_name)
void Challenge::addUnlockGPReward(const std::string &gp_name)
{
UnlockableFeature feature;
feature.name = _(gp_name.c_str());
@ -59,7 +60,8 @@ void Challenge::addUnlockGPReward(std::string gp_name)
}
//-----------------------------------------------------------------------------
void Challenge::addUnlockDifficultyReward(std::string internal_name, std::string user_name)
void Challenge::addUnlockDifficultyReward(const std::string &internal_name,
const std::string &user_name)
{
UnlockableFeature feature;
feature.name = internal_name;
@ -69,7 +71,8 @@ void Challenge::addUnlockDifficultyReward(std::string internal_name, std::string
}
//-----------------------------------------------------------------------------
void Challenge::addUnlockKartReward(std::string internal_name, std::string user_name)
void Challenge::addUnlockKartReward(const std::string &internal_name,
const std::string &user_name)
{
UnlockableFeature feature;
feature.name = internal_name;

15
src/challenges/challenge.hpp
View File

@ -54,7 +54,7 @@ private:
std::vector<UnlockableFeature> m_feature; // Features to unlock
std::vector<std::string> m_prerequisites; // what needs to be done before accessing this challenge
public:
Challenge(std::string id, std::string name);
Challenge(const std::string &id, const std::string &name);
Challenge() {m_Id=""; m_Name="";m_state=CH_INACTIVE;}
virtual ~Challenge() {};
const std::string
@ -63,11 +63,14 @@ public:
&getName() const { return m_Name; }
void setName(const std::string& s) { m_Name = s; }
void setId(const std::string& s) { m_Id = s; }
void addUnlockTrackReward(std::string track_name);
void addUnlockModeReward(std::string internal_mode_name, std::string user_mode_name);
void addUnlockGPReward(std::string gp_name);
void addUnlockDifficultyReward(std::string internal_name, std::string user_name);
void addUnlockKartReward(std::string internal_name, std::string user_name);
void addUnlockTrackReward(const std::string &track_name);
void addUnlockModeReward(const std::string &internal_mode_name,
const std::string &user_mode_name);
void addUnlockGPReward(const std::string &gp_name);
void addUnlockDifficultyReward(const std::string &internal_name,
const std::string &user_name);
void addUnlockKartReward(const std::string &internal_name,
const std::string &user_name);
const std::string getUnlockedMessage() const;
const std::vector<UnlockableFeature>&

2
src/challenges/challenge_data.cpp
View File

@ -20,7 +20,6 @@
#include <stdexcept>
#include "track.hpp"
#include "translation.hpp"
#include "grand_prix_data.hpp"
#include "grand_prix_manager.hpp"
@ -28,6 +27,7 @@
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "modes/linear_world.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)

6
src/unlock_manager.cpp → src/challenges/unlock_manager.cpp
View File

@ -16,16 +16,18 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "unlock_manager.hpp"
#include <set>
#include <string>
#include <stdio.h>
#include "unlock_manager.hpp"
#include "race_manager.hpp"
#include "file_manager.hpp"
#include "string_utils.hpp"
#include "user_config.hpp"
#include "challenges/challenge_data.hpp"
#include "utils/string_utils.hpp"
UnlockManager* unlock_manager=0;
//-----------------------------------------------------------------------------

0
src/unlock_manager.hpp → src/challenges/unlock_manager.hpp
View File

2
src/explosion.cpp
View File

@ -20,9 +20,9 @@
#include <plib/ssg.h>
#include "explosion.hpp"
#include "items/projectile_manager.hpp"
#include "scene.hpp"
#include "audio/sfx_base.hpp"
#include "audio/sfx_manager.hpp"
#include "graphics/scene.hpp"
#include "utils/vec3.hpp"
Explosion::Explosion(const Vec3& coord, const int explosion_sound) : ssgTransform()

6
src/file_manager.cpp
View File

@ -18,6 +18,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 "file_manager.hpp"
#include <stdexcept>
#include <sstream>
@ -39,12 +40,13 @@
#endif
// ul.h includes windows.h, so this define is necessary
#define _WINSOCKAPI_
#include <plib/ul.h>
#include "file_manager.hpp"
#include "btBulletDynamicsCommon.h"
#include "translation.hpp"
#include "material_manager.hpp"
#include "string_utils.hpp"
#include "utils/string_utils.hpp"
#ifdef __APPLE__
// dynamic data path detection onmac

4
src/grand_prix_data.cpp
View File

@ -21,11 +21,11 @@
#include <iostream>
#include <stdexcept>
#include "file_manager.hpp"
#include "grand_prix_data.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
#include "grand_prix_data.hpp"
#include "string_utils.hpp"
#include "tracks/track_manager.hpp"
#include "utils/string_utils.hpp"
GrandPrixData::GrandPrixData(const std::string filename)
{

5
src/grand_prix_manager.cpp
View File

@ -17,11 +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 "grand_prix_manager.hpp"
#include <set>
#include "string_utils.hpp"
#include "file_manager.hpp"
#include "grand_prix_manager.hpp"
#include "utils/string_utils.hpp"
GrandPrixManager *grand_prix_manager = NULL;

7
src/moving_texture.cpp → src/graphics/moving_texture.cpp
View File

@ -17,11 +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 "constants.hpp"
#include "moving_texture.hpp"
#include "string_utils.hpp"
#include "graphics/moving_texture.hpp"
#include "translation.hpp"
#include "modes/world.hpp"
#include "utils/constants.hpp"
#include "utils/string_utils.hpp"
MovingTexture::MovingTexture(char *data, ssgBranch *branch)
{

0
src/moving_texture.hpp → src/graphics/moving_texture.hpp
View File

3
src/graphics/nitro.cpp
View File

@ -18,9 +18,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "graphics/nitro.hpp"
#include "constants.hpp"
#include "material_manager.hpp"
#include "karts/kart.hpp"
#include "utils/constants.hpp"
Nitro::Nitro(Kart* kart)
: ParticleSystem(200, 0.0f, true, 0.5f),

2
src/scene.cpp → src/graphics/scene.cpp
View File

@ -21,8 +21,8 @@
#include "material_manager.hpp"
#include "material.hpp"
#include "camera.hpp"
#include "track.hpp"
#include "modes/world.hpp"
#include "tracks/track.hpp"
#include "user_config.hpp"
#include "btBulletDynamicsCommon.h"

0
src/scene.hpp → src/graphics/scene.hpp
View File

0
src/shadow.cpp → src/graphics/shadow.cpp
View File

0
src/shadow.hpp → src/graphics/shadow.hpp
View File

2
src/graphics/smoke.cpp
View File

@ -19,9 +19,9 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "smoke.hpp"
#include "constants.hpp"
#include "material_manager.hpp"
#include "karts/kart.hpp"
#include "utils/constants.hpp"
Smoke::Smoke(Kart* kart)
: ParticleSystem(200, 0.0f, true, 0.75f),

2
src/gui/challenges_menu.cpp
View File

@ -19,8 +19,8 @@
#include "widget_manager.hpp"
#include "menu_manager.hpp"
#include "unlock_manager.hpp"
#include "translation.hpp"
#include "challenges/unlock_manager.hpp"
#include "gui/challenges_menu.hpp"
#include "network/network_manager.hpp"

2
src/gui/char_sel.cpp
View File

@ -27,8 +27,8 @@
#include "menu_manager.hpp"
#include "material_manager.hpp"
#include "material.hpp"
#include "unlock_manager.hpp"
#include "translation.hpp"
#include "challenges/unlock_manager.hpp"
#include "karts/kart_model.hpp"
#include "karts/kart_properties.hpp"
#include "karts/kart_properties_manager.hpp"

4
src/gui/feature_unlocked.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 "gui/feature_unlocked.hpp"
#include "widget_manager.hpp"
#include "menu_manager.hpp"
#include "unlock_manager.hpp"
#include "translation.hpp"
#include "challenges/unlock_manager.hpp"
#include "gui/feature_unlocked.hpp"
enum WidgetTokens
{

2
src/gui/font.cpp
View File

@ -22,7 +22,7 @@
#include "file_manager.hpp"
#include "user_config.hpp"
#include "gui/font.hpp"
#include "string_utils.hpp"
#include "utils/string_utils.hpp"
Font* font_gui;
Font* font_race;

2
src/gui/game_mode.cpp
View File

@ -24,7 +24,7 @@
#include "menu_manager.hpp"
#include "translation.hpp"
#include "user_config.hpp"
#include "unlock_manager.hpp"
#include "challenges/unlock_manager.hpp"
#include "network/network_manager.hpp"
enum WidgetTokens

4
src/gui/grand_prix_ending.cpp
View File

@ -28,15 +28,15 @@
#include <SDL/SDL.h>
#include "loader.hpp"
#include "unlock_manager.hpp"
#include "widget_manager.hpp"
#include "race_manager.hpp"
#include "user_config.hpp"
#include "menu_manager.hpp"
#include "translation.hpp"
#include "scene.hpp"
#include "audio/sfx_manager.hpp"
#include "audio/sfx_base.hpp"
#include "challenges/unlock_manager.hpp"
#include "graphics/scene.hpp"
#include "karts/kart.hpp"
#include "karts/kart_model.hpp"
#include "karts/kart_properties.hpp"

3
src/gui/grand_prix_select.cpp
View File

@ -23,10 +23,11 @@
#include "menu_manager.hpp"
#include "race_manager.hpp"
#include "material_manager.hpp"
#include "unlock_manager.hpp"
#include "translation.hpp"
#include "grand_prix_manager.hpp"
#include "challenges/unlock_manager.hpp"
#include "tracks/track_manager.hpp"
#include "tracks/track.hpp"
enum WidgetTokens
{

2
src/gui/help_page_three.cpp
View File

@ -21,7 +21,7 @@
#include "widget_manager.hpp"
#include "menu_manager.hpp"
#include "translation.hpp"
#include "unlock_manager.hpp"
#include "challenges/unlock_manager.hpp"
enum WidgetTokens
{

2
src/gui/main_menu.cpp
View File

@ -25,7 +25,7 @@
#include "menu_manager.hpp"
#include "translation.hpp"
#include "user_config.hpp"
#include "unlock_manager.hpp"
#include "challenges/unlock_manager.hpp"
#include "network/network_manager.hpp"
enum WidgetTokens

4
src/gui/network_gui.cpp
View File

@ -24,12 +24,12 @@
#include "widget_manager.hpp"
#include "network_gui.hpp"
#include "network/network_manager.hpp"
#include "menu_manager.hpp"
#include "translation.hpp"
#include "sdldrv.hpp"
#include "string_utils.hpp"
#include "user_config.hpp"
#include "network/network_manager.hpp"
#include "utils/string_utils.hpp"
enum WidgetTokens
{

7
src/gui/race_gui.cpp
View File

@ -22,15 +22,14 @@
#include "input.hpp"
#include "sdldrv.hpp"
#include "user_config.hpp"
#include "constants.hpp"
#include "history.hpp"
#include "track.hpp"
#include "race_manager.hpp"
#include "material_manager.hpp"
#include "menu_manager.hpp"
#include "audio/sound_manager.hpp"
#include "race_manager.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
#undef USE_WIDGET_MANAGER
#ifdef USE_WIDGET_MANAGER

1
src/gui/race_options.cpp
View File

@ -21,7 +21,6 @@
#include "user_config.hpp"
#include "menu_manager.hpp"
#include "material_manager.hpp"
#include "unlock_manager.hpp"
#include "translation.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)

2
src/gui/race_results_gui.cpp
View File

@ -25,8 +25,8 @@
#include "menu_manager.hpp"
#include "race_manager.hpp"
#include "highscore_manager.hpp"
#include "unlock_manager.hpp"
#include "translation.hpp"
#include "challenges/unlock_manager.hpp"
#include "modes/world.hpp"
#include "karts/kart_properties.hpp"
#include "network/network_manager.hpp"

4
src/gui/track_sel.cpp
View File

@ -20,11 +20,11 @@
#include "track_sel.hpp"
#include "widget_manager.hpp"
#include "race_manager.hpp"
#include "track.hpp"
#include "menu_manager.hpp"
#include "user_config.hpp"
#include "translation.hpp"
#include "unlock_manager.hpp"
#include "challenges/unlock_manager.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)

4
src/gui/widget.cpp
View File

@ -25,10 +25,10 @@
//FIXME: this should be removed when the scrolling is cleaned
#include "user_config.hpp"
#include "constants.hpp"
#include "material_manager.hpp"
#include "track.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#include "utils/constants.hpp"
const int Widget::MAX_SCROLL = 1000000;

19
src/highscore_manager.cpp
View File

@ -17,18 +17,21 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdexcept>
#include "highscore_manager.hpp"
#include "race_manager.hpp"
#include "lisp/parser.hpp"
#include "lisp/writer.hpp"
#include "translation.hpp"
#include "string_utils.hpp"
#include "file_manager.hpp"
#include "user_config.hpp"
#include <stdexcept>
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf
#endif
#include "race_manager.hpp"
#include "translation.hpp"
#include "file_manager.hpp"
#include "user_config.hpp"
#include "lisp/parser.hpp"
#include "lisp/writer.hpp"
#include "utils/string_utils.hpp"
HighscoreManager* highscore_manager=0;
HighscoreManager::HighscoreManager()

2
src/history.cpp
View File

@ -21,10 +21,10 @@
#include <stdio.h>
#include "track.hpp"
#include "race_manager.hpp"
#include "karts/kart.hpp"
#include "modes/world.hpp"
#include "tracks/track.hpp"
History* history = 0;

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

@ -687,10 +687,6 @@
RelativePath="..\..\file_manager.cpp"
>
</File>
<File
RelativePath="..\..\flyable.cpp"
>
</File>
<File
RelativePath="..\..\grand_prix_data.cpp"
>
@ -735,26 +731,14 @@
RelativePath="../../../src\material_manager.cpp"
>
</File>
<File
RelativePath="../../../src\moving_texture.cpp"
>
</File>
<File
RelativePath="../../../src\race_manager.cpp"
>
</File>
<File
RelativePath="../../../src\scene.cpp"
>
</File>
<File
RelativePath="../../../src\sdldrv.cpp"
>
</File>
<File
RelativePath="../../../src\shadow.cpp"
>
</File>
<File
RelativePath="../../../src\static_ssg.cpp"
>
@ -763,18 +747,10 @@
RelativePath="../../../src\stk_config.cpp"
>
</File>
<File
RelativePath="../../../src\string_utils.cpp"
>
</File>
<File
RelativePath="..\..\terrain_info.cpp"
>
</File>
<File
RelativePath="../../../src\track.cpp"
>
</File>
<File
RelativePath="..\..\translation.cpp"
>
@ -783,10 +759,6 @@
RelativePath="..\..\triangle_mesh.cpp"
>
</File>
<File
RelativePath="..\..\unlock_manager.cpp"
>
</File>
<File
RelativePath="../../../src\user_config.cpp"
>
@ -958,6 +930,10 @@
RelativePath="..\..\challenges\challenge_data.cpp"
>
</File>
<File
RelativePath="..\..\challenges\unlock_manager.cpp"
>
</File>
</Filter>
<Filter
Name="utils"
@ -970,6 +946,10 @@
RelativePath="..\..\utils\ssg_help.cpp"
>
</File>
<File
RelativePath="..\..\utils\string_utils.cpp"
>
</File>
<File
RelativePath="..\..\utils\vec3.cpp"
>
@ -1050,6 +1030,10 @@
RelativePath="..\..\items\cake.cpp"
>
</File>
<File
RelativePath="..\..\items\flyable.cpp"
>
</File>
<File
RelativePath="..\..\items\item.cpp"
>
@ -1130,6 +1114,10 @@
<Filter
Name="graphics"
>
<File
RelativePath="..\..\graphics\moving_texture.cpp"
>
</File>
<File
RelativePath="..\..\graphics\nitro.cpp"
>
@ -1138,6 +1126,14 @@
RelativePath="..\..\graphics\particle_system.cpp"
>
</File>
<File
RelativePath="..\..\graphics\scene.cpp"
>
</File>
<File
RelativePath="..\..\graphics\shadow.cpp"
>
</File>
<File
RelativePath="..\..\graphics\skid_marks.cpp"
>
@ -1190,6 +1186,10 @@
<Filter
Name="tracks"
>
<File
RelativePath="..\..\tracks\track.cpp"
>
</File>
<File
RelativePath="..\..\tracks\track_manager.cpp"
>
@ -1245,10 +1245,6 @@
RelativePath="..\..\file_manager.hpp"
>
</File>
<File
RelativePath="..\..\flyable.hpp"
>
</File>
<File
RelativePath="..\..\grand_prix_data.hpp"
>
@ -1305,14 +1301,6 @@
RelativePath="../../../src\material_manager.hpp"
>
</File>
<File
RelativePath="../../../src\moving_physics.hpp"
>
</File>
<File
RelativePath="../../../src\moving_texture.hpp"
>
</File>
<File
RelativePath="../../../src\no_copy.hpp"
>
@ -1329,18 +1317,10 @@
RelativePath="../../../src\race_manager.hpp"
>
</File>
<File
RelativePath="../../../src\scene.hpp"
>
</File>
<File
RelativePath="../../../src\sdldrv.hpp"
>
</File>
<File
RelativePath="../../../src\shadow.hpp"
>
</File>
<File
RelativePath="../../../src\ssg_help.hpp"
>
@ -1353,18 +1333,10 @@
RelativePath="../../../src\stk_config.hpp"
>
</File>
<File
RelativePath="../../../src\string_utils.hpp"
>
</File>
<File
RelativePath="..\..\terrain_info.hpp"
>
</File>
<File
RelativePath="../../../src\track.hpp"
>
</File>
<File
RelativePath="../../../src\translation.hpp"
>
@ -1373,10 +1345,6 @@
RelativePath="..\..\triangle_mesh.hpp"
>
</File>
<File
RelativePath="..\..\unlock_manager.hpp"
>
</File>
<File
RelativePath="../../../src\user_config.hpp"
>
@ -1556,6 +1524,10 @@
RelativePath="..\..\challenges\challenge_data.hpp"
>
</File>
<File
RelativePath="..\..\challenges\unlock_manager.hpp"
>
</File>
</Filter>
<Filter
Name="network"
@ -1640,6 +1612,10 @@
<Filter
Name="utils"
>
<File
RelativePath="..\..\utils\constants.hpp"
>
</File>
<File
RelativePath="..\..\utils\coord.hpp"
>
@ -1652,6 +1628,10 @@
RelativePath="..\..\utils\ssg_help.hpp"
>
</File>
<File
RelativePath="..\..\utils\string_utils.hpp"
>
</File>
<File
RelativePath="..\..\utils\vec3.hpp"
>
@ -1740,6 +1720,10 @@
RelativePath="..\..\items\cake.hpp"
>
</File>
<File
RelativePath="..\..\items\flyable.hpp"
>
</File>
<File
RelativePath="..\..\items\item.hpp"
>
@ -1828,6 +1812,10 @@
<Filter
Name="graphics"
>
<File
RelativePath="..\..\graphics\moving_texture.hpp"
>
</File>
<File
RelativePath="..\..\graphics\nitro.hpp"
>
@ -1836,6 +1824,14 @@
RelativePath="..\..\graphics\particle_system.hpp"
>
</File>
<File
RelativePath="..\..\graphics\scene.hpp"
>
</File>
<File
RelativePath="..\..\graphics\shadow.hpp"
>
</File>
<File
RelativePath="..\..\graphics\skid_marks.hpp"
>
@ -1848,6 +1844,10 @@
<Filter
Name="tracks"
>
<File
RelativePath="..\..\tracks\track.hpp"
>
</File>
<File
RelativePath="..\..\tracks\track_manager.hpp"
>

2
src/items/attachment.cpp
View File

@ -20,7 +20,6 @@
#define _WINSOCKAPI_
#include <plib/ssg.h>
#include "constants.hpp"
#include "stk_config.hpp"
#include "user_config.hpp"
#include "items/attachment.hpp"
@ -29,6 +28,7 @@
#include "karts/kart.hpp"
#include "network/race_state.hpp"
#include "network/network_manager.hpp"
#include "utils/constants.hpp"
Attachment::Attachment(Kart* _kart)
{

5
src/items/cake.cpp
View File

@ -17,12 +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 "karts/kart.hpp"
#include "items/cake.hpp"
#include "constants.hpp"
#include <iostream>
#include "karts/kart.hpp"
#include "utils/constants.hpp"
float Cake::m_st_max_distance;
float Cake::m_st_max_distance_squared;

9
src/flyable.cpp → src/items/flyable.cpp
View File

@ -17,19 +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 "items/flyable.hpp"
#include <math.h>
#include "flyable.hpp"
#include "track.hpp"
#include "constants.hpp"
#include "callback_manager.hpp"
#include "scene.hpp"
#include "race_manager.hpp"
#include "graphics/scene.hpp"
#include "items/projectile_manager.hpp"
#include "karts/kart.hpp"
#include "modes/world.hpp"
#include "modes/linear_world.hpp"
#include "network/flyable_info.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
#include "utils/ssg_help.hpp"
// static variables:

0
src/flyable.hpp → src/items/flyable.hpp
View File

2
src/items/item.cpp
View File

@ -19,7 +19,7 @@
#include "items/item.hpp"
#include "scene.hpp"
#include "graphics/scene.hpp"
#include "karts/kart.hpp"
#include "utils/coord.hpp"
#include "utils/vec3.hpp"

2
src/items/item_manager.cpp
View File

@ -26,12 +26,12 @@
#include "loader.hpp"
#include "material_manager.hpp"
#include "material.hpp"
#include "string_utils.hpp"
#include "translation.hpp"
#include "items/item_manager.hpp"
#include "items/bubblegumitem.hpp"
#include "karts/kart.hpp"
#include "network/network_manager.hpp"
#include "utils/string_utils.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf

5
src/items/plunger.cpp
View File

@ -19,15 +19,16 @@
#include "items/plunger.hpp"
#include "constants.hpp"
#include "camera.hpp"
#include "race_manager.hpp"
#include "scene.hpp"
#include "graphics/scene.hpp"
#include "items/rubber_band.hpp"
#include "items/projectile_manager.hpp"
#include "karts/player_kart.hpp"
#include "modes/world.hpp"
#include "physics/moving_physics.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
// -----------------------------------------------------------------------------
Plunger::Plunger(Kart *kart) : Flyable(kart, POWERUP_PLUNGER)

1
src/items/powerup.cpp
View File

@ -30,6 +30,7 @@
#include "modes/world.hpp"
#include "network/network_manager.hpp"
#include "network/race_state.hpp"
#include "tracks/track.hpp"
//-----------------------------------------------------------------------------
Powerup::Powerup(Kart* kart_)

2
src/items/projectile_manager.cpp
View File

@ -25,9 +25,9 @@
#include "items/cake.hpp"
#include "items/plunger.hpp"
#include "explosion.hpp"
#include "graphics/scene.hpp"
#include "items/powerup_manager.hpp"
#include "items/powerup.hpp"
#include "scene.hpp"
static ssgSelector *find_selector ( ssgBranch *b );

4
src/items/rubber_band.cpp
View File

@ -21,11 +21,11 @@
#include "material_manager.hpp"
#include "race_manager.hpp"
#include "scene.hpp"
#include "graphics/scene.hpp"
#include "items/plunger.hpp"
#include "items/projectile_manager.hpp"
#include "modes/world.hpp"
#include "karts/kart.hpp"
#include "modes/world.hpp"
#include "physics/physics.hpp"
/** RubberBand constructor. It creates a simple quad and attaches it to the

6
src/karts/kart.cpp
View File

@ -34,15 +34,13 @@
#include "items/item_manager.hpp"
#include "file_manager.hpp"
#include "user_config.hpp"
#include "constants.hpp"
#include "shadow.hpp"
#include "track.hpp"
#include "translation.hpp"
#include "material_manager.hpp"
#include "audio/sound_manager.hpp"
#include "audio/sfx_manager.hpp"
#include "audio/sfx_base.hpp"
#include "graphics/nitro.hpp"
#include "graphics/shadow.hpp"
#include "graphics/skid_marks.hpp"
#include "graphics/smoke.hpp"
#include "gui/menu_manager.hpp"
@ -53,6 +51,8 @@
#include "network/network_manager.hpp"
#include "physics/btUprightConstraint.hpp"
#include "physics/physics.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
#include "utils/coord.hpp"
#include "utils/ssg_help.hpp"
#include "audio/sfx_manager.hpp"

2
src/karts/kart_model.cpp
View File

@ -19,10 +19,10 @@
#include "karts/kart_model.hpp"
#include "constants.hpp"
#include "loader.hpp"
#include "stk_config.hpp"
#include "user_config.hpp"
#include "utils/constants.hpp"
#include "utils/ssg_help.hpp"
float KartModel::UNDEFINED = -99.9f;

2
src/karts/kart_properties.cpp
View File

@ -25,7 +25,6 @@
#include "material_manager.hpp"
#include "loader.hpp"
#include "file_manager.hpp"
#include "string_utils.hpp"
#include "stk_config.hpp"
#include "translation.hpp"
#include "user_config.hpp"
@ -33,6 +32,7 @@
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
#include "utils/ssg_help.hpp"
#include "utils/string_utils.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf

4
src/karts/kart_properties_manager.cpp
View File

@ -24,12 +24,12 @@
#include <ctime>
#include "file_manager.hpp"
#include "string_utils.hpp"
#include "stk_config.hpp"
#include "translation.hpp"
#include "user_config.hpp"
#include "unlock_manager.hpp"
#include "challenges/unlock_manager.hpp"
#include "karts/kart_properties.hpp"
#include "utils/string_utils.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf

4
src/karts/player_kart.cpp
View File

@ -20,19 +20,19 @@
#include "karts/player_kart.hpp"
#include "constants.hpp"
#include "history.hpp"
#include "player.hpp"
#include "sdldrv.hpp"
#include "translation.hpp"
#include "scene.hpp"
#include "camera.hpp"
#include "audio/sfx_manager.hpp"
#include "audio/sfx_base.hpp"
#include "graphics/scene.hpp"
#include "gui/menu_manager.hpp"
#include "gui/race_gui.hpp"
#include "items/item.hpp"
#include "modes/world.hpp"
#include "utils/constants.hpp"
PlayerKart::PlayerKart(const std::string& kart_name, int position, Player *player,
const btTransform& init_pos, int player_index) :

2
src/loader.cpp
View File

@ -33,10 +33,10 @@
#endif
#include "loader.hpp"
#include "moving_texture.hpp"
#include "material_manager.hpp"
#include "file_manager.hpp"
#include "material.hpp"
#include "graphics/moving_texture.hpp"
#include "physics/moving_physics.hpp"
Loader* loader = 0;

8
src/main.cpp
View File

@ -45,9 +45,6 @@
#include <algorithm>
#include "user_config.hpp"
#include "unlock_manager.hpp"
#include "tracks/track_manager.hpp"
#include "track.hpp"
#include "race_manager.hpp"
#include "file_manager.hpp"
#include "loader.hpp"
@ -56,13 +53,14 @@
#include "sdldrv.hpp"
#include "callback_manager.hpp"
#include "history.hpp"
#include "scene.hpp"
#include "stk_config.hpp"
#include "translation.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/scene.hpp"
#include "gui/menu_manager.hpp"
#include "gui/menu_manager.hpp"
#include "gui/widget_manager.hpp"
@ -72,6 +70,8 @@
#include "karts/kart_properties_manager.hpp"
#include "karts/kart.hpp"
#include "network/network_manager.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
// Only needed for bullet debug!
#ifdef HAVE_GLUT

6
src/main_loop.cpp
View File

@ -22,14 +22,14 @@
#include <SDL/SDL.h>
#include <assert.h>
#include "sdldrv.hpp"
#include "gui/menu_manager.hpp"
#include "audio/sound_manager.hpp"
#include "material_manager.hpp"
#include "race_manager.hpp"
#include "modes/world.hpp"
#include "user_config.hpp"
#include "scene.hpp"
#include "history.hpp"
#include "audio/sound_manager.hpp"
#include "graphics/scene.hpp"
#include "gui/menu_manager.hpp"
#include "network/network_manager.hpp"
MainLoop* main_loop = 0;

5
src/material.cpp
View File

@ -17,10 +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 "file_manager.hpp"
#include "material.hpp"
#include "string_utils.hpp"
#include "file_manager.hpp"
#include "stk_config.hpp"
#include "utils/string_utils.hpp"
#define UCLAMP 1
#define VCLAMP 2

11
src/material_manager.cpp
View File

@ -17,18 +17,19 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdexcept>
#include "file_manager.hpp"
#include "material_manager.hpp"
#include "material.hpp"
#include "translation.hpp"
#include "string_utils.hpp"
#include <stdexcept>
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf
# define strdup _strdup
#endif
#include "file_manager.hpp"
#include "material.hpp"
#include "translation.hpp"
#include "utils/string_utils.hpp"
ssgState *fuzzy_gst;
MaterialManager *material_manager=0;

7
src/modes/follow_the_leader.cpp
View File

@ -15,13 +15,14 @@
// 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/follow_the_leader.hpp"
#include "unlock_manager.hpp"
#include "gui/menu_manager.hpp"
#include "user_config.hpp"
#include "translation.hpp"
#include "audio/sound_manager.hpp"
#include "challenges/unlock_manager.hpp"
#include "gui/menu_manager.hpp"
#include "items/powerup_manager.hpp"
#include "modes/follow_the_leader.hpp"
#include "tracks/track.hpp"
//-----------------------------------------------------------------------------
FollowTheLeaderRace::FollowTheLeaderRace() : LinearWorld()

9
src/modes/linear_world.cpp
View File

@ -20,15 +20,14 @@
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf
#endif
#include "gui/race_gui.hpp"
#include "constants.hpp"
#include "track.hpp"
#include "gui/menu_manager.hpp"
#include "translation.hpp"
#include "audio/sound_manager.hpp"
#include "gui/menu_manager.hpp"
#include "gui/race_gui.hpp"
#include "network/network_manager.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
//-----------------------------------------------------------------------------
LinearWorld::LinearWorld() : World()

3
src/modes/standard_race.cpp
View File

@ -16,8 +16,9 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "modes/standard_race.hpp"
#include "user_config.hpp"
#include "unlock_manager.hpp"
#include "challenges/unlock_manager.hpp"
#include "gui/menu_manager.hpp"
//-----------------------------------------------------------------------------

6
src/modes/three_strikes_battle.cpp
View File

@ -16,11 +16,13 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "modes/three_strikes_battle.hpp"
#include "gui/race_gui.hpp"
#include "audio/sound_manager.hpp"
#include <string>
#include "gui/race_gui.hpp"
#include "audio/sound_manager.hpp"
#include "tracks/track.hpp"
//-----------------------------------------------------------------------------
ThreeStrikesBattle::ThreeStrikesBattle() : World()
{

8
src/modes/world.cpp
View File

@ -24,20 +24,18 @@
#include <ctime>
#include "file_manager.hpp"
#include "track.hpp"
#include "race_manager.hpp"
#include "user_config.hpp"
#include "callback_manager.hpp"
#include "history.hpp"
#include "constants.hpp"
#include "translation.hpp"
#include "unlock_manager.hpp"
#include "highscore_manager.hpp"
#include "scene.hpp"
#include "camera.hpp"
#include "audio/sound_manager.hpp"
#include "audio/sfx_manager.hpp"
#include "audio/sfx_base.hpp"
#include "challenges/unlock_manager.hpp"
#include "graphics/scene.hpp"
#include "gui/menu_manager.hpp"
#include "items/item_manager.hpp"
#include "items/projectile_manager.hpp"
@ -48,7 +46,9 @@
#include "network/network_manager.hpp"
#include "network/race_state.hpp"
#include "robots/default_robot.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#include "utils/constants.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf

4
src/modes/world.hpp
View File

@ -24,19 +24,19 @@
#define _WINSOCKAPI_
#include <plib/ssg.h>
#include "track.hpp"
#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 "utils/random_generator.hpp"
#include "modes/clock.hpp"
class SFXBase;
struct KartIconDisplayInfo;
class RaceGUI;
class btRigidBody;
class Track;
/** This class is responsible for running the actual race. A world is created
* by the race manager on the start of each race (so a new world is created

6
src/network/race_state.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_RACE_STATE_H
#define HEADER_RACE_STATE_H
#ifndef HEADER_RACE_STATE_HPP
#define HEADER_RACE_STATE_HPP
#include <vector>
#include "flyable.hpp"
#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"

8
src/physics/moving_physics.cpp
View File

@ -17,18 +17,18 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "moving_physics.hpp"
#include "physics/moving_physics.hpp"
#include <string>
#include <vector>
#define _WINSOCKAPI_
#include <plib/sg.h>
#include "string_utils.hpp"
#include "scene.hpp"
#include "graphics/scene.hpp"
#include "modes/world.hpp"
#include "utils/coord.hpp"
#include "utils/ssg_help.hpp"
#include "modes/world.hpp"
#include "utils/string_utils.hpp"
// -----------------------------------------------------------------------------
MovingPhysics::MovingPhysics(const std::string data)

2
src/physics/physics.cpp
View File

@ -22,8 +22,8 @@
#include "user_config.hpp"
#include "network/race_state.hpp"
#include "physics/btUprightConstraint.hpp"
#include "tracks/track.hpp"
#include "utils/ssg_help.hpp"
#include "track.hpp"
// ----------------------------------------------------------------------------
/** Initialise physics.

4
src/race_manager.cpp
View File

@ -21,11 +21,11 @@
#include <iostream>
#include "unlock_manager.hpp"
#include "modes/world.hpp"
#include "scene.hpp"
#include "user_config.hpp"
#include "stk_config.hpp"
#include "challenges/unlock_manager.hpp"
#include "graphics/scene.hpp"
#include "gui/menu_manager.hpp"
#include "karts/kart_properties_manager.hpp"
#include "network/network_manager.hpp"

5
src/robots/default_robot.cpp
View File

@ -39,12 +39,13 @@
#include <ctime>
#include <cstdio>
#include <iostream>
#include "constants.hpp"
#include "race_manager.hpp"
#include "scene.hpp"
#include "graphics/scene.hpp"
#include "modes/linear_world.hpp"
#include "network/network_manager.hpp"
#include "robots/track_info.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
const TrackInfo *DefaultRobot::m_track_info = NULL;
int DefaultRobot::m_num_of_track_info_instances = 0;

5
src/robots/track_info.cpp
View File

@ -17,10 +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 "constants.hpp"
#include "track.hpp"
#include "robots/track_info.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
TrackInfo::TrackInfo(const Track *track)
{
m_track = track;

7
src/terrain_info.cpp
View File

@ -17,12 +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 "terrain_info.hpp"
#include <math.h>
#include "terrain_info.hpp"
#include "race_manager.hpp"
#include "constants.hpp"
#include "track.hpp"
#include "tracks/track.hpp"
#include "utils/constants.hpp"
TerrainInfo::TerrainInfo(int frequency)
{

4
src/track.cpp → src/tracks/track.cpp
View File

@ -27,14 +27,13 @@
#include "file_manager.hpp"
#include "loader.hpp"
#include "string_utils.hpp"
#include "stk_config.hpp"
#include "translation.hpp"
#include "scene.hpp"
#include "material_manager.hpp"
#include "isect.hpp"
#include "user_config.hpp"
#include "audio/sound_manager.hpp"
#include "graphics/scene.hpp"
#include "items/item.hpp"
#include "items/item_manager.hpp"
#include "lisp/lisp.hpp"
@ -43,6 +42,7 @@
#include "physics/moving_physics.hpp"
#include "race_manager.hpp"
#include "utils/ssg_help.hpp"
#include "utils/string_utils.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
# define snprintf _snprintf

0
src/track.hpp → src/tracks/track.hpp
View File

1
src/tracks/track_manager.cpp
View File

@ -21,7 +21,6 @@
#include <stdexcept>
#include <algorithm>
#include "file_manager.hpp"
#include "string_utils.hpp"
#include "track_manager.hpp"
#include "track.hpp"
#include "stk_config.hpp"

8
src/user_config.cpp
View File

@ -42,13 +42,13 @@
#include "stk_config.hpp"
#include "actionmap.hpp"
#include "translation.hpp"
#include "race_manager.hpp"
#include "file_manager.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "lisp/writer.hpp"
#include "translation.hpp"
#include "unlock_manager.hpp"
#include "race_manager.hpp"
#include "file_manager.hpp"
#include "challenges/unlock_manager.hpp"
UserConfig *user_config;

0
src/constants.hpp → src/utils/constants.hpp
View File

0
src/string_utils.cpp → src/utils/string_utils.cpp
View File

0
src/string_utils.hpp → src/utils/string_utils.hpp
View File