From 57945d2baf72d1e26c31c43a9b070f6e2d06363a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 2 Oct 2020 22:14:20 +0200
Subject: [PATCH] - eliminated a few overlooked 'long's.

---
 source/games/duke/src/actors.cpp    | 2 +-
 source/games/duke/src/actors_d.cpp  | 2 +-
 source/games/duke/src/actors_r.cpp  | 2 +-
 source/games/duke/src/gamedef.cpp   | 2 +-
 source/games/duke/src/player_r.cpp  | 2 +-
 source/games/duke/src/player_w.cpp  | 4 ++--
 source/games/duke/src/sectors_r.cpp | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index d8efe8741..ee4d71128 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -4804,7 +4804,7 @@ void makeitfall(int i)
 int dodge(spritetype* s)
 {
 	short i;
-	long bx, by, mx, my, bxvect, byvect, mxvect, myvect, d;
+	int bx, by, mx, my, bxvect, byvect, mxvect, myvect, d;
 
 	mx = s->x;
 	my = s->y;
diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp
index 90209f9c6..dd58bf39d 100644
--- a/source/games/duke/src/actors_d.cpp
+++ b/source/games/duke/src/actors_d.cpp
@@ -4147,7 +4147,7 @@ void move_d(int g_i, int g_p, int g_x)
 
 	if (a & face_player_smart)
 	{
-		long newx, newy;
+		int newx, newy;
 
 		newx = ps[g_p].posx + (ps[g_p].posxv / 768);
 		newy = ps[g_p].posy + (ps[g_p].posyv / 768);
diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
index 401502888..0e7abd482 100644
--- a/source/games/duke/src/actors_r.cpp
+++ b/source/games/duke/src/actors_r.cpp
@@ -4168,7 +4168,7 @@ void move_r(int g_i, int g_p, int g_x)
 
 	if (a & face_player_smart)
 	{
-		long newx, newy;
+		int newx, newy;
 
 		newx = ps[g_p].posx + (ps[g_p].posxv / 768);
 		newy = ps[g_p].posy + (ps[g_p].posyv / 768);
diff --git a/source/games/duke/src/gamedef.cpp b/source/games/duke/src/gamedef.cpp
index 629e753e3..d6d78b3ff 100644
--- a/source/games/duke/src/gamedef.cpp
+++ b/source/games/duke/src/gamedef.cpp
@@ -488,7 +488,7 @@ static int getlabeloffset(LABELS* pLabel, const char* psz)
 {
 	// find the label psz in the table pLabel.
 	// returns the offset in the array for the label, or -1
-	long l = -1;
+	int l = -1;
 	int i;
 
 	for (i = 0; pLabel[i].lId >= 0; i++)
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index 31cd579c8..b558f1127 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -42,7 +42,7 @@ BEGIN_DUKE_NS
 
 void incur_damage_r(struct player_struct* p)
 {
-	long  damage = 0L, unk = 0L, shield_damage = 0L;
+	int  damage = 0, unk = 0, shield_damage = 0;
 	short gut = 0;
 
 	sprite[p->i].extra -= p->extra_extra8 >> 8;
diff --git a/source/games/duke/src/player_w.cpp b/source/games/duke/src/player_w.cpp
index 810f045b6..091380e7c 100644
--- a/source/games/duke/src/player_w.cpp
+++ b/source/games/duke/src/player_w.cpp
@@ -348,8 +348,8 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
 				p->getang(), (k + (p->hbomb_hold_delay << 5)), i, pi, 1);
 
 			{
-				long lGrenadeLifetime = GetGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, -1, snum);
-				long lGrenadeLifetimeVar = GetGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, -1, snum);
+				int lGrenadeLifetime = GetGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, -1, snum);
+				int lGrenadeLifetimeVar = GetGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, -1, snum);
 				// set timer.  blows up when at zero....
 				sprite[j].extra = lGrenadeLifetime
 					+ mulscale(krand(), lGrenadeLifetimeVar, 14)
diff --git a/source/games/duke/src/sectors_r.cpp b/source/games/duke/src/sectors_r.cpp
index 7f14288a4..0ed8f7bfc 100644
--- a/source/games/duke/src/sectors_r.cpp
+++ b/source/games/duke/src/sectors_r.cpp
@@ -925,7 +925,7 @@ void activatebysector_r(int sect, int j)
 
 static void lotsofpopcorn(short i, short wallnum, short n)
 {
-	long j, xv, yv, z, x1, y1;
+	int j, xv, yv, z, x1, y1;
 	short sect, a;
 
 	sect = -1;