mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix 11414: ‘Possible misuse of comma operator’ warnings (#12919)

Browse Source 
Fix the ‘possible misuse of comma operator’ warnings reported by XCode - the two original ones reported in #11414, plus one more in Util.cpp.
This commit is contained in:
Richard Fine
2020-09-13 12:43:59 -04:00
committed by GitHub
parent cf5b48a9dd
commit d21da12f9f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2-ui/windows/Scenery.cpp
View File

@@ -525,14 +525,17 @@ static scenery_item window_scenery_count_rows_with_selected_item(int32_t tabInde
ScenerySelection currentEntry = { 0, 0 };
ScenerySelection scenerySelection = gWindowSceneryTabSelections[tabIndex];
while ((currentEntry = window_scenery_tab_entries[tabIndex][totalItems]), !currentEntry.IsUndefined())
for (totalItems = 0; totalItems < SCENERY_ENTRIES_PER_TAB + 1; ++totalItems)
{
currentEntry = window_scenery_tab_entries[tabIndex][totalItems];
if (currentEntry.IsUndefined())
break;
if (currentEntry == scenerySelection)
{
sceneryItem.selected_item = totalItems;
sceneryItem.scenerySelection = scenerySelection;
}
totalItems++;
}
sceneryItem.allRows = count_rows(totalItems + 8);
return sceneryItem;
@@ -1202,13 +1205,14 @@ void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t s
uint8_t tabIndex = gWindowSceneryActiveTabIndex;
int32_t sceneryTabItemIndex = 0;
ScenerySelection currentSceneryGlobal = ScenerySelection::CreateUndefined();
int16_t left = 0, top = 0;
while ((currentSceneryGlobal = window_scenery_tab_entries[tabIndex][sceneryTabItemIndex]),
!currentSceneryGlobal.IsUndefined())
for (int32_t sceneryTabItemIndex = 0; sceneryTabItemIndex < SCENERY_ENTRIES_PER_TAB + 1; ++sceneryTabItemIndex)
{
ScenerySelection currentSceneryGlobal = window_scenery_tab_entries[tabIndex][sceneryTabItemIndex];
if (currentSceneryGlobal.IsUndefined())
break;
ScenerySelection tabSelectedScenery = gWindowSceneryTabSelections[tabIndex];
if (gWindowSceneryPaintEnabled == 1 || gWindowSceneryEyedropperEnabled)
@@ -1354,7 +1358,6 @@ void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t s
top += SCENERY_BUTTON_HEIGHT;
left = 0;
}
sceneryTabItemIndex++;
}
}

5
src/openrct2/util/Util.cpp
View File

@@ -336,7 +336,10 @@ int32_t strlogicalcmp(const char* s1, const char* s2)
if (tolower(*s1) != tolower(*s2))
return tolower(*s1) - tolower(*s2);
else
(++s1, ++s2);
{
++s1;
++s2;
}
}
else
{