mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-31 23:58:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up splat.c

Browse Source
This commit is contained in:
Ryan Dwyer
2022-07-02 10:41:12 +10:00
parent bc591bf6fc
commit 28ad7273e0
7 changed files with 75 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/bot.c
+1 -1
View File
@@ -240,7 +240,7 @@ void botSpawn(struct chrdata *chr, u8 respawning)
if (aibot) {
botReset(chr, respawning);
chrInitSplats(chr);
splatResetChr(chr);
thing = scenarioChooseSpawnLocation(chr->chrwidth, &pos, rooms, chr->prop);
chr->hidden |= CHRHFLAG_00100000;
chrMoveToPos(chr, &pos, rooms, thing, true);
src/game/chr.c
+3 -3
View File
@@ -1335,7 +1335,7 @@ void chrInit(struct prop *prop, u8 *ailist)
chr->goposhitcount = 0;
#endif
chrInitSplats(chr);
splatResetChr(chr);
}
struct prop *chr0f020b14(struct prop *prop, struct model *model,
@@ -5417,7 +5417,7 @@ void chrHit(struct shotdata *shotdata, struct hit *hit)
chrBruise(hit->model, hit->hitpart, hit->node, &sp5c);
}
splatsCreateForChrHit(prop, (struct splat *)shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr);
splatsCreateForChrHit(prop, shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr);
}
#else
// NTSC beta wraps all the blood logic in this paintball check.
@@ -5439,7 +5439,7 @@ void chrHit(struct shotdata *shotdata, struct hit *hit)
chrBruise(hit->model, hit->hitpart, hit->node, &sp5c);
splatsCreateForChrHit(prop, (struct splat *)shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr);
splatsCreateForChrHit(prop, shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr);
}
#endif
}
src/game/player.c
+1 -1
View File
@@ -506,7 +506,7 @@ void playerStartNewLife(void)
}
}
chrInitSplats(g_Vars.currentplayer->prop->chr);
splatResetChr(g_Vars.currentplayer->prop->chr);
playerLoadDefaults();
g_Vars.currentplayer->isdead = false;
g_Vars.currentplayer->healthdamagetype = DAMAGETYPE_7;
src/game/prop.c
+20 -20
View File
@@ -1984,7 +1984,7 @@ glabel var7f1ab190pf
/* f063720: 920f003d */ lbu $t7,0x3d($s0)
/* f063724: 8e020004 */ lw $v0,0x4($s0)
/* f063728: 02002025 */ move $a0,$s0
/* f06372c: 0fc5260c */ jal splatTick
/* f06372c: 0fc5260c */ jal splatTickChr
/* f063730: afa20048 */ sw $v0,0x48($sp)
/* f063734: 8fa20048 */ lw $v0,0x48($sp)
/* f063738: 10400008 */ beqz $v0,.PF0f06375c
@@ -2052,7 +2052,7 @@ glabel var7f1ab190pf
.PF0f063818:
/* f063818: 54610007 */ bnel $v1,$at,.PF0f063838
/* f06381c: 962e035e */ lhu $t6,0x35e($s1)
/* f063820: 0fc5260c */ jal splatTick
/* f063820: 0fc5260c */ jal splatTickChr
/* f063824: 02002025 */ move $a0,$s0
/* f063828: 0fc30a3b */ jal playerTickThirdPerson
/* f06382c: 02002025 */ move $a0,$s0
@@ -2154,7 +2154,7 @@ glabel var7f1ab190pf
/* f06398c: 00000000 */ nop
/* f063990: 8e020004 */ lw $v0,0x4($s0)
/* f063994: 02002025 */ move $a0,$s0
/* f063998: 0fc5260c */ jal splatTick
/* f063998: 0fc5260c */ jal splatTickChr
/* f06399c: afa20044 */ sw $v0,0x44($sp)
/* f0639a0: 8fa20044 */ lw $v0,0x44($sp)
/* f0639a4: 10400008 */ beqz $v0,.PF0f0639c8
@@ -2227,7 +2227,7 @@ glabel var7f1ab190pf
.PF0f063a98:
/* f063a98: 54610007 */ bnel $v1,$at,.PF0f063ab8
/* f063a9c: 8faf0034 */ lw $t7,0x34($sp)
/* f063aa0: 0fc5260c */ jal splatTick
/* f063aa0: 0fc5260c */ jal splatTickChr
/* f063aa4: 02002025 */ move $a0,$s0
/* f063aa8: 0fc30a3b */ jal playerTickThirdPerson
/* f063aac: 02002025 */ move $a0,$s0
@@ -2983,7 +2983,7 @@ glabel var7f1ab190pf
/* f063670: 920f003d */ lbu $t7,0x3d($s0)
/* f063674: 8e020004 */ lw $v0,0x4($s0)
/* f063678: 02002025 */ move $a0,$s0
/* f06367c: 0fc527cc */ jal splatTick
/* f06367c: 0fc527cc */ jal splatTickChr
/* f063680: afa20048 */ sw $v0,0x48($sp)
/* f063684: 8fa20048 */ lw $v0,0x48($sp)
/* f063688: 10400008 */ beqz $v0,.PB0f0636ac
@@ -3051,7 +3051,7 @@ glabel var7f1ab190pf
.PB0f063768:
/* f063768: 54610007 */ bnel $v1,$at,.PB0f063788
/* f06376c: 962e035e */ lhu $t6,0x35e($s1)
/* f063770: 0fc527cc */ jal splatTick
/* f063770: 0fc527cc */ jal splatTickChr
/* f063774: 02002025 */ move $a0,$s0
/* f063778: 0fc309fe */ jal playerTickThirdPerson
/* f06377c: 02002025 */ move $a0,$s0
@@ -3153,7 +3153,7 @@ glabel var7f1ab190pf
/* f0638dc: 00000000 */ nop
/* f0638e0: 8e020004 */ lw $v0,0x4($s0)
/* f0638e4: 02002025 */ move $a0,$s0
/* f0638e8: 0fc527cc */ jal splatTick
/* f0638e8: 0fc527cc */ jal splatTickChr
/* f0638ec: afa20044 */ sw $v0,0x44($sp)
/* f0638f0: 8fa20044 */ lw $v0,0x44($sp)
/* f0638f4: 10400008 */ beqz $v0,.PB0f063918
@@ -3226,7 +3226,7 @@ glabel var7f1ab190pf
.PB0f0639e8:
/* f0639e8: 54610007 */ bnel $v1,$at,.PB0f063a08
/* f0639ec: 8faf0034 */ lw $t7,0x34($sp)
/* f0639f0: 0fc527cc */ jal splatTick
/* f0639f0: 0fc527cc */ jal splatTickChr
/* f0639f4: 02002025 */ move $a0,$s0
/* f0639f8: 0fc309fe */ jal playerTickThirdPerson
/* f0639fc: 02002025 */ move $a0,$s0
@@ -3969,7 +3969,7 @@ glabel propsTickPlayer
/* f0634b4: 920f003d */ lbu $t7,0x3d($s0)
/* f0634b8: 8e020004 */ lw $v0,0x4($s0)
/* f0634bc: 02002025 */ or $a0,$s0,$zero
/* f0634c0: 0fc522e0 */ jal splatTick
/* f0634c0: 0fc522e0 */ jal splatTickChr
/* f0634c4: afa20048 */ sw $v0,0x48($sp)
/* f0634c8: 8fa20048 */ lw $v0,0x48($sp)
/* f0634cc: 10400008 */ beqz $v0,.L0f0634f0
@@ -4037,7 +4037,7 @@ glabel propsTickPlayer
.L0f0635ac:
/* f0635ac: 54610007 */ bnel $v1,$at,.L0f0635cc
/* f0635b0: 962e035e */ lhu $t6,0x35e($s1)
/* f0635b4: 0fc522e0 */ jal splatTick
/* f0635b4: 0fc522e0 */ jal splatTickChr
/* f0635b8: 02002025 */ or $a0,$s0,$zero
/* f0635bc: 0fc308d9 */ jal playerTickThirdPerson
/* f0635c0: 02002025 */ or $a0,$s0,$zero
@@ -4133,7 +4133,7 @@ glabel propsTickPlayer
/* f063708: 00000000 */ nop
/* f06370c: 8e020004 */ lw $v0,0x4($s0)
/* f063710: 02002025 */ or $a0,$s0,$zero
/* f063714: 0fc522e0 */ jal splatTick
/* f063714: 0fc522e0 */ jal splatTickChr
/* f063718: afa20044 */ sw $v0,0x44($sp)
/* f06371c: 8fa20044 */ lw $v0,0x44($sp)
/* f063720: 10400008 */ beqz $v0,.L0f063744
@@ -4206,7 +4206,7 @@ glabel propsTickPlayer
.L0f063814:
/* f063814: 54610007 */ bnel $v1,$at,.L0f063834
/* f063818: 8faf0034 */ lw $t7,0x34($sp)
/* f06381c: 0fc522e0 */ jal splatTick
/* f06381c: 0fc522e0 */ jal splatTickChr
/* f063820: 02002025 */ or $a0,$s0,$zero
/* f063824: 0fc308d9 */ jal playerTickThirdPerson
/* f063828: 02002025 */ or $a0,$s0,$zero
@@ -4942,7 +4942,7 @@ glabel propsTickPlayer
/* f062728: 920f003d */ lbu $t7,0x3d($s0)
/* f06272c: 8e020004 */ lw $v0,0x4($s0)
/* f062730: 02002025 */ or $a0,$s0,$zero
/* f062734: 0fc50cd4 */ jal splatTick
/* f062734: 0fc50cd4 */ jal splatTickChr
/* f062738: afa20048 */ sw $v0,0x48($sp)
/* f06273c: 8fa20048 */ lw $v0,0x48($sp)
/* f062740: 10400008 */ beqz $v0,.NB0f062764
@@ -5010,7 +5010,7 @@ glabel propsTickPlayer
.NB0f062820:
/* f062820: 54610007 */ bnel $v1,$at,.NB0f062840
/* f062824: 962e035e */ lhu $t6,0x35e($s1)
/* f062828: 0fc50cd4 */ jal splatTick
/* f062828: 0fc50cd4 */ jal splatTickChr
/* f06282c: 02002025 */ or $a0,$s0,$zero
/* f062830: 0fc2ffcb */ jal playerTickThirdPerson
/* f062834: 02002025 */ or $a0,$s0,$zero
@@ -5106,7 +5106,7 @@ glabel propsTickPlayer
/* f06297c: 00000000 */ sll $zero,$zero,0x0
/* f062980: 8e020004 */ lw $v0,0x4($s0)
/* f062984: 02002025 */ or $a0,$s0,$zero
/* f062988: 0fc50cd4 */ jal splatTick
/* f062988: 0fc50cd4 */ jal splatTickChr
/* f06298c: afa20044 */ sw $v0,0x44($sp)
/* f062990: 8fa20044 */ lw $v0,0x44($sp)
/* f062994: 10400008 */ beqz $v0,.NB0f0629b8
@@ -5179,7 +5179,7 @@ glabel propsTickPlayer
.NB0f062a88:
/* f062a88: 54610007 */ bnel $v1,$at,.NB0f062aa8
/* f062a8c: 8faf0034 */ lw $t7,0x34($sp)
/* f062a90: 0fc50cd4 */ jal splatTick
/* f062a90: 0fc50cd4 */ jal splatTickChr
/* f062a94: 02002025 */ or $a0,$s0,$zero
/* f062a98: 0fc2ffcb */ jal playerTickThirdPerson
/* f062a9c: 02002025 */ or $a0,$s0,$zero
@@ -5818,7 +5818,7 @@ glabel propsTickPlayer
// if (prop->type == PROPTYPE_CHR) {
// struct chrdata *chr = prop->chr;
//
// splatTick(prop);
// splatTickChr(prop);
//
// if (chr && chr->aibot) {
// op = botTick(prop);
@@ -5837,7 +5837,7 @@ glabel propsTickPlayer
// } else if (prop->type == PROPTYPE_SMOKE) {
// op = smokeTickPlayer(prop);
// } else if (prop->type == PROPTYPE_PLAYER) {
// splatTick(prop);
// splatTickChr(prop);
// op = playerTickThirdPerson(prop);
// }
// }
@@ -5881,7 +5881,7 @@ glabel propsTickPlayer
// if (prop->type == PROPTYPE_CHR) {
// struct chrdata *chr = prop->chr;
//
// splatTick(prop);
// splatTickChr(prop);
//
// if (chr && chr->aibot) {
// op = botTick(prop);
@@ -5909,7 +5909,7 @@ glabel propsTickPlayer
// } else if (prop->type == PROPTYPE_SMOKE) {
// op = smokeTickPlayer(prop);
// } else if (prop->type == PROPTYPE_PLAYER) {
// splatTick(prop);
// splatTickChr(prop);
// op = playerTickThirdPerson(prop);
// }
//
src/game/splat.c
+44 -43
View File
@@ -25,7 +25,7 @@ u32 var8007f8b0 = 0x43340000;
u32 var8007f8b4 = 0x40a00000;
u32 var8007f8b8 = 0x42480000;
void splatTick(struct prop *prop)
void splatTickChr(struct prop *prop)
{
struct chrdata *chr = prop->chr;
struct chrdata *attacker = chr->lastattacker;
@@ -64,6 +64,7 @@ void splatTick(struct prop *prop)
chr->deaddropsplatsadded += splatsCreate(1, 1.1f, prop, NULL, 0, 0, isskedar, 1, TICKS(150), attacker, random() & 8);
}
} else {
// Consider creating a wounded drop
u32 value = chr->bulletstaken * chr->tickssincesplat;
if (value > TICKS(240)) {
@@ -72,10 +73,10 @@ void splatTick(struct prop *prop)
if (dist > 40) {
addmore = true;
chr->splatsdroppedhe = 0;
} else if (chr->splatsdroppedhe < 8) {
chr->splatsdroppedhere = 0;
} else if (chr->splatsdroppedhere < 8) {
addmore = true;
chr->splatsdroppedhe++;
chr->splatsdroppedhere++;
}
if (addmore) {
@@ -95,7 +96,7 @@ void splatTick(struct prop *prop)
chr->tickssincesplat += g_Vars.lvupdate240_60;
}
void splatsCreateForChrHit(struct prop *prop, struct splat *arg1, struct coord *arg2, struct coord *arg3, s32 arg4, s32 arg5, struct chrdata *arg6)
void splatsCreateForChrHit(struct prop *prop, struct shotdata *arg1, struct coord *arg2, struct coord *arg3, s32 arg4, s32 arg5, struct chrdata *arg6)
{
#if VERSION != VERSION_JPN_FINAL
struct chrdata *chr = prop->chr;
@@ -114,30 +115,30 @@ void splatsCreateForChrHit(struct prop *prop, struct splat *arg1, struct coord *
#endif
}
s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct splat *arg3, struct coord *arg4, struct coord *arg5, s32 arg6, s32 arg7, s32 arg8, struct chrdata *arg9, s32 arg10)
s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct shotdata *arg3, struct coord *arg4, struct coord *arg5, s32 arg6, s32 arg7, s32 arg8, struct chrdata *arg9, s32 arg10)
{
#if VERSION == VERSION_JPN_FINAL
return 0;
#else
s32 i;
s32 j;
struct splat stacksplat;
struct splat *splat = arg7 == 0 ? arg3 : &stacksplat;
f32 spfc[3];
f32 spf0[3];
f32 spe4[3];
struct shotdata stackshotdata;
struct shotdata *shotdata = arg7 == 0 ? arg3 : &stackshotdata;
struct coord spfc;
struct coord spf0;
struct coord spe4;
Mtxf spa4;
s32 numdropped = 0;
f32 dist;
s32 i;
s32 j;
if (arg7 == 0) {
dist = coordsGetDistance(&splat->unk01c, arg5);
dist = coordsGetDistance(&shotdata->gunpos, arg5);
for (i = 0; i < 3; i++) {
spfc[i] = ((f32 *)&splat->unk028)[i];
spf0[i] = ((f32 *)&splat->unk00c)[i];
((f32 *)&splat->unk01c)[i] = ((f32 *)arg5)[i];
((f32 *)&splat->unk000)[i] = ((f32 *)arg4)[i];
spfc.f[i] = shotdata->dir.f[i];
spf0.f[i] = shotdata->unk0c.f[i];
shotdata->gunpos.f[i] = arg5->f[i];
shotdata->unk00.f[i] = arg4->f[i];
}
} else {
f32 extraheight;
@@ -150,42 +151,41 @@ s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct splat *arg3, struc
dist = 0.7f;
splat->unk028.x = 0; spfc[0] = 0;
splat->unk028.y = -1; spfc[1] = -1;
splat->unk028.z = 0; spfc[2] = 0;
spfc.x = shotdata->dir.x = 0;
spfc.y = shotdata->dir.y = -1;
spfc.z = shotdata->dir.z = 0;
splat->unk00c.x = 0; spf0[0] = 0;
splat->unk00c.y = -1; spf0[1] = -1;
splat->unk00c.z = 0; spf0[2] = 0;
spf0.x = shotdata->unk0c.x = 0;
spf0.y = shotdata->unk0c.y = -1;
spf0.z = shotdata->unk0c.z = 0;
splat->unk01c.x = prop->pos.x;
splat->unk01c.y = prop->pos.y + extraheight;
splat->unk01c.z = prop->pos.z;
shotdata->gunpos.x = prop->pos.x;
shotdata->gunpos.y = prop->pos.y + extraheight;
shotdata->gunpos.z = prop->pos.z;
splat->unk000.x = prop->pos.x;
splat->unk000.y = prop->pos.y + extraheight;
splat->unk000.z = prop->pos.z;
shotdata->unk00.x = prop->pos.x;
shotdata->unk00.y = prop->pos.y + extraheight;
shotdata->unk00.z = prop->pos.z;
}
for (i = 0; i < qty; i++) {
for (j = 0; j < 3; j++) {
f32 rand = RANDOMFRAC();
spe4[j] = (rand * var8007f8a8 + rand * var8007f8a8 - var8007f8a8) * 0.017453292384744f;
spe4.f[j] = (RANDOMFRAC() * var8007f8a8 * 2.0f - var8007f8a8) * 0.017453292384744f;
}
mtx4LoadRotation((struct coord *)spe4, &spa4);
mtx4RotateVec(&spa4, (struct coord *)spfc, &splat->unk028);
mtx4RotateVec(&spa4, (struct coord *)spf0, &splat->unk00c);
mtx4LoadRotation(&spe4, &spa4);
mtx4RotateVec(&spa4, &spfc, &shotdata->dir);
mtx4RotateVec(&spa4, &spf0, &shotdata->unk0c);
#if VERSION >= VERSION_NTSC_1_0
func0f177164(&splat->unk028, &splat->unk028, 403, "splat.c");
func0f177164(&splat->unk00c, &splat->unk00c, 404, "splat.c");
func0f177164(&shotdata->dir, &shotdata->dir, 403, "splat.c");
func0f177164(&shotdata->unk0c, &shotdata->unk0c, 404, "splat.c");
#else
func0f177164(&splat->unk028, &splat->unk028, 405, "splat.c");
func0f177164(&splat->unk00c, &splat->unk00c, 406, "splat.c");
func0f177164(&shotdata->dir, &shotdata->dir, 405, "splat.c");
func0f177164(&shotdata->unk0c, &shotdata->unk0c, 406, "splat.c");
#endif
if (func0f149274(arg1, prop, splat, dist, arg6, arg7, arg8, arg9, arg10)) {
if (func0f149274(arg1, prop, shotdata, dist, arg6, arg7, arg8, arg9, arg10)) {
numdropped++;
}
}
@@ -204,7 +204,6 @@ s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct splat *arg3, struc
}
const char var7f1b5fe0[] = "Splat : Out of range\n";
const char var7f1b5ff8[] = "Splat_ResetChr : Reset One Char : chrdata = %x\n";
#if VERSION == VERSION_JPN_FINAL
void func0f149250jf(void);
@@ -945,14 +944,16 @@ glabel var7f1b6048
);
#endif
void chrInitSplats(struct chrdata *chr)
void splatResetChr(struct chrdata *chr)
{
osSyncPrintf("Splat_ResetChr : Reset One Char : chrdata = %x\n", (u32)chr);
chr->bulletstaken = 0;
chr->tickssincesplat = 0;
chr->stdsplatsadded = 0;
chr->woundedsplatsadded = 0;
chr->deaddropsplatsadded = 0;
chr->splatsdroppedhe = 0;
chr->splatsdroppedhere = 0;
chr->lastdroppos.x = 0;
chr->lastdroppos.y = 0;
chr->lastdroppos.z = 0;