diff --git a/common/main/gauges.h b/common/main/gauges.h index baccfd65f..cd6140a09 100644 --- a/common/main/gauges.h +++ b/common/main/gauges.h @@ -106,7 +106,7 @@ constexpr rgb_array_wrapper player_rgb{}; // 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, vobjptridx_t viewer, int rear_view_flag, int user, const char *label); -void do_cockpit_window_view(int win, int rear_view_flag, int user, const char *label); +void do_cockpit_window_view(int win, int user); #endif #define GAUGE_HUD_NUMMODES 4 diff --git a/similar/main/gamerend.cpp b/similar/main/gamerend.cpp index c356ccc44..471634a7e 100644 --- a/similar/main/gamerend.cpp +++ b/similar/main/gamerend.cpp @@ -536,7 +536,7 @@ static void show_extra_views() do_cockpit_window_view(0,&DemoLeftExtra,DemoRearCheck[DemoDoLeft],DemoWBUType[DemoDoLeft],DemoExtraMessage[DemoDoLeft]); } else - do_cockpit_window_view(0,0,WBU_WEAPON,NULL); + do_cockpit_window_view(0,WBU_WEAPON); if (DemoDoRight) { @@ -550,7 +550,7 @@ static void show_extra_views() } } else - do_cockpit_window_view(1,0,WBU_WEAPON,NULL); + do_cockpit_window_view(1,WBU_WEAPON); DemoDoLeft=DemoDoRight=0; DemoDoingLeft=DemoDoingRight=0; @@ -576,7 +576,7 @@ static void show_extra_views() if (Guided_missile[Player_num]) { //used to be active if (!PlayerCfg.GuidedInBigWindow) - do_cockpit_window_view(1,0,WBU_STATIC,NULL); + do_cockpit_window_view(1,WBU_STATIC); Guided_missile[Player_num] = NULL; } if (choose_missile_viewer()) @@ -589,7 +589,7 @@ static void show_extra_views() else { clear_missile_viewer(); RenderingType=255; - do_cockpit_window_view(1,0,WBU_STATIC,NULL); + do_cockpit_window_view(1,WBU_STATIC); } } @@ -610,7 +610,7 @@ static void show_one_extra_view(const int w) switch (PlayerCfg.Cockpit3DView[w]) { case CV_NONE: RenderingType=255; - do_cockpit_window_view(w,0,WBU_WEAPON,NULL); + do_cockpit_window_view(w,WBU_WEAPON); break; case CV_REAR: if (Rear_view) { //if big window is rear view, show front here @@ -625,7 +625,7 @@ static void show_one_extra_view(const int w) case CV_ESCORT: { auto buddy = find_escort(); if (buddy == object_none) { - do_cockpit_window_view(w,0,WBU_WEAPON,NULL); + do_cockpit_window_view(w,WBU_WEAPON); PlayerCfg.Cockpit3DView[w] = CV_NONE; } else { @@ -642,7 +642,7 @@ static void show_one_extra_view(const int w) if (player!=-1 && Players[player].connected && ((Game_mode & GM_MULTI_COOP) || ((Game_mode & GM_TEAM) && (get_team(player) == get_team(Player_num))))) do_cockpit_window_view(w,&Objects[Players[Coop_view_player[w]].objnum],0,WBU_COOP,Players[Coop_view_player[w]].callsign); else { - do_cockpit_window_view(w,0,WBU_WEAPON,NULL); + do_cockpit_window_view(w,WBU_WEAPON); PlayerCfg.Cockpit3DView[w] = CV_NONE; } break; diff --git a/similar/main/gauges.cpp b/similar/main/gauges.cpp index 3f2187b08..3288a8a11 100644 --- a/similar/main/gauges.cpp +++ b/similar/main/gauges.cpp @@ -3151,7 +3151,7 @@ static array overlap_dirty; //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,int rear_view_flag,int user,const char *label) +void do_cockpit_window_view(int win,int user) { Assert(user == WBU_WEAPON || user == WBU_STATIC); if (user == WBU_STATIC && weapon_box_user[win] != WBU_STATIC) diff --git a/similar/main/newdemo.cpp b/similar/main/newdemo.cpp index a3106a3cd..773fbaef9 100644 --- a/similar/main/newdemo.cpp +++ b/similar/main/newdemo.cpp @@ -4080,7 +4080,7 @@ static void nd_render_extras (ubyte which,const vcobjptr_t obj) if (which==255) { Int3(); // how'd we get here? - do_cockpit_window_view(w,0,WBU_WEAPON,NULL); + do_cockpit_window_view(w,WBU_WEAPON); return; }