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

- When a roof collapses, 'debris smoke' can briefly cloud the debris. Requires GameDir >= r2309.

Browse Source 
- Improved roof collapsing for small roofs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8121 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-03-25 11:30:18 +00:00
parent 7e3d9e368c
commit 0ddb33576a
11 changed files with 85 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/SmokeEffects.cpp
+30 -2
View File
@@ -130,10 +130,12 @@ INT8 FromWorldFlagsToSmokeType( UINT16 ubWorldFlags )
{
return( SIGNAL_SMOKE_EFFECT );
}
else
else if ( ubWorldFlags & MAPELEMENT_EXT_DEBRIS_SMOKE )
{
return( NO_SMOKE_EFFECT );
return(DEBRIS_SMOKE_EFFECT);
}
return(NO_SMOKE_EFFECT);
}
@@ -171,6 +173,10 @@ UINT16 FromSmokeTypeToWorldFlags( INT8 bType )
return( MAPELEMENT_EXT_SIGNAL_SMOKE );
break;
case DEBRIS_SMOKE_EFFECT:
return(MAPELEMENT_EXT_DEBRIS_SMOKE);
break;
default:
return( 0 );
@@ -275,6 +281,10 @@ INT32 NewSmokeEffect( INT32 sGridNo, UINT16 usItem, INT8 bLevel, UINT8 ubOwner,
bSmokeEffectType = SIGNAL_SMOKE_EFFECT;
break;
case EXPLOSV_SMOKE_DEBRIS:
bSmokeEffectType = DEBRIS_SMOKE_EFFECT;
break;
}
pSmoke->ubDuration = (UINT8)Explosive[ Item[ usItem ].ubClassIndex ].ubDuration;
@@ -496,6 +506,24 @@ void AddSmokeEffectToTile( INT32 iSmokeEffectID, INT8 bType, INT32 sGridNo, INT8
}
}
break;
case DEBRIS_SMOKE_EFFECT:
if ( !(gGameSettings.fOptions[TOPTION_ANIMATE_SMOKE]) )
{
strcpy( AniParams.zCachedFile, "TILECACHE\\debris_smoke.STI" );
}
else
{
if ( fDissipating )
{
strcpy( AniParams.zCachedFile, "TILECACHE\\debris_smoke.STI" );
}
else
{
strcpy( AniParams.zCachedFile, "TILECACHE\\debris_smoke.STI" );
}
}
break;
}
// Create tile...