mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-01 08:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Ryan Dwyer
2021-01-17 01:06:06 +10:00
parent 6fe7d5d77b
commit dd7927900f
28 changed files with 425 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/constants.h
+1 -5
View File
@@ -20,6 +20,7 @@
#define CHRRACE(chr) (chr ? chr->race : RACE_HUMAN)
#define FRAMEDURATION (1 / 60.0f)
#define IS4MB() (g_Is4Mb == true)
#define IS8MB() (g_Is4Mb != true)
#define PLAYERCOUNT() ((g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0) + (g_Vars.players[3] ? 1 : 0))
#define PLAYERCOUNT3012() ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0))
#define SECSTOTIME240(secs) (secs * 240)
@@ -575,11 +576,6 @@
#define COVERFLAG_0040 0x0040
#define COVERFLAG_0080 0x0080
#define CREDITFLAG_08 0x08
#define CREDITFLAG_NOTRANOUT 0x20 // Do not transition out - for titles which continue to the next
#define CREDITFLAG_NOTRANIN 0x40 // Do not transition in - for titles which continue from the previous
#define CREDITFLAG_MORE 0x80 // Load another credit to display on the current slide
// L/C/R = left/centered/right
// big/med/sml is the font size
#define CREDITSTYLE_R_BIG_R_MED 1
src/include/game/data/data_020df0.h
+1 -1
View File
@@ -213,7 +213,7 @@ extern u8 g_CutsceneSubtitles;
extern s32 g_ScreenSize;
extern s32 g_ScreenRatio;
extern u8 g_ScreenSplit;
extern s32 g_ScreenWidthMultiplier;
extern s32 g_ScaleX;
extern u32 var8007fac4;
extern u32 var8007fac8;
extern u32 var8007facc;
src/include/game/radar.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
Gfx *func0f18e5ac(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4);
Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4);
s32 radarGetTeamIndex(s32 team);
Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, u32 colour2, bool swapcolours);
Gfx *radarRender(Gfx *gdl);
src/include/gbiex.h
+3 -3
View File
@@ -106,10 +106,10 @@
/**
* gDPFillRectangle - a wrapper around gDPFillRectangle which applies
* g_ScreenWidthMultiplier to the X coordinates.
* g_ScaleX to the X coordinates.
*
* g_ScreenWidthMultiplier is normally 1, but 2 when using hi-res.
* g_ScaleX is normally 1, but 2 when using hi-res.
*/
#define gDPFillRectangleScaled(pkt, x1, y1, x2, y2) gDPFillRectangle(pkt, (x1) * g_ScreenWidthMultiplier, y1, (x2) * g_ScreenWidthMultiplier, y2)
#define gDPFillRectangleScaled(pkt, x1, y1, x2, y2) gDPFillRectangle(pkt, (x1) * g_ScaleX, y1, (x2) * g_ScaleX, y2)
#endif