diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Game.cpp | 1 | ||||
| -rw-r--r-- | src/core/Pad.cpp | 9 | ||||
| -rw-r--r-- | src/core/config.h | 2 | ||||
| -rw-r--r-- | src/core/re3.cpp | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 92564289..9d8e4ce7 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -316,7 +316,6 @@ bool CGame::Initialise(const char* datFile) COcclusion::Init(); CCollision::Init(); CSetPieces::Init(); - TheText.Load(); CTheZones::Init(); CUserDisplay::Init(); CMessages::Init(); diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 99b9c8a8..97cc1786 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -518,9 +518,12 @@ void FlyingFishCheat(void) bool CControllerState::CheckForInput(void) { - return !!LeftStickX || !!LeftStickY || !!RightStickX || !!RightStickY || !!LeftShoulder1 || !!LeftShoulder2 || !!RightShoulder1 || !!RightShoulder2 || - !!DPadUp || !!DPadDown || !!DPadLeft || !!DPadRight || !!Start || !!Select || !!Square || !!Triangle || !!Cross || !!Circle || !!LeftShock || - !!RightShock; + return !!RightStickX || !!RightStickY || !!LeftStickX || !!LeftStickY + || !!DPadUp || !!DPadDown || !!DPadLeft || !!DPadRight + || !!Triangle || !!Cross || !!Circle || !!Square + || !!Start || !!Select + || !!LeftShoulder1 || !!LeftShoulder2 || !!RightShoulder1 || !!RightShoulder2 + || !!LeftShock || !!RightShock; } void diff --git a/src/core/config.h b/src/core/config.h index 7ba1a6fd..5459c336 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -257,7 +257,7 @@ enum Config { //#define MISSION_REPLAY // mobile feature #endif //#define SIMPLIER_MISSIONS // apply simplifications from mobile -//#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT +#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT #define SCRIPT_LOG_FILE_LEVEL 1 // 0 == no log, 1 == overwrite every frame, 2 == full log #ifndef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 6032fc4a..d49eff50 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -474,6 +474,8 @@ DebugMenuPopulate(void) DebugMenuAddCmd("Spawn", "Spawn PCJ 600", [](){ SpawnCar(MI_PCJ600); }); DebugMenuAddCmd("Spawn", "Spawn Faggio", [](){ SpawnCar(MI_FAGGIO); }); DebugMenuAddCmd("Spawn", "Spawn Freeway", [](){ SpawnCar(MI_FREEWAY); }); + DebugMenuAddCmd("Spawn", "Spawn Squalo", [](){ SpawnCar(MI_SQUALO); }); + DebugMenuAddCmd("Spawn", "Spawn Skimmer", [](){ SpawnCar(MI_SKIMMER); }); DebugMenuAddVarBool8("Render", "Draw hud", &CHud::m_Wants_To_Draw_Hud, nil); DebugMenuAddVarBool8("Render", "Backface Culling", &gBackfaceCulling, nil); |