From 7b45342955a180307ad91b89f125d4df2b3e0df2 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 12 Nov 2008 22:32:04 -0800 Subject: [PATCH 1/6] Forcing build. --- pushbuild.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pushbuild.txt b/pushbuild.txt index 48082f72..34806ce2 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -1 +1 @@ -12 +a billion \ No newline at end of file From 8e5c7713fcfac858b8c99cef314f3a2fb8850e93 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 12 Nov 2008 22:34:52 -0800 Subject: [PATCH 2/6] Forcing build. --- pushbuild.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pushbuild.txt b/pushbuild.txt index 34806ce2..0523a0ee 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -1 +1 @@ -a billion \ No newline at end of file +a billion and nine \ No newline at end of file From 30174c07de74ffddce7e9e555ccb28d440b42377 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 12 Nov 2008 22:41:17 -0800 Subject: [PATCH 3/6] Forcing build. --- pushbuild.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pushbuild.txt b/pushbuild.txt index 0523a0ee..d25d059a 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -1 +1 @@ -a billion and nine \ No newline at end of file +a billion and TRILLIONS \ No newline at end of file From acea705df883cc188bb02d5a7a96939f88e5220c Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Fri, 14 Nov 2008 03:51:57 -0600 Subject: [PATCH 4/6] Moved IDA scripts from editor/ida to tools/ida_scripts --HG-- rename : editor/ida/gcc_fpic.idc => tools/ida_scripts/gcc_fpic.idc rename : editor/ida/linux_vtable_dump.idc => tools/ida_scripts/linux_vtable_dump.idc --- {editor/ida => tools/ida_scripts}/gcc_fpic.idc | 0 {editor/ida => tools/ida_scripts}/linux_vtable_dump.idc | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {editor/ida => tools/ida_scripts}/gcc_fpic.idc (100%) rename {editor/ida => tools/ida_scripts}/linux_vtable_dump.idc (100%) diff --git a/editor/ida/gcc_fpic.idc b/tools/ida_scripts/gcc_fpic.idc similarity index 100% rename from editor/ida/gcc_fpic.idc rename to tools/ida_scripts/gcc_fpic.idc diff --git a/editor/ida/linux_vtable_dump.idc b/tools/ida_scripts/linux_vtable_dump.idc similarity index 100% rename from editor/ida/linux_vtable_dump.idc rename to tools/ida_scripts/linux_vtable_dump.idc From 2ff9b0aada970d8430c68aa97fef54a0e44b701e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 16 Nov 2008 16:06:18 -0800 Subject: [PATCH 5/6] Removed pointless "systems" folder from core. --HG-- rename : core/systems/ExtensionSys.cpp => core/ExtensionSys.cpp rename : core/systems/ExtensionSys.h => core/ExtensionSys.h rename : core/systems/ForwardSys.cpp => core/ForwardSys.cpp rename : core/systems/ForwardSys.h => core/ForwardSys.h rename : core/systems/HandleSys.cpp => core/HandleSys.cpp rename : core/systems/HandleSys.h => core/HandleSys.h rename : core/systems/LibrarySys.cpp => core/LibrarySys.cpp rename : core/systems/LibrarySys.h => core/LibrarySys.h rename : core/systems/PluginInfoDatabase.cpp => core/PluginInfoDatabase.cpp rename : core/systems/PluginInfoDatabase.h => core/PluginInfoDatabase.h rename : core/systems/PluginSys.cpp => core/PluginSys.cpp rename : core/systems/PluginSys.h => core/PluginSys.h rename : core/systems/ShareSys.cpp => core/ShareSys.cpp rename : core/systems/ShareSys.h => core/ShareSys.h --- core/{systems => }/ExtensionSys.cpp | 0 core/{systems => }/ExtensionSys.h | 0 core/{systems => }/ForwardSys.cpp | 0 core/{systems => }/ForwardSys.h | 0 core/{systems => }/HandleSys.cpp | 0 core/{systems => }/HandleSys.h | 0 core/{systems => }/LibrarySys.cpp | 0 core/{systems => }/LibrarySys.h | 0 core/Logger.cpp | 2 +- core/PlayerManager.cpp | 2 +- core/{systems => }/PluginInfoDatabase.cpp | 0 core/{systems => }/PluginInfoDatabase.h | 0 core/{systems => }/PluginSys.cpp | 0 core/{systems => }/PluginSys.h | 0 core/{systems => }/ShareSys.cpp | 0 core/{systems => }/ShareSys.h | 0 core/msvc8/sourcemod_mm.vcproj | 28 ++--- core/msvc9/sourcemod_mm.vcproj | 129 ++++++++++------------ core/sourcemod.cpp | 2 +- 19 files changed, 73 insertions(+), 90 deletions(-) rename core/{systems => }/ExtensionSys.cpp (100%) rename core/{systems => }/ExtensionSys.h (100%) rename core/{systems => }/ForwardSys.cpp (100%) rename core/{systems => }/ForwardSys.h (100%) rename core/{systems => }/HandleSys.cpp (100%) rename core/{systems => }/HandleSys.h (100%) rename core/{systems => }/LibrarySys.cpp (100%) rename core/{systems => }/LibrarySys.h (100%) rename core/{systems => }/PluginInfoDatabase.cpp (100%) rename core/{systems => }/PluginInfoDatabase.h (100%) rename core/{systems => }/PluginSys.cpp (100%) rename core/{systems => }/PluginSys.h (100%) rename core/{systems => }/ShareSys.cpp (100%) rename core/{systems => }/ShareSys.h (100%) diff --git a/core/systems/ExtensionSys.cpp b/core/ExtensionSys.cpp similarity index 100% rename from core/systems/ExtensionSys.cpp rename to core/ExtensionSys.cpp diff --git a/core/systems/ExtensionSys.h b/core/ExtensionSys.h similarity index 100% rename from core/systems/ExtensionSys.h rename to core/ExtensionSys.h diff --git a/core/systems/ForwardSys.cpp b/core/ForwardSys.cpp similarity index 100% rename from core/systems/ForwardSys.cpp rename to core/ForwardSys.cpp diff --git a/core/systems/ForwardSys.h b/core/ForwardSys.h similarity index 100% rename from core/systems/ForwardSys.h rename to core/ForwardSys.h diff --git a/core/systems/HandleSys.cpp b/core/HandleSys.cpp similarity index 100% rename from core/systems/HandleSys.cpp rename to core/HandleSys.cpp diff --git a/core/systems/HandleSys.h b/core/HandleSys.h similarity index 100% rename from core/systems/HandleSys.h rename to core/HandleSys.h diff --git a/core/systems/LibrarySys.cpp b/core/LibrarySys.cpp similarity index 100% rename from core/systems/LibrarySys.cpp rename to core/LibrarySys.cpp diff --git a/core/systems/LibrarySys.h b/core/LibrarySys.h similarity index 100% rename from core/systems/LibrarySys.h rename to core/LibrarySys.h diff --git a/core/Logger.cpp b/core/Logger.cpp index cc35ef1a..977bf732 100644 --- a/core/Logger.cpp +++ b/core/Logger.cpp @@ -34,7 +34,7 @@ #include "sourcemm_api.h" #include "sm_stringutil.h" #include "Logger.h" -#include "systems/LibrarySys.h" +#include "LibrarySys.h" #include "TimerSys.h" #include "sm_version.h" diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp index b17a6f9c..55c25217 100644 --- a/core/PlayerManager.cpp +++ b/core/PlayerManager.cpp @@ -46,7 +46,7 @@ #include #include #include "GameConfigs.h" -#include "systems/ExtensionSys.h" +#include "ExtensionSys.h" PlayerManager g_Players; bool g_OnMapStarted = false; diff --git a/core/systems/PluginInfoDatabase.cpp b/core/PluginInfoDatabase.cpp similarity index 100% rename from core/systems/PluginInfoDatabase.cpp rename to core/PluginInfoDatabase.cpp diff --git a/core/systems/PluginInfoDatabase.h b/core/PluginInfoDatabase.h similarity index 100% rename from core/systems/PluginInfoDatabase.h rename to core/PluginInfoDatabase.h diff --git a/core/systems/PluginSys.cpp b/core/PluginSys.cpp similarity index 100% rename from core/systems/PluginSys.cpp rename to core/PluginSys.cpp diff --git a/core/systems/PluginSys.h b/core/PluginSys.h similarity index 100% rename from core/systems/PluginSys.h rename to core/PluginSys.h diff --git a/core/systems/ShareSys.cpp b/core/ShareSys.cpp similarity index 100% rename from core/systems/ShareSys.cpp rename to core/ShareSys.cpp diff --git a/core/systems/ShareSys.h b/core/ShareSys.h similarity index 100% rename from core/systems/ShareSys.h rename to core/ShareSys.h diff --git a/core/msvc8/sourcemod_mm.vcproj b/core/msvc8/sourcemod_mm.vcproj index fcfc7357..9aea667c 100644 --- a/core/msvc8/sourcemod_mm.vcproj +++ b/core/msvc8/sourcemod_mm.vcproj @@ -1291,31 +1291,31 @@ UniqueIdentifier="{7D3AB33D-C1AD-46ee-B505-FEA8B6EF18E4}" > @@ -1325,31 +1325,31 @@ UniqueIdentifier="{D1864A10-FF5F-4672-A70E-57C9F7486F92}" > diff --git a/core/msvc9/sourcemod_mm.vcproj b/core/msvc9/sourcemod_mm.vcproj index d3f79183..1491051b 100644 --- a/core/msvc9/sourcemod_mm.vcproj +++ b/core/msvc9/sourcemod_mm.vcproj @@ -844,6 +844,14 @@ RelativePath="..\EventManager.cpp" > + + + + @@ -860,6 +868,14 @@ RelativePath="..\HalfLife2.cpp" > + + + + @@ -908,10 +924,22 @@ RelativePath="..\PlayerManager.cpp" > + + + + + + @@ -1026,6 +1054,14 @@ RelativePath="..\EventManager.h" > + + + + @@ -1042,6 +1078,14 @@ RelativePath="..\HalfLife2.h" > + + + + @@ -1090,10 +1134,22 @@ RelativePath="..\PlayerManager.h" > + + + + + + @@ -1264,79 +1320,6 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #include "sourcemod.h" #include "sourcemm_api.h" -#include "systems/LibrarySys.h" +#include "LibrarySys.h" #include #include "PluginSys.h" #include "ShareSys.h" From d1405f2ab370e1cbfa00e8c6f0d714f61cb0b180 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 16 Nov 2008 18:41:14 -0600 Subject: [PATCH 6/6] Updated core Makefile. --- core/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 304dbb8f..899a6e67 100644 --- a/core/Makefile +++ b/core/Makefile @@ -27,9 +27,13 @@ OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \ smn_lang.cpp smn_player.cpp smn_string.cpp smn_sorting.cpp smn_textparse.cpp smn_timers.cpp \ smn_usermsgs.cpp smn_menus.cpp smn_database.cpp smn_vector.cpp smn_adt_array.cpp \ smn_adt_trie.cpp smn_hudtext.cpp smn_adt_stack.cpp smn_nextmap.cpp -OBJECTS += systems/ExtensionSys.cpp systems/ForwardSys.cpp systems/HandleSys.cpp \ - systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp systems/PluginSys.cpp \ - systems/ShareSys.cpp +OBJECTS += ExtensionSys.cpp \ + ForwardSys.cpp \ + HandleSys.cpp \ + LibrarySys.cpp \ + PluginInfoDatabase.cpp \ + PluginSys.cpp \ + ShareSys.cpp OBJECTS += thread/ThreadWorker.cpp thread/BaseWorker.cpp thread/PosixThreads.cpp ThreadSupport.cpp ##############################################