Convert Op4-specific headers to use pragma once

Resolves twhl-community/halflife-updated#50
twhl-community · Nov 19, 2021 · 8aa9c01 · 8aa9c01
1 parent fdd344f
commit 8aa9c01
Show file tree

Hide file tree

Showing 33 changed files with 66 additions and 132 deletions.
diff --git a/dlls/COFAllyMonster.h b/dlls/COFAllyMonster.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef COFALLYMONSTER_H
-#define COFALLYMONSTER_H
+
+#pragma once
 
 /**
 *	@brief Base class for Opposing force allies
@@ -95,5 +95,3 @@ class COFAllyMonster : public CBaseMonster
 	EHANDLE		m_hTalkTarget;	// who to look at while talking
 	CUSTOM_SCHEDULES;
 };
-
-#endif
diff --git a/dlls/ctf/CItemAcceleratorCTF.h b/dlls/ctf/CItemAcceleratorCTF.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CITEMACCELERATORCTF_H
-#define CITEMACCELERATORCTF_H
+
+#pragma once
 
 #include "CItemCTF.h"
 
@@ -30,5 +30,3 @@ class CItemAcceleratorCTF : public CItemCTF
 
 	bool MyTouch( CBasePlayer* pPlayer ) override;
 };
-
-#endif
diff --git a/dlls/ctf/CItemBackpackCTF.h b/dlls/ctf/CItemBackpackCTF.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CITEMBACKPACKCTF_H
-#define CITEMBACKPACKCTF_H
+
+#pragma once
 
 #include "CItemCTF.h"
 
@@ -30,5 +30,3 @@ class CItemBackpackCTF : public CItemCTF
 
 	int Classify() override;
 };
-
-#endif
diff --git a/dlls/ctf/CItemCTF.h b/dlls/ctf/CItemCTF.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CITEMCTF_H
-#define CITEMCTF_H
+
+#pragma once
 
 #include "CTFDefs.h"
 
@@ -58,5 +58,3 @@ class CItemCTF : public CBaseAnimating
 	CTFItem::CTFItem m_iItemFlag;
 	const char* m_pszItemName;
 };
-
-#endif
diff --git a/dlls/ctf/CItemLongJumpCTF.h b/dlls/ctf/CItemLongJumpCTF.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CITEMLONGJUMPCTF_H
-#define CITEMLONGJUMPCTF_H
+
+#pragma once
 
 #include "CItemCTF.h"
 
@@ -30,5 +30,3 @@ class CItemLongJumpCTF : public CItemCTF
 
 	int Classify() override;
 };
-
-#endif
diff --git a/dlls/ctf/CItemPortableHEVCTF.h b/dlls/ctf/CItemPortableHEVCTF.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CITEMPORTABLEHEVCTF_H
-#define CITEMPORTABLEHEVCTF_H
+
+#pragma once
 
 #include "CItemCTF.h"
 
@@ -30,5 +30,3 @@ class CItemPortableHEVCTF : public CItemCTF
 
 	int Classify() override;
 };
-
-#endif
diff --git a/dlls/ctf/CItemRegenerationCTF.h b/dlls/ctf/CItemRegenerationCTF.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CITEMREGENERATIONCTF_H
-#define CITEMREGENERATIONCTF_H
+
+#pragma once
 
 #include "CItemCTF.h"
 
@@ -30,5 +30,3 @@ class CItemRegenerationCTF : public CItemCTF
 
 	int Classify() override;
 };
-
-#endif
diff --git a/dlls/ctf/CItemSpawnCTF.h b/dlls/ctf/CItemSpawnCTF.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CITEMSPAWNCTF_H
-#define CITEMSPAWNCTF_H
+
+#pragma once
 
 #include "CTFDefs.h"
 
@@ -24,5 +24,3 @@ class CItemSpawnCTF : public CPointEntity
 
 	CTFTeam team_no;
 };
-
-#endif
diff --git a/dlls/ctf/CTFDefs.h b/dlls/ctf/CTFDefs.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CTFDEFS_H
-#define CTFDEFS_H
+
+#pragma once
 
 /**
 *	@file CTF gamemode definitions
@@ -45,5 +45,3 @@ enum CTFItem : unsigned int
 	ItemsMask = LongJump | PortableHEV | Backpack | Acceleration | Unknown | Regeneration
 };
 }
-
-#endif //CTFDEFS_H
diff --git a/dlls/ctf/CTFGoal.h b/dlls/ctf/CTFGoal.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CTFGOAL_H
-#define CTFGOAL_H
+
+#pragma once
 
 class CTFGoal : public CBaseAnimating
 {
@@ -35,5 +35,3 @@ class CTFGoal : public CBaseAnimating
 	Vector m_GoalMin;
 	Vector m_GoalMax;
 };
-
-#endif
diff --git a/dlls/ctf/CTFGoalBase.h b/dlls/ctf/CTFGoalBase.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CTFGOALBASE_H
-#define CTFGOALBASE_H
+
+#pragma once
 
 #include "CTFGoal.h"
 
@@ -28,5 +28,3 @@ class CTFGoalBase : public CTFGoal
 
 	void TurnOnLight(CBasePlayer* pPlayer);
 };
-
-#endif
diff --git a/dlls/ctf/CTFGoalFlag.h b/dlls/ctf/CTFGoalFlag.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CTFGOALFLAG_H
-#define CTFGOALFLAG_H
+
+#pragma once
 
 #include "CTFGoal.h"
 
@@ -65,5 +65,3 @@ class CTFGoalFlag : public CTFGoal
 	int m_nReturnPlayer;
 	float m_flReturnTime;
 };
-
-#endif
diff --git a/dlls/ctf/CTFSpawn.h b/dlls/ctf/CTFSpawn.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CTFSPAWN_H
-#define CTFSPAWN_H
+
+#pragma once
 
 #include "CTFDefs.h"
 
@@ -31,6 +31,3 @@ class CTFSpawn : public CBaseEntity
 	CTFTeam team_no;
 	bool m_fState;
 };
-
-
-#endif
diff --git a/dlls/ctf/ctfplay_gamerules.h b/dlls/ctf/ctfplay_gamerules.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef CTFPLAY_GAMERULES_H
-#define CTFPLAY_GAMERULES_H
+
+#pragma once
 
 #include "CTFDefs.h"
 
@@ -140,5 +140,3 @@ void ScatterPlayerCTFPowerups( CBasePlayer* pPlayer );
 void DropPlayerCTFPowerup( CBasePlayer* pPlayer );
 void FlushCTFPowerupTimes();
 void InitItemsForPlayer(CBasePlayer* pPlayer);
-
-#endif
diff --git a/dlls/rope/CElectrifiedWire.h b/dlls/rope/CElectrifiedWire.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef ROPE_CELECTRIFIEDWIRE_H
-#define ROPE_CELECTRIFIEDWIRE_H
+
+#pragma once
 
 #include "CRope.h"
 
@@ -82,5 +82,3 @@ class CElectrifiedWire : public CRope
 
 	float m_flLastSparkTime;
 };
-
-#endif
diff --git a/dlls/rope/CRope.h b/dlls/rope/CRope.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef GAME_SERVER_ENTITIES_ROPE_CROPE_H
-#define GAME_SERVER_ENTITIES_ROPE_CROPE_H
+
+#pragma once
 
 class CRopeSegment;
 class CRopeSample;
@@ -323,5 +323,3 @@ class CRope : public CBaseDelay
 
 	BOOL m_bMakeSound;
 };
-
-#endif
diff --git a/dlls/rope/CRopeSample.h b/dlls/rope/CRopeSample.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef ROPE_CROPESAMPLE_H
-#define ROPE_CROPESAMPLE_H
+
+#pragma once
 
 class CRope;
 
@@ -64,5 +64,3 @@ class CRopeSample : public CBaseEntity
 	RopeSampleData m_Data;
 	CRope* m_pMasterRope;
 };
-
-#endif
diff --git a/dlls/rope/CRopeSegment.h b/dlls/rope/CRopeSegment.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef ROPE_CROPESEGMENT_H
-#define ROPE_CROPESEGMENT_H
+
+#pragma once
 
 class CRopeSample;
 
@@ -87,5 +87,3 @@ class CRopeSegment : public CBaseAnimating
 	BOOL m_bCauseDamage;
 	BOOL m_bCanBeGrabbed;
 };
-
-#endif
diff --git a/dlls/weapons/CDisplacer.h b/dlls/weapons/CDisplacer.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef WEAPONS_CDISPLACER_H
-#define WEAPONS_CDISPLACER_H
+
+#pragma once
 
 enum DisplacerAnim
 {
@@ -95,5 +95,3 @@ class CDisplacer : public CBasePlayerWeapon
 
 	unsigned short m_usFireDisplacer;
 };
-
-#endif
diff --git a/dlls/weapons/CDisplacerBall.h b/dlls/weapons/CDisplacerBall.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef WEAPONS_CDISPLACERBALL_H
-#define WEAPONS_CDISPLACERBALL_H
+
+#pragma once
 
 class CDisplacerBall : public CBaseEntity
 {
@@ -60,5 +60,3 @@ class CDisplacerBall : public CBaseEntity
 
 	EHANDLE m_hDisplacedTarget;
 };
-
-#endif
diff --git a/dlls/weapons/CEagle.h b/dlls/weapons/CEagle.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef WEAPONS_CEAGLE_H
-#define WEAPONS_CEAGLE_H
+
+#pragma once
 
 class CEagleLaser;
 
@@ -92,5 +92,3 @@ class CEagle : public CBasePlayerWeapon
 	BOOL m_bLaserActive;
 	CEagleLaser* m_pLaser;
 };
-
-#endif
diff --git a/dlls/weapons/CEagleLaser.h b/dlls/weapons/CEagleLaser.h
@@ -12,8 +12,8 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#ifndef WEAPONS_CEAGLELASER_H
-#define WEAPONS_CEAGLELASER_H
+
+#pragma once
 
 /**
 *	@brief Identical to CLaserSpot, different class to avoid RPG laser confusion logic. - Solokiller
@@ -25,4 +25,3 @@ class CEagleLaser : public CLaserSpot
 
 	static CEagleLaser* CreateSpot();
 };
-#endif
diff --git a/dlls/weapons/CGrapple.h b/dlls/weapons/CGrapple.h
@@ -12,8 +12,8 @@
 *   use or distribution of this code by or to any unlicensed person is illegal.
 *
 ****/
-#ifndef WEAPONS_CGRAPPLE_H
-#define WEAPONS_CGRAPPLE_H
+
+#pragma once
 
 class CGrappleTip;
 
@@ -104,5 +104,3 @@ class CGrapple : public CBasePlayerWeapon
 
 	bool m_bMomentaryStuck;
 };
-
-#endif