UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Scott Ehlert 2008-11-19 02:16:45 -06:00
commit d6fc82f8fa
21 changed files with 81 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
core/systems/ExtensionSys.cpp → core/ExtensionSys.cpp
View File

0
core/systems/ExtensionSys.h → core/ExtensionSys.h
View File

0
core/systems/ForwardSys.cpp → core/ForwardSys.cpp
View File

0
core/systems/ForwardSys.h → core/ForwardSys.h
View File

0
core/systems/HandleSys.cpp → core/HandleSys.cpp
View File

0
core/systems/HandleSys.h → core/HandleSys.h
View File

0
core/systems/LibrarySys.cpp → core/LibrarySys.cpp
View File

0
core/systems/LibrarySys.h → core/LibrarySys.h
View File

2
core/Logger.cpp
View File

@ -34,7 +34,7 @@
#include "sourcemm_api.h" #include "sourcemm_api.h"
#include "sm_stringutil.h" #include "sm_stringutil.h"
#include "Logger.h" #include "Logger.h"
#include "systems/LibrarySys.h" #include "LibrarySys.h"
#include "TimerSys.h" #include "TimerSys.h"
#include "sm_version.h" #include "sm_version.h"

10
core/Makefile
View File

@ -28,9 +28,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_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_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 smn_adt_trie.cpp smn_hudtext.cpp smn_adt_stack.cpp smn_nextmap.cpp
OBJECTS += systems/ExtensionSys.cpp systems/ForwardSys.cpp systems/HandleSys.cpp \ OBJECTS += ExtensionSys.cpp \
systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp systems/PluginSys.cpp \ ForwardSys.cpp \
systems/ShareSys.cpp HandleSys.cpp \
LibrarySys.cpp \
PluginInfoDatabase.cpp \
PluginSys.cpp \
ShareSys.cpp
OBJECTS += thread/ThreadWorker.cpp thread/BaseWorker.cpp thread/PosixThreads.cpp ThreadSupport.cpp OBJECTS += thread/ThreadWorker.cpp thread/BaseWorker.cpp thread/PosixThreads.cpp ThreadSupport.cpp
############################################## ##############################################

2
core/PlayerManager.cpp
View File

@ -46,7 +46,7 @@
#include <inetchannel.h> #include <inetchannel.h>
#include <iclient.h> #include <iclient.h>
#include "GameConfigs.h" #include "GameConfigs.h"
#include "systems/ExtensionSys.h" #include "ExtensionSys.h"
PlayerManager g_Players; PlayerManager g_Players;
bool g_OnMapStarted = false; bool g_OnMapStarted = false;

0
core/systems/PluginInfoDatabase.cpp → core/PluginInfoDatabase.cpp
View File

0
core/systems/PluginInfoDatabase.h → core/PluginInfoDatabase.h
View File

0
core/systems/PluginSys.cpp → core/PluginSys.cpp
View File

0
core/systems/PluginSys.h → core/PluginSys.h
View File

0
core/systems/ShareSys.cpp → core/ShareSys.cpp
View File

0
core/systems/ShareSys.h → core/ShareSys.h
View File

28
core/msvc8/sourcemod_mm.vcproj
View File

@ -1291,31 +1291,31 @@
UniqueIdentifier="{7D3AB33D-C1AD-46ee-B505-FEA8B6EF18E4}" UniqueIdentifier="{7D3AB33D-C1AD-46ee-B505-FEA8B6EF18E4}"
> >
<File <File
RelativePath="..\systems\ExtensionSys.h" RelativePath="..\ExtensionSys.h"
> >
</File> </File>
<File <File
RelativePath="..\systems\ForwardSys.h" RelativePath="..\ForwardSys.h"
> >
</File> </File>
<File <File
RelativePath="..\systems\HandleSys.h" RelativePath="..\HandleSys.h"
> >
</File> </File>
<File <File
RelativePath="..\systems\LibrarySys.h" RelativePath="..\LibrarySys.h"
> >
</File> </File>
<File <File
RelativePath="..\systems\PluginInfoDatabase.h" RelativePath="..\PluginInfoDatabase.h"
> >
</File> </File>
<File <File
RelativePath="..\systems\PluginSys.h" RelativePath="..\PluginSys.h"
> >
</File> </File>
<File <File
RelativePath="..\systems\ShareSys.h" RelativePath="..\ShareSys.h"
> >
</File> </File>
</Filter> </Filter>
@ -1325,31 +1325,31 @@
UniqueIdentifier="{D1864A10-FF5F-4672-A70E-57C9F7486F92}" UniqueIdentifier="{D1864A10-FF5F-4672-A70E-57C9F7486F92}"
> >
<File <File
RelativePath="..\systems\ExtensionSys.cpp" RelativePath="..\ExtensionSys.cpp"
> >
</File> </File>
<File <File
RelativePath="..\systems\ForwardSys.cpp" RelativePath="..\ForwardSys.cpp"
> >
</File> </File>
<File <File
RelativePath="..\systems\HandleSys.cpp" RelativePath="..\HandleSys.cpp"
> >
</File> </File>
<File <File
RelativePath="..\systems\LibrarySys.cpp" RelativePath="..\LibrarySys.cpp"
> >
</File> </File>
<File <File
RelativePath="..\systems\PluginInfoDatabase.cpp" RelativePath="..\PluginInfoDatabase.cpp"
> >
</File> </File>
<File <File
RelativePath="..\systems\PluginSys.cpp" RelativePath="..\PluginSys.cpp"
> >
</File> </File>
<File <File
RelativePath="..\systems\ShareSys.cpp" RelativePath="..\ShareSys.cpp"
> >
</File> </File>
</Filter> </Filter>

129
core/msvc9/sourcemod_mm.vcproj
View File

@ -1101,6 +1101,14 @@
RelativePath="..\EventManager.cpp" RelativePath="..\EventManager.cpp"
> >
</File> </File>
<File
RelativePath="..\ExtensionSys.cpp"
>
</File>
<File
RelativePath="..\ForwardSys.cpp"
>
</File>
<File <File
RelativePath="..\frame_hooks.cpp" RelativePath="..\frame_hooks.cpp"
> >
@ -1117,6 +1125,14 @@
RelativePath="..\HalfLife2.cpp" RelativePath="..\HalfLife2.cpp"
> >
</File> </File>
<File
RelativePath="..\HandleSys.cpp"
>
</File>
<File
RelativePath="..\LibrarySys.cpp"
>
</File>
<File <File
RelativePath="..\Logger.cpp" RelativePath="..\Logger.cpp"
> >
@ -1165,10 +1181,22 @@
RelativePath="..\PlayerManager.cpp" RelativePath="..\PlayerManager.cpp"
> >
</File> </File>
<File
RelativePath="..\PluginInfoDatabase.cpp"
>
</File>
<File
RelativePath="..\PluginSys.cpp"
>
</File>
<File <File
RelativePath="..\Profiler.cpp" RelativePath="..\Profiler.cpp"
> >
</File> </File>
<File
RelativePath="..\ShareSys.cpp"
>
</File>
<File <File
RelativePath="..\sm_autonatives.cpp" RelativePath="..\sm_autonatives.cpp"
> >
@ -1283,6 +1311,14 @@
RelativePath="..\EventManager.h" RelativePath="..\EventManager.h"
> >
</File> </File>
<File
RelativePath="..\ExtensionSys.h"
>
</File>
<File
RelativePath="..\ForwardSys.h"
>
</File>
<File <File
RelativePath="..\frame_hooks.h" RelativePath="..\frame_hooks.h"
> >
@ -1299,6 +1335,14 @@
RelativePath="..\HalfLife2.h" RelativePath="..\HalfLife2.h"
> >
</File> </File>
<File
RelativePath="..\HandleSys.h"
>
</File>
<File
RelativePath="..\LibrarySys.h"
>
</File>
<File <File
RelativePath="..\Logger.h" RelativePath="..\Logger.h"
> >
@ -1347,10 +1391,22 @@
RelativePath="..\PlayerManager.h" RelativePath="..\PlayerManager.h"
> >
</File> </File>
<File
RelativePath="..\PluginInfoDatabase.h"
>
</File>
<File
RelativePath="..\PluginSys.h"
>
</File>
<File <File
RelativePath="..\Profiler.h" RelativePath="..\Profiler.h"
> >
</File> </File>
<File
RelativePath="..\ShareSys.h"
>
</File>
<File <File
RelativePath="..\sm_autonatives.h" RelativePath="..\sm_autonatives.h"
> >
@ -1521,79 +1577,6 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Systems"
UniqueIdentifier="{63775418-DF3F-4198-BFB1-738B19EE3EE0}"
>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{7D3AB33D-C1AD-46ee-B505-FEA8B6EF18E4}"
>
<File
RelativePath="..\systems\ExtensionSys.h"
>
</File>
<File
RelativePath="..\systems\ForwardSys.h"
>
</File>
<File
RelativePath="..\systems\HandleSys.h"
>
</File>
<File
RelativePath="..\systems\LibrarySys.h"
>
</File>
<File
RelativePath="..\systems\PluginInfoDatabase.h"
>
</File>
<File
RelativePath="..\systems\PluginSys.h"
>
</File>
<File
RelativePath="..\systems\ShareSys.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{D1864A10-FF5F-4672-A70E-57C9F7486F92}"
>
<File
RelativePath="..\systems\ExtensionSys.cpp"
>
</File>
<File
RelativePath="..\systems\ForwardSys.cpp"
>
</File>
<File
RelativePath="..\systems\HandleSys.cpp"
>
</File>
<File
RelativePath="..\systems\LibrarySys.cpp"
>
</File>
<File
RelativePath="..\systems\PluginInfoDatabase.cpp"
>
</File>
<File
RelativePath="..\systems\PluginSys.cpp"
>
</File>
<File
RelativePath="..\systems\ShareSys.cpp"
>
</File>
</Filter>
</Filter>
<Filter <Filter
Name="SourcePawn" Name="SourcePawn"
UniqueIdentifier="{C3C3DC6E-E392-4916-B893-7ACB92192DE0}" UniqueIdentifier="{C3C3DC6E-E392-4916-B893-7ACB92192DE0}"

2
core/sourcemod.cpp
View File

@ -32,7 +32,7 @@
#include <stdio.h> #include <stdio.h>
#include "sourcemod.h" #include "sourcemod.h"
#include "sourcemm_api.h" #include "sourcemm_api.h"
#include "systems/LibrarySys.h" #include "LibrarySys.h"
#include <sh_string.h> #include <sh_string.h>
#include "PluginSys.h" #include "PluginSys.h"
#include "ShareSys.h" #include "ShareSys.h"

2
pushbuild.txt
View File

@ -1 +1 @@
13 a billion and TRILLIONS