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

Properly fixed warning for undefined texture for reset-button

Browse Source 
(which is not used). Note that in 0.7rc1 we added a dummy
texture as a work around.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6834 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2010-12-01 00:26:13 +00:00
parent 3fdd589ba4
commit 3fa1a65c01
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/items/attachment_manager.cpp
View File

@@ -49,7 +49,7 @@ initAttachmentType iat[]=
{ATTACH_PARACHUTE, "parachute.b3d", "parachute-attach-icon.png"},
{ATTACH_BOMB, "bomb.b3d", "bomb-attach-icon.png"},
{ATTACH_ANVIL, "anchor.b3d", "anchor-attach-icon.png"},
{ATTACH_TINYTUX, "reset-button.b3d",""},
{ATTACH_TINYTUX, "reset-button.b3d",NULL},
{ATTACH_MAX, "", ""},
};
@@ -71,11 +71,13 @@ void AttachmentManager::loadModels()
// have to be in memory till the end of the game.
std::string full_path = file_manager->getModelFile(iat[i].file);
m_attachments[iat[i].attachment]=irr_driver->getAnimatedMesh(full_path);
std::string full_icon_path = file_manager->getModelFile(iat[i].icon_file);
m_all_icons[iat[i].attachment]=material_manager->getMaterial(full_icon_path,
/* full_path */ false,
/*make_permanent */ true);
if(iat[i].icon_file)
{
std::string full_icon_path = file_manager->getModelFile(iat[i].icon_file);
m_all_icons[iat[i].attachment]=material_manager->getMaterial(full_icon_path,
/* full_path */ false,
/*make_permanent */ true);
}
} // for
} // reInit