hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sidebar will now always redraw.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-04 19:17:43 -07:00
parent 13c0ff67b0
commit 9cc325dc44
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
REDALERT/MAPSEL.CPP
+1
View File
@@ -261,6 +261,7 @@ char const * Map_Selection(void)
} }
if (_flags == KN_LMOUSE) { if (_flags == KN_LMOUSE) {
{ {
choice = 0;
if (choice != -1) { if (choice != -1) {
done = 1; done = 1;
selection = choice; selection = choice;
REDALERT/RADAR.CPP
+8 -8
View File
@@ -447,7 +447,7 @@ void RadarClass::Draw_It(bool forced)
*/ */
if (IsPlayerNames) { if (IsPlayerNames) {
Draw_Names(); Draw_Names();
IsToRedraw = false; // IsToRedraw = false;
BEnd(BENCH_RADAR); BEnd(BENCH_RADAR);
return; return;
} }
@@ -456,7 +456,7 @@ void RadarClass::Draw_It(bool forced)
** If in spy-on-radar facility mode, draw the appropriate info. ** If in spy-on-radar facility mode, draw the appropriate info.
*/ */
if (IsHouseSpy) { if (IsHouseSpy) {
IsToRedraw = false; //IsToRedraw = false;
if (Draw_House_Info()) { if (Draw_House_Info()) {
BEnd(BENCH_RADAR); BEnd(BENCH_RADAR);
return; return;
@@ -468,7 +468,7 @@ void RadarClass::Draw_It(bool forced)
Map.Repair.Draw_Me(true); Map.Repair.Draw_Me(true);
Map.Upgrade.Draw_Me(true); Map.Upgrade.Draw_Me(true);
Map.Zoom.Draw_Me(true); Map.Zoom.Draw_Me(true);
IsToRedraw = false; //IsToRedraw = false;
BEnd(BENCH_RADAR); BEnd(BENCH_RADAR);
return; return;
} }
@@ -486,7 +486,7 @@ void RadarClass::Draw_It(bool forced)
** only these. ** only these.
*/ */
if (!forced && IsToRedraw && !FullRedraw && !IsPulseActive) { if (!forced && IsToRedraw && !FullRedraw && !IsPulseActive) {
IsToRedraw = false; //IsToRedraw = false;
if (PixelPtr) { if (PixelPtr) {
@@ -579,8 +579,8 @@ void RadarClass::Draw_It(bool forced)
} }
Radar_Cursor(true); Radar_Cursor(true);
FullRedraw = false; //FullRedraw = false;
IsToRedraw = false; //IsToRedraw = false;
Map.Repair.Draw_Me(true); Map.Repair.Draw_Me(true);
Map.Upgrade.Draw_Me(true); Map.Upgrade.Draw_Me(true);
@@ -602,8 +602,8 @@ void RadarClass::Draw_It(bool forced)
*/ */
int val = (DoesRadarExist) ? MAX_RADAR_FRAMES : 0; int val = (DoesRadarExist) ? MAX_RADAR_FRAMES : 0;
CC_Draw_Shape(RadarAnim, val, RadX, RadY + (1 * RESFACTOR), WINDOW_MAIN, SHAPE_NORMAL); CC_Draw_Shape(RadarAnim, val, RadX, RadY + (1 * RESFACTOR), WINDOW_MAIN, SHAPE_NORMAL);
FullRedraw = false; //FullRedraw = false;
IsToRedraw = false; //IsToRedraw = false;
if (RunningAsDLL) { if (RunningAsDLL) {
BEnd(BENCH_RADAR); BEnd(BENCH_RADAR);
REDALERT/SIDEBAR.CPP
+3 -3
View File
@@ -779,7 +779,7 @@ void SidebarClass::Draw_It(bool complete)
BStart(BENCH_SIDEBAR); BStart(BENCH_SIDEBAR);
if (IsSidebarActive && (IsToRedraw || complete) && !Debug_Map) { if (IsSidebarActive && (IsToRedraw || complete) && !Debug_Map) {
IsToRedraw = false; // IsToRedraw = false;
if (LogicPage->Lock()) { if (LogicPage->Lock()) {
/* /*
@@ -814,7 +814,7 @@ void SidebarClass::Draw_It(bool complete)
Zoom.Draw_Me(true); Zoom.Draw_Me(true);
} }
} }
IsToRedraw = false; //IsToRedraw = false;
BEnd(BENCH_SIDEBAR); BEnd(BENCH_SIDEBAR);
} }
@@ -1695,7 +1695,7 @@ bool SidebarClass::StripClass::AI(KeyNumType & input, int , int )
void SidebarClass::StripClass::Draw_It(bool complete) void SidebarClass::StripClass::Draw_It(bool complete)
{ {
if (IsToRedraw || complete) { if (IsToRedraw || complete) {
IsToRedraw = false; // IsToRedraw = false;
if (RunningAsDLL) { if (RunningAsDLL) {
return; return;