Make CONTROLCEN_WEAPON_NUM a weapon_type_t member

common/main/cntrlcen.h

@@ -29,8 +29,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 extern "C" {
 #endif
 
-#define CONTROLCEN_WEAPON_NUM   6
-
 #define MAX_CONTROLCEN_LINKS    10
 
 typedef struct control_center_triggers {

common/main/laser.h

@@ -33,6 +33,7 @@ enum weapon_type_t
 	LASER_ID_L3,
 	LASER_ID_L4,
 #endif
+	CONTROLCEN_WEAPON_NUM = 6,
 	CONCUSSION_ID = 8,
 	FLARE_ID = 9,   //  NOTE: This MUST correspond to the ID generated at bitmaps.tbl read time.
 #if defined(DXX_BUILD_DESCENT_I)

similar/main/paging.c

@@ -34,6 +34,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "game.h"
 #include "piggy.h"
 #include "texmerge.h"
+#include "laser.h"
 #include "polyobj.h"
 #include "vclip.h"
 #include "effects.h"