1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

New feature: additional decals adds blood spatters and structural wear on walls

Browse Source 
Requires GameDir >= r2595 to work

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9113 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2021-06-27 12:20:46 +00:00
parent 4ca4ea279a
commit 89e2bd077a
9 changed files with 420 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/LOS.cpp
+121
View File
@@ -57,6 +57,7 @@
#include "SkillCheck.h" // added by Flugente
#include "ai.h" // sevenfm
#include "GameInitOptionsScreen.h"
#include "renderworld.h" // added by Flugente for SetRenderFlags( RENDER_FLAG_FULL );
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
@@ -3291,6 +3292,126 @@ BOOLEAN BulletHitMerc( BULLET * pBullet, STRUCTURE * pStructure, BOOLEAN fIntend
send_hit( &SWeaponHit );
}
}
// Flugente: add blood spatter to wall next to target
if ( gGameExternalOptions.fAdditionalDecals
&&( pTarget->ubBodyType < ADULTFEMALEMONSTER || (pTarget->ubBodyType >= FATCIV && pTarget->ubBodyType <= BLOODCAT) )
&& iDamage > 15 )
{
// the direction in SWeaponHit.usDirection is erversed for whatever reason
UINT8 properdirection = gOppositeDirection[SWeaponHit.usDirection];
if ( properdirection == SOUTHWEST
||properdirection == WEST
|| properdirection == NORTHWEST
|| properdirection == NORTH
|| properdirection == NORTHEAST)
{
bool northwestalreadydone( false );
INT32 nextGridNoinSight = pBullet->sGridNo;
// If we're firing straight up (NORTHWEST), issues arise if we hit a corner.
// If it's an outside corner, it would be enough to simply mark both outside walls.
// This does not work in an inside corner, as the walls would be tied to the northern and western gridno from our position, not the northwest one.
// It could also be the case that it's an inside corner in a full wall.
// Solution: First check the northern and western gridnos for walls. Only if those don't exist, continue to the northwest gridno and check it's outside walls.
if ( properdirection == NORTHWEST )
{
nextGridNoinSight = NewGridNo( pBullet->sGridNo, DirectionInc( WEST ) );
if ( gubWorldMovementCosts[nextGridNoinSight][WEST][0] >= TRAVELCOST_BLOCKED )
{
STRUCTURE* pStructureForBlood = FindStructure( nextGridNoinSight, STRUCTURE_WALL );
while ( pStructureForBlood )
{
// add if not already set
// add if of proper height
if ( ( pStructureForBlood->ubWallOrientation == INSIDE_TOP_RIGHT ) )
{
northwestalreadydone = true;
if ( !( pStructureForBlood->ubDecalFlag & STRUCTURE_DECALFLAG_BLOOD )
&& StructureHeight( pStructureForBlood ) == 4 )
{
// add blood to wall
pStructureForBlood->ubDecalFlag |= STRUCTURE_DECALFLAG_BLOOD;
gpWorldLevelData[pStructureForBlood->sGridNo].uiFlags |= MAPELEMENT_STRUCTURE_DAMAGED;
// enforce a full render, so that we can draw decals on time
SetRenderFlags( RENDER_FLAG_FULL );
}
}
pStructureForBlood = FindNextStructure( pStructureForBlood, STRUCTURE_WALL );
}
}
nextGridNoinSight = NewGridNo( pBullet->sGridNo, DirectionInc( NORTH ) );
if ( gubWorldMovementCosts[nextGridNoinSight][NORTH][0] >= TRAVELCOST_BLOCKED )
{
STRUCTURE* pStructureForBlood = FindStructure( nextGridNoinSight, STRUCTURE_WALL );
while ( pStructureForBlood )
{
// add if not already set
// add if of proper height
if ( pStructureForBlood->ubWallOrientation == INSIDE_TOP_LEFT )
{
northwestalreadydone = true;
if ( !( pStructureForBlood->ubDecalFlag & STRUCTURE_DECALFLAG_BLOOD )
&& StructureHeight( pStructureForBlood ) == 4 )
{
// add blood to wall
pStructureForBlood->ubDecalFlag |= STRUCTURE_DECALFLAG_BLOOD;
gpWorldLevelData[pStructureForBlood->sGridNo].uiFlags |= MAPELEMENT_STRUCTURE_DAMAGED;
// enforce a full render, so that we can draw decals on time
SetRenderFlags( RENDER_FLAG_FULL );
}
}
pStructureForBlood = FindNextStructure( pStructureForBlood, STRUCTURE_WALL );
}
}
}
nextGridNoinSight = NewGridNo( pBullet->sGridNo, DirectionInc( properdirection ) );
if ( !northwestalreadydone
&& gubWorldMovementCosts[nextGridNoinSight][properdirection][0] >= TRAVELCOST_BLOCKED )
{
STRUCTURE* pStructureForBlood = FindStructure( nextGridNoinSight, STRUCTURE_WALL );
while ( pStructureForBlood )
{
// add if not already set
// add if of proper height
if ( ( ( properdirection == NORTHWEST && ( pStructureForBlood->ubWallOrientation == OUTSIDE_TOP_LEFT || pStructureForBlood->ubWallOrientation == OUTSIDE_TOP_RIGHT ) )
|| ( properdirection == WEST && ( pStructureForBlood->ubWallOrientation == OUTSIDE_TOP_RIGHT || pStructureForBlood->ubWallOrientation == INSIDE_TOP_RIGHT ) )
|| ( properdirection == SOUTHWEST && ( pStructureForBlood->ubWallOrientation == OUTSIDE_TOP_RIGHT || pStructureForBlood->ubWallOrientation == INSIDE_TOP_RIGHT ) )
|| ( properdirection == NORTH && ( pStructureForBlood->ubWallOrientation == OUTSIDE_TOP_LEFT || pStructureForBlood->ubWallOrientation == INSIDE_TOP_LEFT ) )
|| ( properdirection == NORTHEAST && ( pStructureForBlood->ubWallOrientation == OUTSIDE_TOP_LEFT || pStructureForBlood->ubWallOrientation == INSIDE_TOP_LEFT ) )
)
&& !( pStructureForBlood->ubDecalFlag & STRUCTURE_DECALFLAG_BLOOD )
&& StructureHeight( pStructureForBlood ) == 4 )
{
// add blood to wall
pStructureForBlood->ubDecalFlag |= STRUCTURE_DECALFLAG_BLOOD;
gpWorldLevelData[pStructureForBlood->sGridNo].uiFlags |= MAPELEMENT_STRUCTURE_DAMAGED;
// enforce a full render, so that we can draw decals on time
SetRenderFlags( RENDER_FLAG_FULL );
}
pStructureForBlood = FindNextStructure( pStructureForBlood, STRUCTURE_WALL );
}
}
}
}
if (fStopped)
{