Changeset 992 for Daodan/src

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/src

Files:

• BFW_Motoko_Draw.h (deleted)
• BFW_ScriptLang.h (deleted)
• BFW_Utility.h (deleted)
• Daodan.c (modified) (1 diff)
• Daodan.h (modified) (1 diff)
• Daodan_BSL.c (modified) (1 diff)
• Daodan_Character.c (modified) (1 diff)
• Daodan_Cheater.c (modified) (2 diffs)
• Daodan_Config.c (modified) (1 diff)
• Daodan_Console.c (modified) (1 diff)
• Daodan_GL.c (modified) (1 diff)
• Daodan_GL.h (modified) (1 diff)
• Daodan_Utility.c (modified) (1 diff)
• Daodan_Win32.c (modified) (1 diff)
• Daodan_Win32.h (modified) (1 diff)
• Oni (added)
• Oni.h (deleted)
• Oni/BFW_Motoko_Draw.h (added)
• Oni/BFW_ScriptLang.h (added)
• Oni/Character.h (added)
• Oni/GL.h (added)
• Oni/GameState.h (added)
• Oni/OBJt.h (added)
• Oni/Oni.h (added)
• Oni/Symbols_Func.h (added)
• Oni/Symbols_Var.h (added)
• Oni/stdtypes.h (added)
• Oni_Character.h (deleted)
• Oni_GL.h (deleted)
• Oni_GameState.h (deleted)
• Oni_Symbols.h (deleted)
• flatline (deleted)
• guitest.c (modified) (2 diffs)
• patches/Patches.c (modified) (7 diffs)
• patches/objt.h (deleted)

Daodan/src/Daodan.c

@@ -15 +15 @@
 #include "_Version.h"
 
-#include "Oni.h"
-
-#include "Oni_GL.h"
+#include "Oni/Oni.h"
 
 HMODULE DDrDLLModule;

Daodan/src/Daodan.h

@@ -6 +6 @@
 #include "stdint.h"
 
-#define ONICALL __fastcall
-#define UUmType(t) typedef struct t t;
-
-#define DDmAssert(expr) assert(expr);
-
-typedef unsigned char UUtBool;
-#define UUcTrue  ((UUtBool) 1)
-#define UUcFalse ((UUtBool) 0)
-
-typedef unsigned short UUtError;
-#define UUcError_None ((UUtError) 0)
-
-typedef unsigned char UUtUns8;
-typedef unsigned short UUtUns16;
-typedef unsigned int UUtUns32;
-typedef char UUtInt8;
-typedef short UUtInt16;
-typedef int UUtInt32;
+#include "Oni/Oni.h"
 
 extern HMODULE DDrDLLModule;

Daodan/src/Daodan_BSL.c

@@ -8 +8 @@
 #include "Daodan_Patch.h"
 #include "Daodan_Console.h"
-#include "BFW_ScriptLang.h"
-#include "Oni.h"
-#include "Oni_Character.h"
-#include "Oni_GL.h"
+
+#include "Oni/Oni.h"
+
 #include "Daodan_Character.h"
 

Daodan/src/Daodan_Character.c

@@ -1 +1 @@
 #include <stdlib.h>
 #include "Daodan_Character.h"
-#include "Oni_Character.h"
-#include "Oni.h"
+
+#include "Oni/Oni.h"
 
 int DDr_TeamToTeamID(const char* team_string) //Already something like this in the engine, but I'm reimplementing it...

Daodan/src/Daodan_Cheater.c

@@ -2 +2 @@
 #include "stdint.h"
 #include <math.h>
-#include "Oni.h"
-#include "Oni_Character.h"
+
+#include "Oni/Oni.h"
 
 #include "_Version.h"
@@ -9 +9 @@
 #include "Daodan.h"
 #include "Daodan_Cheater.h"
+
 union MSVC_EVIL_FLOAT_HACK
 {

Daodan/src/Daodan_Config.c

@@ -7 +7 @@
 #include "Daodan_Utility.h"
 
-#include "Oni_Symbols.h"
+#include "Oni/Oni.h"
 
 #include "Inifile_Reader.h"

Daodan/src/Daodan_Console.c

@@ -3 +3 @@
 
 #include "Daodan_Console.h"
-#include "Oni_Symbols.h"
+#include "Oni/Oni.h"
 
 void DDrConsole_Print(const char* text)

Daodan/src/Daodan_GL.c

@@ -1 +1 @@
 #include <windows.h>
 #include <math.h>
-
-#include "Oni.h"
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+#include "Oni/Oni.h"
+
 #include "Daodan_Config.h"
 #include "Daodan_Utility.h"
-#include <GL/gl.h>
-#include <GL/glu.h>
 #include "Daodan_Win32.h"
-
 #include "Daodan_GL.h"
-#include "Oni_GL.h"
 
 static const M3tDisplayMode daodan_reslist[] =

Daodan/src/Daodan_GL.h

@@ -3 +3 @@
 
 #include "Daodan.h"
-#include "BFW_Motoko_Draw.h"
+#include "Oni/Oni.h"
 
 unsigned short ONICALL DD_GLrEnumerateDisplayModes(M3tDisplayMode* modes);

Daodan/src/Daodan_Utility.c

@@ -4 +4 @@
 
 #include "Daodan_Utility.h"
-#include "Oni.h"
+#include "Oni/Oni.h"
 
 const double fps = 60.0;

Daodan/src/Daodan_Win32.c

@@ -5 +5 @@
 #include "Daodan_Win32.h"
 
-#include "BFW_Utility.h"
-#include "Oni.h"
+#include "Oni/Oni.h"
 
 

Daodan/src/Daodan_Win32.h

@@ -3 +3 @@
 
 #include "Daodan.h"
-#include "Oni.h"
+#include "Oni/Oni.h"
 
 UUtError ONICALL DD_ONrPlatform_Initialize(ONtPlatformData *PlatformData);

Daodan/src/guitest.c

@@ -3 +3 @@
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 
-guitest(HMODULE hInstance, int nCmdShow)
+void guitest(HMODULE hInstance, int nCmdShow)
 {
         MSG  msg;    
@@ -31 +31 @@
                 DispatchMessage(&msg);
         }
-
-        return (int) msg.wParam;
 }
 

Daodan/src/patches/Patches.c

@@ -10 +10 @@
 #include "../Daodan_Utility.h"
 #include "../Daodan_Win32.h"
-#include "../flatline/Flatline_BSL.h"
-#include "../flatline/Flatline_Hooks.h"
-#include "../Oni.h"
-#include "objt.h"
+
+#include "../Oni/Oni.h"
 
 typedef int (__cdecl *CHINESEPROC)(DWORD ThreadId); 
@@ -19 +17 @@
 // Hooked WMrSlider_SetRange() in ONiOGU_Options_InitDialog. Disables a gamma
 // slider in windowed mode.
-static void ONICALL DD_ONiOGU_GammaSlider_SetRange(WMtWindow* window, int min_value, int max_value)
+static void ONICALL DD_ONiOGU_GammaSlider_SetRange(void* window, int min_value, int max_value)
 {
         WMrWindow_SetEnabled(window, M3gResolutionSwitch && opt_gamma);
@@ -65 +63 @@
 
 
-void ONICALL DDrShowResumeButton(WMtWindow* window, int visibility)
+void ONICALL DDrShowResumeButton(void* window, int visibility)
 {
         if (visibility)
@@ -74 +72 @@
 
 /* Options always visible patch */
-void ONICALL DDrShowOptionsButton(WMtWindow* window, int visibility)
+void ONICALL DDrShowOptionsButton(void* window, int visibility)
 {
         WMrWindow_SetVisible(window, 1);
@@ -83 +81 @@
         if (opt_usedaodanbsl)
                 SLrDaodan_Initialize();
-        if (patch_flatline)
-                SLrFlatline_Initialize();
 }
 
@@ -354 +350 @@
         // Replace start of OniParseCommandLine with XOR eax,eax; RET
         DDrPatch_Int32 ((int*)(OniExe + 0x000d3570), 0x00c3c033);
-}
-
-// Enable flatline multiplayer code
-void DD_Patch_Flatline()
-{
-        DDrPatch_MakeCall((void*)(OniExe + 0x000E17F6), FLrHook_Lasers );
-        
-        //Flatline related stuff
-        DDrPatch_MakeCall((void*)(OniExe + 0x000FBCEA), DDrText_Hook);
-        
-        DDrPatch_Int32((int*)(OniExe + 0x000B24D2), (unsigned int)FLrSpawnHack);
-
-        DDrPatch_NOOP((char*)(OniExe + 0x000C26CB), 6);
-
-        DDrPatch_MakeCall((void*)(OniExe + 0x000C26CB), FLrHook_DoorOpen); 
-        DDrPatch_MakeCall((void*)(OniExe + 0x000EE3CF), FLrHook_ConsoleActivate);
 }
 
@@ -737 +717 @@
         DD_Patch_PrintWarning();
 
-
         DD_Patch_ShowNames();
-/*
-        DD_Patch_ShowTriggerVolumes();
-        DD_Patch_ShowFlags();
-*/
-        if (patch_flatline)
-                DD_Patch_Flatline();
 
         return true;