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

Removed unused code, coding style fixes.

Browse Source
This commit is contained in:
hiker
2018-05-11 09:38:27 +10:00
parent b77a76dd8c
commit d88ce3b3b6
2 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/items/powerup_manager.cpp
View File

@@ -79,7 +79,8 @@ void PowerupManager::unloadPowerups()
if(m_all_meshes[(PowerupType)i])
m_all_meshes[(PowerupType)i]->drop();
//FIXME: I'm not sure if this is OK or if I need to ->drop(), or delete them, or...
//FIXME: I'm not sure if this is OK or if I need to ->drop(),
// or delete them, or...
m_all_icons[i] = (Material*)NULL;
}
} // removeTextures
@@ -125,8 +126,9 @@ void PowerupManager::loadAllPowerups()
LoadPowerup(type, *node);
else
{
Log::fatal("[PowerupManager]", "Can't find item '%s' from powerup.xml, entry %d/",
name.c_str(), i+1);
Log::fatal("PowerupManager",
"Can't find item '%s' from powerup.xml, entry %d.",
name.c_str(), i+1);
exit(-1);
}
}
@@ -158,8 +160,9 @@ void PowerupManager::LoadPowerup(PowerupType type, const XMLNode &node)
#ifdef DEBUG
if (icon_file.size() == 0)
{
Log::debug("[PowerupManager]", "Cannot load powerup %i, no 'icon' attribute under XML node", type);
assert(false);
Log::fatal("PowerupManager",
"Cannot load powerup %i, no 'icon' attribute under XML node",
type);
}
#endif
@@ -180,7 +183,8 @@ void PowerupManager::LoadPowerup(PowerupType type, const XMLNode &node)
if(!m_all_meshes[type])
{
std::ostringstream o;
o<<"Can't load model '"<<model<<"' for powerup type '"<<type<<"', aborting.";
o << "Can't load model '" << model << "' for powerup type '" << type
<< "', aborting.";
throw std::runtime_error(o.str());
}
m_all_meshes[type]->grab();
@@ -188,7 +192,6 @@ void PowerupManager::LoadPowerup(PowerupType type, const XMLNode &node)
else
{
m_all_meshes[type] = 0;
m_all_extends[type] = btVector3(0.0f,0.0f,0.0f);
}
// Load special attributes for certain powerups
switch (type) {
@@ -247,10 +250,12 @@ void PowerupManager::loadWeights(const XMLNode &root,
if(weight_list.size()!=2*(int)POWERUP_LAST)
{
Log::error("[PowerupManager]", "Incorrect number of weights found in class '%s':",
class_name.c_str());
Log::error("[PowerupManager]", "%d instead of %d - probabilities will be incorrect.",
(int)weight_list.size(), (int)POWERUP_LAST);
Log::error("PowerupManager",
"Incorrect number of weights found in class '%s':",
class_name.c_str());
Log::error("PowerupManager",
"%d instead of %d - probabilities will be incorrect.",
(int)weight_list.size(), (int)POWERUP_LAST);
return;
}

42
src/items/powerup_manager.hpp
View File

@@ -103,26 +103,12 @@ private:
/** The icon for each powerup. */
Material* m_all_icons [POWERUP_MAX];
/** A maximum distance for homing powerups. */
float m_all_max_distance[POWERUP_MAX];
/** A force to steer a powerup towards a target. */
float m_all_force_to_target[POWERUP_MAX];
/** Maximum turn angle for steering of homing powerups. */
float m_all_max_turn_angle[POWERUP_MAX];
/** Last time the bouncing ball was collected */
int m_rubber_ball_collect_ticks;
public:
/** The mesh for each model (if the powerup has a model), e.g. a switch
has none. */
irr::scene::IMesh *m_all_meshes[POWERUP_MAX];
private:
/** Size of the corresponding mesh. */
btVector3 m_all_extends[POWERUP_MAX];
/** For each powerup the weight (probability) used depending on the
* number of players. */
@@ -140,7 +126,6 @@ private:
std::vector<PositionClass> m_position_to_class;
PowerupType getPowerupType(const std::string &name) const;
void loadWeights(const XMLNode &root,
const std::string &class_name,
PositionClass position_class);
@@ -153,22 +138,23 @@ public:
void unloadPowerups ();
void LoadPowerup (PowerupType type, const XMLNode &node);
void updateWeightsForRace(unsigned int num_karts);
Material* getIcon (int type) const {return m_all_icons [type];}
PowerupManager::PowerupType
getRandomPowerup(unsigned int pos, unsigned int *n);
getRandomPowerup(unsigned int pos, unsigned int *n);
// ------------------------------------------------------------------------
/** Returns the icon(material) for a powerup. */
Material* getIcon(int type) const {return m_all_icons [type];}
// ------------------------------------------------------------------------
/** Returns the mesh for a certain powerup.
* \param type Mesh type for which the model is returned. */
irr::scene::IMesh
*getMesh (int type) const {return m_all_meshes[type];}
float getForceToTarget(int type) const {return m_all_force_to_target[type];}
float getMaxDistance (int type) const {return m_all_max_distance[type];}
float getMaxTurnAngle (int type) const {return m_all_max_turn_angle[type];}
const btVector3&
getExtend (int type) const {return m_all_extends[type];}
int getBallCollectTicks() const {return m_rubber_ball_collect_ticks;}
void setBallCollectTicks(int ticks) {m_rubber_ball_collect_ticks=ticks;}
};
irr::scene::IMesh *getMesh(int type) const {return m_all_meshes[type];}
// ------------------------------------------------------------------------
/** Returns the last time a rubber ball was collected. */
int getBallCollectTicks() const {return m_rubber_ball_collect_ticks;}
// ------------------------------------------------------------------------
/** Updates the last time at which a rubber ball was collected. */
void setBallCollectTicks(int ticks) {m_rubber_ball_collect_ticks=ticks;}
// ------------------------------------------------------------------------
}; // class PowerupManager
extern PowerupManager* powerup_manager;