diff --git a/extensions/cstrike/AMBuilder b/extensions/cstrike/AMBuilder index 12dea038..116f0ada 100644 --- a/extensions/cstrike/AMBuilder +++ b/extensions/cstrike/AMBuilder @@ -1,25 +1,6 @@ # vim: set ts=2 sw=2 tw=99 noet ft=python: import os -sdk = SM.sdkInfo['ep1'] - -compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep1') - -name = 'game.cstrike.ext.' + sdk['ext'] -extension = AMBuild.AddJob(name) -binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) -SM.PreSetupHL2Job(extension, binary, 'ep1') -binary.AddSourceFiles('extensions/cstrike', [ - 'extension.cpp', - 'natives.cpp', - 'RegNatives.cpp', - 'timeleft.cpp', - 'sdk/smsdk_ext.cpp' - ]) -SM.PostSetupHL2Job(extension, binary, 'ep1') -SM.AutoVersion('extensions/cstrike', binary) -binary.SendToJob() - sdk = SM.sdkInfo['ep2v'] compiler = SM.DefaultHL2Compiler('extensions/cstrike', 'ep2v') diff --git a/extensions/cstrike/extension.cpp b/extensions/cstrike/extension.cpp index f25222ba..549df79e 100644 --- a/extensions/cstrike/extension.cpp +++ b/extensions/cstrike/extension.cpp @@ -55,7 +55,7 @@ extern sp_nativeinfo_t g_CSNatives[]; bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late) { - if (strcmp(g_pSM->GetGameFolderName(), "cstrike") != 0 && strcmp(g_pSM->GetGameFolderName(), "cstrike_beta") != 0) + if (strcmp(g_pSM->GetGameFolderName(), "cstrike") != 0) { snprintf(error, maxlength, "Cannot Load Cstrike Extension on mods other than CS:S"); return false; diff --git a/gamedata/core.games/common.games.txt b/gamedata/core.games/common.games.txt index 3282e957..3cbf9e37 100644 --- a/gamedata/core.games/common.games.txt +++ b/gamedata/core.games/common.games.txt @@ -139,7 +139,6 @@ "game" "FortressForever" "game" "zps" "game" "gesource" - "game" "cstrike_beta" "game" "RnLBeta" } @@ -167,7 +166,6 @@ "game" "gesource" "game" "obsidian" "game" "cstrike" - "game" "cstrike_beta" "game" "RnLBeta" } @@ -210,7 +208,6 @@ "#supported" { "game" "cstrike" - "game" "cstrike_beta" } "Keys" @@ -218,20 +215,6 @@ "GameExtension" "game.cstrike" } } - - "#default" - { - "#supported" - { - "game" "cstrike" - "engine" "original" - } - - "Keys" - { - "HintTextPreByte" "yes" - } - } "tf" { diff --git a/gamedata/core.games/engine.ep1.txt b/gamedata/core.games/engine.ep1.txt index cd54eeab..9aebd3a5 100644 --- a/gamedata/core.games/engine.ep1.txt +++ b/gamedata/core.games/engine.ep1.txt @@ -16,7 +16,6 @@ { "#supported" { - "game" "cstrike" "game" "hl2mp" "game" "ship" "game" "insurgency" diff --git a/gamedata/core.games/engine.ep2valve.txt b/gamedata/core.games/engine.ep2valve.txt index ac377394..95ccfa4c 100644 --- a/gamedata/core.games/engine.ep2valve.txt +++ b/gamedata/core.games/engine.ep2valve.txt @@ -19,7 +19,6 @@ "game" "dod" "game" "tf" "game" "cstrike" - "game" "cstrike_beta" } "Offsets" diff --git a/gamedata/sdktools.games/engine.ep1.txt b/gamedata/sdktools.games/engine.ep1.txt index e1d6ea45..be2a7e61 100644 --- a/gamedata/sdktools.games/engine.ep1.txt +++ b/gamedata/sdktools.games/engine.ep1.txt @@ -16,7 +16,6 @@ { "#supported" { - "game" "cstrike" "game" "hl2mp" "game" "ship" "game" "!Dystopia" @@ -74,7 +73,6 @@ { "#supported" { - "game" "cstrike" "game" "garrysmod" "game" "hl2mp" "game" "ship" @@ -123,7 +121,6 @@ { "#supported" { - "game" "cstrike" "game" "garrysmod" "game" "hl2mp" "game" "ship" @@ -152,7 +149,6 @@ { "#supported" { - "game" "cstrike" "game" "hl2mp" "game" "sourceforts" "game" "synergy" @@ -232,7 +228,6 @@ { "#supported" { - "game" "cstrike" "game" "hl2mp" "game" "NeotokyoSource" "game" "zombie_master" diff --git a/gamedata/sdktools.games/engine.ep2valve.txt b/gamedata/sdktools.games/engine.ep2valve.txt index b7bb9a42..92a1e16e 100644 --- a/gamedata/sdktools.games/engine.ep2valve.txt +++ b/gamedata/sdktools.games/engine.ep2valve.txt @@ -19,7 +19,6 @@ "game" "dod" "game" "tf" "game" "cstrike" - "game" "cstrike_beta" } "Offsets" @@ -69,7 +68,6 @@ "game" "dod" "game" "tf" "game" "cstrike" - "game" "cstrike_beta" } "Signatures" @@ -97,7 +95,6 @@ "game" "dod" "game" "tf" "game" "cstrike" - "game" "cstrike_beta" } "Signatures" @@ -120,7 +117,6 @@ "game" "dod" "game" "tf" "game" "cstrike" - "game" "cstrike_beta" } "Offsets" @@ -213,7 +209,6 @@ "game" "dod" "game" "tf" "game" "cstrike" - "game" "cstrike_beta" } "Signatures" { diff --git a/gamedata/sdktools.games/game.cstrike.txt b/gamedata/sdktools.games/game.cstrike.txt index 64e4641b..52b3a9f8 100644 --- a/gamedata/sdktools.games/game.cstrike.txt +++ b/gamedata/sdktools.games/game.cstrike.txt @@ -12,122 +12,8 @@ "Games" { /* Counter-Strike: Source */ - "#default" + "cstrike" { - "#supported" - { - "engine" "original" - "game" "cstrike" - } - - "Keys" - { - "SlapSoundCount" "3" - "SlapSound1" "player/damage1.wav" - "SlapSound2" "player/damage2.wav" - "SlapSound3" "player/damage3.wav" - } - - "Offsets" - { - "GiveNamedItem" - { - "windows" "329" - "linux" "330" - } - "RemovePlayerItem" - { - "windows" "226" - "linux" "227" - } - "Weapon_GetSlot" - { - "windows" "224" - "linux" "225" - } - "Ignite" - { - "windows" "188" - "linux" "189" - } - "Extinguish" - { - "windows" "189" - "linux" "190" - } - "Teleport" - { - "windows" "98" - "linux" "99" - } - "CommitSuicide" - { - "windows" "357" - "linux" "358" - } - "GetVelocity" - { - "windows" "126" - "linux" "127" - } - "EyeAngles" - { - "windows" "118" - "linux" "119" - } - "AcceptInput" - { - "windows" "35" - "linux" "36" - } - "DispatchKeyValue" - { - "windows" "31" - "linux" "30" - } - "DispatchKeyValueFloat" - { - "windows" "30" - "linux" "31" - } - "DispatchKeyValueVector" - { - "windows" "29" - "linux" "32" - } - "SetEntityModel" - { - "windows" "25" - "linux" "26" - } - "WeaponEquip" - { - "windows" "217" - "linux" "218" - } - "Activate" - { - "windows" "32" - "linux" "33" - } - "PlayerRunCmd" - { - "windows" "347" - "linux" "348" - } - } - } - - /* Counter-Strike: Source ORANGEBOX */ - "#default" - { - "#supported" - { - "engine" "orangebox_valve" - "game" "cstrike" - "game" "cstrike_beta" - } - "Keys" { "SlapSoundCount" "3" diff --git a/gamedata/sdktools.games/master.games.txt b/gamedata/sdktools.games/master.games.txt index 9f59f15d..19b158d6 100644 --- a/gamedata/sdktools.games/master.games.txt +++ b/gamedata/sdktools.games/master.games.txt @@ -58,7 +58,6 @@ "game.cstrike.txt" { "game" "cstrike" - "game" "cstrike_beta" } "game.hl2mp.txt" diff --git a/gamedata/sm-cstrike.games.txt b/gamedata/sm-cstrike.games.txt index 39f7c379..db7a5c48 100644 --- a/gamedata/sm-cstrike.games.txt +++ b/gamedata/sm-cstrike.games.txt @@ -11,40 +11,8 @@ "Games" { - "#default" + "cstrike" { - "#supported" - { - "engine" "original" - "game" "cstrike" - } - - "Signatures" - { - "RoundRespawn" - { - "library" "server" - "windows" "\x56\x8B\xF1\x8B\x06\xFF\x90\x2A\x04\x00\x00\x8B\x86\x2A\x0D\x00" - "linux" "@_ZN9CCSPlayer12RoundRespawnEv" - } - "SwitchTeam" - { - "library" "server" - "windows" "\x83\xEC\x10\x56\x57\x8B\x7C\x24\x1C\x57\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\x85\xC0\x0F\x84\xEA\x00\x00\x00\x83\xFF\x03\x74\x09\x83\xFF\x02\x0F\x85\xDC\x00\x00\x00\x8B\xCE\xE8\x2A\x2A\x2A\x2A\x3B\xF8\x0F\x84\xDC\x00\x00\x00\x57\x8B\xCE\xC6\x86\x2A\x2A" - "linux" "@_ZN9CCSPlayer10SwitchTeamEi" - } - } - } - - "#default" - { - "#supported" - { - "engine" "orangebox_valve" - "game" "cstrike" - "game" "cstrike_beta" - } - "Signatures" { "RoundRespawn" diff --git a/tools/buildbot/PackageScript b/tools/buildbot/PackageScript index 1e745cc5..5455fbc4 100644 --- a/tools/buildbot/PackageScript +++ b/tools/buildbot/PackageScript @@ -209,7 +209,6 @@ AddNormalLibrary('sourcepawn.jit.x86', 'bin') AddNormalLibrary('geoip.ext', 'extensions') AddNormalLibrary('dbi.mysql.ext', 'extensions') AddNormalLibrary('dbi.sqlite.ext', 'extensions') -AddNormalLibrary('game.cstrike.ext.1.ep1', 'extensions') AddNormalLibrary('game.cstrike.ext.2.ep2v', 'extensions') AddNormalLibrary('game.tf2.ext.2.ep2v', 'extensions') AddNormalLibrary('topmenus.ext', 'extensions')