From 790d3f12a613855bd740ec872dc7efe81b39749c Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 21 May 2010 13:55:29 -0400 Subject: [PATCH 1/3] Empires gamedata fixes (bug 4417, r=fyren). --- gamedata/core.games/engine.ep2.txt | 1 + gamedata/sdktools.games/game.empires.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gamedata/core.games/engine.ep2.txt b/gamedata/core.games/engine.ep2.txt index be18270c..ccba0ab9 100644 --- a/gamedata/core.games/engine.ep2.txt +++ b/gamedata/core.games/engine.ep2.txt @@ -22,6 +22,7 @@ "game" "garrysmod" "game" "pvkii" "game" "gesource" + "game" "empires" } "Offsets" diff --git a/gamedata/sdktools.games/game.empires.txt b/gamedata/sdktools.games/game.empires.txt index c772e7e4..0abda4a1 100644 --- a/gamedata/sdktools.games/game.empires.txt +++ b/gamedata/sdktools.games/game.empires.txt @@ -50,7 +50,7 @@ "CommitSuicide" { "windows" "392" - "linux" "393" + "linux" "392" } "GetVelocity" { From 2cc22778b5a24d1659199ff475d55156dbab048d Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 21 May 2010 14:00:33 -0400 Subject: [PATCH 2/3] Added comment to databases.cfg to denote acceptable "host" types --- configs/databases.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/databases.cfg b/configs/databases.cfg index 072c27f7..6d414cc1 100644 --- a/configs/databases.cfg +++ b/configs/databases.cfg @@ -2,6 +2,8 @@ { "driver_default" "mysql" + // When specifying "host", you may use an IP address, a hostname, or a socket file path + "default" { "driver" "default" From 12723167fcdd4715ce748d8160c0cc8cd4c97c02 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 21 May 2010 14:04:19 -0400 Subject: [PATCH 3/3] Added gamedata for Resistance and Liberation (bug 4418, r=fyren) --- gamedata/core.games/common.games.txt | 3 + gamedata/core.games/engine.ep2.txt | 1 + gamedata/sdktools.games/engine.ep2.txt | 1 + gamedata/sdktools.games/game.rnlbeta.txt | 128 +++++++++++++++++++++++ gamedata/sdktools.games/master.games.txt | 4 + 5 files changed, 137 insertions(+) create mode 100644 gamedata/sdktools.games/game.rnlbeta.txt diff --git a/gamedata/core.games/common.games.txt b/gamedata/core.games/common.games.txt index e6dbc128..3282e957 100644 --- a/gamedata/core.games/common.games.txt +++ b/gamedata/core.games/common.games.txt @@ -140,6 +140,7 @@ "game" "zps" "game" "gesource" "game" "cstrike_beta" + "game" "RnLBeta" } "Keys" @@ -167,6 +168,7 @@ "game" "obsidian" "game" "cstrike" "game" "cstrike_beta" + "game" "RnLBeta" } "Keys" @@ -194,6 +196,7 @@ "game" "pvkii" "game" "zps" "game" "gesource" + "game" "RnLBeta" } "Keys" diff --git a/gamedata/core.games/engine.ep2.txt b/gamedata/core.games/engine.ep2.txt index ccba0ab9..ad5cc590 100644 --- a/gamedata/core.games/engine.ep2.txt +++ b/gamedata/core.games/engine.ep2.txt @@ -23,6 +23,7 @@ "game" "pvkii" "game" "gesource" "game" "empires" + "game" "RnLBeta" } "Offsets" diff --git a/gamedata/sdktools.games/engine.ep2.txt b/gamedata/sdktools.games/engine.ep2.txt index df8108e8..0b357451 100644 --- a/gamedata/sdktools.games/engine.ep2.txt +++ b/gamedata/sdktools.games/engine.ep2.txt @@ -128,6 +128,7 @@ "game" "garrysmod" "game" "pvkii" "game" "gesource" + "game" "RnLBeta" } "Offsets" diff --git a/gamedata/sdktools.games/game.rnlbeta.txt b/gamedata/sdktools.games/game.rnlbeta.txt new file mode 100644 index 00000000..565a36f4 --- /dev/null +++ b/gamedata/sdktools.games/game.rnlbeta.txt @@ -0,0 +1,128 @@ +"Games" +{ + /* Resistance and Liberation Open Beta 1.1 */ + "RnLBeta" + { + "Offsets" + { + "GiveNamedItem" + { + "windows" "356" + } + "RemovePlayerItem" + { + "windows" "238" + } + "Weapon_GetSlot" + { + "windows" "236" + } + "Ignite" + { + "windows" "193" + } + "Extinguish" + { + "windows" "197" + } + "Teleport" + { + "windows" "100" + } + "CommitSuicide" + { + "windows" "397" + } + "GetVelocity" + { + "windows" "130" + } + "EyeAngles" + { + "windows" "122" + } + "AcceptInput" + { + "windows" "34" + } + "DispatchKeyValue" + { + "windows" "29" + } + "DispatchKeyValueFloat" + { + "windows" "28" + } + "DispatchKeyValueVector" + { + "windows" "27" + } + "SetEntityModel" + { + "windows" "23" + } + "WeaponEquip" + { + "windows" "229" + } + "Activate" + { + "windows" "31" + } + "PlayerRunCmd" + { + "windows" "376" + } + + /* Offset into CBaseTempEntity constructor (vs2010 moved it!) */ + "s_pTempEntities" + { + "windows" "19" + } + "GetTEName" + { + "windows" "4" + } + "GetTENext" + { + "windows" "8" + } + "TE_GetServerClass" + { + "windows" "0" + } + "FireOutputBackup" + { + "windows" "9" + } + } + "Signatures" + { + "CBaseTempEntity" + { + "library" "server" + "windows" "\x55\x8B\xEC\x8B\xC1\x8B\x2A\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\x8B\x15\x2A\x2A\x2A\x2A\x89" + } + "DispatchSpawn" + { + "library" "server" + "windows" "\x55\x8B\xEC\x51\x53\x56\x8B\x75\x2A\x57\x85\xF6\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x8B" + } + "CreateEntityByName" + { + "library" "server" + "windows" "\x55\x8B\xEC\x56\x8B\x2A\x2A\x57\x8B\x2A\x2A\x83\x2A\x2A\x74\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x2A\x56\xFF\xD2" + } + "FindEntityByClassname" + { + "library" "server" + "windows" "\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x2A\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\x03\xC0\x8B\x3C\xC6\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74" + } + "FireOutput" + { + "library" "server" + "windows" "\x81\xEC\x1C\x01\x00\x00\x53\x55\x56\x8B\x71\x14\x85\xF6" + } + } + } +} \ No newline at end of file diff --git a/gamedata/sdktools.games/master.games.txt b/gamedata/sdktools.games/master.games.txt index c469c96e..9f59f15d 100644 --- a/gamedata/sdktools.games/master.games.txt +++ b/gamedata/sdktools.games/master.games.txt @@ -151,4 +151,8 @@ { "game" "gesource" } + "game.rnlbeta.txt" + { + "game" "RnLBeta" + } }