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

Give nolok a special swatter

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11539 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-09-04 01:54:28 +00:00
parent bfc1a5e14c
commit 06821dc880
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/models/Hammer.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

7
data/models/License.txt
View File

@ -24,6 +24,13 @@
Tires by Thomas Oppl, released under CC-BY-SA 3.0
scene and finishing touches by Marianne Gagnon
* Hammer.jpg
by Marianne Gagnon, released under CC-BY-SA 3.0
Incorporates image by Philipp Zinger, released under CCBY 3.0
image by Louise Price, released under CC-BY 2.0 (considered a derivate work thus allowing to upgrade the license version),
image by Smoth 007, released under CC-BY-SA 2.0 (considered a derivate work thus allowing to upgrade the license version),
image by Juangonzalez64 released under the public domain
* swatter
released under CC-BY-SA 3.0
by Funto

BIN
data/models/swatter_nolok.b3d Normal file
View File

Binary file not shown.

5
src/items/attachment.cpp
View File

@ -115,7 +115,10 @@ void Attachment::set(AttachmentType type, float time,
switch(type)
{
case ATTACH_SWATTER :
m_node->setMesh(attachment_manager->getMesh(type));
if (m_kart->getIdent() == "nolok")
m_node->setMesh(attachment_manager->getMesh(ATTACH_NOLOKS_SWATTER));
else
m_node->setMesh(attachment_manager->getMesh(type));
m_plugin = new Swatter(m_kart, was_bomb, bomb_scene_node);
break;
case ATTACH_BOMB:

1
src/items/attachment.hpp
View File

@ -57,6 +57,7 @@ public:
ATTACH_BOMB,
ATTACH_ANVIL,
ATTACH_SWATTER,
ATTACH_NOLOKS_SWATTER,
ATTACH_TINYTUX,
ATTACH_MAX,
ATTACH_NOTHING

13
src/items/attachment_manager.cpp
View File

@ -47,12 +47,13 @@ struct initAttachmentType {Attachment::AttachmentType attachment;
initAttachmentType iat[]=
{
{Attachment::ATTACH_PARACHUTE, "parachute.b3d", "parachute-attach-icon.png"},
{Attachment::ATTACH_BOMB, "bomb.b3d", "bomb-attach-icon.png" },
{Attachment::ATTACH_ANVIL, "anchor.b3d", "anchor-attach-icon.png" },
{Attachment::ATTACH_SWATTER, "swatter.b3d", "swatter-icon.png" },
{Attachment::ATTACH_TINYTUX, "reset-button.b3d","reset-attach-icon.png" },
{Attachment::ATTACH_MAX, "", "" },
{Attachment::ATTACH_PARACHUTE, "parachute.b3d", "parachute-attach-icon.png"},
{Attachment::ATTACH_BOMB, "bomb.b3d", "bomb-attach-icon.png" },
{Attachment::ATTACH_ANVIL, "anchor.b3d", "anchor-attach-icon.png" },
{Attachment::ATTACH_SWATTER, "swatter.b3d", "swatter-icon.png" },
{Attachment::ATTACH_NOLOKS_SWATTER, "swatter_nolok.b3d","swatter-icon.png" },
{Attachment::ATTACH_TINYTUX, "reset-button.b3d", "reset-attach-icon.png" },
{Attachment::ATTACH_MAX, "", "" },
};
//-----------------------------------------------------------------------------