From 3e93f2d707d3159d7161eae6a9abd15844f4e19e Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 3 Mar 2013 01:03:33 +0000 Subject: [PATCH] Move */main/gauges.h -> common/main/gauges.h --- {d2x-rebirth => common}/main/gauges.h | 19 +++++- d1x-rebirth/main/gauges.h | 91 --------------------------- 2 files changed, 16 insertions(+), 94 deletions(-) rename {d2x-rebirth => common}/main/gauges.h (85%) delete mode 100644 d1x-rebirth/main/gauges.h diff --git a/d2x-rebirth/main/gauges.h b/common/main/gauges.h similarity index 85% rename from d2x-rebirth/main/gauges.h rename to common/main/gauges.h index 8908eb401..81e6cb1cb 100644 --- a/d2x-rebirth/main/gauges.h +++ b/common/main/gauges.h @@ -24,15 +24,22 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "fix.h" #include "gr.h" #include "piggy.h" -#include "object.h" #include "hudmsg.h" //from gauges.c +#if defined(DXX_BUILD_DESCENT_I) +#define MAX_GAUGE_BMS_PC 80 // increased from 56 to 80 by a very unhappy MK on 10/24/94. +#define MAX_GAUGE_BMS_MAC 85 +#define MAX_GAUGE_BMS (MacPig ? MAX_GAUGE_BMS_MAC : MAX_GAUGE_BMS_PC) + +extern bitmap_index Gauges[MAX_GAUGE_BMS_MAC]; // Array of all gauge bitmaps. +#elif defined(DXX_BUILD_DESCENT_II) #define MAX_GAUGE_BMS 100 // increased from 56 to 80 by a very unhappy MK on 10/24/94. extern bitmap_index Gauges[MAX_GAUGE_BMS]; // Array of all gauge bitmaps. extern bitmap_index Gauges_hires[MAX_GAUGE_BMS]; // hires gauges +#endif // Flags for gauges/hud stuff @@ -43,7 +50,10 @@ void render_gauges(void); void init_gauges(void); void close_gauges(void); void cockpit_decode_alpha(grs_bitmap *bm); +#if defined(DXX_BUILD_DESCENT_II) void show_reticle(int reticle_type, int secondary_display); +void show_HUD_names(); +#endif void show_mousefs_indicator(int mx, int my, int mz, int x, int y, int size); extern void draw_hud(); // draw all the HUD stuff @@ -55,7 +65,6 @@ extern void player_dead_message(void); extern void update_laser_weapon_info(void); extern void play_homing_warning(void); -extern void show_HUD_names(); typedef struct { ubyte r,g,b; @@ -63,6 +72,7 @@ typedef struct { extern rgb player_rgb[]; +#if defined(DXX_BUILD_DESCENT_II) #define WBU_WEAPON 0 // the weapons display #define WBU_MISSILE 1 // the missile view #define WBU_ESCORT 2 // the "buddy bot" @@ -72,12 +82,15 @@ extern rgb player_rgb[]; #define WBU_MARKER 6 // a dropped marker #define WBU_STATIC 7 // playing static after missile hits +struct object; + // draws a 3d view into one of the cockpit windows. win is 0 for // left, 1 for right. viewer is object. NULL object means give up // window user is one of the WBU_ constants. If rear_view_flag is // set, show a rear view. If label is non-NULL, print the label at // the top of the window. -void do_cockpit_window_view(int win, object *viewer, int rear_view_flag, int user, const char *label); +void do_cockpit_window_view(int win, struct object *viewer, int rear_view_flag, int user, const char *label); +#endif #define GAUGE_HUD_NUMMODES 3 diff --git a/d1x-rebirth/main/gauges.h b/d1x-rebirth/main/gauges.h deleted file mode 100644 index 9bbf6e6e4..000000000 --- a/d1x-rebirth/main/gauges.h +++ /dev/null @@ -1,91 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ -/* - * - * Prototypes and defines for gauges - * - */ - - - -#ifndef _GAUGES_H -#define _GAUGES_H - -#include "fix.h" -#include "gr.h" -#include "piggy.h" -#include "hudmsg.h" - -//from gauges.c - -#define MAX_GAUGE_BMS_PC 80 // increased from 56 to 80 by a very unhappy MK on 10/24/94. -#define MAX_GAUGE_BMS_MAC 85 -#define MAX_GAUGE_BMS (MacPig ? MAX_GAUGE_BMS_MAC : MAX_GAUGE_BMS_PC) - -extern bitmap_index Gauges[MAX_GAUGE_BMS_MAC]; // Array of all gauge bitmaps. - -extern void add_points_to_score(); -extern void add_bonus_points_to_score(); - -void render_gauges(void); -void init_gauges(void); -void close_gauges(void); -void cockpit_decode_alpha(grs_bitmap *bm); -void show_mousefs_indicator(int mx, int my, int mz, int x, int y, int size); - -extern void draw_hud(); // draw all the HUD stuff - -extern void player_dead_message(void); -//extern void say_afterburner_status(void); - -// from testgaug.c - -extern void update_laser_weapon_info(void); -extern void play_homing_warning(void); - -typedef struct { - ubyte r,g,b; -} rgb; - -extern rgb player_rgb[]; - -#define GAUGE_HUD_NUMMODES 3 - -typedef struct span { - int l,r; -} span; - -extern span weapon_window_left[],weapon_window_left_hires[],weapon_window_right[],weapon_window_right_hires[]; - - -#define WinBoxLeft (HIRESMODE?weapon_window_left_hires:weapon_window_left) -#define WinBoxRight (HIRESMODE?weapon_window_right_hires:weapon_window_right) - -// defines for the reticle(s) -#define RET_TYPE_CLASSIC 0 -#define RET_TYPE_CLASSIC_REBOOT 1 -#define RET_TYPE_NONE 2 -#define RET_TYPE_X 3 -#define RET_TYPE_DOT 4 -#define RET_TYPE_CIRCLE 5 -#define RET_TYPE_CROSS_V1 6 -#define RET_TYPE_CROSS_V2 7 -#define RET_TYPE_ANGLE 8 - -#define RET_COLOR_DEFAULT_R 0 -#define RET_COLOR_DEFAULT_G 32 -#define RET_COLOR_DEFAULT_B 0 -#define RET_COLOR_DEFAULT_A 0 - -#endif -