mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
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
+196
-195
@@ -109,7 +109,7 @@ INT16 gReverseShadowBuddys[] =
|
||||
SECONDFULLSHADOW, SECONDFULLSHADOW1, SECONDFULLSTRUCT1,
|
||||
THIRDFULLSHADOW, THIRDFULLSHADOW1, THIRDFULLSTRUCT1,
|
||||
FOURTHFULLSHADOW, FOURTHFULLSHADOW1, FOURTHFULLSTRUCT1,
|
||||
|
||||
|
||||
FIRSTDOORSHADOW, FIRSTDOORSH1, FIRSTDOOR1,
|
||||
SECONDDOORSHADOW, SECONDDOORSH1, SECONDDOOR1,
|
||||
THIRDDOORSHADOW, THIRDDOORSH1, THIRDDOOR1,
|
||||
@@ -150,11 +150,11 @@ INT16 gForwardShadowBuddys[] =
|
||||
SEVENTHOSTRUCT, SEVENTHOSTRUCT1, SEVENTHSHADOW1,
|
||||
EIGHTOSTRUCT, EIGHTOSTRUCT1, EIGHTSHADOW1,
|
||||
|
||||
FIRSTFULLSTRUCT, FIRSTFULLSTRUCT1, FIRSTFULLSHADOW1,
|
||||
SECONDFULLSTRUCT, SECONDFULLSTRUCT1, SECONDFULLSHADOW1,
|
||||
THIRDFULLSTRUCT, THIRDFULLSTRUCT1, THIRDFULLSHADOW1,
|
||||
FOURTHFULLSTRUCT, FOURTHFULLSTRUCT1, FOURTHFULLSHADOW1,
|
||||
|
||||
FIRSTFULLSTRUCT, FIRSTFULLSTRUCT1, FIRSTFULLSHADOW1,
|
||||
SECONDFULLSTRUCT, SECONDFULLSTRUCT1, SECONDFULLSHADOW1,
|
||||
THIRDFULLSTRUCT, THIRDFULLSTRUCT1, THIRDFULLSHADOW1,
|
||||
FOURTHFULLSTRUCT, FOURTHFULLSTRUCT1, FOURTHFULLSHADOW1,
|
||||
|
||||
FIRSTDOOR, FIRSTDOOR1, FIRSTDOORSH1,
|
||||
SECONDDOOR, SECONDDOOR1, SECONDDOORSH1,
|
||||
THIRDDOOR, THIRDDOOR1, THIRDDOORSH1,
|
||||
@@ -181,45 +181,45 @@ INT16 gForwardShadowBuddys[] =
|
||||
};
|
||||
|
||||
// Global variable used to initialize tile database with full tile spec
|
||||
UINT8 gFullBaseTileValues[] =
|
||||
UINT8 gFullBaseTileValues[] =
|
||||
|
||||
{
|
||||
{
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // First Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Second Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Third Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Forth Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Fifth Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0,
|
||||
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Sixth Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Seventh Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Water1 Texture
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // Water2 Texture
|
||||
|
||||
@@ -404,116 +404,116 @@ STR gTileSurfaceName[NUMBEROFTILETYPES] =
|
||||
|
||||
UINT16 gNumTilesPerType[ NUMBEROFTILETYPES ] =
|
||||
{
|
||||
FIRSTTEXTURE35 - FIRSTTEXTURE1 + 1,
|
||||
SECONDTEXTURE35 - SECONDTEXTURE1 + 1,
|
||||
THIRDTEXTURE35 - THIRDTEXTURE1 + 1,
|
||||
FOURTHTEXTURE35 - FOURTHTEXTURE1 + 1,
|
||||
FIFTHTEXTURE35 - FIFTHTEXTURE1 + 1,
|
||||
SIXTHTEXTURE37 - SIXTHTEXTURE1 + 1,
|
||||
SEVENTHTEXTURE49 - SEVENTHTEXTURE1 + 1,
|
||||
REGWATERTEXTURE50 - REGWATERTEXTURE1 + 1,
|
||||
FIRSTTEXTURE35 - FIRSTTEXTURE1 + 1,
|
||||
SECONDTEXTURE35 - SECONDTEXTURE1 + 1,
|
||||
THIRDTEXTURE35 - THIRDTEXTURE1 + 1,
|
||||
FOURTHTEXTURE35 - FOURTHTEXTURE1 + 1,
|
||||
FIFTHTEXTURE35 - FIFTHTEXTURE1 + 1,
|
||||
SIXTHTEXTURE37 - SIXTHTEXTURE1 + 1,
|
||||
SEVENTHTEXTURE49 - SEVENTHTEXTURE1 + 1,
|
||||
REGWATERTEXTURE50 - REGWATERTEXTURE1 + 1,
|
||||
DEEPWATERTEXTURE37 - DEEPWATERTEXTURE1 + 1,
|
||||
FIRSTCLIFFHANG17 - FIRSTCLIFFHANG1 + 1,
|
||||
FIRSTCLIFF17 - FIRSTCLIFF1 + 1,
|
||||
FIRSTCLIFFHANG17 - FIRSTCLIFFHANG1 + 1,
|
||||
FIRSTCLIFF17 - FIRSTCLIFF1 + 1,
|
||||
FIRSTCLIFFSHADOW17 - FIRSTCLIFFSHADOW1 + 1, // Med hill
|
||||
|
||||
FIRSTOSTRUCT12 - FIRSTOSTRUCT1 + 1,
|
||||
SECONDOSTRUCT12 - SECONDOSTRUCT1 + 1,
|
||||
THIRDOSTRUCT12 - THIRDOSTRUCT1 + 1,
|
||||
FOURTHOSTRUCT12 - FOURTHOSTRUCT1 + 1, // Fourth OSTRUCT
|
||||
FIFTHOSTRUCT12 - FIFTHOSTRUCT1 + 1, // Fifth OSTRUCT
|
||||
SIXTHOSTRUCT12 - SIXTHOSTRUCT1 + 1, // Sixth OSTRUCT
|
||||
SEVENTHOSTRUCT12 - SEVENTHOSTRUCT1 + 1, // Seventh OSTRUCT
|
||||
EIGHTOSTRUCT12 - EIGHTOSTRUCT1 + 1, // Eigth OSTRUCT
|
||||
FIRSTFULLSTRUCT12 - FIRSTFULLSTRUCT1 + 1,
|
||||
FIRSTOSTRUCT12 - FIRSTOSTRUCT1 + 1,
|
||||
SECONDOSTRUCT12 - SECONDOSTRUCT1 + 1,
|
||||
THIRDOSTRUCT12 - THIRDOSTRUCT1 + 1,
|
||||
FOURTHOSTRUCT12 - FOURTHOSTRUCT1 + 1, // Fourth OSTRUCT
|
||||
FIFTHOSTRUCT12 - FIFTHOSTRUCT1 + 1, // Fifth OSTRUCT
|
||||
SIXTHOSTRUCT12 - SIXTHOSTRUCT1 + 1, // Sixth OSTRUCT
|
||||
SEVENTHOSTRUCT12 - SEVENTHOSTRUCT1 + 1, // Seventh OSTRUCT
|
||||
EIGHTOSTRUCT12 - EIGHTOSTRUCT1 + 1, // Eigth OSTRUCT
|
||||
FIRSTFULLSTRUCT12 - FIRSTFULLSTRUCT1 + 1,
|
||||
SECONDFULLSTRUCT12 - SECONDFULLSTRUCT1 + 1,
|
||||
THIRDFULLSTRUCT2 - THIRDFULLSTRUCT1 + 1,
|
||||
THIRDFULLSTRUCT2 - THIRDFULLSTRUCT1 + 1,
|
||||
FOURTHFULLSTRUCT2 - FOURTHFULLSTRUCT1 + 1,
|
||||
|
||||
FIRSTSHADOW12 - FIRSTSHADOW1 + 1,
|
||||
SECONDSHADOW12 - SECONDSHADOW1 + 1,
|
||||
THIRDSHADOW12 - THIRDSHADOW1 + 1,
|
||||
FOURTHSHADOW12 - FOURTHSHADOW1 + 1,
|
||||
FIFTHSHADOW12 - FIFTHSHADOW1 + 1,
|
||||
SIXTHSHADOW12 - SIXTHSHADOW1 + 1,
|
||||
SEVENTHSHADOW12 - SEVENTHSHADOW1 + 1,
|
||||
EIGHTSHADOW12 - EIGHTSHADOW1 + 1,
|
||||
FIRSTFULLSHADOW12 - FIRSTFULLSHADOW1 + 1,
|
||||
FIRSTSHADOW12 - FIRSTSHADOW1 + 1,
|
||||
SECONDSHADOW12 - SECONDSHADOW1 + 1,
|
||||
THIRDSHADOW12 - THIRDSHADOW1 + 1,
|
||||
FOURTHSHADOW12 - FOURTHSHADOW1 + 1,
|
||||
FIFTHSHADOW12 - FIFTHSHADOW1 + 1,
|
||||
SIXTHSHADOW12 - SIXTHSHADOW1 + 1,
|
||||
SEVENTHSHADOW12 - SEVENTHSHADOW1 + 1,
|
||||
EIGHTSHADOW12 - EIGHTSHADOW1 + 1,
|
||||
FIRSTFULLSHADOW12 - FIRSTFULLSHADOW1 + 1,
|
||||
SECONDFULLSHADOW12 - SECONDFULLSHADOW1 + 1,
|
||||
THIRDFULLSHADOW2 - THIRDFULLSHADOW1 + 1,
|
||||
THIRDFULLSHADOW2 - THIRDFULLSHADOW1 + 1,
|
||||
FOURTHFULLSHADOW2 - FOURTHFULLSHADOW1 + 1,
|
||||
|
||||
|
||||
FIRSTWALL65 - FIRSTWALL1 + 1,
|
||||
SECONDWALL65 - SECONDWALL1 + 1,
|
||||
THIRDWALL65 - THIRDWALL1 + 1,
|
||||
FOURTHWALL65 - FOURTHWALL1 + 1,
|
||||
FIRSTWALL65 - FIRSTWALL1 + 1,
|
||||
SECONDWALL65 - SECONDWALL1 + 1,
|
||||
THIRDWALL65 - THIRDWALL1 + 1,
|
||||
FOURTHWALL65 - FOURTHWALL1 + 1,
|
||||
|
||||
FIRSTDOOR20 - FIRSTDOOR1 + 1,
|
||||
SECONDDOOR20 - SECONDDOOR1 + 1,
|
||||
THIRDDOOR20 - THIRDDOOR1 + 1,
|
||||
FOURTHDOOR20 - FOURTHDOOR1 + 1,
|
||||
FIRSTDOOR20 - FIRSTDOOR1 + 1,
|
||||
SECONDDOOR20 - SECONDDOOR1 + 1,
|
||||
THIRDDOOR20 - THIRDDOOR1 + 1,
|
||||
FOURTHDOOR20 - FOURTHDOOR1 + 1,
|
||||
|
||||
FIRSTDOORSH20 - FIRSTDOORSH1 + 1,
|
||||
SECONDDOORSH20 - SECONDDOORSH1 + 1,
|
||||
THIRDDOORSH20 - THIRDDOORSH1 + 1,
|
||||
FOURTHDOORSH20 - FOURTHDOORSH1 + 1,
|
||||
FIRSTDOORSH20 - FIRSTDOORSH1 + 1,
|
||||
SECONDDOORSH20 - SECONDDOORSH1 + 1,
|
||||
THIRDDOORSH20 - THIRDDOORSH1 + 1,
|
||||
FOURTHDOORSH20 - FOURTHDOORSH1 + 1,
|
||||
|
||||
SLANTROOFCEILING2 - SLANTROOFCEILING1 + 1,
|
||||
ANOTHERDEBRIS10 - ANOTHERDEBRIS1 + 1,
|
||||
ROADPIECES400 - ROADPIECES001 + 1,
|
||||
FOURTHWINDOW2 - FOURTHWINDOW1 + 1,
|
||||
SLANTROOFCEILING2 - SLANTROOFCEILING1 + 1,
|
||||
ANOTHERDEBRIS10 - ANOTHERDEBRIS1 + 1,
|
||||
ROADPIECES400 - ROADPIECES001 + 1,
|
||||
FOURTHWINDOW2 - FOURTHWINDOW1 + 1,
|
||||
|
||||
FIRSTDECORATIONS10 - FIRSTDECORATIONS1 + 1,
|
||||
FIRSTDECORATIONS10 - FIRSTDECORATIONS1 + 1,
|
||||
SECONDDECORATIONS10 - SECONDDECORATIONS1 + 1,
|
||||
THIRDDECORATIONS10 - THIRDDECORATIONS1 + 1,
|
||||
THIRDDECORATIONS10 - THIRDDECORATIONS1 + 1,
|
||||
FOURTHDECORATIONS10 - FOURTHDECORATIONS1 + 1,
|
||||
|
||||
FIRSTWALLDECAL10 - FIRSTWALLDECAL1 + 1,
|
||||
SECONDWALLDECAL10 - SECONDWALLDECAL1 + 1,
|
||||
THIRDWALLDECAL10 - THIRDWALLDECAL1 + 1,
|
||||
FOURTHWALLDECAL10 - FOURTHWALLDECAL1 + 1,
|
||||
FIRSTWALLDECAL10 - FIRSTWALLDECAL1 + 1,
|
||||
SECONDWALLDECAL10 - SECONDWALLDECAL1 + 1,
|
||||
THIRDWALLDECAL10 - THIRDWALLDECAL1 + 1,
|
||||
FOURTHWALLDECAL10 - FOURTHWALLDECAL1 + 1,
|
||||
|
||||
FIRSTFLOOR8 - FIRSTFLOOR1 + 1,
|
||||
SECONDFLOOR8 - SECONDFLOOR1 + 1,
|
||||
THIRDFLOOR8 - THIRDFLOOR1 + 1,
|
||||
FOURTHFLOOR8 - FOURTHFLOOR1 + 1,
|
||||
FIRSTFLOOR8 - FIRSTFLOOR1 + 1,
|
||||
SECONDFLOOR8 - SECONDFLOOR1 + 1,
|
||||
THIRDFLOOR8 - THIRDFLOOR1 + 1,
|
||||
FOURTHFLOOR8 - FOURTHFLOOR1 + 1,
|
||||
|
||||
FIRSTROOF14 - FIRSTROOF1 + 1,
|
||||
SECONDROOF14 - SECONDROOF1 + 1,
|
||||
THIRDROOF14 - THIRDROOF1 + 1,
|
||||
FOURTHROOF14 - FOURTHROOF1 + 1,
|
||||
FIRSTSLANTROOF20 - FIRSTSLANTROOF1 + 1,
|
||||
SECONDSLANTROOF20 - SECONDSLANTROOF1 + 1,
|
||||
FIRSTROOF14 - FIRSTROOF1 + 1,
|
||||
SECONDROOF14 - SECONDROOF1 + 1,
|
||||
THIRDROOF14 - THIRDROOF1 + 1,
|
||||
FOURTHROOF14 - FOURTHROOF1 + 1,
|
||||
FIRSTSLANTROOF20 - FIRSTSLANTROOF1 + 1,
|
||||
SECONDSLANTROOF20 - SECONDSLANTROOF1 + 1,
|
||||
|
||||
FIRSTONROOF12 - FIRSTONROOF1 + 1,
|
||||
SECONDONROOF12 - SECONDONROOF1 + 1,
|
||||
FIRSTONROOF12 - FIRSTONROOF1 + 1,
|
||||
SECONDONROOF12 - SECONDONROOF1 + 1,
|
||||
|
||||
1,
|
||||
|
||||
FIRSTISTRUCT24 - FIRSTISTRUCT1 + 1,
|
||||
SECONDISTRUCT24 - SECONDISTRUCT1 + 1,
|
||||
THIRDISTRUCT24 - THIRDISTRUCT1 + 1,
|
||||
FOURTHISTRUCT24 - FOURTHISTRUCT1 + 1,
|
||||
FIRSTCISTRUCT24 - FIRSTCISTRUCT1 + 1,
|
||||
FIRSTISTRUCT24 - FIRSTISTRUCT1 + 1,
|
||||
SECONDISTRUCT24 - SECONDISTRUCT1 + 1,
|
||||
THIRDISTRUCT24 - THIRDISTRUCT1 + 1,
|
||||
FOURTHISTRUCT24 - FOURTHISTRUCT1 + 1,
|
||||
FIRSTCISTRUCT24 - FIRSTCISTRUCT1 + 1,
|
||||
|
||||
FIRSTROAD35 - FIRSTROAD1 + 1,
|
||||
FIRSTROAD35 - FIRSTROAD1 + 1,
|
||||
|
||||
DEBRISROCKS10 - DEBRISROCKS1 + 1,
|
||||
DEBRISWOOD10 - DEBRISWOOD1 + 1,
|
||||
DEBRISWEEDS10 - DEBRISWEEDS1 + 1,
|
||||
DEBRISGRASS10 - DEBRISGRASS1 + 1,
|
||||
DEBRISSAND10 - DEBRISSAND1 + 1,
|
||||
DEBRISMISC10 - DEBRISMISC1 + 1,
|
||||
DEBRISROCKS10 - DEBRISROCKS1 + 1,
|
||||
DEBRISWOOD10 - DEBRISWOOD1 + 1,
|
||||
DEBRISWEEDS10 - DEBRISWEEDS1 + 1,
|
||||
DEBRISGRASS10 - DEBRISGRASS1 + 1,
|
||||
DEBRISSAND10 - DEBRISSAND1 + 1,
|
||||
DEBRISMISC10 - DEBRISMISC1 + 1,
|
||||
|
||||
ANIOSTRUCT20 - ANIOSTRUCT1 + 1,
|
||||
FENCESTRUCT23 - FENCESTRUCT1 + 1,
|
||||
FENCESHADOW23 - FENCESHADOW1 + 1,
|
||||
ANIOSTRUCT20 - ANIOSTRUCT1 + 1,
|
||||
FENCESTRUCT23 - FENCESTRUCT1 + 1,
|
||||
FENCESHADOW23 - FENCESHADOW1 + 1,
|
||||
FIRSTVEHICLE12 - FIRSTVEHICLE1 + 1,
|
||||
SECONDVEHICLE12 - SECONDVEHICLE1 + 1,
|
||||
FIRSTVEHICLESHADOW12 - FIRSTVEHICLESHADOW1 + 1,
|
||||
SECONDVEHICLESHADOW12 - SECONDVEHICLESHADOW1 + 1,
|
||||
DEBRIS2MISC10 - DEBRIS2MISC1 + 1,
|
||||
DEBRIS2MISC10 - DEBRIS2MISC1 + 1,
|
||||
|
||||
FIRSTDEBRISSTRUCT10 - FIRSTDEBRISSTRUCT1 + 1,
|
||||
SECONDDEBRISSTRUCT10 - SECONDDEBRISSTRUCT1 + 1,
|
||||
@@ -540,10 +540,10 @@ UINT16 gNumTilesPerType[ NUMBEROFTILETYPES ] =
|
||||
FIRSTHIGHROOF15 - FIRSTHIGHROOF1 + 1,
|
||||
SECONDHIGHROOF15 - SECONDHIGHROOF1 + 1,
|
||||
|
||||
FIFTHWALLDECAL10 - FIFTHWALLDECAL1 + 1,
|
||||
SIXTHWALLDECAL10 - SIXTHWALLDECAL1 + 1,
|
||||
FIFTHWALLDECAL10 - FIFTHWALLDECAL1 + 1,
|
||||
SIXTHWALLDECAL10 - SIXTHWALLDECAL1 + 1,
|
||||
SEVENTHWALLDECAL10 - SEVENTHWALLDECAL1 + 1,
|
||||
EIGTHWALLDECAL10 - EIGTHWALLDECAL1 + 1,
|
||||
EIGTHWALLDECAL10 - EIGTHWALLDECAL1 + 1,
|
||||
|
||||
HUMANBLOOD16 - HUMANBLOOD1 + 1,
|
||||
CREATUREBLOOD16 - CREATUREBLOOD1 + 1,
|
||||
@@ -554,39 +554,39 @@ UINT16 gNumTilesPerType[ NUMBEROFTILETYPES ] =
|
||||
FIRSTREVEALEDHIGHROOFS11 - FIRSTREVEALEDHIGHROOFS1 + 1,
|
||||
SECONDREVEALEDHIGHROOFS11 - SECONDREVEALEDHIGHROOFS1 + 1,
|
||||
|
||||
GUN5000 - GUN1 + 1,
|
||||
P1ITEM5000 - P1ITEM1 + 1,
|
||||
P2ITEM5000 - P2ITEM1 + 1,
|
||||
GUN5000 - GUN1 + 1,
|
||||
P1ITEM5000 - P1ITEM1 + 1,
|
||||
P2ITEM5000 - P2ITEM1 + 1,
|
||||
|
||||
WINDOWSHATTER20 - WINDOWSHATTER1 + 1,
|
||||
P3ITEM5000 - P3ITEM1 + 1,
|
||||
BODYEXPLOSION15 - BODYEXPLOSION1 + 1,
|
||||
WINDOWSHATTER20 - WINDOWSHATTER1 + 1,
|
||||
P3ITEM5000 - P3ITEM1 + 1,
|
||||
BODYEXPLOSION15 - BODYEXPLOSION1 + 1,
|
||||
|
||||
EXITTEXTURE35 - EXITTEXTURE1 + 1,
|
||||
FOOTPRINTS80 - FOOTPRINTS1 + 1,
|
||||
EXITTEXTURE35 - EXITTEXTURE1 + 1,
|
||||
FOOTPRINTS80 - FOOTPRINTS1 + 1,
|
||||
|
||||
FIRSTPOINTERS24 - FIRSTPOINTERS1 + 1,
|
||||
SECONDPOINTERS8 - SECONDPOINTERS1 + 1,
|
||||
THIRDPOINTERS3 - THIRDPOINTERS1 + 1,
|
||||
FIRSTPOINTERS24 - FIRSTPOINTERS1 + 1,
|
||||
SECONDPOINTERS8 - SECONDPOINTERS1 + 1,
|
||||
THIRDPOINTERS3 - THIRDPOINTERS1 + 1,
|
||||
|
||||
GOODRUN11 - GOODRUN1 + 1,
|
||||
GOODWALK11 - GOODWALK1 + 1,
|
||||
GOODSWAT11 - GOODSWAT1 + 1,
|
||||
GOODPRONE11 - GOODPRONE1 + 1,
|
||||
CONFIRMMOVE11 - CONFIRMMOVE1 + 1,
|
||||
VEHICLEMOVE10 - VEHICLEMOVE1 + 1,
|
||||
ACTIONTWO11 - ACTIONTWO1 + 1,
|
||||
BADMARKER11 - BADMARKER1 + 1,
|
||||
GOODRING10 - GOODRING1 + 1,
|
||||
ROTATINGKEY8 - ROTATINGKEY1 + 1,
|
||||
SELRING10 - SELRING1 + 1,
|
||||
SPECIALTILE_COVER_5 - SPECIALTILE_MAPEXIT + 1,
|
||||
BULLETTILE2 - BULLETTILE1 + 1,
|
||||
GOODRUN11 - GOODRUN1 + 1,
|
||||
GOODWALK11 - GOODWALK1 + 1,
|
||||
GOODSWAT11 - GOODSWAT1 + 1,
|
||||
GOODPRONE11 - GOODPRONE1 + 1,
|
||||
CONFIRMMOVE11 - CONFIRMMOVE1 + 1,
|
||||
VEHICLEMOVE10 - VEHICLEMOVE1 + 1,
|
||||
ACTIONTWO11 - ACTIONTWO1 + 1,
|
||||
BADMARKER11 - BADMARKER1 + 1,
|
||||
GOODRING10 - GOODRING1 + 1,
|
||||
ROTATINGKEY8 - ROTATINGKEY1 + 1,
|
||||
SELRING10 - SELRING1 + 1,
|
||||
SPECIALTILE_COVER_5 - SPECIALTILE_MAPEXIT + 1,
|
||||
BULLETTILE2 - BULLETTILE1 + 1,
|
||||
|
||||
FIRSTMISS5 - FIRSTMISS1 + 1,
|
||||
SECONDMISS5 - SECONDMISS1 + 1,
|
||||
THIRDMISS14 - THIRDMISS1 + 1,
|
||||
WIREFRAMES15 - WIREFRAMES1 + 1
|
||||
FIRSTMISS5 - FIRSTMISS1 + 1,
|
||||
SECONDMISS5 - SECONDMISS1 + 1,
|
||||
THIRDMISS14 - THIRDMISS1 + 1,
|
||||
WIREFRAMES15 - WIREFRAMES1 + 1
|
||||
};
|
||||
|
||||
UINT8 gTileTypeLogicalHeight[ NUMBEROFTILETYPES ] =
|
||||
@@ -639,10 +639,10 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
cnt+=3;
|
||||
};
|
||||
|
||||
|
||||
|
||||
if ( uiDatabaseElem >= FIRSTDOOR1 &&
|
||||
uiDatabaseElem <= FOURTHDOORSH20 )
|
||||
|
||||
if ( uiDatabaseElem >= FIRSTDOOR1 &&
|
||||
uiDatabaseElem <= FOURTHDOORSH20 )
|
||||
{
|
||||
// Door anims
|
||||
// Open
|
||||
@@ -720,7 +720,7 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
};
|
||||
}
|
||||
|
||||
if ( uiDatabaseElem == FIRSTMISS1 )
|
||||
if ( uiDatabaseElem == FIRSTMISS1 )
|
||||
{
|
||||
// Allocate Animated tile data
|
||||
AllocateAnimTileData( TileElement, 5 );
|
||||
@@ -732,14 +732,14 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
}
|
||||
}
|
||||
|
||||
if ( uiDatabaseElem >= FIRSTMISS1 &&
|
||||
uiDatabaseElem <= FIRSTMISS5 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTMISS1 &&
|
||||
uiDatabaseElem <= FIRSTMISS5 )
|
||||
{
|
||||
TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
}
|
||||
|
||||
|
||||
if ( uiDatabaseElem == WINDOWSHATTER1 || uiDatabaseElem == WINDOWSHATTER6 || uiDatabaseElem == WINDOWSHATTER11 || uiDatabaseElem == WINDOWSHATTER16 )
|
||||
if ( uiDatabaseElem == WINDOWSHATTER1 || uiDatabaseElem == WINDOWSHATTER6 || uiDatabaseElem == WINDOWSHATTER11 || uiDatabaseElem == WINDOWSHATTER16 )
|
||||
{
|
||||
// Allocate Animated tile data
|
||||
AllocateAnimTileData( TileElement, 5 );
|
||||
@@ -751,19 +751,19 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
}
|
||||
}
|
||||
|
||||
if ( uiDatabaseElem >= WINDOWSHATTER1 &&
|
||||
uiDatabaseElem <= WINDOWSHATTER20 )
|
||||
{
|
||||
if ( uiDatabaseElem >= WINDOWSHATTER1 &&
|
||||
uiDatabaseElem <= WINDOWSHATTER20 )
|
||||
{
|
||||
TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
}
|
||||
|
||||
// if ( usType == FIRSTEXPLOSION )
|
||||
// {
|
||||
// {
|
||||
// TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
// }
|
||||
|
||||
if ( usType == BODYEXPLOSION )
|
||||
{
|
||||
{
|
||||
TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
}
|
||||
|
||||
@@ -774,22 +774,22 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
|
||||
// SET FLAGS FOR OBJECTS PEICES WHICH USE PROPER Z
|
||||
if ( fUseRaisedObjectType )
|
||||
{
|
||||
{
|
||||
TileElement->uiFlags |= OBJECTLAYER_USEZHEIGHT;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// OFFSET SLANTED ROOFS TO HEIGHT OF WALLS
|
||||
if ( uiDatabaseElem >= FIRSTROOF1 &&
|
||||
uiDatabaseElem <= SECONDSLANTROOF20 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTROOF1 &&
|
||||
uiDatabaseElem <= SECONDSLANTROOF20 )
|
||||
{
|
||||
//TileElement->sOffsetHeight = WALL_HEIGHT;
|
||||
}
|
||||
|
||||
// Set flag for full 3d tiles, as well as the dynamic flag for the folliage
|
||||
if ( uiDatabaseElem >= FIRSTFULLSTRUCT1 &&
|
||||
uiDatabaseElem <= SECONDFULLSTRUCT12 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTFULLSTRUCT1 &&
|
||||
uiDatabaseElem <= SECONDFULLSTRUCT12 )
|
||||
{
|
||||
//TileElement->uiFlags |= FULL3D_TILE;
|
||||
sIndexDiff = uiDatabaseElem - gTileTypeStartIndex[ usType ];
|
||||
|
||||
@@ -808,9 +808,9 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
}
|
||||
|
||||
//Ignore height for cliffs ie: if we rasie the land, do not offset the cliff
|
||||
if ( uiDatabaseElem >= FIRSTCLIFFHANG1 &&
|
||||
uiDatabaseElem <= FIRSTCLIFFSHADOW17 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTCLIFFHANG1 &&
|
||||
uiDatabaseElem <= FIRSTCLIFFSHADOW17 )
|
||||
{
|
||||
if ( usType == FIRSTCLIFFHANG )
|
||||
{
|
||||
TileElement->uiFlags |= CLIFFHANG_TILE;
|
||||
@@ -819,20 +819,20 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
|
||||
}
|
||||
|
||||
if ( uiDatabaseElem >= FIRSTWALL1 &&
|
||||
uiDatabaseElem <= FOURTHWALL65 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTWALL1 &&
|
||||
uiDatabaseElem <= FOURTHWALL65 )
|
||||
{
|
||||
TileElement->uiFlags |= WALL_TILE;
|
||||
}
|
||||
|
||||
// Set a-frames heigher!
|
||||
if ( uiDatabaseElem >= FIRSTWALL1 &&
|
||||
uiDatabaseElem <= FOURTHWALL47 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTWALL1 &&
|
||||
uiDatabaseElem <= FOURTHWALL47 )
|
||||
{
|
||||
|
||||
// Set these ones higher ( for roof pieces )
|
||||
if ( uiDatabaseElem >= ( gTileTypeStartIndex[ usType ] + WALL_AFRAME_START ) &&
|
||||
uiDatabaseElem <= ( gTileTypeStartIndex[ usType ] + WALL_AFRAME_END ) )
|
||||
if ( uiDatabaseElem >= ( gTileTypeStartIndex[ usType ] + WALL_AFRAME_START ) &&
|
||||
uiDatabaseElem <= ( gTileTypeStartIndex[ usType ] + WALL_AFRAME_END ) )
|
||||
{
|
||||
//TileElement->sOffsetHeight = WALL_HEIGHT;
|
||||
TileElement->uiFlags |= AFRAME_TILE;
|
||||
@@ -842,32 +842,32 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
}
|
||||
|
||||
// Set UI Elements to be dynamic
|
||||
if ( uiDatabaseElem >= FOOTPRINTS1 &&
|
||||
uiDatabaseElem <= THIRDPOINTERS2 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FOOTPRINTS1 &&
|
||||
uiDatabaseElem <= THIRDPOINTERS2 )
|
||||
{
|
||||
TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
TileElement->uiFlags |= OBJECTLAYER_USEZHEIGHT;
|
||||
}
|
||||
|
||||
// Set UI Elements to use object z level
|
||||
if ( usType >= FOOTPRINTS &&
|
||||
usType <= LASTUIELEM )
|
||||
{
|
||||
if ( usType >= FOOTPRINTS &&
|
||||
usType <= LASTUIELEM )
|
||||
{
|
||||
TileElement->uiFlags |= OBJECTLAYER_USEZHEIGHT;
|
||||
}
|
||||
|
||||
// Set UI Elements to use object z level
|
||||
if ( usType >= HUMANBLOOD &&
|
||||
usType <= CREATUREBLOOD )
|
||||
{
|
||||
if ( usType >= HUMANBLOOD &&
|
||||
usType <= CREATUREBLOOD )
|
||||
{
|
||||
TileElement->uiFlags |= OBJECTLAYER_USEZHEIGHT;
|
||||
}
|
||||
|
||||
|
||||
// Set UI Elements to use object z level
|
||||
if ( usType >= GUNS &&
|
||||
usType <= P2ITEMS )
|
||||
{
|
||||
if ( usType >= GUNS &&
|
||||
usType <= P2ITEMS )
|
||||
{
|
||||
TileElement->uiFlags |= OBJECTLAYER_USEZHEIGHT;
|
||||
}
|
||||
if ( usType == P3ITEMS )
|
||||
@@ -880,39 +880,39 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
TileElement->uiFlags |= OBJECTLAYER_USEZHEIGHT;
|
||||
}
|
||||
|
||||
if ( uiDatabaseElem >= FIRSTDOOR1 &&
|
||||
uiDatabaseElem <= FOURTHDOORSH20 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTDOOR1 &&
|
||||
uiDatabaseElem <= FOURTHDOORSH20 )
|
||||
{
|
||||
//TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
}
|
||||
|
||||
// Set UI Elements to be dynamic
|
||||
if ( uiDatabaseElem == MOCKFLOOR1 )
|
||||
{
|
||||
if ( uiDatabaseElem == MOCKFLOOR1 )
|
||||
{
|
||||
TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
|
||||
}
|
||||
|
||||
|
||||
if ( usType == BULLETTILE )
|
||||
{
|
||||
if ( usType == BULLETTILE )
|
||||
{
|
||||
TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
}
|
||||
|
||||
if ( usType == WIREFRAMES )
|
||||
{
|
||||
if ( usType == WIREFRAMES )
|
||||
{
|
||||
//TileElement->uiFlags |= DYNAMIC_TILE;
|
||||
}
|
||||
|
||||
// Set full tile flag for floors
|
||||
if ( uiDatabaseElem >= FIRSTFLOOR1 &&
|
||||
uiDatabaseElem <= FOURTHFLOOR8 )
|
||||
{
|
||||
if ( uiDatabaseElem >= FIRSTFLOOR1 &&
|
||||
uiDatabaseElem <= FOURTHFLOOR8 )
|
||||
{
|
||||
TileElement->ubFullTile = 1;
|
||||
}
|
||||
|
||||
if ( uiDatabaseElem >= FIRSTTEXTURE1 &&
|
||||
uiDatabaseElem <= DEEPWATERTEXTURE10 )
|
||||
uiDatabaseElem <= DEEPWATERTEXTURE10 )
|
||||
{
|
||||
// Set tile 'fullness' attribute
|
||||
TileElement->ubFullTile = gFullBaseTileValues[ uiDatabaseElem ];
|
||||
@@ -925,7 +925,7 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
}
|
||||
|
||||
if ( uiDatabaseElem >= REGWATERTEXTURE18 && uiDatabaseElem <= REGWATERTEXTURE50 || uiDatabaseElem == REGWATERTEXTURE ||
|
||||
uiDatabaseElem == REGWATERTEXTURE12 || uiDatabaseElem == REGWATERTEXTURE14 || uiDatabaseElem == REGWATERTEXTURE16 )
|
||||
uiDatabaseElem == REGWATERTEXTURE12 || uiDatabaseElem == REGWATERTEXTURE14 || uiDatabaseElem == REGWATERTEXTURE16 )
|
||||
{
|
||||
TileElement->ubTerrainID = FLAT_GROUND;
|
||||
}
|
||||
@@ -936,3 +936,4 @@ void SetSpecificDatabaseValues( UINT16 usType, UINT16 uiDatabaseElem, TILE_ELEME
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user