Legacy sidebar/radar enabled very broken.

This commit is contained in:
Justin Marshall
2020-06-01 22:15:58 -07:00
parent ac8897feff
commit acef90427c
2 changed files with 4 additions and 7 deletions
+1 -4
View File
@@ -364,8 +364,6 @@ void RadarClass::Draw_It(bool forced)
{
DisplayClass::Draw_It(forced);
#if (0) // Legacy radar rendering not used. ST - 2/26/2020 3:53PM
static char * _hiresradarnames[]={
"natoradr.shp", //HOUSE_SPAIN,
"natoradr.shp", //HOUSE_GREECE,
@@ -465,7 +463,7 @@ void RadarClass::Draw_It(bool forced)
}
}
if (IsRadarActivating || IsRadarDeactivating || IsRadarJammed) {
if (IsRadarActivating || IsRadarDeactivating /*|| IsRadarJammed*/) {
Radar_Anim();
Map.Repair.Draw_Me(true);
Map.Upgrade.Draw_Me(true);
@@ -627,7 +625,6 @@ void RadarClass::Draw_It(bool forced)
}
BEnd(BENCH_RADAR);
#endif
}
+3 -3
View File
@@ -994,9 +994,9 @@ bool SidebarClass::Activate(int control)
//
// We don't want the original sidebar to be visible. ST - 1/31/2019 11:28AM
//
if (control < 100) {
return IsSidebarActive;
}
//if (control < 100) {
// return IsSidebarActive;
//}
bool old = IsSidebarActive;