1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Reverted the usage of the externalized XML tileset structure (ja2Set.dat.xml) and also removed the additional P4-P9 items

Browse Source 
o Disabled the usage, because it seems to cause some problems when loading the maps (reported by Smeagol)
o Now it is possible again to choose if we want the XML tileset structure or the binary one (ja2.ini -> USE_XML_TILESETS)
o If we later need the additional P4-P9 items we can enable it again and have to check carefully what causes the problems

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-04-12 20:53:38 +00:00
parent 83c4ebc8c6
commit 5817dee775
5 changed files with 280 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/InterfaceItemImages.cpp
+71 -71
View File
@@ -173,82 +173,82 @@ bool RegisterItemImages()
//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;
}
//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\\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\\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\\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\\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;
}
// // 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;
}