Fixed compilation of P_BringUpWeapon

"struct player_s" is now forward-declared and all the instances of P_BringUpWeapon use it as the argument.
skyjake · Nov 30, 2011 · 98bbf71 · 98bbf71
1 parent 3dbdbdd
commit 98bbf71
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 3 deletions.
diff --git a/doomsday/plugins/jdoom/include/p_pspr.h b/doomsday/plugins/jdoom/include/p_pspr.h
@@ -41,6 +41,8 @@
 #pragma interface
 #endif
 
+struct player_s;
+
 /**
  * Overlay psprites are scaled shapes drawn directly on the viewscreen,
  * coordinates are in virtual, [320 x 200] viewscreen-space.

diff --git a/doomsday/plugins/jdoom/src/p_pspr.c b/doomsday/plugins/jdoom/src/p_pspr.c
@@ -126,7 +126,7 @@ void P_SetPsprite(player_t* player, int position, statenum_t stnum)
 /**
  * Starts bringing the pending weapon up from the bottom of the screen.
  */
-void P_BringUpWeapon(player_t *player)
+void P_BringUpWeapon(struct player_s *player)
 {
     weaponmodeinfo_t   *wminfo;
     int wminfonum = player->pendingWeapon;

diff --git a/doomsday/plugins/jdoom64/include/p_pspr.h b/doomsday/plugins/jdoom64/include/p_pspr.h
@@ -34,6 +34,8 @@
 #  error "Using jDoom64 headers without __JDOOM64__"
 #endif
 
+struct player_s;
+
 /**
  * Overlay psprites are scaled shapes drawn directly on the view screen,
  * coordinates are given for a 320*200 view screen.

diff --git a/doomsday/plugins/jdoom64/src/p_pspr.c b/doomsday/plugins/jdoom64/src/p_pspr.c
@@ -135,7 +135,7 @@ void P_SetPsprite(player_t *player, int position, statenum_t stnum)
 /**
  * Starts bringing the pending weapon up from the bottom of the screen.
  */
-void P_BringUpWeapon(player_t *player)
+void P_BringUpWeapon(struct player_s *player)
 {
     weaponmodeinfo_t   *wminfo;
 

diff --git a/doomsday/plugins/jheretic/include/p_pspr.h b/doomsday/plugins/jheretic/include/p_pspr.h
@@ -34,6 +34,8 @@
 #  error "Using jHeretic headers without __JHERETIC__"
 #endif
 
+struct player_s;
+
 typedef enum {
     ps_weapon,
     ps_flash,

diff --git a/doomsday/plugins/jheretic/src/p_pspr.c b/doomsday/plugins/jheretic/src/p_pspr.c
@@ -574,7 +574,7 @@ void P_PostMorphWeapon(player_t *player, weapontype_t weapon)
 /**
  * Starts bringing the pending weapon up from the bottom of the screen.
  */
-void P_BringUpWeapon(player_t *player)
+void P_BringUpWeapon(struct player_s *player)
 {
     weaponmodeinfo_t   *wminfo;
 

diff --git a/doomsday/plugins/jhexen/include/p_pspr.h b/doomsday/plugins/jhexen/include/p_pspr.h
@@ -32,6 +32,8 @@
 #  error "Using jHexen headers without __JHEXEN__"
 #endif
 
+struct player_s;
+
 typedef enum {
     ps_weapon,
     ps_flash,