mirror of
https://github.com/halpz/re3.git
synced 2025-07-30 08:20:27 +00:00
Merge remote-tracking branch 'origin/master' into miami
# Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp
This commit is contained in:
@ -1,4 +1,7 @@
|
||||
#pragma once
|
||||
#ifdef PS2_MENU
|
||||
#include "Frontend_PS2.h"
|
||||
#else
|
||||
|
||||
#include "Sprite2d.h"
|
||||
|
||||
@ -94,20 +97,6 @@
|
||||
#define CONTSETUP_BACK_BOTTOM 122.0f
|
||||
#define CONTSETUP_BACK_HEIGHT 25.0f
|
||||
|
||||
enum eLanguages
|
||||
{
|
||||
LANGUAGE_AMERICAN,
|
||||
LANGUAGE_FRENCH,
|
||||
LANGUAGE_GERMAN,
|
||||
LANGUAGE_ITALIAN,
|
||||
LANGUAGE_SPANISH,
|
||||
#ifdef MORE_LANGUAGES
|
||||
LANGUAGE_POLISH,
|
||||
LANGUAGE_RUSSIAN,
|
||||
LANGUAGE_JAPANESE,
|
||||
#endif
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
MENUALIGN_LEFT = 1,
|
||||
@ -591,6 +580,19 @@ public:
|
||||
int32 m_nSelectedScreenMode;
|
||||
#endif
|
||||
|
||||
enum LANGUAGE
|
||||
{
|
||||
LANGUAGE_AMERICAN,
|
||||
LANGUAGE_FRENCH,
|
||||
LANGUAGE_GERMAN,
|
||||
LANGUAGE_ITALIAN,
|
||||
LANGUAGE_SPANISH,
|
||||
#ifdef MORE_LANGUAGES
|
||||
LANGUAGE_POLISH,
|
||||
LANGUAGE_RUSSIAN,
|
||||
LANGUAGE_JAPANESE,
|
||||
#endif
|
||||
};
|
||||
bool GetIsMenuActive() {return !!m_bMenuActive;}
|
||||
|
||||
static uint8 m_PrefsStereoMono;
|
||||
@ -666,3 +668,6 @@ VALIDATE_SIZE(CMenuManager, 0x688);
|
||||
#endif
|
||||
|
||||
extern CMenuManager FrontEndMenuManager;
|
||||
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user