Fixes and additions

Author: rafradek

.github/workflows/main.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build-and-package:
@@ -103,6 +106,7 @@ jobs:
 
     - name: Create GitHub Release
       uses: softprops/action-gh-release@v1
+      if: github.event_name != 'pull_request'
       with:
         files: build/release/*.zip
         token: ${{ secrets.GITHUB_TOKEN }}

.vscode/settings.json

@@ -93,7 +93,11 @@
         "cfenv": "cpp",
         "valarray": "cpp",
         "filesystem": "cpp",
-        "*.cfg": "c"
+        "*.cfg": "c",
+        "text_encoding": "cpp",
+        "hash_map": "cpp",
+        "expected": "cpp",
+        "ranges": "cpp"
     },
     "Lua.runtime.fileEncoding": "utf8",
     "Lua.diagnostics.disable": [

AMBuilder

@@ -160,6 +160,7 @@ if not Extension.optimize_mods_only:
     'src/mod/etc/ratelimit_exclude.cpp',
     'src/mod/etc/release_source_mutex.cpp',
     'src/mod/etc/server_allow_wait_command.cpp',
+    'src/mod/etc/server_redirects.cpp',
     'src/mod/etc/suppress_nb_event_messages.cpp',
     'src/mod/etc/target_changegravity_improved.cpp',
     'src/mod/etc/vehicle_fix.cpp',
@@ -193,6 +194,7 @@ if not Extension.optimize_mods_only:
   # 'src/mod/util/screenshot_png.cpp',
     'src/mod/util/search_paths.cpp',
     'src/mod/util/vscript_send_output_to_admins.cpp',
+    'src/mod/util/vscript_load_init_scripts.cpp',
   # 'src/mod/util/serialize_spew.cpp',
   #  'src/mod/util/vprof_remote.cpp',
   ]

cfg/sigsegv_convars.cfg

@@ -115,6 +115,8 @@ sig_etc_ratelimit_exclude_commands	""		// Mod: space-delimited list of commands
 sig_etc_ratelimit_exclude	"0"		// Mod: exclude selected client commands from server-side ratelimiting
 sig_etc_allow_wait_command	"1"		// Mod: always allow wait command on server
 sig_etc_suppress_nb_event_messages	"0"		// Mod: suppress NextBot event RESULT_CRITICAL collision console messages
+sig_etc_server_redirects	"1"		// Mod: Allows for server redirects with passwords
+sig_etc_server_redirects_redirect_only "0" // This server is for redirects only
 sig_etc_target_changegravity_improved	"0"		// Mod: improve the target_changegravity entity so that it's actually usable
 sig_etc_vehicle_fix	"1"		// "Mod: fix prop_vehicle_driveable"
 sig_etc_weapon_mimic_teamnum	"1"		// Mod: weapon mimic teamnum fix
@@ -388,4 +390,5 @@ sig_util_vprof_recv	"0"		// Utility: vprof forwarding: client receive
 sig_util_vprof_send_host	"jgvm-win8"		// Network host to use for VProf transmission
 sig_util_vprof_send_port	"30001"		// Network port to use for VProf transmission
 sig_util_vprof_send	"0"		// Utility: vprof forwarding: server send
-sig_util_vscript_send_output_to_admins "1" // Utility: Send output and errors from vscript to admins
+sig_util_vscript_send_output_to_admins "1" // Utility: Send output and errors from vscript to admins
+sig_util_vscript_load_init_scripts "1" // "Utility: Load vscript serverinit.nut before mapspawn"

cfg/sigsegv_convars_no_mvm.cfg

@@ -88,6 +88,8 @@ sig_etc_ratelimit_exclude_commands	""		// Mod: space-delimited list of commands
 sig_etc_ratelimit_exclude	"0"		// Mod: exclude selected client commands from server-side ratelimiting
 sig_etc_allow_wait_command	"1"		// Mod: always allow wait command on server
 sig_etc_sendprop_override_extension "0" // Mod: Force load buildin proxysend/sendproxy extension. Loaded automatically when proxysend extension is detected in extensions
+sig_etc_server_redirects	"1"		// Mod: Allows for server redirects with passwords
+sig_etc_server_redirects_redirect_only "0" // This server is for redirects only
 sig_etc_suppress_nb_event_messages	"0"		// Mod: suppress NextBot event RESULT_CRITICAL collision console messages
 sig_etc_target_changegravity_improved	"0"		// Mod: improve the target_changegravity entity so that it's actually usable
 sig_etc_vehicle_fix	"1"		// Etc: fix prop_vehicle_driveable
@@ -122,4 +124,5 @@ sig_util_listenserverhost	"0"		// Utility: override UTIL_GetListenServerHost on
 sig_util_make_item	"1"		// Utility: enable sig_makeitem_* client commands
 sig_util_make_item_adminonly	"1"		// Utility: restrict this mod's functionality to SM admins only
 sig_util_pooled_string_fix "0" // Mod: Always enable the 65k+ pooled strings fix
-sig_util_vscript_send_output_to_admins "1" // Utility: Send output and errors from vscript to admins
+sig_util_vscript_send_output_to_admins "1" // Utility: Send output and errors from vscript to admins
+sig_util_vscript_load_init_scripts "1" // "Utility: Load vscript serverinit.nut before mapspawn"

gamedata/sigsegv/entities.txt

@@ -1043,6 +1043,7 @@
 				"CTFWeaponBaseMelee::SecondaryAttack" "_ZN18CTFWeaponBaseMelee15SecondaryAttackEv"
 				"CTFWeaponBaseMelee::Smack" "_ZN18CTFWeaponBaseMelee5SmackEv"
 				"CTFWeaponBaseMelee::Swing" "_ZN18CTFWeaponBaseMelee5SwingEP9CTFPlayer"
+				"CTFWrench::Smack" "_ZN9CTFWrench5SmackEv"
 				"CTFWeaponBuilder::CanDeploy" "_ZN16CTFWeaponBuilder9CanDeployEv"
 				"CTFWeaponBuilder::GetViewModel" "_ZNK16CTFWeaponBuilder12GetViewModelEi"
 				"CTFWeaponBuilder::SetSubType" "_ZN16CTFWeaponBuilder10SetSubTypeEi"

gamedata/sigsegv/globals.txt

@@ -140,6 +140,7 @@
 				"CBaseEntity::m_pPredictionPlayer" "_ZN11CBaseEntity19m_pPredictionPlayerE"
 				"g_pScriptVM" "g_pScriptVM"
 				"g_GameStringPool" "_ZL16g_GameStringPool"
+				"steamgameserverapicontext" "steamgameserverapicontext"
 
 			}
 
@@ -163,6 +164,9 @@
 				"g_BSPData" "g_BSPData"
 				"g_HostState" "_ZL11g_HostState"
 				"s_Steam3Server" "_ZL14s_Steam3Server"
+				"g_bUseFakeIP" "g_bUseFakeIP"
+				"g_nFakeIP" "g_nFakeIP"
+				"g_arFakePorts" "g_arFakePorts"
 			}
 		}
 	}

gamedata/sigsegv/misc.txt

@@ -3155,6 +3155,20 @@
 					type "sym"
 					sym  "_Z23COM_GetUncompressedSizePKvj"
 				}
+
+				"CBaseServer::CheckPassword"
+				{
+					lib "engine"
+					type "sym"
+					sym  "_ZN11CBaseServer13CheckPasswordER8netadr_sPKcS3_"
+				}
+
+				"CBaseServer::ConnectClient"
+				{
+					lib "engine"
+					type "sym"
+					sym  "_ZN11CBaseServer13ConnectClientER8netadr_siiiiPKcS3_S3_i"
+				}
 
 			}
 			"addrs_group"
@@ -3258,6 +3272,11 @@
 				"ClientData_Update" "_Z17ClientData_UpdateP11CBasePlayer"
 
 				"GetCurrentSkyCamera" "_Z19GetCurrentSkyCamerav"
+				
+				"VScriptServerInit" "_Z17VScriptServerInitv"
+				"VScriptRunScript" "_Z16VScriptRunScriptPKcP9HSCRIPT__b"
+				"CServerGameDLL::GetServerBrowserMapOverride" "_ZN14CServerGameDLL27GetServerBrowserMapOverrideEv"
+				
 			}
 
 			"addrs_group"

src/convar_restore.cpp

@@ -17,7 +17,16 @@ namespace ConVar_Restore
 	std::list<ConVar *>     s_ConVars;
 	std::list<ConCommand *> s_ConCmds;
 
-	
+	const char *GetConfigFileName()
+	{
+		int param = CommandLine()->FindParm("-sig_config_file");
+		if (param == 0) {
+			return "cfg/sigsegv_convars.cfg";
+		}
+		else {
+			return CommandLine()->GetParm(param + 1);
+		}
+	}
 	void Register(ConCommandBase *pCommand)
 	{
 		/* ignore s_EmptyConVar */
@@ -97,28 +106,28 @@ namespace ConVar_Restore
 
 		//file.PutChar('}');
 		if (!filesystem->WriteFile(path,"GAME", file)) {
-			Warning("ConVar_Restore::Save: Could not save Ke27020yValues to \"cfg/sigsegv_convars.cfg\".\n");
+			Warning("ConVar_Restore::Save: Could not save KeyValues to \"%s\".\n", path);
 		}
 
 		//kv->deleteThis();
 	}
 
 	void Save()
 	{
-		SaveActual(false, "cfg/sigsegv_convars.cfg");
+		SaveActual(false, GetConfigFileName());
 	}
 
 	void SaveNonDefault()
 	{
-		SaveActual(true, "cfg/sigsegv_convars.cfg");
+		SaveActual(true, GetConfigFileName());
 	}
 
 	void Load()
 	{
 		CCommandBuffer buf;
 
 		CUtlBuffer file( 0, 0, CUtlBuffer::TEXT_BUFFER );
-		if (filesystem->ReadFile("cfg/sigsegv_convars.cfg", "GAME", file)) {
+		if (filesystem->ReadFile(GetConfigFileName(), "GAME", file)) {
 			char line[1024];
 			while(file.GetBytesRemaining() > 0) {
 				file.EatWhiteSpace();
@@ -193,6 +202,6 @@ namespace ConVar_Restore
 	void OnExtUnload()
 	{
 		if (cvar_autosave.GetBool())
-			SaveActual(false, "cfg/sigsegv_convars.cfg");
+			SaveActual(false, GetConfigFileName());
 	}
 }

src/mod/attr/custom_attributes.cpp

@@ -4120,7 +4120,6 @@ namespace Mod::Attr::Custom_Attributes
 				for (int i = 0; i < 4; i++) {
 					int addcond = (iCondOverride >> (i * 8)) & 255;
 					if (addcond != 0) {
-						raise(SIGTRAP);
 						nCond = (ETFCond) addcond;
 						DETOUR_MEMBER_CALL(nCond, bool1);
 						addcond_overridden = true;

src/mod/etc/melee_ignore_teammates.cpp

@@ -35,7 +35,7 @@ namespace Mod::Etc::Melee_Ignore_Teammates
 		if (cleave_attack) {
 			ForEachEntity([&](CBaseEntity *ent){
 				int flags = ent->m_fFlags;
-				if ((flags & FL_NPC || ent->IsCombatCharacter()) && !(flags & FL_OBJECT || flags & FL_CLIENT)) {
+				if (((flags & FL_NPC) || ent->IsCombatCharacter() || (flags & FL_GRENADE)) && !(flags & FL_OBJECT || flags & FL_CLIENT)) {
 					ent->m_fFlags |= FL_OBJECT;
 					altered_flags.push_back(ent);
 				}
@@ -74,6 +74,31 @@ namespace Mod::Etc::Melee_Ignore_Teammates
 		}
 		else {
 			result = DETOUR_MEMBER_CALL(tr, cleave_attack, traces);
+			// Check if there is a wall between us and the target, and if entity is alive
+			if (traces != nullptr) {
+				auto &tracesRef = *traces;
+				FOR_EACH_VEC_BACK(tracesRef, i) {
+					auto &trace = tracesRef[i];
+					CBaseEntity *entity = trace.m_pEnt;
+					if (entity != nullptr) {
+						if (!entity->IsAlive()) {
+							traces->Remove(i);
+							continue;
+						}
+
+						trace_t t;
+						CTraceFilterNoNPCsOrPlayer f(nullptr, COLLISION_GROUP_NONE);
+						UTIL_TraceLine(trace.startpos, trace.endpos + (trace.endpos - trace.startpos), MASK_SOLID_BRUSHONLY, &f, &t);
+						if (t.DidHit()) {
+							UTIL_TraceLine(trace.startpos, entity->WorldSpaceCenter(), MASK_SOLID_BRUSHONLY, &f, &t);
+						}
+						if (t.DidHit()) {
+							traces->Remove(i);
+							continue;
+						}
+					}
+				}
+			}
 		}
 
 		if (cleave_attack) {

src/mod/etc/misc.cpp

@@ -249,6 +249,23 @@ namespace Mod::Etc::Misc
         }
 	}
 
+	RefCount rc_CTFWrench_Smack;
+	DETOUR_DECL_MEMBER(void, CTFWrench_Smack)
+	{
+		SCOPED_INCREMENT(rc_CTFWrench_Smack);
+		DETOUR_MEMBER_CALL();
+	}
+
+	DETOUR_DECL_MEMBER(bool, CTraceFilterIgnorePlayers_ShouldHitEntity, IHandleEntity *pServerEntity, int contentsMask)
+	{
+		auto result = DETOUR_MEMBER_CALL(pServerEntity, contentsMask);
+        if (result && rc_CTFWrench_Smack) {
+            auto entity = EntityFromEntityHandle(pServerEntity);
+            if (entity != nullptr && entity->IsCombatItem()) return false;
+        }
+        return result;
+    }
+
     class CMod : public IMod
 	{
 	public:
@@ -286,6 +303,10 @@ namespace Mod::Etc::Misc
 
 			// No deathcam if music is playing
 			MOD_ADD_DETOUR_MEMBER(CTFPlayer_Event_Killed, "CTFPlayer::Event_Killed");
+
+			// Shields do not block building repair now
+			MOD_ADD_DETOUR_MEMBER(CTraceFilterIgnorePlayers_ShouldHitEntity, "CTraceFilterIgnorePlayers::ShouldHitEntity");
+			MOD_ADD_DETOUR_MEMBER(CTFWrench_Smack, "CTFWrench::Smack");
 		}
 	};
 	CMod s_Mod;