thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge m_menu.h

Browse source 
(since we will probably want the lua skincolor menu stuff when we're trying to make it compile)
This commit is contained in:
Sally Coolatta 2020-08-09 20:36:59 -04:00
parent a5313e34fe
commit 1c6c874152
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/m_menu.h
View file

@ -448,14 +448,10 @@ void Screenshot_option_Onchange(void);
// Addons menu updating // Addons menu updating
void Addons_option_Onchange(void); void Addons_option_Onchange(void);
<<<<<<< HEAD
void M_ReplayHut(INT32 choice); void M_ReplayHut(INT32 choice);
void M_SetPlaybackMenuPointer(void); void M_SetPlaybackMenuPointer(void);
INT32 HU_GetHighlightColor(void); INT32 HU_GetHighlightColor(void);
=======
// Moviemode menu updating
void Moviemode_option_Onchange(void);
// Player Setup menu colors linked list // Player Setup menu colors linked list
typedef struct menucolor_s { typedef struct menucolor_s {
@ -473,7 +469,6 @@ UINT16 M_GetColorBefore(UINT16 color);
UINT16 M_GetColorAfter(UINT16 color); UINT16 M_GetColorAfter(UINT16 color);
void M_InitPlayerSetupColors(void); void M_InitPlayerSetupColors(void);
void M_FreePlayerSetupColors(void); void M_FreePlayerSetupColors(void);
>>>>>>> srb2/next
// These defines make it a little easier to make menus // These defines make it a little easier to make menus
#define DEFAULTMENUSTYLE(id, header, source, prev, x, y)\ #define DEFAULTMENUSTYLE(id, header, source, prev, x, y)\
@ -535,13 +530,8 @@ void M_FreePlayerSetupColors(void);
sizeof (source)/sizeof (menuitem_t),\ sizeof (source)/sizeof (menuitem_t),\
&MainDef,\ &MainDef,\
source,\ source,\
<<<<<<< HEAD
M_DrawServerMenu,\ M_DrawServerMenu,\
24,40,\ 24,40,\
=======
M_DrawLevelPlatterMenu,\
0,0,\
>>>>>>> srb2/next
0,\ 0,\
NULL\ NULL\
} }