mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #7609: In the sprite aligner window the 'Reset relative' button crashes the game. 

The 'offs_start_map' is a 'SmallMap', so its own 'Erase' function should be called instead of the underlying vector's 'erase' function.
And fix a "typo". :)
pull/7514/head
stormcone 2019-05-27 00:52:53 +02:00 committed by Charles Pigott
parent 846fc8fe09
commit 6396ec05fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_debug_gui.cpp
View File

@ -972,7 +972,7 @@ struct SpriteAlignerWindow : Window {
this->offs_start_map.Insert(this->current_sprite, XyOffs(spr->x_offs, spr->y_offs)); this->offs_start_map.Insert(this->current_sprite, XyOffs(spr->x_offs, spr->y_offs));
} }
switch (widget) { switch (widget) {
/* Move ten units at a time if ctrl is pressed. */ /* Move eight units at a time if ctrl is pressed. */
case WID_SA_UP: spr->y_offs -= _ctrl_pressed ? 8 : 1; break; case WID_SA_UP: spr->y_offs -= _ctrl_pressed ? 8 : 1; break;
case WID_SA_DOWN: spr->y_offs += _ctrl_pressed ? 8 : 1; break; case WID_SA_DOWN: spr->y_offs += _ctrl_pressed ? 8 : 1; break;
case WID_SA_LEFT: spr->x_offs -= _ctrl_pressed ? 8 : 1; break; case WID_SA_LEFT: spr->x_offs -= _ctrl_pressed ? 8 : 1; break;
@ -986,7 +986,7 @@ struct SpriteAlignerWindow : Window {
case WID_SA_RESET_REL: case WID_SA_RESET_REL:
/* Reset the starting offsets for the current sprite. */ /* Reset the starting offsets for the current sprite. */
this->offs_start_map.erase(this->offs_start_map.begin() + this->current_sprite); this->offs_start_map.Erase(this->current_sprite);
this->SetDirty(); this->SetDirty();
break; break;
} }