Changeset 987

Timestamp:

Mar 19, 2014, 1:44:30 PM (11 years ago)

Author:

alloc

Message:

Daodan: Made symbols const

Location:

Daodan/src

Files:

• Oni_Symbols.h (modified) (5 diffs)
• patches/Patches.c (modified) (2 diffs)

Daodan/src/Oni_Symbols.h

@@ -21 +21 @@
 #define BFgDebugFileEnable      (*((bool*)0x0055c8d0))
 
-// Parameter 1 to COrTextArea_Print. Context pointer?
-#define COgConsoleLines         (*((uint32_t*)0x005cb468))
-
 // Command line instance
 #define COgCommandLine          (*((void**)0x00571b74))
@@ -99 +96 @@
 
 
-#define DefFunc( type, name, callingconvention, args, address) typedef type ( callingconvention * _##name ) args; static _##name name = (_##name)address
+#define DefFunc( type, name, callingconvention, args, address) typedef type ( callingconvention * _##name ) args; static const _##name name = (_##name)address
 
 // Orig timing functions, replaced by DDrMachineTime_* if option "usegettickcount" is enabled
@@ -147 +144 @@
 
 DefFunc(void, ONrGameState_Timer_Start, ONICALL, (char* function, int time), 0x004FD370);
+DefFunc(void, ONrGameState_HandleUtilityInput, ONICALL, (const void* inInput), 0x004f6200);
+DefFunc(uint8_t, ONrDebugKey_WentDown, ONICALL, (uint32_t inKey), 0x005050d0);
 
 // Get active (player?) character
@@ -160 +159 @@
 
 // Print message to console
-DefFunc(void, COrTextArea_Print, ONICALL, (uint32_t area, uint32_t priority, uint32_t textshade, uint32_t textshadowshade, const char* text, uint32_t unk_alwaws_0, uint32_t fadetime), 0x00431340);
+DefFunc(void, COrTextArea_Print, ONICALL, (void* area, uint32_t priority, uint32_t textshade, uint32_t textshadowshade, const char* text, uint32_t unk_alwaws_0, uint32_t fadetime), 0x00431340);
 DefFunc(int16_t, COrTextArea_Resize, ONICALL, (void* inTextArea, UUtRect* inBounds, int16_t inNumTextEntries), 0x00431460);
 
@@ -204 +203 @@
 
 // Draw text on the screen
-DefFunc(int16_t, TSrContext_DrawText, ONICALL, (uint32_t TSrContext, char* Text, char alpha, uint32_t usuallyzero, void* pRect), 0x0042DF00);
+DefFunc(int16_t, TSrContext_DrawText, ONICALL, (void* TSrContext, char* Text, char alpha, uint32_t usuallyzero, void* pRect), 0x0042DF00);
 DefFunc(int16_t, TSrContext_New, ONICALL, (void* FontInstance, int size, int hthsik1,int hthsik2,int hthsik3, void* TSrContext), 0x0042EA30);
 DefFunc(int16_t, TSrContext_SetFontSize, ONICALL, (void* ioTextContext, uint16_t inSize), 0x0042ED50);

Daodan/src/patches/Patches.c

@@ -179 +179 @@
 }
 
+_ONrGameState_HandleUtilityInput Oni_ONrGameState_HandleUtilityInput = (_ONrGameState_HandleUtilityInput)0;
+void ONICALL DD_ONrGameState_HandleUtilityInput(const void* inInput)
+{
+        Oni_ONrGameState_HandleUtilityInput(inInput);
+        
+        if (ONrDebugKey_WentDown(7)) {
+                OBJgTriggerVolume_Visible = !OBJgTriggerVolume_Visible;
+        }
+}
 
 
@@ -497 +506 @@
 {
         Oni_ONrMechanics_Register = DDrPatch_MakeDetour((void*)ONrMechanics_Register, (void*)DD_ONrMechanics_Register);
+        Oni_ONrGameState_HandleUtilityInput = DDrPatch_MakeDetour((void*)ONrGameState_HandleUtilityInput, (void*)DD_ONrGameState_HandleUtilityInput);
 }