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

Data and Source v1.13 Mod High Resolution version from 2006-04-15

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@25 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-04-19 18:16:27 +00:00
parent 8b2d0e33aa
commit 8d448f9c64
83 changed files with 2125 additions and 3651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Explosion Control.cpp
+25 -2
View File
@@ -81,6 +81,7 @@ UINT8 ubTransKeyFrame[ NUM_EXP_TYPES ] =
1,
1,
1,
1,
};
UINT8 ubDamageKeyFrame[ NUM_EXP_TYPES ] =
@@ -94,6 +95,7 @@ UINT8 ubDamageKeyFrame[ NUM_EXP_TYPES ] =
18,
18,
18,
18,
};
@@ -108,6 +110,7 @@ UINT32 uiExplosionSoundID[ NUM_EXP_TYPES ] =
AIR_ESCAPING_1,
AIR_ESCAPING_1,
AIR_ESCAPING_1,
325,//TODO: Madd: hard coded for now -- we need to externalize explosion sounds, animations, etc. at some point in the near future
};
@@ -122,6 +125,7 @@ CHAR8 zBlastFilenames[][70] =
"TILECACHE\\TEAR_EXP.STI",
"TILECACHE\\TEAR_EXP.STI",
"TILECACHE\\MUST_EXP.STI",
"TILECACHE\\FLAM_EXP.STI",
};
CHAR8 sBlastSpeeds[] =
@@ -135,6 +139,8 @@ CHAR8 sBlastSpeeds[] =
80,
80,
80,
80,
80,
};
#define BOMB_QUEUE_DELAY (1000 + Random( 500 ) )
@@ -1325,7 +1331,7 @@ BOOLEAN DishOutGasDamage( SOLDIERTYPE * pSoldier, EXPLOSIVETYPE * pExplosive, IN
return( fRecompileMovementCosts );
}
if ( pExplosive->ubType == EXPLOSV_CREATUREGAS )
if ( pExplosive->ubType == EXPLOSV_CREATUREGAS || pExplosive->ubType == EXPLOSV_BURNABLEGAS)
{
if ( pSoldier->uiStatusFlags & SOLDIER_MONSTER )
{
@@ -1337,6 +1343,12 @@ BOOLEAN DishOutGasDamage( SOLDIERTYPE * pSoldier, EXPLOSIVETYPE * pExplosive, IN
// already affected by creature gas this turn
return( fRecompileMovementCosts );
}
if ( sSubsequent && pSoldier->fHitByGasFlags & HIT_BY_BURNABLEGAS )
{
// already affected by BURNABLEGAS this turn
return( fRecompileMovementCosts );
}
}
else // no gas mask help from creature attacks
// ATE/CJC: gas stuff
@@ -1446,6 +1458,9 @@ BOOLEAN DishOutGasDamage( SOLDIERTYPE * pSoldier, EXPLOSIVETYPE * pExplosive, IN
case EXPLOSV_MUSTGAS:
pSoldier->fHitByGasFlags |= HIT_BY_MUSTARDGAS;
break;
case EXPLOSV_BURNABLEGAS:
pSoldier->fHitByGasFlags |= HIT_BY_BURNABLEGAS;
break;
default:
break;
}
@@ -1502,6 +1517,13 @@ BOOLEAN ExpAffect( INT16 sBombGridNo, INT16 sGridNo, UINT32 uiDist, UINT16 usIte
fBlastEffect = FALSE;
break;
case EXPLOSV_BURNABLEGAS:
fSmokeEffect = TRUE;
bSmokeEffectType = BURNABLEGAS_SMOKE_EFFECT;
fBlastEffect = FALSE;
break;
case EXPLOSV_TEARGAS:
fSmokeEffect = TRUE;
@@ -2118,6 +2140,7 @@ void SpreadEffect( INT16 sGridNo, UINT8 ubRadius, UINT16 usItem, UINT8 ubOwner,
{
case EXPLOSV_MUSTGAS:
case EXPLOSV_BURNABLEGAS:
case EXPLOSV_TEARGAS:
case EXPLOSV_SMOKE:
case EXPLOSV_CREATUREGAS:
@@ -3529,4 +3552,4 @@ void RemoveAllActiveTimedBombs( void )
}
} while( iItemIndex != -1 );
}
}