popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

Merge branch 'port' of https://github.com/fgsfdsfgs/perfect_dark into port-net

Browse Source
This commit is contained in:
fgsfds committed 2024-11-15 01:36:54 +01:00
2 parents 6d20ed25fb f514e25208
commit 6ddebf8aa6
6 files changed
+605 -379
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

port/src/preprocess/filemodel.c
+595 -365
View File
File diff suppressed because it is too large. Load diff
port/src/preprocess/filepads.c
-1
View File
@@ -235,7 +235,6 @@ static u32 convertCover(u8 *dst, u32 dstpos, u8 *src, u32 srcpos, int num_covers
host_covers[i].pos = PD_SWAPPED_VAL(n64_covers[i].pos);
host_covers[i].look = PD_SWAPPED_VAL(n64_covers[i].look);
host_covers[i].flags = PD_BE16(n64_covers[i].flags);
host_covers[i].unk1a = PD_BE16(n64_covers[i].unk1a);
}
dstpos += num_covers * sizeof(struct coverdefinition);
port/src/preprocess/filesetup.c
+1 -1
View File
@@ -1003,7 +1003,7 @@ static u32 convertProps(u8* dst, u8* src)
static uintptr_t convertIntro(u8 *dst, u8 *src)
{
u8 cmd_size[] = {
static const u8 cmd_size[] = {
3, // INTROCMD_SPAWN
4, // INTROCMD_WEAPON
4, // INTROCMD_AMMO
src/game/bondmove.c
+6 -5
View File
@@ -1105,7 +1105,9 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
aimoffhist[i] = !aimonhist[i];
}
g_Vars.currentplayer->insightaimmode = aimonhist[numsamples - 1];
if (numsamples > 0) {
g_Vars.currentplayer->insightaimmode = aimonhist[numsamples - 1];
}
}
if (!lvIsPaused()) {
@@ -1436,10 +1438,9 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
aimoffhist[i] = !aimonhist[i];
}
#ifdef AVOID_UB
if (numsamples)
#endif
g_Vars.currentplayer->insightaimmode = aimonhist[numsamples - 1];
if (numsamples > 0) {
g_Vars.currentplayer->insightaimmode = aimonhist[numsamples - 1];
}
}
if (!lvIsPaused()) {
src/game/sight.c
+3 -3
View File
@@ -312,7 +312,7 @@ void sightTick(bool sighton)
if (g_Vars.currentplayer->lookingatprop.prop != g_Vars.currentplayer->trackedprops[0].prop) {
struct sndstate *handle;
handle = snd00010718(&handle, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_0007, 1, 1, -1, true);
handle = snd00010718(NULL, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_0007, 1, 1, -1, true);
trackedprop = &g_Vars.currentplayer->trackedprops[0];
@@ -338,7 +338,7 @@ void sightTick(bool sighton)
if (index >= 0) {
struct sndstate *handle;
handle = snd00010718(&handle, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_0007, 1, 1, -1, 1);
handle = snd00010718(NULL, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_0007, 1, 1, -1, 1);
trackedprop = &g_Vars.currentplayer->trackedprops[index];
@@ -361,7 +361,7 @@ void sightTick(bool sighton)
if (index >= 0) {
struct sndstate *handle;
handle = snd00010718(&handle, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_0007, 1, 1, -1, 1);
handle = snd00010718(NULL, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_0007, 1, 1, -1, 1);
trackedprop = &g_Vars.currentplayer->trackedprops[index];
src/include/types.h
-4
View File
@@ -541,8 +541,6 @@ struct modelrodata_type11 { // type 0x11
u32 unk0c;
u32 unk10;
void *unk14;
u32 unk18;
u32 unk1c;
};
struct modelrodata_toggle { // type 0x12
@@ -553,7 +551,6 @@ struct modelrodata_toggle { // type 0x12
struct modelrodata_positionheld { // type 0x15
struct coord pos;
s16 mtxindex;
s32 unk10;
};
struct modelrodata_stargunfire { // type 0x16
@@ -2853,7 +2850,6 @@ struct coverdefinition {
struct coord pos;
struct coord look;
u16 flags;
u16 unk1a;
};
struct cover {