Merged New Inventory Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+6 -6
View File
@@ -3225,7 +3225,7 @@ enum TileTypeDefines
// Quick defines for finding last type entry in tile types
#define LASTTEXTURE (DEEPWATERTEXTURE - 1)
#define LASTBANKS (FIRSTCLIFFSHADOW - 1)
#define LASTCLIFFHANG (FIRSTCLIFF-1)
#define LASTCLIFFHANG (FIRSTCLIFF-1)
#define LASTCLIFFSHADOW (FIRSTOSTRUCT - 1)
#define LASTOSTRUCT (THIRDFULLSTRUCT - 1)
#define LASTSHADOW (FIRSTWALL - 1)
@@ -3245,7 +3245,7 @@ enum TileTypeDefines
//#define LASTDEBRIS (FOOTPRINTS - 1)
#define LASTFOOTPRINTS (FIRSTPOINTERS - 1)
#define LASTPOINTERS (SELRING - 1)
#define LASTUIELEM (WIREFRAMES - 1) // Change this entry if adding new types to the end
#define LASTUIELEM (WIREFRAMES - 1) // Change this entry if adding new types to the end
#define LASTTIELSETELEM (GUNS - 1)
//===========================================================================
@@ -3253,10 +3253,10 @@ enum TileTypeDefines
// DEFINES FOR SPECIFIC SPECIAL TILE SLOTS
#define WALL_AFRAME_START 31
#define WALL_AFRAME_END 34
#define WALL_AFRAME1 31
#define WALL_AFRAME2 32
#define WALL_AFRAME3 33
#define WALL_AFRAME4 34
#define WALL_AFRAME1 31
#define WALL_AFRAME2 32
#define WALL_AFRAME3 33
#define WALL_AFRAME4 34
extern INT16 gOpenDoorList[20];