Changeset 992


Ignore:
Timestamp:
Apr 5, 2014, 12:19:11 PM (11 years ago)
Author:
alloc
Message:

Daodan: Removed unused MSVC tree, build folders; reorganized source layout; removed Flatline from current Daodan

Location:
Daodan
Files:
12 added
14 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • Daodan/makefile

    r990 r992  
    11SRC = src
    22TARGET = build
    3 SUBFOLDERS = patches flatline beaengine
     3SUBFOLDERS = patches beaengine
    44
    55DEF = BEA_ENGINE_STATIC

  • Daodan/src/Daodan.c

    r990 r992  
    1515#include "_Version.h"
    1616
    17 #include "Oni.h"
    18 
    19 #include "Oni_GL.h"
     17#include "Oni/Oni.h"
    2018
    2119HMODULE DDrDLLModule;

  • Daodan/src/Daodan.h

    r894 r992  
    66#include "stdint.h"
    77
    8 #define ONICALL __fastcall
    9 #define UUmType(t) typedef struct t t;
    10 
    11 #define DDmAssert(expr) assert(expr);
    12 
    13 typedef unsigned char UUtBool;
    14 #define UUcTrue  ((UUtBool) 1)
    15 #define UUcFalse ((UUtBool) 0)
    16 
    17 typedef unsigned short UUtError;
    18 #define UUcError_None ((UUtError) 0)
    19 
    20 typedef unsigned char UUtUns8;
    21 typedef unsigned short UUtUns16;
    22 typedef unsigned int UUtUns32;
    23 typedef char UUtInt8;
    24 typedef short UUtInt16;
    25 typedef int UUtInt32;
     8#include "Oni/Oni.h"
    269
    2710extern HMODULE DDrDLLModule;

  • Daodan/src/Daodan_BSL.c

    r882 r992  
    88#include "Daodan_Patch.h"
    99#include "Daodan_Console.h"
    10 #include "BFW_ScriptLang.h"
    11 #include "Oni.h"
    12 #include "Oni_Character.h"
    13 #include "Oni_GL.h"
     10
     11#include "Oni/Oni.h"
     12
    1413#include "Daodan_Character.h"
    1514

  • Daodan/src/Daodan_Character.c

    r739 r992  
    11#include <stdlib.h>
    22#include "Daodan_Character.h"
    3 #include "Oni_Character.h"
    4 #include "Oni.h"
     3
     4#include "Oni/Oni.h"
    55
    66int DDr_TeamToTeamID(const char* team_string) //Already something like this in the engine, but I'm reimplementing it...

  • Daodan/src/Daodan_Cheater.c

    r837 r992  
    22#include "stdint.h"
    33#include <math.h>
    4 #include "Oni.h"
    5 #include "Oni_Character.h"
     4
     5#include "Oni/Oni.h"
    66
    77#include "_Version.h"
    … …  
    99#include "Daodan.h"
    1010#include "Daodan_Cheater.h"
     11
    1112union MSVC_EVIL_FLOAT_HACK
    1213{

  • Daodan/src/Daodan_Config.c

    r990 r992  
    77#include "Daodan_Utility.h"
    88
    9 #include "Oni_Symbols.h"
     9#include "Oni/Oni.h"
    1010
    1111#include "Inifile_Reader.h"

  • Daodan/src/Daodan_Console.c

    r692 r992  
    33
    44#include "Daodan_Console.h"
    5 #include "Oni_Symbols.h"
     5#include "Oni/Oni.h"
    66
    77void DDrConsole_Print(const char* text)

  • Daodan/src/Daodan_GL.c

    r893 r992  
    11#include <windows.h>
    22#include <math.h>
    3 
    4 #include "Oni.h"
     3#include <GL/gl.h>
     4#include <GL/glu.h>
     5
     6#include "Oni/Oni.h"
     7
    58#include "Daodan_Config.h"
    69#include "Daodan_Utility.h"
    7 #include <GL/gl.h>
    8 #include <GL/glu.h>
    910#include "Daodan_Win32.h"
    10 
    1111#include "Daodan_GL.h"
    12 #include "Oni_GL.h"
    1312
    1413static const M3tDisplayMode daodan_reslist[] =

  • Daodan/src/Daodan_GL.h

    r705 r992  
    33
    44#include "Daodan.h"
    5 #include "BFW_Motoko_Draw.h"
     5#include "Oni/Oni.h"
    66
    77unsigned short ONICALL DD_GLrEnumerateDisplayModes(M3tDisplayMode* modes);

  • Daodan/src/Daodan_Utility.c

    r692 r992  
    44
    55#include "Daodan_Utility.h"
    6 #include "Oni.h"
     6#include "Oni/Oni.h"
    77
    88const double fps = 60.0;

  • Daodan/src/Daodan_Win32.c

    r838 r992  
    55#include "Daodan_Win32.h"
    66
    7 #include "BFW_Utility.h"
    8 #include "Oni.h"
     7#include "Oni/Oni.h"
    98
    109

  • Daodan/src/Daodan_Win32.h

    r705 r992  
    33
    44#include "Daodan.h"
    5 #include "Oni.h"
     5#include "Oni/Oni.h"
    66
    77UUtError ONICALL DD_ONrPlatform_Initialize(ONtPlatformData *PlatformData);

  • Daodan/src/guitest.c

    r990 r992  
    33LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
    44
    5 guitest(HMODULE hInstance, int nCmdShow)
     5void guitest(HMODULE hInstance, int nCmdShow)
    66{
    77        MSG  msg;   
    … …  
    3131                DispatchMessage(&msg);
    3232        }
    33 
    34         return (int) msg.wParam;
    3533}
    3634

  • Daodan/src/patches/Patches.c

    r990 r992  
    1010#include "../Daodan_Utility.h"
    1111#include "../Daodan_Win32.h"
    12 #include "../flatline/Flatline_BSL.h"
    13 #include "../flatline/Flatline_Hooks.h"
    14 #include "../Oni.h"
    15 #include "objt.h"
     12
     13#include "../Oni/Oni.h"
    1614
    1715typedef int (__cdecl *CHINESEPROC)(DWORD ThreadId);
    … …  
    1917// Hooked WMrSlider_SetRange() in ONiOGU_Options_InitDialog. Disables a gamma
    2018// slider in windowed mode.
    21 static void ONICALL DD_ONiOGU_GammaSlider_SetRange(WMtWindow* window, int min_value, int max_value)
     19static void ONICALL DD_ONiOGU_GammaSlider_SetRange(void* window, int min_value, int max_value)
    2220{
    2321        WMrWindow_SetEnabled(window, M3gResolutionSwitch && opt_gamma);
    … …  
    6563
    6664
    67 void ONICALL DDrShowResumeButton(WMtWindow* window, int visibility)
     65void ONICALL DDrShowResumeButton(void* window, int visibility)
    6866{
    6967        if (visibility)
    … …  
    7472
    7573/* Options always visible patch */
    76 void ONICALL DDrShowOptionsButton(WMtWindow* window, int visibility)
     74void ONICALL DDrShowOptionsButton(void* window, int visibility)
    7775{
    7876        WMrWindow_SetVisible(window, 1);
    … …  
    8381        if (opt_usedaodanbsl)
    8482                SLrDaodan_Initialize();
    85         if (patch_flatline)
    86                 SLrFlatline_Initialize();
    8783}
    8884
    … …  
    354350        // Replace start of OniParseCommandLine with XOR eax,eax; RET
    355351        DDrPatch_Int32 ((int*)(OniExe + 0x000d3570), 0x00c3c033);
    356 }
    357 
    358 // Enable flatline multiplayer code
    359 void DD_Patch_Flatline()
    360 {
    361         DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
    362        
    363         //Flatline related stuff
    364         DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
    365        
    366         DDrPatch_Int32((int*)(OniExe + 0x000B24D2), (unsigned int)FLrSpawnHack);
    367 
    368         DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);
    369 
    370         DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen);
    371         DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
    372352}
    373353
    … …  
    737717        DD_Patch_PrintWarning();
    738718
    739 
    740719        DD_Patch_ShowNames();
    741 /*
    742         DD_Patch_ShowTriggerVolumes();
    743         DD_Patch_ShowFlags();
    744 */
    745         if (patch_flatline)
    746                 DD_Patch_Flatline();
    747720
    748721        return true;
Note: See TracChangeset for help on using the changeset viewer.