move to addons/trigger_bomb_reset

rehlds · Dec 13, 2022 · 9513084 · 9513084
1 parent 38b1b6d
commit 9513084
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 28 deletions.
diff --git a/regamedll/CMakeLists.txt b/regamedll/CMakeLists.txt
@@ -228,6 +228,7 @@ set(GAMEDLL_SRCS
 	"dlls/API/CSPlayerItem.cpp"
 	"dlls/addons/item_airbox.cpp"
 	"dlls/addons/point_command.cpp"
+	"dlls/addons/trigger_bomb_reset.cpp"
 	"dlls/addons/trigger_random.cpp"
 	"dlls/addons/trigger_setorigin.cpp"
 	"dlls/wpn_shared/wpn_ak47.cpp"

diff --git a/regamedll/dlls/addons/trigger_bomb_reset.cpp b/regamedll/dlls/addons/trigger_bomb_reset.cpp
@@ -0,0 +1,38 @@
+/*
+*
+*   This program is free software; you can redistribute it and/or modify it
+*   under the terms of the GNU General Public License as published by the
+*   Free Software Foundation; either version 2 of the License, or (at
+*   your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful, but
+*   WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*   General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software Foundation,
+*   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#include "precompiled.h"
+
+LINK_ENTITY_TO_CLASS(trigger_bomb_reset, CTriggerBombReset, CCSTriggerBombReset)
+
+void CTriggerBombReset::Spawn()
+{
+	InitTrigger();
+	SetTouch(&CTriggerBombReset::Touch);
+}
+
+void CTriggerBombReset::Touch(CBaseEntity *pOther)
+{
+	CWeaponBox *pWeaponBox = dynamic_cast<CWeaponBox *>(pOther);
+
+	if (pWeaponBox && pWeaponBox->m_bIsBomb)
+	{
+		// If the bomb touches this trigger, tell it to reset to its last known valid position.
+		pWeaponBox->ResetToLastValidPlayerHeldPosition();
+	}
+}
diff --git a/regamedll/dlls/addons/trigger_bomb_reset.h b/regamedll/dlls/addons/trigger_bomb_reset.h
@@ -0,0 +1,28 @@
+/*
+*
+*   This program is free software; you can redistribute it and/or modify it
+*   under the terms of the GNU General Public License as published by the
+*   Free Software Foundation; either version 2 of the License, or (at
+*   your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful, but
+*   WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*   General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software Foundation,
+*   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#pragma once
+
+#include "triggers.h"
+
+class CTriggerBombReset: public CBaseTrigger
+{
+public:
+	virtual void Spawn();
+	virtual void Touch(CBaseEntity *pOther);
+};
diff --git a/regamedll/dlls/triggers.cpp b/regamedll/dlls/triggers.cpp
@@ -1814,25 +1814,6 @@ void CTriggerTeleport::Spawn()
 	SetTouch(&CTriggerTeleport::TeleportTouch);
 }
 
-LINK_ENTITY_TO_CLASS(trigger_bomb_reset, CTriggerBombReset, CCSTriggerBombReset)
-
-void CTriggerBombReset::Spawn()
-{
-	InitTrigger();
-	SetTouch(&CTriggerBombReset::Touch);
-}
-
-void CTriggerBombReset::Touch(CBaseEntity *pOther)
-{
-	CWeaponBox *pWeaponBox = dynamic_cast<CWeaponBox *>(pOther);
-
-	if (pWeaponBox && pWeaponBox->m_bIsBomb)
-	{
-		// If the bomb touches this trigger, tell it to reset to its last known valid position.
-		pWeaponBox->ResetToLastValidPlayerHeldPosition();
-	}
-}
-
 LINK_ENTITY_TO_CLASS(info_teleport_destination, CPointEntity, CCSPointEntity)
 LINK_ENTITY_TO_CLASS(func_buyzone, CBuyZone, CCSBuyZone)
 

diff --git a/regamedll/dlls/triggers.h b/regamedll/dlls/triggers.h
@@ -395,13 +395,6 @@ class CTriggerTeleport: public CBaseTrigger
 	virtual void Spawn();
 };
 
-class CTriggerBombReset: public CBaseTrigger
-{
-public:
-	virtual void Spawn();
-	virtual void Touch(CBaseEntity *pOther);
-};
-
 class CBuyZone: public CBaseTrigger
 {
 public:

diff --git a/regamedll/msvc/ReGameDLL.vcxproj b/regamedll/msvc/ReGameDLL.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug Play|Win32">
@@ -25,6 +25,7 @@
   <ItemGroup>
     <ClCompile Include="..\dlls\addons\item_airbox.cpp" />
     <ClCompile Include="..\dlls\addons\point_command.cpp" />
+    <ClCompile Include="..\dlls\addons\trigger_bomb_reset.cpp" />
     <ClCompile Include="..\dlls\addons\trigger_random.cpp" />
     <ClCompile Include="..\dlls\addons\trigger_setorigin.cpp" />
     <ClCompile Include="..\dlls\airtank.cpp" />
@@ -616,6 +617,7 @@
     <ClInclude Include="..\dlls\activity.h" />
     <ClInclude Include="..\dlls\addons\item_airbox.h" />
     <ClInclude Include="..\dlls\addons\point_command.h" />
+    <ClInclude Include="..\dlls\addons\trigger_bomb_reset.h" />
     <ClInclude Include="..\dlls\addons\trigger_random.h" />
     <ClInclude Include="..\dlls\addons\trigger_setorigin.h" />
     <ClInclude Include="..\dlls\airtank.h" />

diff --git a/regamedll/msvc/ReGameDLL.vcxproj.filters b/regamedll/msvc/ReGameDLL.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="engine">
@@ -549,6 +549,9 @@
     <ClCompile Include="..\dlls\addons\point_command.cpp">
       <Filter>dlls\addons</Filter>
     </ClCompile>
+    <ClCompile Include="..\dlls\addons\trigger_bomb_reset.cpp">
+      <Filter>dlls\addons</Filter>
+    </ClCompile>
     <ClCompile Include="..\public\FileSystem.cpp">
       <Filter>public</Filter>
     </ClCompile>
@@ -1049,5 +1052,8 @@
     <ClInclude Include="..\dlls\addons\point_command.h">
       <Filter>dlls\addons</Filter>
     </ClInclude>
+    <ClInclude Include="..\dlls\addons\trigger_bomb_reset.h">
+      <Filter>dlls\addons</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/regamedll/regamedll/dlls.h b/regamedll/regamedll/dlls.h
@@ -134,6 +134,7 @@ using FloatRef = float;
 #include "addons/trigger_setorigin.h"
 #include "addons/trigger_random.h"
 #include "addons/point_command.h"
+#include "addons/trigger_bomb_reset.h"
 
 // Tutor
 #include "tutor.h"