Remove unused types

Resolves twhl-community#88 (cherry picked from commit f5fc7fb)
LogicAndTrick · Dec 26, 2021 · 349d429 · 349d429
1 parent 9c5a18b
commit 349d429
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 20 deletions.
diff --git a/cl_dll/ammo.h b/cl_dll/ammo.h
@@ -54,5 +54,3 @@ struct WEAPON
 	HSPRITE hZoomedAutoaim;
 	Rect rcZoomedAutoaim;
 };
-
-typedef int AMMO;
diff --git a/cl_dll/ammohistory.h b/cl_dll/ammohistory.h
@@ -85,8 +85,6 @@ class WeaponsResource
 	bool HasAmmo(WEAPON* p);
 
 	///// AMMO /////
-	AMMO GetAmmo(int iId) { return iId; }
-
 	void SetAmmo(int iId, int iCount) { riAmmo[iId] = iCount; }
 
 	int CountAmmo(int iId);

diff --git a/common/Platform.h b/common/Platform.h
@@ -48,8 +48,6 @@
 #include <cstring>
 
 using byte = unsigned char;
-using word = unsigned short;
-using func_t = unsigned int;
 using string_t = unsigned int;
 using qboolean = int;
 

diff --git a/dlls/UserMessages.cpp b/dlls/UserMessages.cpp
@@ -21,7 +21,6 @@
 
 int gmsgShake = 0;
 int gmsgFade = 0;
-int gmsgSelAmmo = 0;
 int gmsgFlashlight = 0;
 int gmsgFlashBattery = 0;
 int gmsgResetHUD = 0;
@@ -63,12 +62,11 @@ int gmsgStatusValue = 0;
 void LinkUserMessages()
 {
 	// Already taken care of?
-	if (0 != gmsgSelAmmo)
+	if (0 != gmsgCurWeapon)
 	{
 		return;
 	}
 
-	gmsgSelAmmo = REG_USER_MSG("SelAmmo", sizeof(SelAmmo));
 	gmsgCurWeapon = REG_USER_MSG("CurWeapon", 3);
 	gmsgGeigerRange = REG_USER_MSG("Geiger", 1);
 	gmsgFlashlight = REG_USER_MSG("Flashlight", 2);

diff --git a/dlls/UserMessages.h b/dlls/UserMessages.h
@@ -17,7 +17,6 @@
 
 extern int gmsgShake;
 extern int gmsgFade;
-extern int gmsgSelAmmo;
 extern int gmsgFlashlight;
 extern int gmsgFlashBattery;
 extern int gmsgResetHUD;

diff --git a/dlls/cbase.h b/dlls/cbase.h
@@ -866,14 +866,6 @@ push_trigger_data
 
 #define TRACER_FREQ 4 // Tracers fire every 4 bullets
 
-typedef struct _SelAmmo
-{
-	byte Ammo1Type;
-	byte Ammo1;
-	byte Ammo2Type;
-	byte Ammo2;
-} SelAmmo;
-
 //LRC- much as I hate to add new globals, I can't see how to read data from the World entity.
 extern bool g_startSuit;
 

diff --git a/dlls/extdll.h b/dlls/extdll.h
@@ -22,8 +22,6 @@
 #include "Platform.h"
 
 // Header file containing definition of globalvars_t and entvars_t
-typedef unsigned int func_t;   //
-typedef unsigned int string_t; // from engine's pr_comp.h;
 
 // Vector class
 #include "mathlib.h"