From 9d5eb0ac1e7a4563118da2310e86bc03d988bd34 Mon Sep 17 00:00:00 2001 From: Ben Lankamp Date: Sat, 20 Jun 2020 10:27:17 +0200 Subject: [PATCH] * Centering of mission accomplished * Added 8 px next to the Options bar * TEMP: everything costs $50 --- code/REDALERT/DISPLAY.CPP | 2 +- code/REDALERT/POWER.CPP | 3 +++ code/REDALERT/SCENARIO.CPP | 7 +------ code/REDALERT/SIDEBAR.CPP | 2 +- code/REDALERT/TECHNO.CPP | 2 +- code/REDALERT/io/UserInput.h | 1 + 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/REDALERT/DISPLAY.CPP b/code/REDALERT/DISPLAY.CPP index 17db919..85c4438 100644 --- a/code/REDALERT/DISPLAY.CPP +++ b/code/REDALERT/DISPLAY.CPP @@ -188,7 +188,7 @@ DisplayClass::DisplayClass(void) : ShadowShapes = 0; TransIconset = 0; - Set_View_Dimensions(0, 0, ScreenWidth, ScreenHeight); + Set_View_Dimensions(0, 8 * RESFACTOR, ScreenWidth, ScreenHeight); } diff --git a/code/REDALERT/POWER.CPP b/code/REDALERT/POWER.CPP index 5e1fc0d..7987686 100644 --- a/code/REDALERT/POWER.CPP +++ b/code/REDALERT/POWER.CPP @@ -204,6 +204,8 @@ void PowerClass::Draw_It(bool complete) power_height = Bound(power_height, 0, PowerButton.Height - 2); drain_height = Bound(drain_height, 0, PowerButton.Height - 2); + bottom -= (15 * RESFACTOR); + /* ** Draw the power output graphic on top of the power bar framework. */ @@ -245,6 +247,7 @@ void PowerClass::Draw_It(bool complete) } BEnd(BENCH_POWER); } + RadarClass::Draw_It(complete); } diff --git a/code/REDALERT/SCENARIO.CPP b/code/REDALERT/SCENARIO.CPP index 8a257e8..3eabd81 100644 --- a/code/REDALERT/SCENARIO.CPP +++ b/code/REDALERT/SCENARIO.CPP @@ -922,11 +922,6 @@ void Do_Win(void) Session.GameName[0] = 0; } - /* - ** Determine a cosmetic center point for the text. - */ - int x = Map.TacPixelX + (Lepton_To_Pixel(Map.TacLeptonWidth)/2); - /* ** Hack section. If it's allied scenario 10, variation A, then skip the ** score and map selection, don't increment scenario, and set it to @@ -945,7 +940,7 @@ void Do_Win(void) Map.Flag_To_Redraw (true); Map.Render(); #ifdef WIN32 - Fancy_Text_Print(TXT_SCENARIO_WON, x, 90*RESFACTOR, &ColorRemaps[PCOLOR_RED], TBLACK, TPF_CENTER|TPF_VCR|TPF_USE_GRAD_PAL|TPF_DROPSHADOW); + Fancy_Text_Print(TXT_SCENARIO_WON, (SeenBuff.Get_Width() / 2), 90*RESFACTOR, &ColorRemaps[PCOLOR_RED], TBLACK, TPF_CENTER|TPF_VCR|TPF_USE_GRAD_PAL|TPF_DROPSHADOW); #else Fancy_Text_Print(TXT_MISSION, x, 90*RESFACTOR, &ColorRemaps[PCOLOR_RED], TBLACK, TPF_CENTER|TPF_VCR|TPF_USE_GRAD_PAL|TPF_DROPSHADOW); Fancy_Text_Print(TXT_HACKHACK, x, 110*RESFACTOR, &ColorRemaps[PCOLOR_RED], TBLACK, TPF_CENTER|TPF_VCR|TPF_USE_GRAD_PAL|TPF_DROPSHADOW); diff --git a/code/REDALERT/SIDEBAR.CPP b/code/REDALERT/SIDEBAR.CPP index 2dc13a1..212c1a1 100644 --- a/code/REDALERT/SIDEBAR.CPP +++ b/code/REDALERT/SIDEBAR.CPP @@ -1030,7 +1030,7 @@ bool SidebarClass::Activate(int control) ** activate it on the left side of the screen. */ if (IsSidebarActive /*&& X*/) { - Set_View_Dimensions( 0, 0, SeenBuff.Get_Width() - ( SIDE_WIDTH * RESFACTOR ) ); + Set_View_Dimensions( 0, 8 * RESFACTOR, SeenBuff.Get_Width() - ( SIDE_WIDTH * RESFACTOR ) ); IsToRedraw = true; Help_Text(TXT_NONE); diff --git a/code/REDALERT/TECHNO.CPP b/code/REDALERT/TECHNO.CPP index 5700235..fc768bf 100644 --- a/code/REDALERT/TECHNO.CPP +++ b/code/REDALERT/TECHNO.CPP @@ -6705,7 +6705,7 @@ bool TechnoTypeClass::Read_INI(CCINIClass & ini) SightRange = ini.Get_Int(Name(), "Sight", SightRange); Level = ini.Get_Int(Name(), "TechLevel", Level); MaxSpeed = MPHType(_Scale_To_256(ini.Get_Int(Name(), "Speed", fixed(MaxSpeed, 256) * 100))); - Cost = ini.Get_Int(Name(), "Cost", Cost); + Cost = 50; // ini.Get_Int(Name(), "Cost", Cost); MaxAmmo = ini.Get_Int(Name(), "Ammo", MaxAmmo); Risk = Reward = Points = ini.Get_Int(Name(), "Points", Points); Ownable = ini.Get_Owners(Name(), "Owner", Ownable); diff --git a/code/REDALERT/io/UserInput.h b/code/REDALERT/io/UserInput.h index 50d7c39..c98ff8a 100644 --- a/code/REDALERT/io/UserInput.h +++ b/code/REDALERT/io/UserInput.h @@ -74,6 +74,7 @@ std::map const sdl_keyMapping = { { SDLK_F12, KN_F12 }, { SDLK_BACKSPACE, KN_BACKSPACE }, + { SDLK_SPACE, KN_SPACE }, { SDLK_KP_ENTER, KN_RETURN }, { SDLK_RETURN, KN_RETURN }, { SDLK_ESCAPE, KN_ESC },