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

started renaming herring to item

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2008-10-29 01:45:29 +00:00
parent 9fca81a80e
commit 42e0af65b7
17 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -60,8 +60,8 @@ supertuxkart_SOURCES = main.cpp \
items/attachment_manager.cpp items/attachment_manager.hpp \
items/collectable.cpp items/collectable.hpp \
items/collectable_manager.cpp items/collectable_manager.hpp \
items/herring.cpp items/herring.hpp \
items/herring_manager.cpp items/herring_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/missile.cpp items/missile.hpp \
items/cake.cpp items/cake.hpp \

2
src/grand_prix_data.hpp
View File

@ -25,7 +25,7 @@
#include <vector>
#include <cassert>
#include "items/herring_manager.hpp"
#include "items/item_manager.hpp"
/** Simple class that hold the data relevant to a 'grand_prix', aka. a number
of races that has to be completed one after the other */

2
src/highscore_manager.cpp
View File

@ -102,7 +102,7 @@ void HighscoreManager::Load()
// check file version
int v;
if (!node->get("file-version",v) || v<CURRENT_HSCORE_FILE_VERSION)
if (!node->get("file-version",v) || v<(int)CURRENT_HSCORE_FILE_VERSION)
{
fprintf(stderr, "Highscore file format too old, a new one will be created.\n");
std::string warning = _("The highscore file was too old,\nall highscores have been erased.");

2
src/history.cpp
View File

@ -176,7 +176,7 @@ void History::Save()
for(int k=0; k<nKarts; k++)
{
Kart* kart= RaceManager::getKart(k);
//Kart* kart= RaceManager::getKart(k);
j = m_wrapped ? m_current : 0;
for(int i=0; i<m_size; i++)
{

32
src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj
View File

@ -7,6 +7,10 @@
objects = {
/* Begin PBXBuildFile section */
95090A490EB7EA960048841A /* item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95090A450EB7EA960048841A /* item.cpp */; };
95090A4A0EB7EA960048841A /* item.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95090A460EB7EA960048841A /* item.hpp */; };
95090A4B0EB7EA960048841A /* item_manager.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95090A470EB7EA960048841A /* item_manager.hpp */; };
95090A4C0EB7EA960048841A /* item_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95090A480EB7EA960048841A /* item_manager.cpp */; };
9518C11D0EB7AF7A00952372 /* cake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9518C11B0EB7AF7A00952372 /* cake.cpp */; };
9518C11E0EB7AF7A00952372 /* cake.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9518C11C0EB7AF7A00952372 /* cake.hpp */; };
95B0CF470EB69DDA001A0D06 /* actionmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0C9E90EB69DCE001A0D06 /* actionmap.cpp */; };
@ -389,10 +393,6 @@
95B0D35F0EB69DDF001A0D06 /* collectable.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE2E0EB69DD9001A0D06 /* collectable.hpp */; };
95B0D3600EB69DDF001A0D06 /* collectable_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE2F0EB69DD9001A0D06 /* collectable_manager.cpp */; };
95B0D3610EB69DDF001A0D06 /* collectable_manager.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE300EB69DD9001A0D06 /* collectable_manager.hpp */; };
95B0D3620EB69DDF001A0D06 /* herring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE310EB69DD9001A0D06 /* herring.cpp */; };
95B0D3630EB69DDF001A0D06 /* herring.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE320EB69DD9001A0D06 /* herring.hpp */; };
95B0D3640EB69DDF001A0D06 /* herring_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE330EB69DD9001A0D06 /* herring_manager.cpp */; };
95B0D3650EB69DDF001A0D06 /* herring_manager.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE340EB69DD9001A0D06 /* herring_manager.hpp */; };
95B0D3680EB69DDF001A0D06 /* missile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE370EB69DD9001A0D06 /* missile.cpp */; };
95B0D3690EB69DDF001A0D06 /* missile.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE380EB69DD9001A0D06 /* missile.hpp */; };
95B0D36A0EB69DDF001A0D06 /* projectile_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE390EB69DD9001A0D06 /* projectile_manager.cpp */; };
@ -756,8 +756,6 @@
95B0D35D0EB69DDF001A0D06 /* bowling.hpp in CopyFiles */,
95B0D35F0EB69DDF001A0D06 /* collectable.hpp in CopyFiles */,
95B0D3610EB69DDF001A0D06 /* collectable_manager.hpp in CopyFiles */,
95B0D3630EB69DDF001A0D06 /* herring.hpp in CopyFiles */,
95B0D3650EB69DDF001A0D06 /* herring_manager.hpp in CopyFiles */,
95B0D3690EB69DDF001A0D06 /* missile.hpp in CopyFiles */,
95B0D36B0EB69DDF001A0D06 /* projectile_manager.hpp in CopyFiles */,
95B0D36E0EB69DDF001A0D06 /* kart.hpp in CopyFiles */,
@ -832,12 +830,18 @@
95B0D3F40EB69DE0001A0D06 /* ssg_help.hpp in CopyFiles */,
95B0D3F60EB69DE0001A0D06 /* vec3.hpp in CopyFiles */,
9518C11E0EB7AF7A00952372 /* cake.hpp in CopyFiles */,
95090A4A0EB7EA960048841A /* item.hpp in CopyFiles */,
95090A4B0EB7EA960048841A /* item_manager.hpp in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
95090A450EB7EA960048841A /* item.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = item.cpp; sourceTree = "<group>"; };
95090A460EB7EA960048841A /* item.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = item.hpp; sourceTree = "<group>"; };
95090A470EB7EA960048841A /* item_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = item_manager.hpp; sourceTree = "<group>"; };
95090A480EB7EA960048841A /* item_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = item_manager.cpp; sourceTree = "<group>"; };
9518C11B0EB7AF7A00952372 /* cake.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cake.cpp; sourceTree = "<group>"; };
9518C11C0EB7AF7A00952372 /* cake.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cake.hpp; sourceTree = "<group>"; };
95B0C9E90EB69DCE001A0D06 /* actionmap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = actionmap.cpp; sourceTree = "<group>"; };
@ -1220,10 +1224,6 @@
95B0CE2E0EB69DD9001A0D06 /* collectable.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = collectable.hpp; sourceTree = "<group>"; };
95B0CE2F0EB69DD9001A0D06 /* collectable_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = collectable_manager.cpp; sourceTree = "<group>"; };
95B0CE300EB69DD9001A0D06 /* collectable_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = collectable_manager.hpp; sourceTree = "<group>"; };
95B0CE310EB69DD9001A0D06 /* herring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = herring.cpp; sourceTree = "<group>"; };
95B0CE320EB69DD9001A0D06 /* herring.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = herring.hpp; sourceTree = "<group>"; };
95B0CE330EB69DD9001A0D06 /* herring_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = herring_manager.cpp; sourceTree = "<group>"; };
95B0CE340EB69DD9001A0D06 /* herring_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = herring_manager.hpp; sourceTree = "<group>"; };
95B0CE370EB69DD9001A0D06 /* missile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = missile.cpp; sourceTree = "<group>"; };
95B0CE380EB69DD9001A0D06 /* missile.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = missile.hpp; sourceTree = "<group>"; };
95B0CE390EB69DD9001A0D06 /* projectile_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = projectile_manager.cpp; sourceTree = "<group>"; };
@ -2302,10 +2302,10 @@
95B0CE2E0EB69DD9001A0D06 /* collectable.hpp */,
95B0CE2F0EB69DD9001A0D06 /* collectable_manager.cpp */,
95B0CE300EB69DD9001A0D06 /* collectable_manager.hpp */,
95B0CE310EB69DD9001A0D06 /* herring.cpp */,
95B0CE320EB69DD9001A0D06 /* herring.hpp */,
95B0CE330EB69DD9001A0D06 /* herring_manager.cpp */,
95B0CE340EB69DD9001A0D06 /* herring_manager.hpp */,
95090A450EB7EA960048841A /* item.cpp */,
95090A460EB7EA960048841A /* item.hpp */,
95090A470EB7EA960048841A /* item_manager.hpp */,
95090A480EB7EA960048841A /* item_manager.cpp */,
95B0CE370EB69DD9001A0D06 /* missile.cpp */,
95B0CE380EB69DD9001A0D06 /* missile.hpp */,
95B0CE390EB69DD9001A0D06 /* projectile_manager.cpp */,
@ -2955,8 +2955,6 @@
95B0D35C0EB69DDF001A0D06 /* bowling.cpp in Sources */,
95B0D35E0EB69DDF001A0D06 /* collectable.cpp in Sources */,
95B0D3600EB69DDF001A0D06 /* collectable_manager.cpp in Sources */,
95B0D3620EB69DDF001A0D06 /* herring.cpp in Sources */,
95B0D3640EB69DDF001A0D06 /* herring_manager.cpp in Sources */,
95B0D3680EB69DDF001A0D06 /* missile.cpp in Sources */,
95B0D36A0EB69DDF001A0D06 /* projectile_manager.cpp in Sources */,
95B0D36C0EB69DDF001A0D06 /* kart.cpp in Sources */,
@ -3017,6 +3015,8 @@
95B0D3F30EB69DE0001A0D06 /* ssg_help.cpp in Sources */,
95B0D3F50EB69DE0001A0D06 /* vec3.cpp in Sources */,
9518C11D0EB7AF7A00952372 /* cake.cpp in Sources */,
95090A490EB7EA960048841A /* item.cpp in Sources */,
95090A4C0EB7EA960048841A /* item_manager.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
src/items/attachment.hpp
View File

@ -21,7 +21,7 @@
#define HEADER_ATTACHMENT_H
#include "stk_config.hpp"
#include "items/herring.hpp"
#include "items/item.hpp"
#include "utils/random_generator.hpp"
class Kart;

2
src/items/herring.cpp → src/items/item.cpp
View File

@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "vec3.hpp"
#include "items/herring.hpp"
#include "items/item.hpp"
#include "kart.hpp"
#include "scene.hpp"
#include "coord.hpp"

0
src/items/herring.hpp → src/items/item.hpp
View File

2
src/items/herring_manager.cpp → src/items/item_manager.cpp
View File

@ -23,7 +23,7 @@
#include "network/network_manager.hpp"
#include "user_config.hpp"
#include "items/herring_manager.hpp"
#include "items/item_manager.hpp"
#include "file_manager.hpp"
#include "loader.hpp"
#include "material_manager.hpp"

2
src/items/herring_manager.hpp → src/items/item_manager.hpp
View File

@ -23,7 +23,7 @@
#include <vector>
#include <map>
#include "items/herring.hpp"
#include "items/item.hpp"
#include "lisp/lisp.hpp"
class Kart;

2
src/kart.cpp
View File

@ -30,7 +30,7 @@
#include "bullet/Demos/OpenGL/GL_ShapeDrawer.h"
#include "loader.hpp"
#include "coord.hpp"
#include "items/herring_manager.hpp"
#include "items/item_manager.hpp"
#include "file_manager.hpp"
#include "skid_mark.hpp"
#include "user_config.hpp"

2
src/main.cpp
View File

@ -60,7 +60,7 @@
#include "sdldrv.hpp"
#include "callback_manager.hpp"
#include "history.hpp"
#include "items/herring_manager.hpp"
#include "items/item_manager.hpp"
#include "items/attachment_manager.hpp"
#include "audio/sound_manager.hpp"
#include "audio/sfx_manager.hpp"

2
src/modes/world.cpp
View File

@ -24,7 +24,7 @@
#include <ctime>
#include "modes/world.hpp"
#include "items/herring_manager.hpp"
#include "items/item_manager.hpp"
#include "items/projectile_manager.hpp"
#include "gui/menu_manager.hpp"
#include "file_manager.hpp"

2
src/network/race_state.hpp
View File

@ -26,7 +26,7 @@
#include "network/herring_info.hpp"
#include "network/flyable_info.hpp"
#include "kart_control.hpp"
#include "items/herring.hpp"
#include "items/item.hpp"
#include "flyable.hpp"
#include "race_manager.hpp"
#include "kart.hpp"

2
src/player_kart.cpp
View File

@ -25,7 +25,7 @@
#include "player_kart.hpp"
#include "player.hpp"
#include "sdldrv.hpp"
#include "items/herring.hpp"
#include "items/item.hpp"
#include "modes/world.hpp"
#include "gui/menu_manager.hpp"
#include "gui/race_gui.hpp"

2
src/sdldrv.cpp
View File

@ -34,7 +34,7 @@
#include "material_manager.hpp"
#include "kart_properties_manager.hpp"
#include "main_loop.hpp"
#include "items/herring_manager.hpp"
#include "items/item_manager.hpp"
#include "items/collectable_manager.hpp"
#include "items/attachment_manager.hpp"
#include "items/projectile_manager.hpp"

4
src/track.cpp
View File

@ -38,8 +38,8 @@
#include "material_manager.hpp"
#include "isect.hpp"
#include "user_config.hpp"
#include "items/herring.hpp"
#include "items/herring_manager.hpp"
#include "items/item.hpp"
#include "items/item_manager.hpp"
#include "race_manager.hpp"
#include "audio/sound_manager.hpp"
#include "utils/ssg_help.hpp"