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

Items will now (as a default) be dropped to the ground.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-02-01 11:34:19 +00:00
parent b5dc88e492
commit 17b20de61e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tracks/track.cpp
View File

@ -703,9 +703,15 @@ void Track::loadTrackModel(unsigned int mode_id)
else if(name=="small-nitro") type = Item::ITEM_SILVER_COIN; else if(name=="small-nitro") type = Item::ITEM_SILVER_COIN;
else type = Item::ITEM_GOLD_COIN; else type = Item::ITEM_GOLD_COIN;
Vec3 xyz; Vec3 xyz;
int bits = node->getXYZ(&xyz); // Set some kind of default in case Z is not defined in the file
// (with the new track exporter it always is defined anyway).
// Z is the height from which the item is dropped on the track.
xyz.setZ(1000);
node->getXYZ(&xyz);
bool drop=true;
node->get("drop", &drop);
// Height is needed if bit 2 (for z) is not set // Height is needed if bit 2 (for z) is not set
itemCommand(xyz, type, /* need_height */ !XMLNode::hasZ(bits) ); itemCommand(xyz, type, drop);
} }
else if (name=="start") else if (name=="start")
{ {
@ -878,11 +884,11 @@ void Track::handleCamera(const XMLNode &root)
/** Handle creation and placement of an item. /** Handle creation and placement of an item.
* \param xyz The position of the item. * \param xyz The position of the item.
* \param type The item type. * \param type The item type.
* \param need_height True if the item Z position should be determined based on * \param drop True if the item Z position should be determined based on
* the track topology. * the track topology.
*/ */
void Track::itemCommand(const Vec3 &xyz, Item::ItemType type, void Track::itemCommand(const Vec3 &xyz, Item::ItemType type,
int need_height) bool drop)
{ {
// Some modes (e.g. time trial) don't have any bonus boxes // Some modes (e.g. time trial) don't have any bonus boxes
if(type==Item::ITEM_BONUS_BOX && if(type==Item::ITEM_BONUS_BOX &&
@ -891,9 +897,8 @@ void Track::itemCommand(const Vec3 &xyz, Item::ItemType type,
Vec3 loc(xyz); Vec3 loc(xyz);
// if only 2d coordinates are given, let the item fall from very high // if only 2d coordinates are given, let the item fall from very high
if(need_height) if(drop)
{ {
loc.setZ(1000);
loc.setZ(getTerrainHeight(loc)); loc.setZ(getTerrainHeight(loc));
} }

2
src/tracks/track.hpp
View File

@ -162,7 +162,7 @@ private:
void loadTrackInfo(); void loadTrackInfo();
void itemCommand(const Vec3 &xyz, Item::ItemType item_type, void itemCommand(const Vec3 &xyz, Item::ItemType item_type,
int bNeedHeight); bool drop);
void loadQuadGraph(unsigned int mode_id); void loadQuadGraph(unsigned int mode_id);
void convertTrackToBullet(const scene::IMesh *mesh, void convertTrackToBullet(const scene::IMesh *mesh,
const scene::ISceneNode*node); const scene::ISceneNode*node);