Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename game_0b69d0.c to player.c

Browse Source
This commit is contained in:
Ryan Dwyer committed 2022-02-09 20:23:06 +10:00
1 parent d02b72be2e
commit 583796e7aa
43 files changed
+623 -621
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/chr/chraction.c
+7 -7
View File
@@ -19,7 +19,7 @@
#include "game/game_0b28d0.h"
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/game_0b69d0.h"
#include "game/player.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/explosions/explosions.h"
@@ -4074,7 +4074,7 @@ void chrSetShield(struct chrdata *chr, f32 amount)
if (playernum >= 0) {
s32 prevplayernum = g_Vars.currentplayernum;
setCurrentPlayerNum(playernum);
currentPlayerDisplayHealth();
playerDisplayHealth();
g_Vars.currentplayerstats->armourcount += amount * 0.125f;
setCurrentPlayerNum(prevplayernum);
}
@@ -4789,7 +4789,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse
}
playerUpdateDamageStats(aprop, vprop, statsamount);
currentPlayerDisplayHealth();
playerDisplayHealth();
if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_ONEHITKILLS)) {
g_Vars.currentplayer->bondhealth = 0;
@@ -4803,7 +4803,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse
if (g_Vars.currentplayer->training == false
&& g_Vars.currentplayer->bondhealth <= 0) {
currentPlayerDieByShooter(aplayernum, false);
playerDieByShooter(aplayernum, false);
chr->blurnumtimesdied++;
}
@@ -4827,15 +4827,15 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse
g_Vars.currentplayer->bondshotspeed[2] += vector->z * boostscale;
if (showdamage) {
currentPlayerDisplayDamage();
playerDisplayDamage();
}
if (showshield) {
currentPlayerDisplayShield();
playerDisplayShield();
}
if (g_Vars.normmplayerisrunning && aprop && aprop->type == PROPTYPE_PLAYER) {
currentPlayerCheckIfShotInBack(prevplayernum, vector->x, vector->z);
playerCheckIfShotInBack(prevplayernum, vector->x, vector->z);
}
}