Changeset 878 for Daodan


Ignore:
Timestamp:
Jun 2, 2013, 1:58:39 PM (11 years ago)
Author:
alloc
Message:

Daodan: Flatline fix

Location:
Daodan/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Daodan/src/flatline/Flatline.c

    r877 r878  
    1515
    1616uint32_t last1 = 0; uint32_t last2 = 0;
    17 player_info Players[MAX_PLAYERS] = {{0}, {0}, {0}, {0}};
     17player_info Players[MAX_PLAYERS];
    1818player_info * PlayerList[MAX_CONNECTIONS] = {0};
    1919multiplayer_status MultiplayerStatus;
     
    3333
    3434
    35 short TRrAnimation_GetType(char* anim)
     35short TRrAnimation_GetType(const void* anim)
    3636{
    3737        return *(short*)(anim + 0x15A);
     
    4242{
    4343        ONCC            *ONCC   = Char->ONCC;
    44         void            *TRAC   = ONCC->TRAC;
     44        void            *TRAC   = (void*)ONCC->TRAC;
    4545        short   index = Char->Number;
    4646        short animType;
  • Daodan/src/flatline/Flatline_BSL.c

    r877 r878  
    211211}
    212212
    213 uint16_t tele(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
     213uint16_t ONICALL tele(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
    214214{
    215215        ActiveCharacter *AC = ONrGetActiveCharacter(ONgGameState->PlayerCharacter);
  • Daodan/src/flatline/Flatline_Hooks.c

    r877 r878  
    44
    55//Don't modify this.
    6 char * FLrHook_DoorOpen( DoorObject *Door, Character *Char)
     6char* ONICALL FLrHook_DoorOpen( DoorObject *Door, Character *Char)
    77{
    88        int crashStop;         
     
    2222        return (char*)(Door->Door.class);
    2323}
    24 short FLrHook_ConsoleActivate( void *inObject, Character *inCharacter )
     24short ONICALL FLrHook_ConsoleActivate( void *inObject, Character *inCharacter )
    2525{
    2626        if(server_started)
     
    5454*/
    5555
    56 void FLrHook_Lasers( Character* Char )
     56void ONICALL FLrHook_Lasers( Character* Char )
    5757{
    5858        ONiDrawWeaponSight( Char );
  • Daodan/src/flatline/Flatline_Hooks.h

    r877 r878  
    33
    44#include "../Oni.h"
    5 char * FLrHook_DoorOpen( DoorObject *Door, Character *Char);
    6 short FLrHook_ConsoleActivate( void *inObject, Character *inCharacter );
    7 void FLrHook_Lasers( Character* PlayerChar );
     5char* ONICALL FLrHook_DoorOpen( DoorObject *Door, Character *Char);
     6short ONICALL FLrHook_ConsoleActivate( void *inObject, Character *inCharacter );
     7void ONICALL FLrHook_Lasers( Character* PlayerChar );
    88
    99#endif
  • Daodan/src/patches/Patches.c

    r877 r878  
    226226}
    227227
    228 // Adds new BSL functions if usedaodanbsl is enabled
     228// Adds new BSL functions
    229229void DD_Patch_DaodanInit()
    230230{
     
    249249        DDrPatch_NOOP((char*)(OniExe + 0x000E1957), 6 );
    250250        DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
    251 
    252251       
    253252        //Flatline related stuff
    254253        DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
    255254       
    256         DDrPatch_Int32((int*)(OniExe + 0x000B24D2), FLrSpawnHack);
     255        DDrPatch_Int32((int*)(OniExe + 0x000B24D2), (unsigned int)FLrSpawnHack);
    257256
    258257        DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);
Note: See TracChangeset for help on using the changeset viewer.