diff --git a/common/main/cntrlcen.h b/common/main/cntrlcen.h index 716064dc1..1d4b7095b 100644 --- a/common/main/cntrlcen.h +++ b/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 { diff --git a/common/main/laser.h b/common/main/laser.h index 5852804ef..264a223c7 100644 --- a/common/main/laser.h +++ b/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) diff --git a/similar/main/paging.c b/similar/main/paging.c index eff543e37..5262ee6e6 100644 --- a/similar/main/paging.c +++ b/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"