From 22f5eb26b73be0a30a6edcd9e36670486ad5e876 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Sun, 9 Aug 2020 02:22:51 +0500 Subject: [PATCH 1/3] wscript: update. --- dlls/wscript | 4 +++- wscript | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wscript b/dlls/wscript index 5f17aefc..e02e7238 100644 --- a/dlls/wscript +++ b/dlls/wscript @@ -25,7 +25,9 @@ def build(bld): source = bld.path.parent.ant_glob([ 'pm_shared/*.c', ]) - + source += bld.path.ant_glob([ + 'tot/civ.cpp', + ]) source += [ 'agrunt.cpp', 'airtank.cpp', diff --git a/wscript b/wscript index b01647df..78a99416 100644 --- a/wscript +++ b/wscript @@ -271,6 +271,9 @@ def configure(conf): conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:] conf.define('CLIENT_WEAPONS', '1') + conf.define('CROWBAR_IDLE_ANIM', '1') + conf.define('CROWBAR_FIX_RAPID_CROWBAR', '1') + conf.define('GAUSS_OVERCHARGE_FIX', '1') if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS: conf.define('MOBILE_HACKS', '1') From 38b2b257f14db67e27572aaa9571f59f9fc6389a Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin <15944199+nekonomicon@users.noreply.github.com> Date: Wed, 15 Jun 2022 02:01:26 +0500 Subject: [PATCH 2/3] cmake: change gamedir. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 123cd838..5c3e7e41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ else() option(64BIT "Disable auto -m32 appending to compiler flags" ON) endif() -set(GAMEDIR "valve" CACHE STRING "Gamedir path") +set(GAMEDIR "tot" CACHE STRING "Gamedir path") set(SERVER_INSTALL_DIR "dlls" CACHE STRING "Where put server dll") set(CLIENT_INSTALL_DIR "cl_dlls" CACHE STRING "Where put client dll") set(SERVER_LIBRARY_NAME "hl" CACHE STRING "Library name for PC platforms") From 8b9716908fa05f509727acc80499ea036728f513 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin <15944199+nekonomicon@users.noreply.github.com> Date: Fri, 4 Nov 2022 02:29:02 +0500 Subject: [PATCH 3/3] Fix civilian scientist's voice pitch selection. --- dlls/tot/civ.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/tot/civ.cpp b/dlls/tot/civ.cpp index a784e0e2..3b154941 100644 --- a/dlls/tot/civ.cpp +++ b/dlls/tot/civ.cpp @@ -42,6 +42,12 @@ LINK_ENTITY_TO_CLASS(monster_civ, CCivScientist); //========================================================= void CCivScientist::Spawn(void) { + // We need to set it before precache so the right voice will be chosen + if( pev->body == -1 ) + {// -1 chooses a random head + pev->body = RANDOM_LONG( 0, NUM_SCIENTIST_HEADS - 1 );// pick a head, any he + } + Precache(); SET_MODEL(ENT(pev), "models/civ_sci.mdl"); @@ -62,11 +68,6 @@ void CCivScientist::Spawn(void) // White hands pev->skin = 0; - if (pev->body == -1) - {// -1 chooses a random head - pev->body = RANDOM_LONG(0, NUM_SCIENTIST_HEADS - 1);// pick a head, any head - } - // Luther is black, make his hands black if (pev->body == HEAD_LUTHER) pev->skin = 1;