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

Set names for menucolourpalette properties

Browse Source
This commit is contained in:
Ryan Dwyer
2023-05-29 18:31:26 +10:00
parent 953afe9925
commit 0ebce0dcf9
6 changed files with 180 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/constants.h
+1 -1
View File
@@ -59,7 +59,7 @@
#define IS4MB() (g_Is4Mb == true)
#define IS8MB() (g_Is4Mb != true)
#define LINEHEIGHT (VERSION == VERSION_JPN_FINAL ? 14 : 11)
#define MIXCOLOUR(dialog, property) dialog->transitionfrac < 0.0f ? g_MenuColourPalettes[dialog->type].property : colourBlend(g_MenuColourPalettes[dialog->type2].property, g_MenuColourPalettes[dialog->type].property, dialog->colourweight)
#define MIXCOLOUR(dialog, property) dialog->transitionfrac < 0.0f ? g_MenuColours[dialog->type].property : colourBlend(g_MenuColours[dialog->type2].property, g_MenuColours[dialog->type].property, dialog->colourweight)
#define MPCHR(index) ((index) < MAX_PLAYERS ? &g_PlayerConfigsArray[index].base : &g_BotConfigsArray[(index) - MAX_PLAYERS].base)
#define RANDOMFRAC() (random() * (1.0f / U32_MAX))
#define SECSTOTIME240(secs) (secs * 240)
src/include/game/menu.h
+3 -3
View File
@@ -4,9 +4,9 @@
#include "data.h"
#include "types.h"
extern const struct menucolourpalette g_MenuColourPalettes[];
extern const struct menucolourpalette g_MenuColourPalettes2[];
extern const struct menucolourpalette g_MenuColourPalettes3[];
extern const struct menucolourpalette g_MenuColours[];
extern const struct menucolourpalette g_MenuWave1Colours[];
extern const struct menucolourpalette g_MenuWave2Colours[];
void menuTick(void);
src/include/types.h
+15 -15
View File
@@ -5526,21 +5526,21 @@ struct menurendercontext {
};
struct menucolourpalette {
/*0x00*/ u32 unk00;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unfocused;
/*0x1c*/ u32 disabled;
/*0x20*/ u32 focused;
/*0x24*/ u32 checkedunfocused;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x00*/ u32 dialog_border1;
/*0x04*/ u32 dialog_titlebg;
/*0x08*/ u32 dialog_border2;
/*0x0c*/ u32 dialog_titlefg;
/*0x10*/ u32 dialog_bodybg;
/*0x14*/ u32 unused14;
/*0x18*/ u32 item_unfocused;
/*0x1c*/ u32 item_disabled;
/*0x20*/ u32 item_focused_inner;
/*0x24*/ u32 checkbox_checked_unfocused;
/*0x28*/ u32 item_focused_outer;
/*0x2c*/ u32 listgroup_headerbg;
/*0x30*/ u32 listgroup_headerfg;
/*0x34*/ u32 unused34;
/*0x38*/ u32 unused38;
};
struct bytelist {