mirrors
/
OpenLoco
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix road dropdown not remembering selection (#1108) 

* Fix road dropdown not remembering selection

Incorrectly signed type was causing comparisons of equality to fail

* Update changelog
This commit is contained in:
Duncan 2021-08-14 14:20:48 +01:00 committed by GitHub
parent 29b405007e
commit 3c4937e7ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,9 +1,10 @@
21.08+ (???)
------------------------------------------------------------------------
- Fix: [#1108] Road selection not being remembered.
21.08 (2021-08-12)
------------------------------------------------------------------------
- Fix: [#366] People and mail cargo incorrectly delivered to far away stations.
- Fix: [#366] Original Bug. People and mail cargo incorrectly delivered to far away stations.
- Fix: [#1035] Incorrect colour selection when building buildings.
- Fix: [#1070] Crash when naming stations after exhausting natural names.
- Fix: [#1094] Repeated clicking on construction window not always working.

8
src/OpenLoco/Windows/ToolbarTop.cpp
View File

@ -42,7 +42,7 @@ namespace OpenLoco::Ui::Windows::ToolbarTop::Game
static loco_global<uint8_t, 0x009C870C> last_town_option;
static loco_global<uint8_t, 0x009C870D> last_port_option;
static loco_global<int8_t[18], 0x0050A006> available_objects;
static loco_global<uint8_t[18], 0x0050A006> available_objects;
namespace Widx
{
@ -342,7 +342,7 @@ namespace OpenLoco::Ui::Windows::ToolbarTop::Game
// Sanity check: any objects available?
uint32_t i = 0;
while (available_objects[i] != -1 && i < std::size(available_objects))
while (available_objects[i] != 0xFF && i < std::size(available_objects))
i++;
if (i == 0)
return;
@ -351,12 +351,12 @@ namespace OpenLoco::Ui::Windows::ToolbarTop::Game
// Add available objects to Dropdown.
uint16_t highlighted_item = 0;
for (i = 0; available_objects[i] != -1 && i < std::size(available_objects); i++)
for (i = 0; available_objects[i] != 0xFF && i < std::size(available_objects); i++)
{
uint32_t obj_image;
string_id obj_string_id;
int objIndex = available_objects[i];
auto objIndex = available_objects[i];
if ((objIndex & (1 << 7)) != 0)
{
auto road = ObjectManager::get<RoadObject>(objIndex & 0x7F);

8
src/OpenLoco/Windows/ToolbarTopCommon.cpp
View File

@ -33,7 +33,7 @@ namespace OpenLoco::Ui::Windows::ToolbarTop::Common
static loco_global<uint8_t, 0x009C870C> last_town_option;
static loco_global<int8_t[18], 0x0050A006> available_objects;
static loco_global<uint8_t[18], 0x0050A006> available_objects;
// 0x00439DE4
void draw(Window* self, Gfx::Context* context)
@ -199,7 +199,7 @@ namespace OpenLoco::Ui::Windows::ToolbarTop::Common
// Sanity check: any objects available?
uint32_t i = 0;
while (available_objects[i] != -1 && i < std::size(available_objects))
while (available_objects[i] != 0xFF && i < std::size(available_objects))
i++;
if (i == 0)
return;
@ -208,12 +208,12 @@ namespace OpenLoco::Ui::Windows::ToolbarTop::Common
// Add available objects to Dropdown.
uint16_t highlighted_item = 0;
for (i = 0; available_objects[i] != -1 && i < std::size(available_objects); i++)
for (i = 0; available_objects[i] != 0xFF && i < std::size(available_objects); i++)
{
uint32_t obj_image;
string_id obj_string_id;
int objIndex = available_objects[i];
auto objIndex = available_objects[i];
if ((objIndex & (1 << 7)) != 0)
{
auto road = ObjectManager::get<RoadObject>(objIndex & 0x7F);