Optimize references to player ship

common/main/bm.h

@@ -74,7 +74,10 @@ typedef struct {
 extern int Num_object_types;
 
 struct player_ship;
+//right now there's only one player ship, but we can have another by
+//adding an array and setting the pointer to the active ship.
 extern struct player_ship only_player_ship;
+static struct player_ship *const Player_ship=&only_player_ship;
 extern int Num_cockpits;
 extern bitmap_index cockpit_bitmap[N_COCKPIT_BITMAPS];
 extern short tmap_xlate_table[MAX_TEXTURES];

common/main/player.h

@@ -240,7 +240,6 @@ extern int Player_num;  // The player number who is on the console.
 extern player Players[MAX_PLAYERS + DXX_PLAYER_HEADER_ADD_EXTRA_PLAYERS];   // Misc player info
 void player_rw_swap(player_rw *p, int swap);
 #endif
-extern player_ship *Player_ship;
 
 extern struct object *Guided_missile[MAX_PLAYERS];
 extern int Guided_missile_sig[MAX_PLAYERS];

similar/main/bm.cpp

@@ -83,7 +83,7 @@ int Dead_modelnums[MAX_POLYGON_MODELS];
 
 //right now there's only one player ship, but we can have another by
 //adding an array and setting the pointer to the active ship.
-player_ship only_player_ship,*Player_ship=&only_player_ship;
+player_ship only_player_ship;
 
 //----------------- Miscellaneous bitmap pointers ---------------
 int             Num_cockpits = 0;

similar/main/controls.cpp

@@ -28,6 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "game.h"
 #include "object.h"
 #include "player.h"
+#include "bm.h"
 #include "controls.h"
 #include "render.h"
 #include "args.h"