Changeset 878

Timestamp:

Jun 2, 2013, 1:58:39 PM (11 years ago)

Author:

alloc

Message:

Daodan: Flatline fix

Location:

Daodan/src

Files:

• flatline/Flatline.c (modified) (3 diffs)
• flatline/Flatline_BSL.c (modified) (1 diff)
• flatline/Flatline_Hooks.c (modified) (3 diffs)
• flatline/Flatline_Hooks.h (modified) (1 diff)
• patches/Patches.c (modified) (2 diffs)

Daodan/src/flatline/Flatline.c

@@ -15 +15 @@
 
 uint32_t last1 = 0; uint32_t last2 = 0;
-player_info Players[MAX_PLAYERS] = {{0}, {0}, {0}, {0}};
+player_info Players[MAX_PLAYERS];
 player_info * PlayerList[MAX_CONNECTIONS] = {0};
 multiplayer_status MultiplayerStatus;
@@ -33 +33 @@
 
 
-short TRrAnimation_GetType(char* anim)
+short TRrAnimation_GetType(const void* anim)
 {
         return *(short*)(anim + 0x15A);
@@ -42 +42 @@
 {
         ONCC            *ONCC   = Char->ONCC;
-        void            *TRAC   = ONCC->TRAC;
+        void            *TRAC   = (void*)ONCC->TRAC;
         short   index = Char->Number;
         short animType;

Daodan/src/flatline/Flatline_BSL.c

@@ -211 +211 @@
 }
 
-uint16_t tele(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
+uint16_t ONICALL tele(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
 {
         ActiveCharacter *AC = ONrGetActiveCharacter(ONgGameState->PlayerCharacter);

Daodan/src/flatline/Flatline_Hooks.c

@@ -4 +4 @@
 
 //Don't modify this.
-char * FLrHook_DoorOpen( DoorObject *Door, Character *Char)
+char* ONICALL FLrHook_DoorOpen( DoorObject *Door, Character *Char)
 {
         int crashStop;          
@@ -22 +22 @@
         return (char*)(Door->Door.class);
 }
-short FLrHook_ConsoleActivate( void *inObject, Character *inCharacter )
+short ONICALL FLrHook_ConsoleActivate( void *inObject, Character *inCharacter )
 {
         if(server_started)
@@ -54 +54 @@
 */
 
-void FLrHook_Lasers( Character* Char )
+void ONICALL FLrHook_Lasers( Character* Char )
 {
         ONiDrawWeaponSight( Char );

Daodan/src/flatline/Flatline_Hooks.h

@@ -3 +3 @@
 
 #include "../Oni.h"
-char * FLrHook_DoorOpen( DoorObject *Door, Character *Char);
-short FLrHook_ConsoleActivate( void *inObject, Character *inCharacter );
-void FLrHook_Lasers( Character* PlayerChar );
+char* ONICALL FLrHook_DoorOpen( DoorObject *Door, Character *Char);
+short ONICALL FLrHook_ConsoleActivate( void *inObject, Character *inCharacter );
+void ONICALL FLrHook_Lasers( Character* PlayerChar );
 
 #endif

Daodan/src/patches/Patches.c

@@ -226 +226 @@
 }
 
-// Adds new BSL functions if usedaodanbsl is enabled
+// Adds new BSL functions
 void DD_Patch_DaodanInit()
 {
@@ -249 +249 @@
         DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
         DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
-
         
         //Flatline related stuff
         DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
         
-        DDrPatch_Int32((int*)(OniExe + 0x000B24D2), FLrSpawnHack);
+        DDrPatch_Int32((int*)(OniExe + 0x000B24D2), (unsigned int)FLrSpawnHack);
 
         DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);