Merged heads. Fixed conflicts in cvars.inc and zadmin.inc.
Readded some functions in zadmin.inc, but made them as comments. No reason to remove these so we don't have to remake them again.
This commit is contained in:
@ -16,9 +16,6 @@
|
||||
#include <cstrike>
|
||||
#include <zrtools>
|
||||
|
||||
#undef REQUIRE_PLUGIN
|
||||
#include <market>
|
||||
|
||||
#define VERSION "3.0-dev"
|
||||
|
||||
// Core includes.
|
||||
@ -37,6 +34,7 @@
|
||||
#include "zr/playerclasses/playerclasses"
|
||||
#include "zr/weapons/weapons"
|
||||
#include "zr/hitgroups"
|
||||
#include "zr/roundstart"
|
||||
#include "zr/roundend"
|
||||
#include "zr/infect"
|
||||
#include "zr/damage"
|
||||
@ -62,9 +60,6 @@
|
||||
#include "zr/jumpboost"
|
||||
#include "zr/volfeatures/volfeatures"
|
||||
|
||||
// Almost replaced! :)
|
||||
#include "zr/zombie"
|
||||
|
||||
/**
|
||||
* Record plugin info.
|
||||
*/
|
||||
@ -106,35 +101,7 @@ public OnPluginStart()
|
||||
WeaponsInit();
|
||||
SayHooksInit();
|
||||
EventInit();
|
||||
MarketInit();
|
||||
}
|
||||
|
||||
/**
|
||||
* Library is being removed.
|
||||
*
|
||||
* @param name The name of the library.
|
||||
*/
|
||||
public OnLibraryRemoved(const String:name[])
|
||||
{
|
||||
// If market is being removed, then set variable to false.
|
||||
if (StrEqual(name, "market", false))
|
||||
{
|
||||
g_bMarket = false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Library is being added.
|
||||
*
|
||||
* @param name The name of the library.
|
||||
*/
|
||||
public OnLibraryAdded(const String:name[])
|
||||
{
|
||||
// If market is being added, then set variable to true.
|
||||
if (StrEqual(name, "market", false))
|
||||
{
|
||||
g_bMarket = true;
|
||||
}
|
||||
ZMarketInit();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -165,7 +132,7 @@ public OnMapEnd()
|
||||
*/
|
||||
public OnConfigsExecuted()
|
||||
{
|
||||
// Forward event to modules.
|
||||
// Forward event to modules. (OnConfigsExecuted)
|
||||
ConfigLoad();
|
||||
ModelsLoad();
|
||||
DownloadsLoad();
|
||||
@ -177,6 +144,7 @@ public OnConfigsExecuted()
|
||||
ClassLoad();
|
||||
VolLoad();
|
||||
|
||||
// Forward event to modules. (OnModulesLoaded)
|
||||
ConfigOnModulesLoaded();
|
||||
ClassOnModulesLoaded();
|
||||
}
|
||||
|
Reference in New Issue
Block a user