From b1bde7ac3f726b16c18959eab33da48f66c4babf Mon Sep 17 00:00:00 2001 From: relnev Date: Sun, 26 May 2002 22:06:17 +0000 Subject: [PATCH] makefile: disable stand_gui for now. rest: staticize some globals --- Makefile | 3 ++- src/cutscene/cutscenes.cpp | 7 ++++++- src/menuui/optionsmenu.cpp | 11 ++++++++--- src/mission/missiongoals.cpp | 11 ++++++++--- src/missionui/missiondebrief.cpp | 7 ++++++- src/missionui/redalert.cpp | 7 ++++++- src/ship/aigoals.cpp | 7 ++++++- 7 files changed, 42 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index bf2f3ea..e74083d 100644 --- a/Makefile +++ b/Makefile @@ -228,9 +228,10 @@ SOURCES =./src/anim/animplay.cpp \ ./src/network/multiutil.cpp \ ./src/network/psnet.cpp \ ./src/network/psnet2.cpp \ - ./src/network/stand_gui.cpp \ ./src/platform/unix.cpp +# ./src/network/stand_gui.cpp + OBJECTS=$(SOURCES:.cpp=.o) diff --git a/src/cutscene/cutscenes.cpp b/src/cutscene/cutscenes.cpp index 3d9d4dd..b7412e4 100644 --- a/src/cutscene/cutscenes.cpp +++ b/src/cutscene/cutscenes.cpp @@ -7,6 +7,11 @@ * Code for the cutscenes viewer screen * * $Log$ + * Revision 1.3 2002/05/26 22:06:17 relnev + * makefile: disable stand_gui for now. + * + * rest: staticize some globals + * * Revision 1.2 2002/05/07 03:16:43 theoddone33 * The Great Newline Fix * @@ -257,7 +262,7 @@ static int Background_bitmap; static UI_BUTTON List_region; static UI_WINDOW Ui_window; -ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { +static ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { { // GR_640 ui_button_info("TDB_00", 7, 5, 37, 7, 0), // tech database 1 ui_button_info("TDB_01", 7, 19, 37, 23, 1), // tech database 2 diff --git a/src/menuui/optionsmenu.cpp b/src/menuui/optionsmenu.cpp index 31bcce0..8c5319d 100644 --- a/src/menuui/optionsmenu.cpp +++ b/src/menuui/optionsmenu.cpp @@ -7,8 +7,13 @@ * C module that contains functions to drive the Options user interface * * $Log$ - * Revision 1.1 2002/05/03 03:28:09 root - * Initial revision + * Revision 1.2 2002/05/26 22:06:17 relnev + * makefile: disable stand_gui for now. + * + * rest: staticize some globals + * + * Revision 1.1.1.1 2002/05/03 03:28:09 root + * Initial import. * * * 31 10/25/99 5:47p Jefff @@ -285,7 +290,7 @@ struct options_buttons { options_buttons(char *name, int x1, int y1, int h, int t, int f = 0) : filename(name), x(x1), y(y1), hotspot(h), tab(t), flags(f) {} }; -options_buttons Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { +static options_buttons Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { { // GR_640 options_buttons("OPT_00", 17, 2, 0, -1), // options tab options_buttons("OPT_01", 102, 2, 1, -1), // multiplayer tab diff --git a/src/mission/missiongoals.cpp b/src/mission/missiongoals.cpp index b1966a2..132437d 100644 --- a/src/mission/missiongoals.cpp +++ b/src/mission/missiongoals.cpp @@ -7,8 +7,13 @@ * Module for working with Mission goals * * $Log$ - * Revision 1.1 2002/05/03 03:28:09 root - * Initial revision + * Revision 1.2 2002/05/26 22:06:17 relnev + * makefile: disable stand_gui for now. + * + * rest: staticize some globals + * + * Revision 1.1.1.1 2002/05/03 03:28:09 root + * Initial import. * * * 15 10/27/99 5:22p Jefff @@ -480,7 +485,7 @@ int Mission_goal_timestamp; mission_event Mission_events[MAX_MISSION_EVENTS]; mission_goal Mission_goals[MAX_GOALS]; // structure for the goals of this mission -goal_text Goal_text; +static goal_text Goal_text; #define DIRECTIVE_SOUND_DELAY 500 // time directive success sound effect is delayed #define DIRECTIVE_SPECIAL_DELAY 7000 // mark special directives as true after 7 seconds diff --git a/src/missionui/missiondebrief.cpp b/src/missionui/missiondebrief.cpp index 2afba6e..1b6b21d 100644 --- a/src/missionui/missiondebrief.cpp +++ b/src/missionui/missiondebrief.cpp @@ -7,6 +7,11 @@ * C module for running the debriefing * * $Log$ + * Revision 1.3 2002/05/26 22:06:17 relnev + * makefile: disable stand_gui for now. + * + * rest: staticize some globals + * * Revision 1.2 2002/05/07 03:16:46 theoddone33 * The Great Newline Fix * @@ -521,7 +526,7 @@ typedef struct { char callsign[CALLSIGN_LEN]; } debrief_multi_list_info; -ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { +static ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { { // GR_640 ui_button_info("DB_00", 6, 1, 37, 7, 0), // debriefing ui_button_info("DB_01", 6, 21, 37, 23, 1), // statistics diff --git a/src/missionui/redalert.cpp b/src/missionui/redalert.cpp index 52b1b6c..b373f00 100644 --- a/src/missionui/redalert.cpp +++ b/src/missionui/redalert.cpp @@ -7,6 +7,11 @@ * Module for Red Alert mission interface and code * * $Log$ + * Revision 1.3 2002/05/26 22:06:17 relnev + * makefile: disable stand_gui for now. + * + * rest: staticize some globals + * * Revision 1.2 2002/05/03 13:34:33 theoddone33 * More stuff compiles * @@ -220,7 +225,7 @@ static int Ra_flash_coords[GR_NUM_RESOLUTIONS][2] = { #define RA_REPLAY_MISSION 0 #define RA_CONTINUE 1 -ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { +static ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = { { // GR_640 ui_button_info("RAB_00", 2, 445, -1, -1, 0), ui_button_info("RAB_01", 575, 432, -1, -1, 1), diff --git a/src/ship/aigoals.cpp b/src/ship/aigoals.cpp index 5d004d3..234ebe0 100644 --- a/src/ship/aigoals.cpp +++ b/src/ship/aigoals.cpp @@ -7,6 +7,11 @@ * File to deal with manipulating AI goals, etc. * * $Log$ + * Revision 1.3 2002/05/26 22:06:17 relnev + * makefile: disable stand_gui for now. + * + * rest: staticize some globals + * * Revision 1.2 2002/05/07 03:16:52 theoddone33 * The Great Newline Fix * @@ -1898,7 +1903,7 @@ void validate_mission_goals(int objnum, ai_info *aip) } //XSTR:OFF -char *Goal_text[5] = { +static char *Goal_text[5] = { "EVENT_SHIP", "EVENT_WING", "PLAYER_SHIP", -- 2.39.2