From 42e0af65b7f11cb96dd266b8a0b873505513b640 Mon Sep 17 00:00:00 2001 From: auria Date: Wed, 29 Oct 2008 01:45:29 +0000 Subject: [PATCH] started renaming herring to item git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2389 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/Makefile.am | 4 +-- src/grand_prix_data.hpp | 2 +- src/highscore_manager.cpp | 2 +- src/history.cpp | 2 +- .../Xcode/STK_XCode.xcodeproj/project.pbxproj | 32 +++++++++---------- src/items/attachment.hpp | 2 +- src/items/{herring.cpp => item.cpp} | 2 +- src/items/{herring.hpp => item.hpp} | 0 .../{herring_manager.cpp => item_manager.cpp} | 2 +- .../{herring_manager.hpp => item_manager.hpp} | 2 +- src/kart.cpp | 2 +- src/main.cpp | 2 +- src/modes/world.cpp | 2 +- src/network/race_state.hpp | 2 +- src/player_kart.cpp | 2 +- src/sdldrv.cpp | 2 +- src/track.cpp | 4 +-- 17 files changed, 33 insertions(+), 33 deletions(-) rename src/items/{herring.cpp => item.cpp} (99%) rename src/items/{herring.hpp => item.hpp} (100%) rename src/items/{herring_manager.cpp => item_manager.cpp} (99%) rename src/items/{herring_manager.hpp => item_manager.hpp} (98%) diff --git a/src/Makefile.am b/src/Makefile.am index 846624e85..b5ca95928 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 \ diff --git a/src/grand_prix_data.hpp b/src/grand_prix_data.hpp index 42cfdbeb2..681ff2ce9 100644 --- a/src/grand_prix_data.hpp +++ b/src/grand_prix_data.hpp @@ -25,7 +25,7 @@ #include #include -#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 */ diff --git a/src/highscore_manager.cpp b/src/highscore_manager.cpp index 5433d7680..a96894d1e 100644 --- a/src/highscore_manager.cpp +++ b/src/highscore_manager.cpp @@ -102,7 +102,7 @@ void HighscoreManager::Load() // check file version int v; - if (!node->get("file-version",v) || vget("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."); diff --git a/src/history.cpp b/src/history.cpp index 64225492c..dfff32105 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -176,7 +176,7 @@ void History::Save() for(int k=0; k #include -#include "items/herring.hpp" +#include "items/item.hpp" #include "lisp/lisp.hpp" class Kart; diff --git a/src/kart.cpp b/src/kart.cpp index 739c9e4e2..f379d05c1 100644 --- a/src/kart.cpp +++ b/src/kart.cpp @@ -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" diff --git a/src/main.cpp b/src/main.cpp index 58e182839..60cf9600f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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" diff --git a/src/modes/world.cpp b/src/modes/world.cpp index 37bb0aa75..da6aacc99 100644 --- a/src/modes/world.cpp +++ b/src/modes/world.cpp @@ -24,7 +24,7 @@ #include #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" diff --git a/src/network/race_state.hpp b/src/network/race_state.hpp index 61521c933..1f7c08b59 100644 --- a/src/network/race_state.hpp +++ b/src/network/race_state.hpp @@ -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" diff --git a/src/player_kart.cpp b/src/player_kart.cpp index 2ea409770..020ff9130 100644 --- a/src/player_kart.cpp +++ b/src/player_kart.cpp @@ -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" diff --git a/src/sdldrv.cpp b/src/sdldrv.cpp index 8b8e0599a..ac275cb3e 100755 --- a/src/sdldrv.cpp +++ b/src/sdldrv.cpp @@ -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" diff --git a/src/track.cpp b/src/track.cpp index f4fa99adb..4f98c91cb 100644 --- a/src/track.cpp +++ b/src/track.cpp @@ -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"