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

- 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
TileEngine/TileDat.cpp
+7 -7
View File
@@ -588,13 +588,13 @@ UINT16 gNumTilesPerType[ NUMBEROFTILETYPES ] =
THIRDMISS14 - THIRDMISS1 + 1,
WIREFRAMES15 - WIREFRAMES1 + 1,
//MM: New item tileslots start here
P4ITEM5000 - P4ITEM1 + 1,
P5ITEM5000 - P5ITEM1 + 1,
P6ITEM5000 - P6ITEM1 + 1,
P7ITEM5000 - P7ITEM1 + 1,
P8ITEM5000 - P8ITEM1 + 1,
P9ITEM5000 - P9ITEM1 + 1
////MM: New item tileslots start here
// P4ITEM5000 - P4ITEM1 + 1,
// P5ITEM5000 - P5ITEM1 + 1,
// P6ITEM5000 - P6ITEM1 + 1,
// P7ITEM5000 - P7ITEM1 + 1,
// P8ITEM5000 - P8ITEM1 + 1,
// P9ITEM5000 - P9ITEM1 + 1
};
TileEngine/TileDat.h
+74 -74
View File
@@ -3014,78 +3014,78 @@ enum TileDefines
WIREFRAMES14,
WIREFRAMES15,
//MM: New item tileslots start here
P4ITEM1,
P4ITEM2,
P4ITEM3,
P4ITEM4,
P4ITEM5,
P4ITEM6,
P4ITEM7,
P4ITEM8,
P4ITEM9,
P4ITEM10,
P4ITEM5000 = P4ITEM10 + 4990,
////MM: New item tileslots start here
//P4ITEM1,
//P4ITEM2,
//P4ITEM3,
//P4ITEM4,
//P4ITEM5,
//P4ITEM6,
//P4ITEM7,
//P4ITEM8,
//P4ITEM9,
//P4ITEM10,
//P4ITEM5000 = P4ITEM10 + 4990,
P5ITEM1,
P5ITEM2,
P5ITEM3,
P5ITEM4,
P5ITEM5,
P5ITEM6,
P5ITEM7,
P5ITEM8,
P5ITEM9,
P5ITEM10,
P5ITEM5000 = P5ITEM10 + 4990,
//P5ITEM1,
//P5ITEM2,
//P5ITEM3,
//P5ITEM4,
//P5ITEM5,
//P5ITEM6,
//P5ITEM7,
//P5ITEM8,
//P5ITEM9,
//P5ITEM10,
//P5ITEM5000 = P5ITEM10 + 4990,
P6ITEM1,
P6ITEM2,
P6ITEM3,
P6ITEM4,
P6ITEM5,
P6ITEM6,
P6ITEM7,
P6ITEM8,
P6ITEM9,
P6ITEM10,
P6ITEM5000 = P6ITEM10 + 4990,
//P6ITEM1,
//P6ITEM2,
//P6ITEM3,
//P6ITEM4,
//P6ITEM5,
//P6ITEM6,
//P6ITEM7,
//P6ITEM8,
//P6ITEM9,
//P6ITEM10,
//P6ITEM5000 = P6ITEM10 + 4990,
P7ITEM1,
P7ITEM2,
P7ITEM3,
P7ITEM4,
P7ITEM5,
P7ITEM6,
P7ITEM7,
P7ITEM8,
P7ITEM9,
P7ITEM10,
P7ITEM5000 = P7ITEM10 + 4990,
//P7ITEM1,
//P7ITEM2,
//P7ITEM3,
//P7ITEM4,
//P7ITEM5,
//P7ITEM6,
//P7ITEM7,
//P7ITEM8,
//P7ITEM9,
//P7ITEM10,
//P7ITEM5000 = P7ITEM10 + 4990,
P8ITEM1,
P8ITEM2,
P8ITEM3,
P8ITEM4,
P8ITEM5,
P8ITEM6,
P8ITEM7,
P8ITEM8,
P8ITEM9,
P8ITEM10,
P8ITEM5000 = P8ITEM10 + 4990,
//P8ITEM1,
//P8ITEM2,
//P8ITEM3,
//P8ITEM4,
//P8ITEM5,
//P8ITEM6,
//P8ITEM7,
//P8ITEM8,
//P8ITEM9,
//P8ITEM10,
//P8ITEM5000 = P8ITEM10 + 4990,
P9ITEM1,
P9ITEM2,
P9ITEM3,
P9ITEM4,
P9ITEM5,
P9ITEM6,
P9ITEM7,
P9ITEM8,
P9ITEM9,
P9ITEM10,
P9ITEM5000 = P9ITEM10 + 4990,
//P9ITEM1,
//P9ITEM2,
//P9ITEM3,
//P9ITEM4,
//P9ITEM5,
//P9ITEM6,
//P9ITEM7,
//P9ITEM8,
//P9ITEM9,
//P9ITEM10,
//P9ITEM5000 = P9ITEM10 + 4990,
NUMBEROFTILES
};
@@ -3290,13 +3290,13 @@ enum TileTypeDefines
WIREFRAMES,
//MM: New item tileslots start here
P4ITEMS,
P5ITEMS,
P6ITEMS,
P7ITEMS,
P8ITEMS,
P9ITEMS,
////MM: New item tileslots start here
//P4ITEMS,
//P5ITEMS,
//P6ITEMS,
//P7ITEMS,
//P8ITEMS,
//P9ITEMS,
NUMBEROFTILETYPES
};