Merge.
This commit is contained in:
Scott Ehlert
commit
d6fc82f8fa
@ -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"
|
||||
|
||||
|
||||
@ -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_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
|
||||
|
||||
##############################################
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
#include <inetchannel.h>
|
||||
#include <iclient.h>
|
||||
#include "GameConfigs.h"
|
||||
#include "systems/ExtensionSys.h"
|
||||
#include "ExtensionSys.h"
|
||||
|
||||
PlayerManager g_Players;
|
||||
bool g_OnMapStarted = false;
|
||||
|
||||
@ -1291,31 +1291,31 @@
|
||||
UniqueIdentifier="{7D3AB33D-C1AD-46ee-B505-FEA8B6EF18E4}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\systems\ExtensionSys.h"
|
||||
RelativePath="..\ExtensionSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\ForwardSys.h"
|
||||
RelativePath="..\ForwardSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\HandleSys.h"
|
||||
RelativePath="..\HandleSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\LibrarySys.h"
|
||||
RelativePath="..\LibrarySys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\PluginInfoDatabase.h"
|
||||
RelativePath="..\PluginInfoDatabase.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\PluginSys.h"
|
||||
RelativePath="..\PluginSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\ShareSys.h"
|
||||
RelativePath="..\ShareSys.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
@ -1325,31 +1325,31 @@
|
||||
UniqueIdentifier="{D1864A10-FF5F-4672-A70E-57C9F7486F92}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\systems\ExtensionSys.cpp"
|
||||
RelativePath="..\ExtensionSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\ForwardSys.cpp"
|
||||
RelativePath="..\ForwardSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\HandleSys.cpp"
|
||||
RelativePath="..\HandleSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\LibrarySys.cpp"
|
||||
RelativePath="..\LibrarySys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\PluginInfoDatabase.cpp"
|
||||
RelativePath="..\PluginInfoDatabase.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\PluginSys.cpp"
|
||||
RelativePath="..\PluginSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\systems\ShareSys.cpp"
|
||||
RelativePath="..\ShareSys.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
||||
@ -1101,6 +1101,14 @@
|
||||
RelativePath="..\EventManager.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\ExtensionSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\ForwardSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\frame_hooks.cpp"
|
||||
>
|
||||
@ -1117,6 +1125,14 @@
|
||||
RelativePath="..\HalfLife2.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\HandleSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\LibrarySys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Logger.cpp"
|
||||
>
|
||||
@ -1165,10 +1181,22 @@
|
||||
RelativePath="..\PlayerManager.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PluginInfoDatabase.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PluginSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Profiler.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\ShareSys.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sm_autonatives.cpp"
|
||||
>
|
||||
@ -1283,6 +1311,14 @@
|
||||
RelativePath="..\EventManager.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\ExtensionSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\ForwardSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\frame_hooks.h"
|
||||
>
|
||||
@ -1299,6 +1335,14 @@
|
||||
RelativePath="..\HalfLife2.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\HandleSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\LibrarySys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Logger.h"
|
||||
>
|
||||
@ -1347,10 +1391,22 @@
|
||||
RelativePath="..\PlayerManager.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PluginInfoDatabase.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\PluginSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Profiler.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\ShareSys.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sm_autonatives.h"
|
||||
>
|
||||
@ -1521,79 +1577,6 @@
|
||||
>
|
||||
</File>
|
||||
</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
|
||||
Name="SourcePawn"
|
||||
UniqueIdentifier="{C3C3DC6E-E392-4916-B893-7ACB92192DE0}"
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
#include <stdio.h>
|
||||
#include "sourcemod.h"
|
||||
#include "sourcemm_api.h"
|
||||
#include "systems/LibrarySys.h"
|
||||
#include "LibrarySys.h"
|
||||
#include <sh_string.h>
|
||||
#include "PluginSys.h"
|
||||
#include "ShareSys.h"
|
||||
|
||||
@ -1 +1 @@
|
||||
13
|
||||
a billion and TRILLIONS
|
||||
|
||||
Loading…
Reference in New Issue
Block a user