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

Merge remote-tracking branch 'base/port' into port

Browse Source
This commit is contained in:
Raf committed 2023-09-05 04:40:45 +08:00
2 parents 488198b7da dde656c4c3
commit c08d8b6bcb
20 files changed
+175 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/chraction.c
+4
View File
@@ -6579,7 +6579,11 @@ bool chrHasLosToPosWasteful(struct chrdata *chr, struct coord *pos, RoomNum *roo
return chrHasLosToPos(chr, pos, rooms);
}
#ifdef PLATFORM_N64
return chrHasLosToPos(chr, pos, rooms);
#else
return false;
#endif
}
bool chrHasLosToProp(struct chrdata *chr, struct prop *prop)
src/game/explosions.c
+9 -3
View File
@@ -28,6 +28,12 @@
#include "data.h"
#include "types.h"
#ifdef PLATFORM_N64
#define SHAKE_TIME 6
#else
#define SHAKE_TIME 12
#endif
struct explosion *g_Explosions;
s32 g_MaxExplosions;
@@ -296,7 +302,7 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp
struct prop *expprop = propAllocate();
if (type != EXPLOSIONTYPE_16 && type != EXPLOSIONTYPE_BULLETHOLE) {
g_ExplosionShakeTotalTimer = 6;
g_ExplosionShakeTotalTimer = SHAKE_TIME;
}
if (expprop) {
@@ -554,8 +560,8 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp
*/
void explosionShake(void)
{
g_ExplosionShakeTotalTimer = 6;
g_ExplosionShakeIntensityTimer = 6;
g_ExplosionShakeTotalTimer = SHAKE_TIME;
g_ExplosionShakeIntensityTimer = SHAKE_TIME;
}
void explosionsUpdateShake(struct coord *arg0, struct coord *arg1, struct coord *arg2)
src/game/fmb.c
+10
View File
@@ -585,6 +585,16 @@ struct menuitem g_MainMenu4MbMenuItems[] = {
0,
(void *)&g_ChangeAgentMenuDialog,
},
#ifndef PLATFORM_N64
{
MENUITEMTYPE_SELECTABLE,
0,
MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_BIGFONT,
L_OPTIONS_110, // "Exit Game"
0x00000007,
(void *)&g_ExitGameMenuDialog,
},
#endif
{ MENUITEMTYPE_END },
};
src/game/game_1531a0.c
+3 -3
View File
@@ -341,7 +341,7 @@ void textReset(void)
textLoadFont(REF_SEG _fonthandelgothiclgSegmentRomStart, REF_SEG _fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false);
}
textLoadFont(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false);
textLoadFont(REF_SEG _fonthandelgothicxsSegmentRomStart, REF_SEG _fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false);
#elif VERSION >= VERSION_PAL_BETA
textLoadFont(REF_SEG _fontnumericSegmentRomStart, REF_SEG _fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false);
textLoadFont(REF_SEG _fonthandelgothicxsSegmentRomStart, REF_SEG _fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false);
@@ -394,7 +394,7 @@ Gfx *text0f153628(Gfx *gdl)
}
#endif
else {
gDPSetTextureFilter(gdl++, G_TF_BILERP);
gDPSetTextureFilter(gdl++, TEX_FILTER_2D);
}
return gdl;
@@ -1790,7 +1790,7 @@ Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fon
(*x + curchar->width) * 4 + var8007fadc,
G_TX_RENDERTILE,
var8007fae8 + 32,
((curchar->height - 1) << 5) + var8007fae4 + 32,
((curchar->height) << 5) + var8007fae4 + 32,
1024,
65536 - 1024 / var8007fad0);
} else {
src/game/lang.c
+3 -3
View File
@@ -290,7 +290,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint)
g_JpnCacheCacheItems[freeindexsingle].codepoint = codepoint;
dmaExec((u8 *) (freeindexsingle * (TMUL * 0x0c) + (romptr_t) &g_JpnCharCachePixels[0]),
(romptr_t) &_fontjpnSegmentRomStart + ((codepoint * TMUL) * 0xc + TMUL * (24 * 0xc)),
(romptr_t) REF_SEG _fontjpnSegmentRomStart + ((codepoint * TMUL) * 0xc + TMUL * (24 * 0xc)),
TMUL * 0x0c);
return &g_JpnCharCachePixels[TMUL * freeindexsingle];
@@ -311,7 +311,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint)
g_JpnCacheCacheItems[freeindexsingle].ttl = 2;
g_JpnCacheCacheItems[freeindexsingle].codepoint = codepoint >> 1;
dmaExec(&g_JpnCharCachePixels[freeindexsingle * 8], (romptr_t) &_fontjpnsingleSegmentRomStart + (codepoint >> SHIFTAMOUNT) * 0x60, 0x60);
dmaExec(&g_JpnCharCachePixels[freeindexsingle * 8], (romptr_t) REF_SEG _fontjpnsingleSegmentRomStart + (codepoint >> SHIFTAMOUNT) * 0x60, 0x60);
return &g_JpnCharCachePixels[freeindexsingle * 8];
}
@@ -322,7 +322,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint)
g_JpnCacheCacheItems[freeindexmulti + 0].codepoint = codepoint >> 1;
g_JpnCacheCacheItems[freeindexmulti + 1].codepoint = codepoint >> 1;
dmaExec(&g_JpnCharCachePixels[freeindexmulti * 8], (romptr_t) &_fontjpnmultiSegmentRomStart + ((codepoint & 0x1fff) >> SHIFTAMOUNT) * 0x80, 0x80);
dmaExec(&g_JpnCharCachePixels[freeindexmulti * 8], (romptr_t) REF_SEG _fontjpnmultiSegmentRomStart + ((codepoint & 0x1fff) >> SHIFTAMOUNT) * 0x80, 0x80);
return &g_JpnCharCachePixels[freeindexmulti * 8];
}
src/game/langinit.c
+9
View File
@@ -7,6 +7,15 @@
u16 *g_FrameBuffers[NUM_FRAMEBUFFERS];
#ifndef PLATFORM_N64
#if VERSION >= VERSION_JPN_FINAL
u32 var8009d010pf[4];
s32 g_JpnMaxCacheItems;
#elif VERSION >= VERSION_PAL_BETA
u32 var8009d010pf[4];
#endif
#endif
void langInit(void)
{
s32 i;
src/game/menu.c
+4 -4
View File
@@ -3011,7 +3011,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l
textMeasure(&textheight, &textwidth, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
x = dialogleft - 1;
x = dialogleft - 2;
y = (dialogtop + dialogbottom) / 2 - textwidth - 3;
if (y < dialogtop) {
@@ -4624,11 +4624,11 @@ void menuProcessInput(void)
if (buttonsnow & BUTTON_RADIAL) {
inputs.select = 1;
}
// this will naturally feel nice w/ a switch layout
// with the default mapping for weapon-back
if (buttonsnow & BUTTON_WPNBACK) {
inputs.select = 1;
inputs.back = 1;
}
#endif
if (buttonsnow & B_BUTTON) {
inputs.back = 1;
src/game/tex.c
+3
View File
@@ -39,6 +39,9 @@ s32 g_TexLutMode;
u32 var800ab5b4;
struct tilestate g_TexTileStates[8];
struct tilesize g_TexTileSizes[8];
#ifndef PLATFORM_N64
u32 g_TexFilter2D = G_TF_BILERP;
#endif
// Default
u16 g_SurfaceTypeDefaultSounds[] = { SFX_HIT_STONE_8087, SFX_HIT_STONE_8088 };
src/game/texreset.c
+3
View File
@@ -136,6 +136,9 @@ void texReset(void)
// reset backend texture cache
videoResetTextureCache();
// get backend texture settings
g_TexFilter2D = videoGetTextureFilter2D() ? G_TF_BILERP : G_TF_POINT;
#endif
g_TexWords = mempAlloc(ALIGN16(g_TexNumConfigs * 4), MEMPOOL_STAGE);
src/include/data.h
+11
View File
@@ -528,12 +528,23 @@ extern struct menudialogdef g_HtDetailsMenuDialog;
extern struct menudialogdef g_HtFailedMenuDialog;
extern struct menudialogdef g_HtCompletedMenuDialog;
extern struct menudialogdef g_HangarListMenuDialog;
#ifndef PLATFORM_N64
extern f32 g_PlayerCrosshairSway;
extern f32 g_PlayerDefaultFovY;
extern s32 g_PlayerMouseAimMode;
extern f32 g_PlayerMouseAimSpeedX;
extern f32 g_PlayerMouseAimSpeedY;
extern f32 g_ViShakeIntensityMult;
extern u32 g_TexFilter2D;
#define TEX_FILTER_2D g_TexFilter2D
#else
#define TEX_FILTER_2D G_TF_BILERP
#endif
#endif
src/include/game/mainmenu.h
+3
View File
@@ -10,6 +10,9 @@ extern struct menudialogdef g_AcceptMissionMenuDialog;
extern struct menudialogdef g_PreAndPostMissionBriefingMenuDialog;
extern struct menudialogdef g_RetryMissionMenuDialog;
extern struct menudialogdef g_NextMissionMenuDialog;
#ifndef PLATFORM_N64
extern struct menudialogdef g_ExitGameMenuDialog;
#endif
char *menuTextCurrentStageName(struct menuitem *item);
char *soloMenuTextDifficulty(struct menuitem *item);
src/lib/vi.c
+12
View File
@@ -14,6 +14,9 @@
#include "lib/mtx.h"
#include "data.h"
#include "types.h"
#ifndef PLATFORM_N64
#include "video.h"
#endif
#define TO_U16_A(x) ((u16)(x))
#define TO_U16_B(x) ((x) & 0xffff)
@@ -280,6 +283,10 @@ void viHandleRetrace(void)
osSetIntMask(prevmask);
#endif
#ifndef PLATFORM_N64
videoSetWindowOffset(0, offset);
#endif
osViSetMode(var8008dd60[1 - var8005ce74]);
osViBlack(g_ViUnblackTimer);
osViSetXScale(g_ViXScalesBySlot[1 - var8005ce74]);
@@ -460,8 +467,13 @@ void viShake(f32 intensity)
intensity = 0;
}
#ifdef PLATFORM_N64
g_ViShakeIntensity = intensity;
g_ViShakeTimer = 10;
#else
g_ViShakeIntensity = intensity * g_ViShakeIntensityMult;
g_ViShakeTimer = 20;
#endif
}
void viSetMode(s32 mode)