Skip to content

Commit

Permalink
Removed trailing whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
Monsterovich committed Oct 28, 2024
1 parent 5ebe62f commit 17d9464
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/combat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAP
{
psDroid->shieldPoints -= actualDamage;
actualDamage = 0;
}
}
else
{
actualDamage -= psDroid->shieldPoints;
Expand All @@ -527,7 +527,7 @@ int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAP

if (weaponSubClass != WSC_FLAME &&
weaponSubClass != WSC_COMMAND &&
PERCENT(psDroid->shieldPoints, droidGetMaxShieldPoints(psDroid)) > 25)
PERCENT(psDroid->shieldPoints, droidGetMaxShieldPoints(psDroid)) > 25)
{
Vector3i dv;
dv.y = psDroid->pos.z;
Expand Down
16 changes: 8 additions & 8 deletions src/display3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3473,16 +3473,16 @@ static void queueDroidPowerBarsRects(DROID *psDroid, bool drawBox, BatchedMultiR
batchedMultiRectRenderer.addRect(PIERECT_DrawRequest(psDroid->sDisplay.screenX - psDroid->sDisplay.screenR, psDroid->sDisplay.screenY + psDroid->sDisplay.screenR + 3, psDroid->sDisplay.screenX - psDroid->sDisplay.screenR + damage, psDroid->sDisplay.screenY + psDroid->sDisplay.screenR + 4, powerCol), rectGroup);
batchedMultiRectRenderer.addRect(PIERECT_DrawRequest(psDroid->sDisplay.screenX - psDroid->sDisplay.screenR, psDroid->sDisplay.screenY + psDroid->sDisplay.screenR + 4, psDroid->sDisplay.screenX - psDroid->sDisplay.screenR + damage, psDroid->sDisplay.screenY + psDroid->sDisplay.screenR + 5, powerColShadow), rectGroup);
batchedMultiRectRenderer.addRect(PIERECT_DrawRequest(
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR - 3,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR,
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR - 1,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR - shields, WZCOL_LBLUE),
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR - 3,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR,
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR - 1,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR - shields, WZCOL_LBLUE),
rectGroup);
batchedMultiRectRenderer.addRect(PIERECT_DrawRequest(
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR - 2,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR,
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR - shields, WZCOL_BLACK),
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR - 2,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR,
psDroid->sDisplay.screenX - psDroid->sDisplay.screenR,
psDroid->sDisplay.screenY + psDroid->sDisplay.screenR - shields, WZCOL_BLACK),
rectGroup);
}

Expand Down
4 changes: 2 additions & 2 deletions src/droid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ void droidUpdate(DROID *psDroid)

void droidUpdateShields(DROID *psDroid)
{
if (hasCommander(psDroid) || psDroid->droidType == DROID_COMMAND)
if (hasCommander(psDroid) || psDroid->droidType == DROID_COMMAND)
{
if (psDroid->shieldPoints < 0)
{
Expand Down Expand Up @@ -1001,7 +1001,7 @@ UDWORD droidCalculateShieldInterruptRegenTime(const DROID *psDroid)
return DROID_INITIAL_SHIELD_INTERRUPT_REGEN_TIME - (DROID_SHIELD_INTERRUPT_REGEN_TIME_DEC * getDroidLevel(psDroid));
}

UDWORD droidGetMaxShieldPoints(const DROID *psDroid)
UDWORD droidGetMaxShieldPoints(const DROID *psDroid)
{
UDWORD percent = psDroid->originalBody / 100;
return percent * (DROID_INITIAL_SHILED_POINTS_PERCENT + DROID_ADDITVE_SHILED_POINTS_PERCENT * getDroidLevel(psDroid));
Expand Down

0 comments on commit 17d9464

Please sign in to comment.