Merge pull request #183 from actionquake/bug/compat-silliness

Adjusted jmod menu to avoid compiler warnings/errors
actionquake · Apr 9, 2024 · d420f64 · d420f64
2 parents fccf353 + d810e5d
commit d420f64
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/source/a_team.c b/source/a_team.c
@@ -1111,8 +1111,8 @@ pmenu_t pmitemmenu[] = {
   { "Laser Sight                (jmod laser)",			PMENU_ALIGN_LEFT,	NULL, ToggleLaser			},
   { "Slippers                   (jmod slippers)",		PMENU_ALIGN_LEFT,	NULL, ToggleSlippers		},
   { NULL,												PMENU_ALIGN_LEFT,	NULL, NULL					},
-  { "Respawn to Closest Spawn   (jmod spawnc)",			PMENU_ALIGN_LEFT,	NULL, Cmd_GotoPC_f   		},
-  { "Respawn to Random Spawn    (jmod spawnp)",			PMENU_ALIGN_LEFT,	NULL, Cmd_GotoP_f   		},
+  { "Respawn to Closest Spawn   (jmod spawnc)",			PMENU_ALIGN_LEFT,	NULL, Cmd_GotoPC_f_compat   },
+  { "Respawn to Random Spawn    (jmod spawnp)",			PMENU_ALIGN_LEFT,	NULL, Cmd_GotoP_f_compat   	},
 
 };
 

diff --git a/source/tng_jump.c b/source/tng_jump.c
@@ -358,6 +358,16 @@ void Cmd_Goto_f (edict_t *ent)
 
 }
 
+void Cmd_GotoP_f_compat (edict_t *ent,  pmenu_t *p)
+{
+	Cmd_GotoP_f(ent);
+}
+
+void Cmd_GotoPC_f_compat (edict_t *ent,  pmenu_t *p)
+{
+	Cmd_GotoPC_f(ent);
+}
+
 void Cmd_GotoP_f (edict_t *ent)
 {
 	edict_t 	*spot = NULL;

diff --git a/source/tng_jump.h b/source/tng_jump.h
@@ -12,6 +12,8 @@ void Cmd_Jmod_f (edict_t *ent);
 void Cmd_PMLCA_f (edict_t *ent);
 void Cmd_RHS_f (edict_t *ent);
 void Cmd_Goto_f (edict_t *ent);
+void Cmd_GotoP_f_compat (edict_t *ent,  pmenu_t *p);
+void Cmd_GotoPC_f_compat (edict_t *ent,  pmenu_t *p);
 void Cmd_GotoP_f (edict_t *ent);
 void Cmd_GotoPC_f (edict_t *ent);
 void Cmd_Clear_f (edict_t *ent);