- Duke: Remove incur_damage() from dispatcher.

* Only used locally within `processinput()` for each game.
ZDoom · Nov 10, 2023 · f4fee75 · f4fee75
1 parent 7dbd38c
commit f4fee75
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/source/games/duke/src/dispatch.cpp b/source/games/duke/src/dispatch.cpp
@@ -43,8 +43,6 @@ void addweapon_d(DDukePlayer* p, int weapon, bool wswitch);
 void addweapon_r(DDukePlayer* p, int weapon, bool wswitch);
 int ifhitbyweapon_r(DDukeActor* sn);
 int ifhitbyweapon_d(DDukeActor* sn);
-void incur_damage_d(DDukePlayer* p);
-void incur_damage_r(DDukePlayer* p);
 void selectweapon_d(DDukePlayer* const p, int j);
 void selectweapon_r(DDukePlayer* const p, int j);
 int doincrements_d(DDukePlayer* p);
@@ -80,7 +78,6 @@ void SetDispatcher()
 		addweapon_d,
 		ifhitbyweapon_d,
 
-		incur_damage_d,
 		selectweapon_d,
 		doincrements_d,
 		checkweapons_d,
@@ -102,7 +99,6 @@ void SetDispatcher()
 		addweapon_r,
 		ifhitbyweapon_r,
 
-		incur_damage_r,
 		selectweapon_r,
 		doincrements_r,
 		checkweapons_r,

diff --git a/source/games/duke/src/duke3d.h b/source/games/duke/src/duke3d.h
@@ -77,7 +77,6 @@ struct Dispatcher
 	int  (*ifhitbyweapon)(DDukeActor* sectnum);
 
 	// player
-	void (*incur_damage)(DDukePlayer* p);
 	void (*selectweapon)(DDukePlayer* const p, int j);
 	int (*doincrements)(DDukePlayer* p);
 	void (*checkweapons)(DDukePlayer* p);

diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
@@ -49,7 +49,7 @@ void operateweapon_ww(DDukePlayer* const p, ESyncBits actions);
 //
 //---------------------------------------------------------------------------
 
-void incur_damage_d(DDukePlayer* p)
+static void incur_damage(DDukePlayer* p)
 {
 	const auto pact = p->GetActor();
 	int damage = 0L, shield_damage = 0L;
@@ -1597,7 +1597,7 @@ void processinput_d(DDukePlayer* const p)
 	}
 
 
-	if (pact->spr.extra > 0) fi.incur_damage(p);
+	if (pact->spr.extra > 0) incur_damage(p);
 	else
 	{
 		pact->spr.extra = 0;

diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
@@ -43,7 +43,7 @@ BEGIN_DUKE_NS
 //
 //---------------------------------------------------------------------------
 
-void incur_damage_r(DDukePlayer* p)
+static void incur_damage(DDukePlayer* p)
 {
 	int  damage = 0, shield_damage = 0;
 	int gut = 0;
@@ -2419,7 +2419,7 @@ void processinput_r(DDukePlayer* const p)
 	}
 
 
-	if (pact->spr.extra > 0) fi.incur_damage(p);
+	if (pact->spr.extra > 0) incur_damage(p);
 	else
 	{
 		pact->spr.extra = 0;