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

renamed 'homing' to 'cake'

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

0
data/homingmissile.projectile → data/cake.projectile
View File

82
src/Makefile.am
View File

@ -49,25 +49,25 @@ supertuxkart_SOURCES = main.cpp \
audio/music_information.cpp audio/music_information.hpp \
audio/music_ogg.cpp audio/music_ogg.hpp \
audio/sfx_base.hpp \
audio/sfx_manager.cpp audio/sfx_manager.hpp \
audio/sfx_openal.cpp audio/sfx_openal.hpp \
audio/sound_manager.cpp audio/sound_manager.hpp \
utils/random_generator.hpp utils/random_generator.cpp \
utils/ssg_help.cpp utils/ssg_help.hpp \
material_manager.cpp material_manager.hpp \
grand_prix_manager.cpp grand_prix_manager.hpp \
items/attachment.cpp items/attachment.hpp \
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/projectile_manager.cpp items/projectile_manager.hpp \
items/missile.cpp items/missile.hpp \
items/homing.cpp items/homing.hpp \
items/bowling.cpp items/bowling.hpp \
smoke.cpp smoke.hpp \
input.hpp kart_control.hpp \
audio/sfx_manager.cpp audio/sfx_manager.hpp \
audio/sfx_openal.cpp audio/sfx_openal.hpp \
audio/sound_manager.cpp audio/sound_manager.hpp \
utils/random_generator.hpp utils/random_generator.cpp \
utils/ssg_help.cpp utils/ssg_help.hpp \
material_manager.cpp material_manager.hpp \
grand_prix_manager.cpp grand_prix_manager.hpp \
items/attachment.cpp items/attachment.hpp \
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/projectile_manager.cpp items/projectile_manager.hpp \
items/missile.cpp items/missile.hpp \
items/cake.cpp items/cake.hpp \
items/bowling.cpp items/bowling.hpp \
smoke.cpp smoke.hpp \
input.hpp kart_control.hpp \
isect.cpp isect.hpp \
track.cpp track.hpp \
explosion.cpp explosion.hpp \
@ -75,37 +75,37 @@ supertuxkart_SOURCES = main.cpp \
grand_prix_data.cpp grand_prix_data.hpp \
kart_properties_manager.cpp kart_properties_manager.hpp \
kart_properties.cpp kart_properties.hpp \
stk_config.cpp stk_config.hpp \
highscores.cpp highscores.hpp \
highscore_manager.cpp highscore_manager.hpp \
unlock_manager.cpp unlock_manager.hpp \
stk_config.cpp stk_config.hpp \
highscores.cpp highscores.hpp \
highscore_manager.cpp highscore_manager.hpp \
unlock_manager.cpp unlock_manager.hpp \
file_manager.cpp file_manager.hpp \
loader.cpp loader.hpp \
loader.cpp loader.hpp \
race_manager.cpp race_manager.hpp \
string_utils.cpp string_utils.hpp \
track_manager.cpp track_manager.hpp \
callback.hpp \
moving_physics.hpp moving_physics.cpp \
moving_texture.hpp moving_texture.cpp \
callback.hpp \
moving_physics.hpp moving_physics.cpp \
moving_texture.hpp moving_texture.cpp \
callback_manager.cpp callback_manager.hpp \
physics.cpp physics.hpp \
skid_mark.cpp skid_mark.hpp \
shadow.cpp shadow.hpp \
skid_mark.cpp skid_mark.hpp \
shadow.cpp shadow.hpp \
particle_system.cpp particle_system.hpp \
main_loop.cpp main_loop.hpp \
camera.cpp camera.hpp \
sdldrv.cpp sdldrv.hpp \
main_loop.cpp main_loop.hpp \
camera.cpp camera.hpp \
sdldrv.cpp sdldrv.hpp \
moveable.cpp moveable.hpp \
kart.cpp kart.hpp \
kart.cpp kart.hpp \
user_pointer.hpp auto_kart.hpp \
player_kart.cpp player_kart.hpp \
terrain_info.cpp 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_kart.cpp player_kart.hpp \
terrain_info.cpp 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 \
challenges/challenge.hpp challenges/challenge.cpp \
challenges/challenge_data.hpp challenges/challenge_data.cpp \

2
src/gui/help_page_two.cpp
View File

@ -70,7 +70,7 @@ HelpPageTwo::HelpPageTwo()
widget_manager->breakLine();
widget_manager->addImgWgt(WTOK_IMG2, 10, 12,
collectable_manager->getIcon(COLLECT_HOMING)->getState()->getTextureHandle());
collectable_manager->getIcon(COLLECT_CAKE)->getState()->getTextureHandle());
widget_manager->addTextWgt(WTOK_TXT2, 90, 12,
_("Cake - thrown at the closest rival,\nbest on short ranges and long straights"));

2
src/gui/race_gui.cpp
View File

@ -185,7 +185,7 @@ RaceGUI::handle(GameAction ga, int value)
if (race_manager->getNumPlayers() ==1 )
{
Kart* kart = RaceManager::getPlayerKart(0);
kart->setCollectable(COLLECT_HOMING, 10000);
kart->setCollectable(COLLECT_CAKE, 10000);
}
break;
case GA_DEBUG_TOGGLE_FPS:

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

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
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 */; };
95B0CF480EB69DDA001A0D06 /* actionmap.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0C9EA0EB69DCE001A0D06 /* actionmap.hpp */; };
95B0CF490EB69DDA001A0D06 /* music.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0C9EC0EB69DCE001A0D06 /* music.hpp */; };
@ -391,8 +393,6 @@
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 */; };
95B0D3660EB69DDF001A0D06 /* homing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE350EB69DD9001A0D06 /* homing.cpp */; };
95B0D3670EB69DDF001A0D06 /* homing.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE360EB69DD9001A0D06 /* homing.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 */; };
@ -758,7 +758,6 @@
95B0D3610EB69DDF001A0D06 /* collectable_manager.hpp in CopyFiles */,
95B0D3630EB69DDF001A0D06 /* herring.hpp in CopyFiles */,
95B0D3650EB69DDF001A0D06 /* herring_manager.hpp in CopyFiles */,
95B0D3670EB69DDF001A0D06 /* homing.hpp in CopyFiles */,
95B0D3690EB69DDF001A0D06 /* missile.hpp in CopyFiles */,
95B0D36B0EB69DDF001A0D06 /* projectile_manager.hpp in CopyFiles */,
95B0D36E0EB69DDF001A0D06 /* kart.hpp in CopyFiles */,
@ -832,12 +831,15 @@
95B0D3F20EB69DE0001A0D06 /* random_generator.hpp in CopyFiles */,
95B0D3F40EB69DE0001A0D06 /* ssg_help.hpp in CopyFiles */,
95B0D3F60EB69DE0001A0D06 /* vec3.hpp in CopyFiles */,
9518C11E0EB7AF7A00952372 /* cake.hpp in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
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>"; };
95B0C9EA0EB69DCE001A0D06 /* actionmap.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = actionmap.hpp; sourceTree = "<group>"; };
95B0C9EC0EB69DCE001A0D06 /* music.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = music.hpp; sourceTree = "<group>"; };
@ -1222,8 +1224,6 @@
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>"; };
95B0CE350EB69DD9001A0D06 /* homing.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = homing.cpp; sourceTree = "<group>"; };
95B0CE360EB69DD9001A0D06 /* homing.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = homing.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>"; };
@ -2290,6 +2290,8 @@
95B0CE260EB69DD9001A0D06 /* items */ = {
isa = PBXGroup;
children = (
9518C11B0EB7AF7A00952372 /* cake.cpp */,
9518C11C0EB7AF7A00952372 /* cake.hpp */,
95B0CE270EB69DD9001A0D06 /* attachment.cpp */,
95B0CE280EB69DD9001A0D06 /* attachment.hpp */,
95B0CE290EB69DD9001A0D06 /* attachment_manager.cpp */,
@ -2304,8 +2306,6 @@
95B0CE320EB69DD9001A0D06 /* herring.hpp */,
95B0CE330EB69DD9001A0D06 /* herring_manager.cpp */,
95B0CE340EB69DD9001A0D06 /* herring_manager.hpp */,
95B0CE350EB69DD9001A0D06 /* homing.cpp */,
95B0CE360EB69DD9001A0D06 /* homing.hpp */,
95B0CE370EB69DD9001A0D06 /* missile.cpp */,
95B0CE380EB69DD9001A0D06 /* missile.hpp */,
95B0CE390EB69DD9001A0D06 /* projectile_manager.cpp */,
@ -2957,7 +2957,6 @@
95B0D3600EB69DDF001A0D06 /* collectable_manager.cpp in Sources */,
95B0D3620EB69DDF001A0D06 /* herring.cpp in Sources */,
95B0D3640EB69DDF001A0D06 /* herring_manager.cpp in Sources */,
95B0D3660EB69DDF001A0D06 /* homing.cpp in Sources */,
95B0D3680EB69DDF001A0D06 /* missile.cpp in Sources */,
95B0D36A0EB69DDF001A0D06 /* projectile_manager.cpp in Sources */,
95B0D36C0EB69DDF001A0D06 /* kart.cpp in Sources */,
@ -3017,6 +3016,7 @@
95B0D3F10EB69DE0001A0D06 /* random_generator.cpp in Sources */,
95B0D3F30EB69DE0001A0D06 /* ssg_help.cpp in Sources */,
95B0D3F50EB69DE0001A0D06 /* vec3.cpp in Sources */,
9518C11D0EB7AF7A00952372 /* cake.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

18
src/items/homing.cpp → src/items/cake.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 "items/homing.hpp"
#include "items/cake.hpp"
#include "constants.hpp"
#include <iostream>
float Homing::m_st_max_distance;
float Homing::m_st_max_distance_squared;
float Homing::m_st_max_turn_angle;
float Cake::m_st_max_distance;
float Cake::m_st_max_distance_squared;
float Cake::m_st_max_turn_angle;
Homing::Homing (Kart *kart) : Flyable(kart, COLLECT_HOMING)
Cake::Cake (Kart *kart) : Flyable(kart, COLLECT_CAKE)
{
m_target = NULL;
@ -107,12 +107,12 @@ Homing::Homing (Kart *kart) : Flyable(kart, COLLECT_HOMING)
m_body->applyTorque( btVector3(5,-3,7) );
} // Homing
} // Cake
// -----------------------------------------------------------------------------
void Homing::init(const lisp::Lisp* lisp, ssgEntity *homing)
void Cake::init(const lisp::Lisp* lisp, ssgEntity *cake_model)
{
Flyable::init(lisp, homing, COLLECT_HOMING);
Flyable::init(lisp, cake_model, COLLECT_CAKE);
m_st_max_turn_angle = 15.0f;
m_st_max_distance = 80.0f;
m_st_max_distance_squared = 80.0f * 80.0f;
@ -124,7 +124,7 @@ void Homing::init(const lisp::Lisp* lisp, ssgEntity *homing)
} // init
// -----------------------------------------------------------------------------
void Homing::update(float dt)
void Cake::update(float dt)
{
if(m_target != NULL)

12
src/items/homing.hpp → src/items/cake.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_HOMING_H
#define HEADER_HOMING_H
#ifndef HEADER_CAKE_H
#define HEADER_CAKE_H
#include "flyable.hpp"
class Homing : public Flyable
class Cake : public Flyable
{
private:
static float m_st_max_distance; // maximum distance for a missile to be attracted
@ -35,8 +35,8 @@ private:
Kart* m_target; // which kart is targeted by this
// projectile (NULL if none)
public:
Homing (Kart *kart);
static void init (const lisp::Lisp* lisp, ssgEntity* homing);
Cake (Kart *kart);
static void init (const lisp::Lisp* lisp, ssgEntity* cake_model);
virtual void update (float dt);
virtual void hitTrack () { explode(NULL); }
// Kinematic objects are not allowed to have a velocity (assertion in
@ -44,6 +44,6 @@ public:
virtual const btVector3 &getVelocity() const {return m_initial_velocity;}
virtual void setVelocity(const btVector3& v) {m_initial_velocity=v; }
}; // Homing
}; // Cake
#endif

2
src/items/collectable.cpp
View File

@ -87,7 +87,7 @@ void Collectable::use()
{
case COLLECT_ZIPPER: m_owner->handleZipper();
break ;
case COLLECT_HOMING:
case COLLECT_CAKE:
case COLLECT_BOWLING:
case COLLECT_MISSILE:
m_sound_shot->position(m_owner->getXYZ());

8
src/items/collectable_manager.cpp
View File

@ -26,7 +26,7 @@
#include "translation.hpp"
#include "items/bowling.hpp"
#include "missile.hpp"
#include "items/homing.hpp"
#include "items/cake.hpp"
#include "loader.hpp"
#if defined(WIN32) && !defined(__CYGWIN__)
@ -45,7 +45,7 @@ initCollectableType ict[]=
{COLLECT_ZIPPER, "zipper.collectable" },
{COLLECT_BOWLING, "bowling.projectile" },
{COLLECT_MISSILE, "missile.projectile" },
{COLLECT_HOMING, "homingmissile.projectile" },
{COLLECT_CAKE, "cake.projectile" },
{COLLECT_ANVIL, "anvil.collectable" },
{COLLECT_PARACHUTE, "parachute.collectable" },
{COLLECT_MAX, "" },
@ -139,8 +139,8 @@ void CollectableManager::LoadNode(const lisp::Lisp* lisp, int collectType )
Bowling::init (lisp, m_all_models[collectType]); break;
case COLLECT_MISSILE:
Missile::init(lisp, m_all_models[collectType]); break;
case COLLECT_HOMING:
Homing::init (lisp, m_all_models[collectType]); break;
case COLLECT_CAKE:
Cake::init (lisp, m_all_models[collectType]); break;
default:;
} // switch

2
src/items/collectable_manager.hpp
View File

@ -30,7 +30,7 @@ class ssgEntity;
// The anvil and parachute must be at the end of the enum, and the
// zipper just before them (see collectable::hitRedHerring).
enum CollectableType {COLLECT_NOTHING,
COLLECT_MISSILE, COLLECT_HOMING,
COLLECT_MISSILE, COLLECT_CAKE,
COLLECT_BOWLING, COLLECT_ZIPPER,
COLLECT_PARACHUTE, COLLECT_ANVIL,
COLLECT_MAX};

4
src/items/projectile_manager.cpp
View File

@ -23,7 +23,7 @@
#include "items/projectile_manager.hpp"
#include "items/bowling.hpp"
#include "missile.hpp"
#include "items/homing.hpp"
#include "items/cake.hpp"
#include "explosion.hpp"
#include "items/collectable_manager.hpp"
#include "items/collectable.hpp"
@ -186,7 +186,7 @@ Flyable *ProjectileManager::newProjectile(Kart *kart, CollectableType type)
switch(type)
{
case COLLECT_BOWLING: f = new Bowling(kart); break;
case COLLECT_HOMING: f = new Homing(kart); break;
case COLLECT_CAKE: f = new Cake(kart); break;
case COLLECT_MISSILE: f = new Missile(kart); break;
default: return NULL;
}

2
src/robots/default_robot.cpp
View File

@ -376,7 +376,7 @@ void DefaultRobot::handle_items( const float DELTA, const int STEPS )
break;
case COLLECT_MISSILE:
case COLLECT_HOMING:
case COLLECT_CAKE:
if( m_time_since_last_shot > 5.0f && m_crashes.m_kart != -1 )
{
if( (getXYZ()-RaceManager::getKart(m_crashes.m_kart)->getXYZ() ).length_2d() >