summaryrefslogtreecommitdiffstats
path: root/src/core/re3.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-04 00:31:00 +0200
committeraap <aap@papnet.eu>2019-08-04 00:31:00 +0200
commita3e3527a3b8f260db285c76dc1044baab8a2f773 (patch)
tree17869d4d50729e13497f7769679bdec0fef0a069 /src/core/re3.cpp
parentMerge pull request #181 from Nick007J/master (diff)
downloadre3-a3e3527a3b8f260db285c76dc1044baab8a2f773.tar
re3-a3e3527a3b8f260db285c76dc1044baab8a2f773.tar.gz
re3-a3e3527a3b8f260db285c76dc1044baab8a2f773.tar.bz2
re3-a3e3527a3b8f260db285c76dc1044baab8a2f773.tar.lz
re3-a3e3527a3b8f260db285c76dc1044baab8a2f773.tar.xz
re3-a3e3527a3b8f260db285c76dc1044baab8a2f773.tar.zst
re3-a3e3527a3b8f260db285c76dc1044baab8a2f773.zip
Diffstat (limited to 'src/core/re3.cpp')
-rw-r--r--src/core/re3.cpp34
1 files changed, 7 insertions, 27 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 35b3cfa4..9681160f 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -14,6 +14,7 @@
#include "Streaming.h"
#include "PathFind.h"
#include "Boat.h"
+#include "Heli.h"
#include "Automobile.h"
#include "debugmenu_public.h"
@@ -318,6 +319,12 @@ DebugMenuPopulate(void)
DebugMenuAddCmd("Debug", "Toggle Comedy Controls", ToggleComedy);
DebugMenuAddCmd("Debug", "Place Car on Road", PlaceOnRoad);
+ DebugMenuAddVarBool8("Debug", "Catalina Heli On", (int8*)&CHeli::CatalinaHeliOn, nil);
+ DebugMenuAddCmd("Debug", "Catalina Fly By", CHeli::StartCatalinaFlyBy);
+ DebugMenuAddCmd("Debug", "Catalina Take Off", CHeli::CatalinaTakeOff);
+ DebugMenuAddCmd("Debug", "Catalina Fly Away", CHeli::MakeCatalinaHeliFlyAway);
+ DebugMenuAddVarBool8("Debug", "Script Heli On", (int8*)0x95CD43, nil);
+
DebugMenuAddVarBool8("Debug", "Show Ped Road Groups", (int8*)&gbShowPedRoadGroups, nil);
DebugMenuAddVarBool8("Debug", "Show Car Road Groups", (int8*)&gbShowCarRoadGroups, nil);
DebugMenuAddVarBool8("Debug", "Show Collision Lines", (int8*)&gbShowCollisionLines, nil);
@@ -347,29 +354,6 @@ delayedPatches10(int a, int b)
}
*/
-void __declspec(naked) HeadlightsFix()
-{
- static const float fMinusOne = -1.0f;
- _asm
- {
- fld [esp+708h-690h]
- fcomp fMinusOne
- fnstsw ax
- and ah, 5
- cmp ah, 1
- jnz HeadlightsFix_DontLimit
- fld fMinusOne
- fstp [esp+708h-690h]
-
-HeadlightsFix_DontLimit:
- fld [esp+708h-690h]
- fabs
- fld st
- push 0x5382F2
- retn
- }
-}
-
const int re3_buffsize = 1024;
static char re3_buff[re3_buffsize];
@@ -454,10 +438,6 @@ patch()
InjectHook(0x475E00, printf, PATCH_JUMP); // _Error
- // stolen from silentpatch (sorry)
- Patch<WORD>(0x5382BF, 0x0EEB);
- InjectHook(0x5382EC, HeadlightsFix, PATCH_JUMP);
-
// InterceptCall(&open_script_orig, open_script, 0x438869);
// InterceptCall(&RsEventHandler_orig, delayedPatches10, 0x58275E);