From 116d9c9b1142bc336b2e53d28a81d96ed5f37178 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Fri, 20 Mar 2015 17:30:43 -0400 Subject: [PATCH] fix some FS1 breakage --- src/menuui/techmenu.cpp | 2 +- src/missionui/missionscreencommon.cpp | 4 ++-- src/missionui/missionweaponchoice.cpp | 2 +- src/network/multiui.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/menuui/techmenu.cpp b/src/menuui/techmenu.cpp index dbffd0d..89454d3 100644 --- a/src/menuui/techmenu.cpp +++ b/src/menuui/techmenu.cpp @@ -658,7 +658,7 @@ void techroom_select_new_entry() // Techroom_ship_rot = PI; #ifdef MAKE_FS1 - if (Tab == (WEAPONS_DATA_TAB || INTEL_DATA_TAB)){ + if ( (Tab == WEAPONS_DATA_TAB) || (Tab == INTEL_DATA_TAB) ) { techroom_init_desc(Current_list[Cur_entry].desc, Tech_data_desc_coords[gr_screen.res][SHIP_W_COORD]); } else { techroom_init_desc(Current_list[Cur_entry].desc, Tech_desc_coords[gr_screen.res][SHIP_W_COORD]); diff --git a/src/missionui/missionscreencommon.cpp b/src/missionui/missionscreencommon.cpp index e82fdc5..f182a44 100644 --- a/src/missionui/missionscreencommon.cpp +++ b/src/missionui/missionscreencommon.cpp @@ -724,9 +724,9 @@ void common_select_init() // Load in the background transition anim if ( Game_mode & GM_MULTIPLAYER ) - Background_anim = anim_load("BriefTransMulti", 1); // 1 as last parm means file is mem-mapped + Background_anim = anim_load("BriefTransMulti"); else { - Background_anim = anim_load("BriefTrans", 1); // 1 as last parm means file is mem-mapped + Background_anim = anim_load("BriefTrans"); } SDL_assert( Background_anim != NULL ); diff --git a/src/missionui/missionweaponchoice.cpp b/src/missionui/missionweaponchoice.cpp index 9bde593..6e8bfb5 100644 --- a/src/missionui/missionweaponchoice.cpp +++ b/src/missionui/missionweaponchoice.cpp @@ -1753,7 +1753,7 @@ void wl_start_slot_animation(int n) // maybe we have to load this animation if ( wl_ship->anim == NULL ) { - wl_ship->anim = anim_load(Ship_info[ship_class].overhead_filename, 1); + wl_ship->anim = anim_load(Ship_info[ship_class].overhead_filename); if ( wl_ship->anim == NULL ) { Int3(); // couldn't load anim filename.. get Alan return; diff --git a/src/network/multiui.cpp b/src/network/multiui.cpp index 23ff373..e3c1846 100644 --- a/src/network/multiui.cpp +++ b/src/network/multiui.cpp @@ -3445,7 +3445,7 @@ void multi_sg_rank_display_stuff() // display the selected rank #ifdef MAKE_FS1 gr_set_color_fast(&Color_bright); - multi_sg_rank_build_name(Ranks[Multi_sg_netgame->rank_base].name,rank_name); + multi_sg_rank_build_name(Ranks[Multi_sg_netgame->rank_base].name, rank_name, SDL_arraysize(rank_name)); gr_string(Msg_rank_sel_coords[gr_screen.res][MSG_X_COORD],Msg_rank_sel_coords[gr_screen.res][MSG_Y_COORD],rank_name); #endif } -- 2.39.2