diff --git a/Tactical/Weapons.h b/Tactical/Weapons.h index a36c3390..4080969c 100644 --- a/Tactical/Weapons.h +++ b/Tactical/Weapons.h @@ -299,7 +299,7 @@ typedef struct UINT8 ubVolatility; // maximum chance of accidental explosion UINT8 ubAnimationID; // Animation enum to use UINT32 uiIndex; - UINT16 ubDuration; + UINT8 ubDuration; UINT8 ubStartRadius; } EXPLOSIVETYPE; diff --git a/Tactical/XML_Explosive.cpp b/Tactical/XML_Explosive.cpp index d3ecb70b..8aba8a19 100644 --- a/Tactical/XML_Explosive.cpp +++ b/Tactical/XML_Explosive.cpp @@ -187,7 +187,7 @@ explosiveEndElementHandle(void *userData, const char *name) else if(strcmp(name, "ubDuration") == 0) { pData->curElement = ELEMENT; - pData->curExplosive.ubDuration = (UINT16) atol(pData->szCharData); + pData->curExplosive.ubDuration = (UINT8) atol(pData->szCharData); } pData->maxReadDepth--; diff --git a/TileEngine/LightEffects.cpp b/TileEngine/LightEffects.cpp index ad9d056b..fcde0556 100644 --- a/TileEngine/LightEffects.cpp +++ b/TileEngine/LightEffects.cpp @@ -96,7 +96,7 @@ void UpdateLightingSprite( LIGHTEFFECT *pLight ) } -INT32 NewLightEffect( INT16 sGridNo, UINT16 ubDuration, UINT8 ubStartRadius ) +INT32 NewLightEffect( INT16 sGridNo, UINT8 ubDuration, UINT8 ubStartRadius ) { LIGHTEFFECT *pLight; INT32 iLightIndex; diff --git a/TileEngine/LightEffects.h b/TileEngine/LightEffects.h index dd95f85c..23bac323 100644 --- a/TileEngine/LightEffects.h +++ b/TileEngine/LightEffects.h @@ -15,9 +15,9 @@ typedef struct { INT16 sGridNo; // gridno at which the tear gas cloud is centered - UINT16 ubDuration; // the number of turns will remain effective + UINT8 ubDuration; // the number of turns will remain effective UINT8 bRadius; // the current radius - UINT16 bAge; // the number of turns light has been around + UINT8 bAge; // the number of turns light has been around BOOLEAN fAllocated; INT32 iLight; UINT32 uiTimeOfLastUpdate; diff --git a/TileEngine/SmokeEffects.h b/TileEngine/SmokeEffects.h index 8ad1e135..07d1036e 100644 --- a/TileEngine/SmokeEffects.h +++ b/TileEngine/SmokeEffects.h @@ -22,10 +22,10 @@ typedef struct TAG_SMOKE_EFFECT { INT16 sGridNo; // gridno at which the tear gas cloud is centered - UINT16 ubDuration; // the number of turns gas will remain effective + UINT8 ubDuration; // the number of turns gas will remain effective UINT8 ubRadius; // the current radius of the cloud in map tiles UINT8 bFlags; // 0 - outdoors (fast spread), 1 - indoors (slow) - UINT16 bAge; // the number of turns gas has been around + UINT8 bAge; // the number of turns gas has been around BOOLEAN fAllocated; INT8 bType; UINT16 usItem;