From c0925fe4091c2992f7de49550b1f8c8cc5a12574 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Fri, 11 Sep 2015 22:41:09 -0400 Subject: [PATCH] link Shivan techroom data visibility to mission --- src/menuui/techmenu.cpp | 5 ++--- src/missionui/missiondebrief.cpp | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/menuui/techmenu.cpp b/src/menuui/techmenu.cpp index 97f183e..5106a33 100644 --- a/src/menuui/techmenu.cpp +++ b/src/menuui/techmenu.cpp @@ -1559,9 +1559,8 @@ void techroom_intel_init() stuff_string(Intel_info[Intel_info_size].desc, F_MULTITEXT, NULL, TECH_INTEL_DESC_LEN); SDL_strlcpy(Intel_info[Intel_info_size].name, "Shivan", SDL_arraysize(Intel_info[0].name)); SDL_strlcpy(Intel_info[Intel_info_size].anim_filename, Intel_anim_filenames[2], SDL_arraysize(Intel_info[0].anim_filename)); - // FIXME: shouldn't always be in the intel database but no choice at this point - // there are only about 4 missions before they show up anyway so it may not be worth it - Intel_info[Intel_info_size].in_tech_db = 1; + // Shivans are only visible after mission sm1-05a in campaign + Intel_info[Intel_info_size].in_tech_db = 0; Intel_info_size++; } diff --git a/src/missionui/missiondebrief.cpp b/src/missionui/missiondebrief.cpp index dcb39d6..4fc47ce 100644 --- a/src/missionui/missiondebrief.cpp +++ b/src/missionui/missiondebrief.cpp @@ -393,6 +393,10 @@ #include "localize.h" #include "multi_endgame.h" #include "osapi.h" +#ifdef MAKE_FS1 +#include "techmenu.h" +#endif + #define MAX_TOTAL_DEBRIEF_LINES 200 @@ -1822,6 +1826,18 @@ void debrief_accept(int ok_to_post_start_game_event) } // continue as normal else { +#ifdef MAKE_FS1 + // if single player campagin, maybe mark shivans as visible in + // tech room at completion of mission 5 + if ( !(Game_mode & GM_MULTIPLAYER) && (Intel_info[2].in_tech_db == 0) ) { + char *m_name = Campaign.missions[Campaign.current_mission].name; + + if ( m_name && !SDL_strcasecmp(m_name, "sm1-05a.fsm") ) { + Intel_info[2].in_tech_db = 1; + } + } +#endif + // end the mission mission_campaign_mission_over(); -- 2.39.2