diff --git a/Makefile b/Makefile index 1e4fe54..7ebc52d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ SOURCEDIR=src +SMINCLUDES=env/include BUILDDIR=build -SPCOMP=bin/spcomp +SPCOMP=env/linux/bin/spcomp VERSIONDUMP=./updateversion.sh vpath %.sp $(SOURCEDIR) @@ -26,7 +27,7 @@ prepare_builddir: %.smx: %.sp $(VERSIONDUMP) - $(SPCOMP) -i$(SOURCEDIR) -i$(SOURCEDIR)/include -o$(BUILDDIR)/$@ $< + $(SPCOMP) -i$(SOURCEDIR) -i$(SOURCEDIR)/include -i$(SMINCLUDES) -o$(BUILDDIR)/$@ $< clean: @echo "Removing build directory" diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index b17824c..0000000 --- a/changelog.txt +++ /dev/null @@ -1,135 +0,0 @@ -2009.02.21 - 2.5.1.29 - * Moved model precache to startup. This will probably fix the freeze on infection problem. - -2009.02.16 - 2.5.1.28 - * Fixed ambience sound not always playing. Changed ambience module to play a ambience sound per client, when they connect. - * Improved logging function. - * Fixed zvision not disabled if the setting is empty in classes.txt. Disabled zvision timer (not really needed?). - -2009.02.13 - 2.5.1.27 - * Fixed bug in formatted log messages when client is negative or 0 (console). - * Simplified log formatting style. - * Blocked non-root admins from changing log flags (except print to chat flags). - * Fixed unknown command error on zr_anticamp_list command. - * Simplified some messages by using ReplyToCommand. - * Added module based log flags. - * Made CVARs for alpha values (transparency). - * Changed CVAR zr_classes_default to select a random class on map load, if "random" is used. - * Removed CVAR zr_classes_save. This feature can be replaced later with client cookies from SourceMod 1.1.0. - * Fixed zmenu not closing when teleporting or spawning. - -2009.02.02 - 2.5.1.26 - * Fixed message typo. - * Added debug messages when applying models. - * Added log messages on manual infecions and weapon restrictions. - -2009.01.31 - 2.5.1.25 - * Fixed incorrect weapon name used in group weapon restrictions (bullpup => aug). - * Improved logging system. CVAR zr_debug renamed to zr_log. Using bit flags instead of on/off CVAR. Added flag configurations to zombie admin menu. - * Fixed index out of bounds error in anticamp module. - -2009.01.18 - 2.5.1.24 - * Created a anticamp feature that give players damage at a specified interval in custom defined volumes. Only affects humans. - * Re-formatted changes.txt. - -2009.01.17 - 2.5.1.23 - * Fixed teleport location text to display as float values instead of decimal. - -2009.01.16 - 2.5.1.22 - * Changed hardcoded antistick force into a CVAR. - -2009.01.14 - 2.5.1.21 - * Fixed spectactor admins not able to teleport players to their custom location. - -2009.01.13 - 2.5.1.20 - * Fixed zstuck still working when disabled. - * Code cleanup: Removed old teleport functions and debug messages in zspawn. - -2009.01.13 - 2.5.1.19 - * Added per-client teleport buffers instead of one common (still only for admins). - * Made zr_tele_reset_buffers CVAR for resetting custom saved locations on round start. Abuse protection. - * Fixed spectactors able to teleport, using admin commands. - * Added !teleabort chat trigger. Doesn't abort cooldown. - * Changed ztele to tele in CVAR names. - -2008.12.27 - 2.5.1.18 - * Made zr_suicide_world_damage CVAR for respawning as zombie if a zombie was killed by the world. - * Removed spawn protection on respawned zombies. - -2008.12.26 - 2.5.1.17 - * Finished teleporter admin commands; zr_teleport, zr_tele_saveloc, zr_tele_loc, zr_tele_abort. - * Teleport admin menu made, but not coded. - -2008.12.20 - 2.5.1.16 - * Improved the teleporter. Startup delay, cooldown, separate team delays and limits. Admin commands made, but not coded yet. - -2008.12.16 - 2.5.1.15 - Richard - * Removed unnecessary function call in OnPluginEnd causeing the periodical GameRules not available error. - -2008.11.24 - 2.5.1.14 - Richard - * Made zr_ztele_humans cvar for allowing or disallowing humans to use the teleporter. Defaults to allow. - -2008.11.17 - 2.5.1.13 - Richard - * Made a switch for printing suicide attempts to admin chat. - * Added suicide response to client chat too, not just the console. - -2008.11.16 - 2.5.1.12 - Richard - * Applied game rules not available fix from Grey Echo. - -2008.11.13 - 2.5.1.11 - Richard - * ZSpawn fix confirmed. - * Added debug messages on OnPlayerDisconnect and PlayerDeath. (zr_debug must be 2, might spam the console). - * Fixed invalid timer handle errors on OnClientDisconnect and PlayerDeath. - * Fixed client not in game error in ZR_DebugPrintToConsole. - -2008.10.29 - 2.5.1.10 - Richard - * Improved handling of invalid handle errors on OnClientDisconnect and PlayerDeath. - CloseHandle sometimes cause errors when destroying timers. Solution: KillTimer. - * Added debug switch and a function for printing/logging messages to client consoles or the server. - * Added debug messages on zspawn. - * Fixed zr_spawn not spawning spectactors (if @all is used). - -2008.10.11 - 2.5.1.9 - Richard - * Added CVAR for saving class selection after map changes. Default: off. - If default classes are used, this one should be off. - -2008.10.11 - 2.5.1.8 - Richard - * Added CVAR for setting default class. - -2008.10.11 - 2.5.1.7 - Richard - * Fixed bugs in IsClientPlayer - * Made a zombie admin menu (zr_admin). - -2008.10.10 - 2.5.1.6 - Richard - * Fixed night vision state not remembered. If zomibes turn off zvision, nvgs - will be off next time too. - -2008.10.08 - 2.5.1.5 - Richard - * Fixed invalid client index errors. - -2008.10.08 - 2.5.1.4 - Richard - * Fixed zombie moans not looping when interval is 0 (disabled). - -2008.10.08 - 2.5.1.3 - Richard - * Made the console commands zr_set_class_knockback and zr_get_class_knockback. - -2008.10.07 - 2.5.1.2 - Richard - * Added support for overriding class nvgs with the CVAR. - -1: Disable override, 0/1: Off/On - -2008.09.21 - 2.5.1.1 - mbalex - * Added centered counter for spawn protection. - * Made chat commands visible to other players. - * Made unlimited ammo and hit sounds scripts part of the patch. - * Added public CVars zombie_enabled and zombie_version. - * IsClientConnected must always be before IsClientInGame, because - IsClientInGame does not implicit call it. - -2008.09.20 - 2.5.1 - * Fixed spawn protection not protecting against zombies. (Richard) - * Made protected players invisible and move faster. (mbalex) - * Changed class knockback to be a multiplier of the default knockback. (Richard) - -2008.09.17 - 2.5.1 - * Added support for alpha values in classes. (mbalex) - diff --git a/src/include/admin.inc b/env/include/admin.inc similarity index 100% rename from src/include/admin.inc rename to env/include/admin.inc diff --git a/src/include/adminmenu.inc b/env/include/adminmenu.inc similarity index 100% rename from src/include/adminmenu.inc rename to env/include/adminmenu.inc diff --git a/src/include/adt.inc b/env/include/adt.inc similarity index 100% rename from src/include/adt.inc rename to env/include/adt.inc diff --git a/src/include/adt_array.inc b/env/include/adt_array.inc similarity index 100% rename from src/include/adt_array.inc rename to env/include/adt_array.inc diff --git a/src/include/adt_stack.inc b/env/include/adt_stack.inc similarity index 100% rename from src/include/adt_stack.inc rename to env/include/adt_stack.inc diff --git a/src/include/adt_trie.inc b/env/include/adt_trie.inc similarity index 100% rename from src/include/adt_trie.inc rename to env/include/adt_trie.inc diff --git a/src/include/banning.inc b/env/include/banning.inc similarity index 100% rename from src/include/banning.inc rename to env/include/banning.inc diff --git a/src/include/bitbuffer.inc b/env/include/bitbuffer.inc similarity index 100% rename from src/include/bitbuffer.inc rename to env/include/bitbuffer.inc diff --git a/src/include/clientprefs.inc b/env/include/clientprefs.inc similarity index 100% rename from src/include/clientprefs.inc rename to env/include/clientprefs.inc diff --git a/src/include/clients.inc b/env/include/clients.inc similarity index 100% rename from src/include/clients.inc rename to env/include/clients.inc diff --git a/src/include/commandfilters.inc b/env/include/commandfilters.inc similarity index 100% rename from src/include/commandfilters.inc rename to env/include/commandfilters.inc diff --git a/src/include/console.inc b/env/include/console.inc similarity index 100% rename from src/include/console.inc rename to env/include/console.inc diff --git a/src/include/core.inc b/env/include/core.inc similarity index 100% rename from src/include/core.inc rename to env/include/core.inc diff --git a/src/include/cstrike.inc b/env/include/cstrike.inc similarity index 100% rename from src/include/cstrike.inc rename to env/include/cstrike.inc diff --git a/src/include/datapack.inc b/env/include/datapack.inc similarity index 100% rename from src/include/datapack.inc rename to env/include/datapack.inc diff --git a/src/include/dbi.inc b/env/include/dbi.inc similarity index 100% rename from src/include/dbi.inc rename to env/include/dbi.inc diff --git a/src/include/entity.inc b/env/include/entity.inc similarity index 100% rename from src/include/entity.inc rename to env/include/entity.inc diff --git a/src/include/entity_prop_stocks.inc b/env/include/entity_prop_stocks.inc similarity index 100% rename from src/include/entity_prop_stocks.inc rename to env/include/entity_prop_stocks.inc diff --git a/src/include/events.inc b/env/include/events.inc similarity index 100% rename from src/include/events.inc rename to env/include/events.inc diff --git a/src/include/files.inc b/env/include/files.inc similarity index 100% rename from src/include/files.inc rename to env/include/files.inc diff --git a/src/include/float.inc b/env/include/float.inc similarity index 100% rename from src/include/float.inc rename to env/include/float.inc diff --git a/src/include/functions.inc b/env/include/functions.inc similarity index 100% rename from src/include/functions.inc rename to env/include/functions.inc diff --git a/src/include/geoip.inc b/env/include/geoip.inc similarity index 100% rename from src/include/geoip.inc rename to env/include/geoip.inc diff --git a/src/include/halflife.inc b/env/include/halflife.inc similarity index 100% rename from src/include/halflife.inc rename to env/include/halflife.inc diff --git a/src/include/handles.inc b/env/include/handles.inc similarity index 100% rename from src/include/handles.inc rename to env/include/handles.inc diff --git a/src/include/helpers.inc b/env/include/helpers.inc similarity index 100% rename from src/include/helpers.inc rename to env/include/helpers.inc diff --git a/src/include/keyvalues.inc b/env/include/keyvalues.inc similarity index 100% rename from src/include/keyvalues.inc rename to env/include/keyvalues.inc diff --git a/src/include/lang.inc b/env/include/lang.inc similarity index 100% rename from src/include/lang.inc rename to env/include/lang.inc diff --git a/src/include/logging.inc b/env/include/logging.inc similarity index 100% rename from src/include/logging.inc rename to env/include/logging.inc diff --git a/src/include/mapchooser.inc b/env/include/mapchooser.inc similarity index 100% rename from src/include/mapchooser.inc rename to env/include/mapchooser.inc diff --git a/src/include/menus.inc b/env/include/menus.inc similarity index 100% rename from src/include/menus.inc rename to env/include/menus.inc diff --git a/src/include/nextmap.inc b/env/include/nextmap.inc similarity index 100% rename from src/include/nextmap.inc rename to env/include/nextmap.inc diff --git a/src/include/profiler.inc b/env/include/profiler.inc similarity index 100% rename from src/include/profiler.inc rename to env/include/profiler.inc diff --git a/src/include/regex.inc b/env/include/regex.inc similarity index 100% rename from src/include/regex.inc rename to env/include/regex.inc diff --git a/src/include/sdktools.inc b/env/include/sdktools.inc similarity index 100% rename from src/include/sdktools.inc rename to env/include/sdktools.inc diff --git a/src/include/sdktools_engine.inc b/env/include/sdktools_engine.inc similarity index 100% rename from src/include/sdktools_engine.inc rename to env/include/sdktools_engine.inc diff --git a/src/include/sdktools_entinput.inc b/env/include/sdktools_entinput.inc similarity index 100% rename from src/include/sdktools_entinput.inc rename to env/include/sdktools_entinput.inc diff --git a/src/include/sdktools_entoutput.inc b/env/include/sdktools_entoutput.inc similarity index 100% rename from src/include/sdktools_entoutput.inc rename to env/include/sdktools_entoutput.inc diff --git a/src/include/sdktools_functions.inc b/env/include/sdktools_functions.inc similarity index 100% rename from src/include/sdktools_functions.inc rename to env/include/sdktools_functions.inc diff --git a/src/include/sdktools_sound.inc b/env/include/sdktools_sound.inc similarity index 100% rename from src/include/sdktools_sound.inc rename to env/include/sdktools_sound.inc diff --git a/src/include/sdktools_stocks.inc b/env/include/sdktools_stocks.inc similarity index 100% rename from src/include/sdktools_stocks.inc rename to env/include/sdktools_stocks.inc diff --git a/src/include/sdktools_stringtables.inc b/env/include/sdktools_stringtables.inc similarity index 100% rename from src/include/sdktools_stringtables.inc rename to env/include/sdktools_stringtables.inc diff --git a/src/include/sdktools_tempents.inc b/env/include/sdktools_tempents.inc similarity index 100% rename from src/include/sdktools_tempents.inc rename to env/include/sdktools_tempents.inc diff --git a/src/include/sdktools_tempents_stocks.inc b/env/include/sdktools_tempents_stocks.inc similarity index 100% rename from src/include/sdktools_tempents_stocks.inc rename to env/include/sdktools_tempents_stocks.inc diff --git a/src/include/sdktools_trace.inc b/env/include/sdktools_trace.inc similarity index 100% rename from src/include/sdktools_trace.inc rename to env/include/sdktools_trace.inc diff --git a/src/include/sdktools_voice.inc b/env/include/sdktools_voice.inc similarity index 100% rename from src/include/sdktools_voice.inc rename to env/include/sdktools_voice.inc diff --git a/src/include/sorting.inc b/env/include/sorting.inc similarity index 100% rename from src/include/sorting.inc rename to env/include/sorting.inc diff --git a/src/include/sourcemod.inc b/env/include/sourcemod.inc similarity index 100% rename from src/include/sourcemod.inc rename to env/include/sourcemod.inc diff --git a/src/include/string.inc b/env/include/string.inc similarity index 100% rename from src/include/string.inc rename to env/include/string.inc diff --git a/src/include/textparse.inc b/env/include/textparse.inc similarity index 100% rename from src/include/textparse.inc rename to env/include/textparse.inc diff --git a/src/include/tf2.inc b/env/include/tf2.inc similarity index 100% rename from src/include/tf2.inc rename to env/include/tf2.inc diff --git a/src/include/tf2_stocks.inc b/env/include/tf2_stocks.inc similarity index 100% rename from src/include/tf2_stocks.inc rename to env/include/tf2_stocks.inc diff --git a/src/include/timers.inc b/env/include/timers.inc similarity index 100% rename from src/include/timers.inc rename to env/include/timers.inc diff --git a/src/include/topmenus.inc b/env/include/topmenus.inc similarity index 100% rename from src/include/topmenus.inc rename to env/include/topmenus.inc diff --git a/src/include/usermessages.inc b/env/include/usermessages.inc similarity index 100% rename from src/include/usermessages.inc rename to env/include/usermessages.inc diff --git a/src/include/vector.inc b/env/include/vector.inc similarity index 100% rename from src/include/vector.inc rename to env/include/vector.inc diff --git a/src/include/version.inc b/env/include/version.inc similarity index 100% rename from src/include/version.inc rename to env/include/version.inc diff --git a/bin/spcomp b/env/linux/bin/spcomp similarity index 100% rename from bin/spcomp rename to env/linux/bin/spcomp diff --git a/env/readme.txt b/env/readme.txt new file mode 100644 index 0000000..b05b9b5 --- /dev/null +++ b/env/readme.txt @@ -0,0 +1,18 @@ +Compiling: + +- Windows: Use compile.bat in the source code repository. +- Linux: Use the makefile. + +The binary will be made in /build. + +The develop environment should be mostly stand-alone with SourcePawn compiler +some tools and include files. But there are some other stuff that's required +for this to work: + +Linux users: +- Mercurial +- Make + +Windows users: +- TortoiseHG (windows version of Mercurial, with both GUI and command line + tools). diff --git a/env/win32/bin/bash.exe b/env/win32/bin/bash.exe new file mode 100644 index 0000000..95f7f7b Binary files /dev/null and b/env/win32/bin/bash.exe differ diff --git a/env/win32/bin/cygiconv-2.dll b/env/win32/bin/cygiconv-2.dll new file mode 100644 index 0000000..cf77cde Binary files /dev/null and b/env/win32/bin/cygiconv-2.dll differ diff --git a/env/win32/bin/cygintl-8.dll b/env/win32/bin/cygintl-8.dll new file mode 100644 index 0000000..fd510bc Binary files /dev/null and b/env/win32/bin/cygintl-8.dll differ diff --git a/env/win32/bin/cygncurses-9.dll b/env/win32/bin/cygncurses-9.dll new file mode 100644 index 0000000..2eaada0 Binary files /dev/null and b/env/win32/bin/cygncurses-9.dll differ diff --git a/env/win32/bin/cygpath.exe b/env/win32/bin/cygpath.exe new file mode 100644 index 0000000..ce25aaf Binary files /dev/null and b/env/win32/bin/cygpath.exe differ diff --git a/env/win32/bin/cygreadline6.dll b/env/win32/bin/cygreadline6.dll new file mode 100644 index 0000000..823a888 Binary files /dev/null and b/env/win32/bin/cygreadline6.dll differ diff --git a/env/win32/bin/cygwin1.dll b/env/win32/bin/cygwin1.dll new file mode 100644 index 0000000..0296b95 Binary files /dev/null and b/env/win32/bin/cygwin1.dll differ diff --git a/env/win32/bin/date.exe b/env/win32/bin/date.exe new file mode 100644 index 0000000..e7e5eba Binary files /dev/null and b/env/win32/bin/date.exe differ diff --git a/env/win32/bin/echo.exe b/env/win32/bin/echo.exe new file mode 100644 index 0000000..4492fe7 Binary files /dev/null and b/env/win32/bin/echo.exe differ diff --git a/env/win32/bin/spcomp.exe b/env/win32/bin/spcomp.exe new file mode 100644 index 0000000..d0842b0 Binary files /dev/null and b/env/win32/bin/spcomp.exe differ diff --git a/src/include/sourcebans.inc b/src/include/sourcebans.inc deleted file mode 100644 index 1a55da0..0000000 --- a/src/include/sourcebans.inc +++ /dev/null @@ -1,31 +0,0 @@ -#if defined _sourcebans_included - #endinput -#endif -#define _sourcebans_included - -public SharedPlugin:__pl_sourcebans = -{ - name = "SourceBans", - file = "sourcebans.smx", - required = 0 -}; - - -public __pl_sourcebans_SetNTVOptional() -{ - MarkNativeAsOptional("SBBanPlayer"); -} - - -/********************************************************* - * Ban Player from server - * - * @param client The client index of the admin who is banning the client - * @param target The client index of the player to ban - * @param time The time to ban the player for (in minutes, 0 = permanent) - * @param reason The reason to ban the player from the server - * @noreturn - *********************************************************/ -native SBBanPlayer(client, target, time, String:reason[]); - -//Yarr! diff --git a/updateversion.bat b/updateversion.bat index 9e6b839..09d9f34 100644 --- a/updateversion.bat +++ b/updateversion.bat @@ -1,14 +1,12 @@ @echo off -REM Note: Copy this script to the source code repositroy and execute it -REM from that location. REM To avoid complicated and maybe impossible tasks in windows batch scripts, REM this script will execute another linux shell script using cygwin. -set BASH=%ZRDEVENV%\win32\bin\bash.exe -set DATEPATH=%ZRDEVENV%\win32\bin\date.exe +set BASH=env\win32\bin\bash.exe +set DATEPATH=env\win32\bin\date.exe REM Converts a windows path to a linux path for cygwin (/cygdrive/c/...). -for /f %%s in ('%ZRDEVENV%\win32\bin\cygpath.exe -u "%DATEPATH%"') do set DATEPATH=%%s +for /f %%s in ('env\win32\bin\cygpath.exe -u "%DATEPATH%"') do set DATEPATH=%%s %BASH% updateversion.sh %DATEPATH%