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

renamed 'collectible' to 'powerup'

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2008-10-30 02:02:56 +00:00
parent 3f26a6f782
commit c595c74f7a
26 changed files with 193 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -58,8 +58,8 @@ supertuxkart_SOURCES = main.cpp \
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/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 \

16
src/flyable.cpp
View File

@ -31,15 +31,15 @@
#include "modes/linear_world.hpp"
// static variables:
float Flyable::m_st_speed[COLLECT_MAX];
ssgEntity* Flyable::m_st_model[COLLECT_MAX];
float Flyable::m_st_min_height[COLLECT_MAX];
float Flyable::m_st_max_height[COLLECT_MAX];
float Flyable::m_st_force_updown[COLLECT_MAX];
btVector3 Flyable::m_st_extend[COLLECT_MAX];
float Flyable::m_st_speed[POWERUP_MAX];
ssgEntity* Flyable::m_st_model[POWERUP_MAX];
float Flyable::m_st_min_height[POWERUP_MAX];
float Flyable::m_st_max_height[POWERUP_MAX];
float Flyable::m_st_force_updown[POWERUP_MAX];
btVector3 Flyable::m_st_extend[POWERUP_MAX];
// ----------------------------------------------------------------------------
Flyable::Flyable(Kart *kart, CollectableType type, float mass) : Moveable()
Flyable::Flyable(Kart *kart, PowerupType type, float mass) : Moveable()
{
// get the appropriate data from the static fields
m_speed = m_st_speed[type];
@ -99,7 +99,7 @@ void Flyable::createPhysics(float y_offset, const btVector3 velocity,
// -----------------------------------------------------------------------------
void Flyable::init(const lisp::Lisp* lisp, ssgEntity *model,
CollectableType type)
PowerupType type)
{
m_st_speed[type] = 25.0f;
m_st_max_height[type] = 1.0f;

16
src/flyable.hpp
View File

@ -55,12 +55,12 @@ protected:
// speed, min_height, max_height. These variables must be static,
// so we need arrays of these variables to have different values
// for bowling balls, missiles, ...
static float m_st_speed[COLLECT_MAX]; // Speed of the projectile
static ssgEntity* m_st_model[COLLECT_MAX]; // 3d model
static float m_st_min_height[COLLECT_MAX]; // min height above track
static float m_st_max_height[COLLECT_MAX]; // max height above track
static float m_st_force_updown[COLLECT_MAX]; // force pushing up/down
static btVector3 m_st_extend[COLLECT_MAX]; // size of the model
static float m_st_speed[POWERUP_MAX]; // Speed of the projectile
static ssgEntity* m_st_model[POWERUP_MAX]; // 3d model
static float m_st_min_height[POWERUP_MAX]; // min height above track
static float m_st_max_height[POWERUP_MAX]; // max height above track
static float m_st_force_updown[POWERUP_MAX]; // force pushing up/down
static btVector3 m_st_extend[POWERUP_MAX]; // size of the model
/** Returns information on what is the closest kart and at what
distance it is. All 3 parameters first are of type 'out'.
@ -76,14 +76,14 @@ protected:
const bool rotates=false, const btTransform* customDirection=NULL);
public:
Flyable (Kart* kart, CollectableType type, float mass=1.0f);
Flyable (Kart* kart, PowerupType type, float mass=1.0f);
virtual ~Flyable ();
/** Enables/disables adjusting ov velocity depending on height above
* terrain. Missiles can 'follow the terrain' with this adjustment,
* but gravity will basically be disabled. */
void setAdjustZVelocity(bool f) { m_adjust_z_velocity = f; }
static void init (const lisp::Lisp* lisp, ssgEntity *model,
CollectableType type);
PowerupType type);
virtual void update (float);
void updateFromServer(const FlyableInfo &f, float dt);

6
src/gui/help_page_one.cpp
View File

@ -118,9 +118,9 @@ get stuck or fall too far, use the rescue button to get back on track."));
widget_manager->breakLine();
widget_manager->addTextWgt(WTOK_MSG6, 100, 17,
_("Collecting coins increases the number of collectables you receive.\n\
After 5 silver coins, each blue box will yield 2 collectables,\nafter 10,\
3 collectables and so on.\nEach gold coin is worth 3 silver coins, \
_("Collecting coins increases the number of powerups you receive.\n\
After 5 silver coins, each blue box will yield 2 powerups,\nafter 10,\
3 powerups and so on.\nEach gold coin is worth 3 silver coins, \
so look out for them!"));
widget_manager->setWgtResizeToText( WTOK_MSG6, false);
widget_manager->breakLine();

15
src/gui/help_page_two.cpp
View File

@ -20,6 +20,7 @@
#include "help_page_two.hpp"
#include "widget_manager.hpp"
#include "menu_manager.hpp"
#include "translation.hpp"
enum WidgetTokens
@ -53,11 +54,11 @@ HelpPageTwo::HelpPageTwo()
);
widget_manager->addTextWgt( WTOK_MSG, 100, 7,
_("To help you win, there are certain collectables you can grab:"));
_("To help you win, there are certain powerups you can grab:"));
widget_manager->breakLine();
widget_manager->addImgWgt( WTOK_IMG1, 10, 12,
collectable_manager->getIcon(COLLECT_MISSILE)->getState()->getTextureHandle());
powerup_manager->getIcon(POWERUP_MISSILE)->getState()->getTextureHandle());
widget_manager->addTextWgt( WTOK_TXT1, 90, 12,
_("Missile - fast stopper in a straight line"));
@ -65,7 +66,7 @@ HelpPageTwo::HelpPageTwo()
widget_manager->breakLine();
widget_manager->addImgWgt(WTOK_IMG2, 10, 12,
collectable_manager->getIcon(COLLECT_CAKE)->getState()->getTextureHandle());
powerup_manager->getIcon(POWERUP_CAKE)->getState()->getTextureHandle());
widget_manager->addTextWgt(WTOK_TXT2, 90, 12,
_("Cake - thrown at the closest rival,\nbest on short ranges and long straights"));
@ -73,7 +74,7 @@ HelpPageTwo::HelpPageTwo()
widget_manager->breakLine();
widget_manager->addImgWgt(WTOK_IMG3, 10, 12,
collectable_manager->getIcon(COLLECT_BOWLING)->getState()->getTextureHandle());
powerup_manager->getIcon(POWERUP_BOWLING)->getState()->getTextureHandle());
widget_manager->addTextWgt(WTOK_TXT3, 90, 12,
_("Bowling Ball - bounces off walls. If you are looking back,\nit will be thrown backwards."));
@ -81,7 +82,7 @@ HelpPageTwo::HelpPageTwo()
widget_manager->breakLine();
widget_manager->addImgWgt(WTOK_IMG4, 10, 12,
collectable_manager->getIcon(COLLECT_ZIPPER)->getState()->getTextureHandle());
powerup_manager->getIcon(POWERUP_ZIPPER)->getState()->getTextureHandle());
widget_manager->addTextWgt(WTOK_TXT4, 90, 12,
_("Zipper - speed boost"));
@ -89,7 +90,7 @@ HelpPageTwo::HelpPageTwo()
widget_manager->breakLine();
widget_manager->addImgWgt(WTOK_IMG5, 10, 12,
collectable_manager->getIcon(COLLECT_PARACHUTE)->getState()->getTextureHandle());
powerup_manager->getIcon(POWERUP_PARACHUTE)->getState()->getTextureHandle());
widget_manager->addTextWgt(WTOK_TXT5, 90, 12,
_("Parachute - slows down all karts in a better position!"));
@ -97,7 +98,7 @@ HelpPageTwo::HelpPageTwo()
widget_manager->breakLine();
widget_manager->addImgWgt(WTOK_IMG6, 10, 12,
collectable_manager->getIcon(COLLECT_ANVIL)->getState()->getTextureHandle());
powerup_manager->getIcon(POWERUP_ANVIL)->getState()->getTextureHandle());
widget_manager->addTextWgt(WTOK_TXT6, 90, 12,
_("Anvil - slows down greatly the kart in the first position"));

20
src/gui/race_gui.cpp
View File

@ -171,21 +171,21 @@ RaceGUI::handle(GameAction ga, int value)
if (race_manager->getNumPlayers() ==1 )
{
Kart* kart = RaceManager::getWorld()->getLocalPlayerKart(0);
kart->setCollectable(COLLECT_BOWLING, 10000);
kart->setPowerup(POWERUP_BOWLING, 10000);
}
break;
case GA_DEBUG_ADD_MISSILE:
if (race_manager->getNumPlayers() ==1 )
{
Kart* kart = RaceManager::getPlayerKart(0);
kart->setCollectable(COLLECT_MISSILE, 10000);
kart->setPowerup(POWERUP_MISSILE, 10000);
}
break;
case GA_DEBUG_ADD_HOMING:
if (race_manager->getNumPlayers() ==1 )
{
Kart* kart = RaceManager::getPlayerKart(0);
kart->setCollectable(COLLECT_CAKE, 10000);
kart->setPowerup(POWERUP_CAKE, 10000);
}
break;
case GA_DEBUG_TOGGLE_FPS:
@ -414,22 +414,22 @@ void RaceGUI::drawPlayerIcons (const KartIconDisplayInfo* info)
} // drawPlayerIcons
//-----------------------------------------------------------------------------
void RaceGUI::drawCollectableIcons ( Kart* player_kart, int offset_x,
void RaceGUI::drawPowerupIcons ( Kart* player_kart, int offset_x,
int offset_y, float ratio_x,
float ratio_y )
{
// If player doesn't have anything, do nothing.
Collectable* collectable=player_kart->getCollectable();
if(collectable->getType() == COLLECT_NOTHING) return;
Powerup* powerup=player_kart->getPowerup();
if(powerup->getType() == POWERUP_NOTHING) return;
// Originally the hardcoded sizes were 320-32 and 400
int x1 = (int)((user_config->m_width/2-32) * ratio_x) + offset_x ;
int y1 = (int)(user_config->m_height*5/6 * ratio_y) + offset_y;
int nSize=(int)(64.0f*std::min(ratio_x, ratio_y));
collectable->getIcon()->apply();
powerup->getIcon()->apply();
int n = player_kart->getNumCollectables() ;
int n = player_kart->getNumPowerup() ;
if ( n > 5 ) n = 5 ;
if ( n < 1 ) n = 1 ;
@ -446,7 +446,7 @@ void RaceGUI::drawCollectableIcons ( Kart* player_kart, int offset_x,
} // for i
glEnd () ;
} // drawCollectableIcons
} // drawPowerupIcons
//-----------------------------------------------------------------------------
/* Energy meter that gets filled with coins */
@ -984,7 +984,7 @@ void RaceGUI::drawStatusText(const float dt)
}
Kart* player_kart = RaceManager::getWorld()->getLocalPlayerKart(pla);
drawCollectableIcons(player_kart, offset_x, offset_y,
drawPowerupIcons(player_kart, offset_x, offset_y,
split_screen_ratio_x, split_screen_ratio_y );
drawEnergyMeter (player_kart, offset_x, offset_y,
split_screen_ratio_x, split_screen_ratio_y );

2
src/gui/race_gui.hpp
View File

@ -111,7 +111,7 @@ private:
void drawEnergyMeter (Kart *player_kart,
int offset_x, int offset_y,
float ratio_x, float ratio_y );
void drawCollectableIcons (Kart* player_kart,
void drawPowerupIcons (Kart* player_kart,
int offset_x, int offset_y,
float ratio_x, float ratio_y );
void drawAllMessages (Kart* player_kart,

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

@ -14,6 +14,10 @@
9518C11D0EB7AF7A00952372 /* cake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9518C11B0EB7AF7A00952372 /* cake.cpp */; };
9518C11E0EB7AF7A00952372 /* cake.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9518C11C0EB7AF7A00952372 /* cake.hpp */; };
958EEFB60EB93C03005F6F70 /* item_info.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 958EEFB50EB93C03005F6F70 /* item_info.hpp */; };
958EF0130EB94819005F6F70 /* powerup_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 958EF00F0EB94818005F6F70 /* powerup_manager.cpp */; };
958EF0140EB94819005F6F70 /* powerup_manager.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 958EF0100EB94819005F6F70 /* powerup_manager.hpp */; };
958EF0150EB94819005F6F70 /* powerup.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 958EF0110EB94819005F6F70 /* powerup.hpp */; };
958EF0160EB94819005F6F70 /* powerup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 958EF0120EB94819005F6F70 /* powerup.cpp */; };
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 */; };
@ -390,10 +394,6 @@
95B0D35B0EB69DDF001A0D06 /* attachment_manager.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE2A0EB69DD9001A0D06 /* attachment_manager.hpp */; };
95B0D35C0EB69DDF001A0D06 /* bowling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE2B0EB69DD9001A0D06 /* bowling.cpp */; };
95B0D35D0EB69DDF001A0D06 /* bowling.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE2C0EB69DD9001A0D06 /* bowling.hpp */; };
95B0D35E0EB69DDF001A0D06 /* collectable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE2D0EB69DD9001A0D06 /* collectable.cpp */; };
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 */; };
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 */; };
@ -754,8 +754,6 @@
95B0D3590EB69DDF001A0D06 /* attachment.hpp in CopyFiles */,
95B0D35B0EB69DDF001A0D06 /* attachment_manager.hpp in CopyFiles */,
95B0D35D0EB69DDF001A0D06 /* bowling.hpp in CopyFiles */,
95B0D35F0EB69DDF001A0D06 /* collectable.hpp in CopyFiles */,
95B0D3610EB69DDF001A0D06 /* collectable_manager.hpp in CopyFiles */,
95B0D3690EB69DDF001A0D06 /* missile.hpp in CopyFiles */,
95B0D36B0EB69DDF001A0D06 /* projectile_manager.hpp in CopyFiles */,
95B0D36E0EB69DDF001A0D06 /* kart.hpp in CopyFiles */,
@ -832,6 +830,8 @@
95090A4A0EB7EA960048841A /* item.hpp in CopyFiles */,
95090A4B0EB7EA960048841A /* item_manager.hpp in CopyFiles */,
958EEFB60EB93C03005F6F70 /* item_info.hpp in CopyFiles */,
958EF0140EB94819005F6F70 /* powerup_manager.hpp in CopyFiles */,
958EF0150EB94819005F6F70 /* powerup.hpp in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
};
@ -845,6 +845,10 @@
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>"; };
958EEFB50EB93C03005F6F70 /* item_info.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = item_info.hpp; sourceTree = "<group>"; };
958EF00F0EB94818005F6F70 /* powerup_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = powerup_manager.cpp; sourceTree = "<group>"; };
958EF0100EB94819005F6F70 /* powerup_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = powerup_manager.hpp; sourceTree = "<group>"; };
958EF0110EB94819005F6F70 /* powerup.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = powerup.hpp; sourceTree = "<group>"; };
958EF0120EB94819005F6F70 /* powerup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = powerup.cpp; 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>"; };
@ -1221,10 +1225,6 @@
95B0CE2A0EB69DD9001A0D06 /* attachment_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = attachment_manager.hpp; sourceTree = "<group>"; };
95B0CE2B0EB69DD9001A0D06 /* bowling.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = bowling.cpp; sourceTree = "<group>"; };
95B0CE2C0EB69DD9001A0D06 /* bowling.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = bowling.hpp; sourceTree = "<group>"; };
95B0CE2D0EB69DD9001A0D06 /* collectable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = collectable.cpp; sourceTree = "<group>"; };
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>"; };
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,10 @@
95B0CE260EB69DD9001A0D06 /* items */ = {
isa = PBXGroup;
children = (
958EF00F0EB94818005F6F70 /* powerup_manager.cpp */,
958EF0100EB94819005F6F70 /* powerup_manager.hpp */,
958EF0110EB94819005F6F70 /* powerup.hpp */,
958EF0120EB94819005F6F70 /* powerup.cpp */,
9518C11B0EB7AF7A00952372 /* cake.cpp */,
9518C11C0EB7AF7A00952372 /* cake.hpp */,
95B0CE270EB69DD9001A0D06 /* attachment.cpp */,
@ -2298,10 +2302,6 @@
95B0CE2A0EB69DD9001A0D06 /* attachment_manager.hpp */,
95B0CE2B0EB69DD9001A0D06 /* bowling.cpp */,
95B0CE2C0EB69DD9001A0D06 /* bowling.hpp */,
95B0CE2D0EB69DD9001A0D06 /* collectable.cpp */,
95B0CE2E0EB69DD9001A0D06 /* collectable.hpp */,
95B0CE2F0EB69DD9001A0D06 /* collectable_manager.cpp */,
95B0CE300EB69DD9001A0D06 /* collectable_manager.hpp */,
95090A450EB7EA960048841A /* item.cpp */,
95090A460EB7EA960048841A /* item.hpp */,
95090A470EB7EA960048841A /* item_manager.hpp */,
@ -2953,8 +2953,6 @@
95B0D3580EB69DDF001A0D06 /* attachment.cpp in Sources */,
95B0D35A0EB69DDF001A0D06 /* attachment_manager.cpp in Sources */,
95B0D35C0EB69DDF001A0D06 /* bowling.cpp in Sources */,
95B0D35E0EB69DDF001A0D06 /* collectable.cpp in Sources */,
95B0D3600EB69DDF001A0D06 /* collectable_manager.cpp in Sources */,
95B0D3680EB69DDF001A0D06 /* missile.cpp in Sources */,
95B0D36A0EB69DDF001A0D06 /* projectile_manager.cpp in Sources */,
95B0D36C0EB69DDF001A0D06 /* kart.cpp in Sources */,
@ -3017,6 +3015,8 @@
9518C11D0EB7AF7A00952372 /* cake.cpp in Sources */,
95090A490EB7EA960048841A /* item.cpp in Sources */,
95090A4C0EB7EA960048841A /* item_manager.cpp in Sources */,
958EF0130EB94819005F6F70 /* powerup_manager.cpp in Sources */,
958EF0160EB94819005F6F70 /* powerup.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

4
src/items/bowling.cpp
View File

@ -26,7 +26,7 @@ float Bowling::m_st_max_distance_squared;
float Bowling::m_st_force_to_target;
// -----------------------------------------------------------------------------
Bowling::Bowling(Kart *kart) : Flyable(kart, COLLECT_BOWLING, 50.0f /* mass */)
Bowling::Bowling(Kart *kart) : Flyable(kart, POWERUP_BOWLING, 50.0f /* mass */)
{
float y_offset = 0.5f*kart->getKartLength()+2.0f*m_extend.getY();
@ -65,7 +65,7 @@ Bowling::Bowling(Kart *kart) : Flyable(kart, COLLECT_BOWLING, 50.0f /* mass */)
// -----------------------------------------------------------------------------
void Bowling::init(const lisp::Lisp* lisp, ssgEntity *bowling)
{
Flyable::init(lisp, bowling, COLLECT_BOWLING);
Flyable::init(lisp, bowling, POWERUP_BOWLING);
m_st_max_distance = 20.0f;
m_st_max_distance_squared = 20.0f * 20.0f;
m_st_force_to_target = 10.0f;

4
src/items/cake.cpp
View File

@ -26,7 +26,7 @@ float Cake::m_st_max_distance;
float Cake::m_st_max_distance_squared;
float Cake::m_st_max_turn_angle;
Cake::Cake (Kart *kart) : Flyable(kart, COLLECT_CAKE)
Cake::Cake (Kart *kart) : Flyable(kart, POWERUP_CAKE)
{
m_target = NULL;
@ -112,7 +112,7 @@ Cake::Cake (Kart *kart) : Flyable(kart, COLLECT_CAKE)
// -----------------------------------------------------------------------------
void Cake::init(const lisp::Lisp* lisp, ssgEntity *cake_model)
{
Flyable::init(lisp, cake_model, COLLECT_CAKE);
Flyable::init(lisp, cake_model, POWERUP_CAKE);
m_st_max_turn_angle = 15.0f;
m_st_max_distance = 80.0f;
m_st_max_distance_squared = 80.0f * 80.0f;

4
src/items/missile.cpp
View File

@ -21,7 +21,7 @@
#include "constants.hpp"
// -----------------------------------------------------------------------------
Missile::Missile(Kart *kart) : Flyable(kart, COLLECT_MISSILE)
Missile::Missile(Kart *kart) : Flyable(kart, POWERUP_MISSILE)
{
float y_offset=kart->getKartLength()+2.0f*m_extend.getY();
createPhysics(y_offset, btVector3(0.0f, m_speed, 0.0f),
@ -31,7 +31,7 @@ Missile::Missile(Kart *kart) : Flyable(kart, COLLECT_MISSILE)
// -----------------------------------------------------------------------------
void Missile::init(const lisp::Lisp* lisp, ssgEntity *missile)
{
Flyable::init(lisp, missile, COLLECT_MISSILE);
Flyable::init(lisp, missile, POWERUP_MISSILE);
} // init
// -----------------------------------------------------------------------------

76
src/items/collectable.cpp → src/items/powerup.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 "items/collectable.hpp"
#include "items/powerup.hpp"
#include "network/network_manager.hpp"
#include "network/race_state.hpp"
@ -31,36 +31,36 @@
#include "stk_config.hpp"
//-----------------------------------------------------------------------------
Collectable::Collectable(Kart* kart_)
Powerup::Powerup(Kart* kart_)
{
m_owner = kart_;
m_sound_shot = sfx_manager->newSFX(SFXManager::SOUND_SHOT);
m_sound_use_anvil = sfx_manager->newSFX(SFXManager::SOUND_USE_ANVIL);
m_sound_use_parachute = sfx_manager->newSFX(SFXManager::SOUND_USE_PARACHUTE);
reset();
} // Collectable
} // Powerup
//-----------------------------------------------------------------------------
/** Frees the memory for the sound effects.
*/
Collectable::~Collectable()
Powerup::~Powerup()
{
sfx_manager->deleteSFX(m_sound_shot);
sfx_manager->deleteSFX(m_sound_use_anvil);
sfx_manager->deleteSFX(m_sound_use_parachute);
} // ~Collectable
} // ~Powerup
//-----------------------------------------------------------------------------
void Collectable::reset()
void Powerup::reset()
{
int type;
RaceManager::getWorld()->getDefaultCollectibles( type, m_number );
m_type = (CollectableType)type;
m_type = (PowerupType)type;
} // reset
//-----------------------------------------------------------------------------
void Collectable::set(CollectableType type, int n)
void Powerup::set(PowerupType type, int n)
{
if (m_type==type)
{
@ -72,30 +72,30 @@ void Collectable::set(CollectableType type, int n)
} // set
//-----------------------------------------------------------------------------
Material *Collectable::getIcon()
Material *Powerup::getIcon()
{
// Check if it's one of the types which have a separate
// data file which includes the icon:
return collectable_manager->getIcon(m_type);
return powerup_manager->getIcon(m_type);
}
//-----------------------------------------------------------------------------
void Collectable::use()
void Powerup::use()
{
m_number--;
switch (m_type)
{
case COLLECT_ZIPPER: m_owner->handleZipper();
case POWERUP_ZIPPER: m_owner->handleZipper();
break ;
case COLLECT_CAKE:
case COLLECT_BOWLING:
case COLLECT_MISSILE:
case POWERUP_CAKE:
case POWERUP_BOWLING:
case POWERUP_MISSILE:
m_sound_shot->position(m_owner->getXYZ());
m_sound_shot->play();
projectile_manager->newProjectile(m_owner, m_type);
break ;
case COLLECT_ANVIL:
case POWERUP_ANVIL:
//Attach an anvil(twice as good as the one given
//by the bananas) to the kart in the 1st position.
for(unsigned int i = 0 ; i < race_manager->getNumKarts(); ++i)
@ -115,7 +115,7 @@ void Collectable::use()
break;
case COLLECT_PARACHUTE:
case POWERUP_PARACHUTE:
{
Kart* player_kart = NULL;
//Attach a parachutte(that last as twice as the
@ -142,30 +142,30 @@ void Collectable::use()
}
break;
case COLLECT_NOTHING:
case POWERUP_NOTHING:
default : break ;
}
if ( m_number <= 0 )
{
m_number = 0;
m_type = COLLECT_NOTHING;
m_type = POWERUP_NOTHING;
}
} // use
//-----------------------------------------------------------------------------
void Collectable::hitBonusBox(int n, const Item &item, int add_info)
void Powerup::hitBonusBox(int n, const Item &item, int add_info)
{
//The probabilities of getting the anvil or the parachute increase
//depending on how bad the owner's position is. For the first
//driver the posibility is none, for the last player is 15 %.
if(m_owner->getPosition() != 1 && m_type == COLLECT_NOTHING)
if(m_owner->getPosition() != 1 && m_type == POWERUP_NOTHING)
{
// On client: just set the value
if(network_manager->getMode()==NetworkManager::NW_CLIENT)
{
m_random.get(100); // keep random numbers in sync
m_type = (CollectableType)add_info;
m_type = (PowerupType)add_info;
m_number = 1;
return;
}
@ -182,7 +182,7 @@ void Collectable::hitBonusBox(int n, const Item &item, int add_info)
if(kart->isEliminated() || kart == m_owner) continue;
if(kart->getPosition() == 1 && kart->hasFinishedRace())
{
m_type = COLLECT_PARACHUTE;
m_type = POWERUP_PARACHUTE;
m_number = 1;
if(network_manager->getMode()==NetworkManager::NW_SERVER)
{
@ -194,7 +194,7 @@ void Collectable::hitBonusBox(int n, const Item &item, int add_info)
}
}
m_type = m_random.get(2) == 0 ? COLLECT_ANVIL : COLLECT_PARACHUTE;
m_type = m_random.get(2) == 0 ? POWERUP_ANVIL : POWERUP_PARACHUTE;
m_number = 1;
if(network_manager->getMode()==NetworkManager::NW_SERVER)
{
@ -211,30 +211,30 @@ void Collectable::hitBonusBox(int n, const Item &item, int add_info)
// dependent on the server informaion:
if(network_manager->getMode()==NetworkManager::NW_CLIENT)
{
if(m_type==COLLECT_NOTHING)
if(m_type==POWERUP_NOTHING)
{
m_type = (CollectableType)add_info;
m_type = (PowerupType)add_info;
m_number = n;
}
else if((CollectableType)add_info==m_type)
else if((PowerupType)add_info==m_type)
{
m_number+=n;
if(m_number > MAX_COLLECTABLES) m_number = MAX_COLLECTABLES;
if(m_number > MAX_POWERUPS) m_number = MAX_POWERUPS;
}
// Ignore new collectable if it is different from the current one
// Ignore new powerup if it is different from the current one
m_random.get(100); // keep random numbers in synch
return;
} // if network client
// Otherwise (server or no network): determine collectable randomly
// Otherwise (server or no network): determine powerup randomly
//rand() is moduled by COLLECT_MAX - 1 - 2 because because we have to
//rand() is moduled by POWERUP_MAX - 1 - 2 because because we have to
//exclude the anvil and the parachute, but later we have to add 1 to prevent
//having a value of 0 since that isn't a valid collectable.
CollectableType newC;
newC = (CollectableType)(m_random.get(COLLECT_MAX - 1 - 2) + 1);
// Save the information about the collectable in the race state
//having a value of 0 since that isn't a valid powerup.
PowerupType newC;
newC = (PowerupType)(m_random.get(POWERUP_MAX - 1 - 2) + 1);
// Save the information about the powerup in the race state
// so that the clients can be updated.
if(network_manager->getMode()==NetworkManager::NW_SERVER)
{
@ -243,7 +243,7 @@ void Collectable::hitBonusBox(int n, const Item &item, int add_info)
newC);
}
if(m_type==COLLECT_NOTHING)
if(m_type==POWERUP_NOTHING)
{
m_type=newC;
m_number = n;
@ -251,7 +251,7 @@ void Collectable::hitBonusBox(int n, const Item &item, int add_info)
else if(newC==m_type)
{
m_number+=n;
if(m_number > MAX_COLLECTABLES) m_number = MAX_COLLECTABLES;
if(m_number > MAX_POWERUPS) m_number = MAX_POWERUPS;
}
// Ignore new collectable if it is different from the current one
// Ignore new powerup if it is different from the current one
} // hitBonusBox

20
src/items/collectable.hpp → src/items/powerup.hpp
View File

@ -17,19 +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.
#ifndef HEADER_COLLECTABLE_H
#define HEADER_COLLECTABLE_H
#ifndef HEADER_POWERUP_H
#define HEADER_POWERUP_H
#define MAX_COLLECTABLES 5
#define MAX_POWERUPS 5
#include "items/collectable_manager.hpp" // needed for collectable_type
#include "items/powerup_manager.hpp" // needed for powerup_type
#include "utils/random_generator.hpp"
class Kart;
class Item;
class SFXBase;
class Collectable
class Powerup
{
private:
RandomGenerator m_random;
@ -39,16 +39,16 @@ private:
protected:
Kart* m_owner;
CollectableType m_type;
PowerupType m_type;
int m_number;
public:
Collectable (Kart* kart_);
~Collectable ();
void set (CollectableType _type, int n=1);
Powerup (Kart* kart_);
~Powerup ();
void set (PowerupType _type, int n=1);
void reset ();
int getNum () const {return m_number;}
CollectableType getType () const {return m_type; }
PowerupType getType () const {return m_type; }
void hitBonusBox (int n, const Item &item, int newC=-1);
Material* getIcon ();
void use ();

54
src/items/collectable_manager.cpp → src/items/powerup_manager.cpp
View File

@ -19,7 +19,7 @@
#include <iostream>
#include <stdexcept>
#include "items/collectable_manager.hpp"
#include "items/powerup_manager.hpp"
#include "file_manager.hpp"
#include "material_manager.hpp"
#include "material.hpp"
@ -35,38 +35,38 @@
typedef struct
{
CollectableType collectable;
PowerupType powerup;
const char*const dataFile;
}
initCollectableType;
initPowerupType;
initCollectableType ict[]=
initPowerupType ict[]=
{
{COLLECT_ZIPPER, "zipper.collectable" },
{COLLECT_BOWLING, "bowling.projectile" },
{COLLECT_MISSILE, "missile.projectile" },
{COLLECT_CAKE, "cake.projectile" },
{COLLECT_ANVIL, "anvil.collectable" },
{COLLECT_PARACHUTE, "parachute.collectable" },
{COLLECT_MAX, "" },
{POWERUP_ZIPPER, "zipper.collectable" },
{POWERUP_BOWLING, "bowling.projectile" },
{POWERUP_MISSILE, "missile.projectile" },
{POWERUP_CAKE, "cake.projectile" },
{POWERUP_ANVIL, "anvil.collectable" },
{POWERUP_PARACHUTE, "parachute.collectable" },
{POWERUP_MAX, "" },
};
CollectableManager* collectable_manager=0;
PowerupManager* powerup_manager=0;
//-----------------------------------------------------------------------------
CollectableManager::CollectableManager()
PowerupManager::PowerupManager()
{
for(int i=0; i<COLLECT_MAX; i++)
for(int i=0; i<POWERUP_MAX; i++)
{
m_all_models[i] = (ssgEntity*)NULL;
m_all_icons[i] = (Material*)NULL;
}
} // CollectableManager
} // PowerupManager
//-----------------------------------------------------------------------------
void CollectableManager::removeTextures()
void PowerupManager::removeTextures()
{
for(int i=0; i<COLLECT_MAX; i++)
for(int i=0; i<POWERUP_MAX; i++)
{
if(m_all_icons [i]) ssgDeRefDelete(m_all_icons [i]->getState());
if(m_all_models[i]) ssgDeRefDelete(m_all_models[i] );
@ -76,16 +76,16 @@ void CollectableManager::removeTextures()
} // removeTextures
//-----------------------------------------------------------------------------
void CollectableManager::loadCollectables()
void PowerupManager::loadPowerups()
{
for(int i=0; ict[i].collectable != COLLECT_MAX; i++)
for(int i=0; ict[i].powerup != POWERUP_MAX; i++)
{
Load(ict[i].collectable, ict[i].dataFile);
Load(ict[i].powerup, ict[i].dataFile);
}
} // loadCollectables
} // loadPowerups
//-----------------------------------------------------------------------------
void CollectableManager::Load(int collectType, const char* filename)
void PowerupManager::Load(int collectType, const char* filename)
{
const lisp::Lisp* ROOT = 0;
@ -109,7 +109,7 @@ void CollectableManager::Load(int collectType, const char* filename)
} // Load
//-----------------------------------------------------------------------------
void CollectableManager::LoadNode(const lisp::Lisp* lisp, int collectType )
void PowerupManager::LoadNode(const lisp::Lisp* lisp, int collectType )
{
std::string sName, sModel, sIconFile;
lisp->get("name", sName );
@ -133,13 +133,13 @@ void CollectableManager::LoadNode(const lisp::Lisp* lisp, int collectType )
m_all_extends[collectType] = btVector3(0.0f,0.0f,0.0f);
}
// Load special attributes for certain collectables
// Load special attributes for certain powerups
switch (collectType) {
case COLLECT_BOWLING:
case POWERUP_BOWLING:
Bowling::init (lisp, m_all_models[collectType]); break;
case COLLECT_MISSILE:
case POWERUP_MISSILE:
Missile::init(lisp, m_all_models[collectType]); break;
case COLLECT_CAKE:
case POWERUP_CAKE:
Cake::init (lisp, m_all_models[collectType]); break;
default:;
} // switch

36
src/items/collectable_manager.hpp → src/items/powerup_manager.hpp
View File

@ -17,8 +17,8 @@
// 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_COLLECTABLEMANAGER_H
#define HEADER_COLLECTABLEMANAGER_H
#ifndef HEADER_POWERUPMANAGER_H
#define HEADER_POWERUPMANAGER_H
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
@ -28,27 +28,27 @@ class Material;
class ssgEntity;
// The anvil and parachute must be at the end of the enum, and the
// zipper just before them (see collectable::hitBonusBox).
enum CollectableType {COLLECT_NOTHING,
COLLECT_MISSILE, COLLECT_CAKE,
COLLECT_BOWLING, COLLECT_ZIPPER,
COLLECT_PARACHUTE, COLLECT_ANVIL,
COLLECT_MAX};
// zipper just before them (see Powerup::hitBonusBox).
enum PowerupType {POWERUP_NOTHING,
POWERUP_MISSILE, POWERUP_CAKE,
POWERUP_BOWLING, POWERUP_ZIPPER,
POWERUP_PARACHUTE, POWERUP_ANVIL,
POWERUP_MAX};
class CollectableManager
class PowerupManager
{
protected:
Material* m_all_icons [COLLECT_MAX];
float m_all_max_distance[COLLECT_MAX]; // if a target is closer than this
float m_all_force_to_target[COLLECT_MAX]; // apply this force to move towards
Material* m_all_icons [POWERUP_MAX];
float m_all_max_distance[POWERUP_MAX]; // if a target is closer than this
float m_all_force_to_target[POWERUP_MAX]; // apply this force to move towards
// the target
float m_all_max_turn_angle[COLLECT_MAX]; // maximum turn angle for homing
ssgEntity* m_all_models[COLLECT_MAX];
btVector3 m_all_extends[COLLECT_MAX];
float m_all_max_turn_angle[POWERUP_MAX]; // maximum turn angle for homing
ssgEntity* m_all_models[POWERUP_MAX];
btVector3 m_all_extends[POWERUP_MAX];
void LoadNode (const lisp::Lisp* lisp, int collectType);
public:
CollectableManager ();
void loadCollectables();
PowerupManager ();
void loadPowerups();
void removeTextures ();
void Load (int collectType, const char* filename);
Material* getIcon (int type) const {return m_all_icons [type]; }
@ -59,6 +59,6 @@ public:
const btVector3& getExtend (int type) const {return m_all_extends[type]; }
};
extern CollectableManager* collectable_manager;
extern PowerupManager* powerup_manager;
#endif

16
src/items/projectile_manager.cpp
View File

@ -25,8 +25,8 @@
#include "missile.hpp"
#include "items/cake.hpp"
#include "explosion.hpp"
#include "items/collectable_manager.hpp"
#include "items/collectable.hpp"
#include "items/powerup_manager.hpp"
#include "items/powerup.hpp"
#include "scene.hpp"
static ssgSelector *find_selector ( ssgBranch *b );
@ -37,7 +37,7 @@ void ProjectileManager::loadData()
{
// Load the explosion model and find the actual selector branch in it.
// Only the explosion model is loaded here, see collectable_manager.
// Only the explosion model is loaded here, see powerup_manager.
m_explosion_model = find_selector((ssgBranch*)loader->load("explode.ac",
CB_EXPLOSION) );
m_explosion_model->ref();
@ -55,7 +55,7 @@ void ProjectileManager::removeTextures()
cleanup();
ssgDeRefDelete(m_explosion_model);
// Only the explosion is here, all other models are actually managed
// by collectable_manager.
// by powerup_manager.
callback_manager->clear(CB_EXPLOSION);
} // removeTextures
@ -180,14 +180,14 @@ void ProjectileManager::updateClient(float dt)
} // updateClient
// -----------------------------------------------------------------------------
Flyable *ProjectileManager::newProjectile(Kart *kart, CollectableType type)
Flyable *ProjectileManager::newProjectile(Kart *kart, PowerupType type)
{
Flyable *f;
switch(type)
{
case COLLECT_BOWLING: f = new Bowling(kart); break;
case COLLECT_CAKE: f = new Cake(kart); break;
case COLLECT_MISSILE: f = new Missile(kart); break;
case POWERUP_BOWLING: f = new Bowling(kart); break;
case POWERUP_CAKE: f = new Cake(kart); break;
case POWERUP_MISSILE: f = new Missile(kart); break;
default: return NULL;
}
m_active_projectiles.push_back(f);

4
src/items/projectile_manager.hpp
View File

@ -23,7 +23,7 @@
#include <vector>
#include <plib/ssg.h>
#include "vec3.hpp"
#include "items/collectable_manager.hpp"
#include "items/powerup_manager.hpp"
class Kart;
class Explosion;
@ -62,7 +62,7 @@ public:
void loadData ();
void cleanup ();
void update (float dt);
Flyable* newProjectile (Kart *kart, CollectableType type);
Flyable* newProjectile (Kart *kart, PowerupType type);
Explosion* newExplosion (const Vec3& coord);
void Deactivate (Flyable *p) {}
void removeTextures ();

10
src/kart.cpp
View File

@ -61,7 +61,7 @@
Kart::Kart (const std::string& kart_name, int position,
const btTransform& init_transform)
: TerrainInfo(1),
Moveable(), m_attachment(this), m_collectable(this)
Moveable(), m_attachment(this), m_powerup(this)
#if defined(WIN32) && !defined(__CYGWIN__)
# pragma warning(1:4355)
@ -351,7 +351,7 @@ void Kart::reset()
}
m_attachment.clear();
m_collectable.reset();
m_powerup.reset();
m_race_position = 9;
m_finished_race = false;
@ -414,12 +414,12 @@ void Kart::collectedItem(const Item &item, int add_info)
case ITEM_GOLD_COIN : m_num_items_collected += 3 ; break;
case ITEM_BONUS_BOX : {
int n=1 + 4*getNumItems() / MAX_ITEMS_COLLECTED;
m_collectable.hitBonusBox(n, item,add_info);break;
m_powerup.hitBonusBox(n, item,add_info);break;
}
default : break;
} // switch TYPE
// Attachments and collectables are stored in the corresponding
// Attachments and powerups are stored in the corresponding
// functions (hit{Red,Green}Item), so only coins need to be
// stored here.
if(network_manager->getMode()==NetworkManager::NW_SERVER &&
@ -512,7 +512,7 @@ void Kart::update(float dt)
{
// use() needs to be called even if there currently is no collecteable
// since use() can test if something needs to be switched on/off.
m_collectable.use() ;
m_powerup.use() ;
m_controls.fire = false;
}

12
src/kart.hpp
View File

@ -29,7 +29,7 @@
#include "kart_properties.hpp"
#include "kart_control.hpp"
#include "items/attachment.hpp"
#include "items/collectable.hpp"
#include "items/powerup.hpp"
#include "terrain_info.hpp"
class SkidMark;
@ -45,7 +45,7 @@ private:
protected:
Attachment m_attachment;
Collectable m_collectable;
Powerup m_powerup;
int m_race_position; // current race position (1-numKarts)
int m_initial_position; // initial position of kart
@ -119,8 +119,8 @@ public:
{ m_kart_properties=kp; }
void attach (attachmentType attachment_, float time)
{ m_attachment.set(attachment_, time); }
void setCollectable (CollectableType t, int n)
{ m_collectable.set(t, n); }
void setPowerup (PowerupType t, int n)
{ m_powerup.set(t, n); }
virtual void setPosition (int p)
{ m_race_position = p; }
@ -128,8 +128,8 @@ public:
void setAttachmentType (attachmentType t, float time_left=0.0f,
Kart*k=NULL)
{ m_attachment.set(t, time_left, k); }
Collectable *getCollectable () { return &m_collectable; }
int getNumCollectables () const { return m_collectable.getNum();}
Powerup *getPowerup () { return &m_powerup; }
int getNumPowerup () const { return m_powerup.getNum();}
int getNumItems () const { return m_num_items_collected;}
int getPosition () const { return m_race_position; }
int getInitialPosition () const { return m_initial_position; }

4
src/main.cpp
View File

@ -443,7 +443,7 @@ void InitTuxkart()
stk_config = new STKConfig ();
kart_properties_manager = new KartPropertiesManager();
projectile_manager = new ProjectileManager ();
collectable_manager = new CollectableManager ();
powerup_manager = new PowerupManager ();
callback_manager = new CallbackManager ();
item_manager = new ItemManager ();
attachment_manager = new AttachmentManager ();
@ -511,7 +511,7 @@ int main(int argc, char *argv[] )
material_manager -> loadMaterial ();
kart_properties_manager -> loadKartData ();
projectile_manager -> loadData ();
collectable_manager -> loadCollectables ();
powerup_manager -> loadPowerups ();
item_manager -> loadDefaultItems();
attachment_manager -> loadModels ();
scene = new Scene();

2
src/modes/standard_race.cpp
View File

@ -93,7 +93,7 @@ void StandardRace::getDefaultCollectibles(int& collectible_type, int& amount)
// in time trial mode, give zippers
if(race_manager->getMinorMode() == RaceManager::MINOR_MODE_TIME_TRIAL)
{
collectible_type = COLLECT_ZIPPER;
collectible_type = POWERUP_ZIPPER;
amount = race_manager->getNumLaps();
}
else World::getDefaultCollectibles(collectible_type, amount);

2
src/modes/world.cpp
View File

@ -469,7 +469,7 @@ void World::loadTrack()
//-----------------------------------------------------------------------------
void World::getDefaultCollectibles(int& collectible_type, int& amount )
{
collectible_type = COLLECT_NOTHING;
collectible_type = POWERUP_NOTHING;
amount = 0;
}
//-----------------------------------------------------------------------------

2
src/network/race_state.cpp
View File

@ -125,7 +125,7 @@ void RaceState::receive(ENetPacket *pkt)
// Firing needs to be done from here to guarantee that any potential
// new rockets are created before the update for the rockets is handled
if(kc.fire)
kart->getCollectable()->use();
kart->getPowerup()->use();
kart->setXYZ(xyz);
kart->setRotation(q);
kart->setSpeed(getFloat());

6
src/player_kart.cpp
View File

@ -208,7 +208,7 @@ void PlayerKart::update(float dt)
if ( m_controls.fire && !isRescue())
{
if (m_collectable.getType()==COLLECT_NOTHING)
if (m_powerup.getType()==POWERUP_NOTHING)
Kart::beep();
}
@ -289,9 +289,9 @@ void PlayerKart::handleZipper()
* \param item Item that was collected.
* \param add_info Additional info to be used then handling the item. If
* this is -1 (default), the item type is selected
* randomly. Otherwise it contains the collectable or
* randomly. Otherwise it contains the powerup or
* attachment for the kart. This is used in network mode to
* let the server determine the collectable/attachment for
* let the server determine the powerup/attachment for
* the clients.
*/
void PlayerKart::collectedItem(const Item &item, int add_info)

12
src/robots/default_robot.cpp
View File

@ -346,7 +346,7 @@ void DefaultRobot::handle_items( const float DELTA, const int STEPS )
KartInfo& kart_info = lworld->m_kart_info[ getWorldKartId() ];
m_time_since_last_shot += DELTA;
if( m_collectable.getType() != COLLECT_NOTHING )
if( m_powerup.getType() != POWERUP_NOTHING )
{
switch( m_item_tactic )
{
@ -358,9 +358,9 @@ void DefaultRobot::handle_items( const float DELTA, const int STEPS )
}
break;
case IT_CALCULATE:
switch( m_collectable.getType() )
switch( m_powerup.getType() )
{
case COLLECT_ZIPPER:
case POWERUP_ZIPPER:
{
const float ANGLE_DIFF = fabsf( normalize_angle(
RaceManager::getTrack()->m_angle[kart_info.m_track_sector]-
@ -375,8 +375,8 @@ void DefaultRobot::handle_items( const float DELTA, const int STEPS )
}
break;
case COLLECT_MISSILE:
case COLLECT_CAKE:
case POWERUP_MISSILE:
case POWERUP_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() >
@ -388,7 +388,7 @@ void DefaultRobot::handle_items( const float DELTA, const int STEPS )
}
break;
case COLLECT_BOWLING:
case POWERUP_BOWLING:
if ( m_time_since_last_shot > 3.0f && m_crashes.m_kart != -1 )
{
m_controls.fire = true;

6
src/sdldrv.cpp
View File

@ -35,7 +35,7 @@
#include "kart_properties_manager.hpp"
#include "main_loop.hpp"
#include "items/item_manager.hpp"
#include "items/collectable_manager.hpp"
#include "items/powerup_manager.hpp"
#include "items/attachment_manager.hpp"
#include "items/projectile_manager.hpp"
#include "loader.hpp"
@ -316,12 +316,12 @@ void SDLDriver::setVideoMode(bool resetTextures)
projectile_manager -> removeTextures();
item_manager -> removeTextures();
kart_properties_manager -> removeTextures();
collectable_manager -> removeTextures();
powerup_manager -> removeTextures();
material_manager->reInit();
collectable_manager -> loadCollectables();
powerup_manager -> loadPowerups();
kart_properties_manager -> loadKartData();
item_manager -> loadDefaultItems();
projectile_manager -> loadData();