1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed soldier tooltips showing attachments when they shouldn't be

Browse Source 
Cleaned up PxItems code to not be so messy, and be more flexible later once we can figure out a way to enable P4-P9items again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2012-05-03 03:34:11 +00:00
parent c237ca4dff
commit 003ada4d4c
5 changed files with 45 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/InterfaceItemImages.cpp
+16 -137
View File
@@ -13,31 +13,11 @@ extern void WriteMessageToFile( const STR16 pString );
bool g_bUsePngItemImages = false;
// old item image handles
UINT32 guiGUNSM;
UINT32 guiP1ITEMS;
UINT32 guiP2ITEMS;
UINT32 guiP3ITEMS;
//MM: New item tileslots start here
UINT32 guiP4ITEMS;
UINT32 guiP5ITEMS;
UINT32 guiP6ITEMS;
UINT32 guiP7ITEMS;
UINT32 guiP8ITEMS;
UINT32 guiP9ITEMS;
UINT32 guiPITEMS[MAX_PITEMS];
// new item image handles
MDItemVideoObjects g_oGUNSM;
MDItemVideoObjects g_oP1ITEMS;
MDItemVideoObjects g_oP2ITEMS;
MDItemVideoObjects g_oP3ITEMS;
//MM: New item tileslots start here
MDItemVideoObjects g_oP4ITEMS;
MDItemVideoObjects g_oP5ITEMS;
MDItemVideoObjects g_oP6ITEMS;
MDItemVideoObjects g_oP7ITEMS;
MDItemVideoObjects g_oP8ITEMS;
MDItemVideoObjects g_oP9ITEMS;
MDItemVideoObjects g_oPITEMS[MAX_PITEMS];
/******************************************************************************/
@@ -132,123 +112,22 @@ bool RegisterItemImages()
return false;
}
// LOAD INTERFACE ITEM PICTURES
if(!g_bUsePngItemImages)
for (UINT8 ubLoop = 0; ubLoop < MAX_PITEMS; ubLoop++)
{
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\mdp1items.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiP1ITEMS ) )
AssertMsg(0, "Missing INTERFACE\\mdplitems.sti" );
// LOAD INTERFACE ITEM PICTURES
if(!g_bUsePngItemImages)
{
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP(String("INTERFACE\\mdp%ditems.sti",ubLoop+1), VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiPITEMS[ubLoop] ) )
AssertMsg(0, String("Missing INTERFACE\\mdp%ditems.sti",ubLoop+1) );
}
else if(!g_oPITEMS[ubLoop].registerItemsFromFilePattern(String("INTERFACE/MDP%dITEMS/*.png",ubLoop+1)))
{
return false;
}
}
else if(!g_oP1ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP1ITEMS/*.png"))
{
return false;
}
// LOAD INTERFACE ITEM PICTURES
if(!g_bUsePngItemImages)
{
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\mdp2items.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiP2ITEMS ) )
AssertMsg(0, "Missing INTERFACE\\mdp2items.sti" );
}
else if(!g_oP2ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP2ITEMS/*.png"))
{
return false;
}
// LOAD INTERFACE ITEM PICTURES
if(!g_bUsePngItemImages)
{
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\mdp3items.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiP3ITEMS ) )
AssertMsg(0, "Missing INTERFACE\\mdp3items.sti" );
}
else if(!g_oP3ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP3ITEMS/*.png"))
{
return false;
}
//MM: New item tileslots start here
// LOAD INTERFACE ITEM PICTURES
//if(!g_bUsePngItemImages)
//{
// VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
// FilenameForBPP("INTERFACE\\mdp4items.sti", VObjectDesc.ImageFile);
// if( !AddVideoObject( &VObjectDesc, &guiP4ITEMS ) )
// AssertMsg(0, "Missing INTERFACE\\mdp4items.sti" );
//}
//else if(!g_oP4ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP4ITEMS/*.png"))
//{
// return false;
//}
// // LOAD INTERFACE ITEM PICTURES
//if(!g_bUsePngItemImages)
//{
// VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
// FilenameForBPP("INTERFACE\\mdp5items.sti", VObjectDesc.ImageFile);
// if( !AddVideoObject( &VObjectDesc, &guiP5ITEMS ) )
// AssertMsg(0, "Missing INTERFACE\\mdp5items.sti" );
//}
//else if(!g_oP5ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP5ITEMS/*.png"))
//{
// return false;
//}
// // LOAD INTERFACE ITEM PICTURES
//if(!g_bUsePngItemImages)
//{
// VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
// FilenameForBPP("INTERFACE\\mdp6items.sti", VObjectDesc.ImageFile);
// if( !AddVideoObject( &VObjectDesc, &guiP6ITEMS ) )
// AssertMsg(0, "Missing INTERFACE\\mdp6items.sti" );
//}
//else if(!g_oP6ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP6ITEMS/*.png"))
//{
// return false;
//}
// // LOAD INTERFACE ITEM PICTURES
//if(!g_bUsePngItemImages)
//{
// VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
// FilenameForBPP("INTERFACE\\mdp7items.sti", VObjectDesc.ImageFile);
// if( !AddVideoObject( &VObjectDesc, &guiP7ITEMS ) )
// AssertMsg(0, "Missing INTERFACE\\mdp7items.sti" );
//}
//else if(!g_oP7ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP7ITEMS/*.png"))
//{
// return false;
//}
// // LOAD INTERFACE ITEM PICTURES
//if(!g_bUsePngItemImages)
//{
// VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
// FilenameForBPP("INTERFACE\\mdp8items.sti", VObjectDesc.ImageFile);
// if( !AddVideoObject( &VObjectDesc, &guiP8ITEMS ) )
// AssertMsg(0, "Missing INTERFACE\\mdp8items.sti" );
//}
//else if(!g_oP8ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP8ITEMS/*.png"))
//{
// return false;
//}
// // LOAD INTERFACE ITEM PICTURES
//if(!g_bUsePngItemImages)
//{
// VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
// FilenameForBPP("INTERFACE\\mdp9items.sti", VObjectDesc.ImageFile);
// if( !AddVideoObject( &VObjectDesc, &guiP9ITEMS ) )
// AssertMsg(0, "Missing INTERFACE\\mdp9items.sti" );
//}
//else if(!g_oP9ITEMS.registerItemsFromFilePattern(L"INTERFACE/MDP9ITEMS/*.png"))
//{
// return false;
//}
return true;
}