falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile bviewDrawFisheye

This commit is contained in:
Ryan Dwyer 2022-06-01 22:21:56 +10:00
parent 251c5f6aff
commit ed29909c77
7 changed files with 278 additions and 2486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/bondeyespy.c
View File

@ -252,7 +252,7 @@ bool eyespyCalculateNewPositionWithPush(struct coord *vel)
if (prop);
g_EyespyHit = EYESPYHIT_LASER;
g_EyespyHit = EYESPYHIT_DAMAGE;
}
}
@ -422,7 +422,7 @@ void eyespyUpdateVertical(void)
struct coord origpos;
f32 accel;
f32 maxfallspeed;
u8 sp73 = 0;
u8 hit = EYESPYHIT_NONE;
f32 newy;
struct coord sp60;
struct coord sp54;
@ -527,7 +527,7 @@ void eyespyUpdateVertical(void)
g_Vars.currentplayer->eyespy->height = newheight;
} else {
rebound = true;
sp73 = 1;
hit = EYESPYHIT_BG;
}
if (rebound) {
@ -536,7 +536,7 @@ void eyespyUpdateVertical(void)
}
if (g_EyespyHit == EYESPYHIT_NONE) {
g_EyespyHit = sp73;
g_EyespyHit = hit;
}
chr0f0220ac(chr);
@ -1068,7 +1068,7 @@ void eyespyProcessInput(bool allowbuttons)
case EYESPYHIT_CHR:
snd00010718(NULL, 0, 16000, 0x40, SFX_EYESPYHIT, 1, 1, -1, 1);
break;
case EYESPYHIT_LASER:
case EYESPYHIT_DAMAGE:
sndStart(var80095200, SFX_PICKUP_LASER, NULL, -1, -1, -1, -1, -1);
break;
default:

2728
src/game/bondview.c
View File

File diff suppressed because it is too large Load Diff

2
src/game/chraction.c
View File

@ -3560,7 +3560,7 @@ void chrReactToDamage(struct chrdata *chr, struct coord *vector, f32 angle, s32
strength *= 4;
eyespy->hit = 4;
eyespy->hit = EYESPYHIT_DAMAGE;
eyespy->vel.x += vector->x * strength;
eyespy->vel.z += vector->z * strength;
}

8
src/game/player.c
View File

@ -5529,20 +5529,20 @@ Gfx *playerRenderHud(Gfx *gdl)
if (g_Vars.currentplayer->eyespy) {
if (g_Vars.currentplayer->eyespy->startuptimer60 < TICKS(50)) {
gdl = bviewDrawFisheye(gdl, -1, 255, 0, g_Vars.currentplayer->eyespy->startuptimer60, g_Vars.currentplayer->eyespy->hit);
gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, 0, g_Vars.currentplayer->eyespy->startuptimer60, g_Vars.currentplayer->eyespy->hit);
} else {
s32 time = g_Vars.currentplayer->eyespy->camerashuttertime;
if (time > 0) {
if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
gdl = bviewDrawFisheye(gdl, -1, 255, time, TICKS(50), g_Vars.currentplayer->eyespy->hit);
gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, time, TICKS(50), g_Vars.currentplayer->eyespy->hit);
} else {
gdl = bviewDrawFisheye(gdl, -1, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit);
gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit);
}
g_Vars.currentplayer->eyespy->camerashuttertime -= g_Vars.lvupdate240_60;
} else {
gdl = bviewDrawFisheye(gdl, -1, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit);
gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit);
}
}

2
src/game/playerreset.c
View File

@ -436,7 +436,7 @@ void playerInitEyespy(void)
g_Vars.currentplayer->eyespy->oldground = 0;
g_Vars.currentplayer->eyespy->height = 0;
g_Vars.currentplayer->eyespy->gravity = 0;
g_Vars.currentplayer->eyespy->hit = false;
g_Vars.currentplayer->eyespy->hit = EYESPYHIT_NONE;
g_Vars.currentplayer->eyespy->opendoor = false;
g_Vars.currentplayer->eyespy->mode = EYESPYMODE_CAMSPY;
propchr = prop->chr;

12
src/include/constants.h
View File

@ -828,12 +828,12 @@
#define EXPLOSIONTYPE_24 24
#define EXPLOSIONTYPE_HUGE25 25
#define EYESPYHIT_NONE 0
#define EYESPYHIT_BG 1
#define EYESPYHIT_CHR 2
#define EYESPYHIT_DOOR 3
#define EYESPYHIT_LASER 4
#define EYESPYHIT_OBJ 5
#define EYESPYHIT_NONE 0
#define EYESPYHIT_BG 1
#define EYESPYHIT_CHR 2
#define EYESPYHIT_DOOR 3
#define EYESPYHIT_DAMAGE 4
#define EYESPYHIT_OBJ 5
#define EYESPYMODE_CAMSPY 0
#define EYESPYMODE_DRUGSPY 1

2
src/include/game/bondview.h
View File

@ -15,7 +15,7 @@ Gfx *bviewDrawSlayerRocketInterlace(Gfx *gdl, u32 arg1, u32 arg2);
Gfx *bviewDrawFilmInterlace(Gfx *gdl, u32 colour, u32 alpha);
Gfx *bviewDrawZoomBlur(Gfx *gdl, u32 colour, s32 alpha, f32 arg3, f32 arg4);
f32 bview0f142d74(s32 arg0, f32 arg1, f32 arg2, f32 arg3);
Gfx *bviewDrawFisheye(Gfx *gdl, s32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 startuptimer60, u8 hit);
Gfx *bviewDrawEyespySideRect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha);
Gfx *bviewDrawEyespyMetrics(Gfx *gdl);
Gfx *bviewDrawNvLens(Gfx *gdl);