dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix changing sprite alignment in sprite aligner window

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-04-07 12:40:24 +01:00
parent 1a6a4c9a6c
commit 89e3b009c3
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf_debug_gui.cpp
View File

@@ -23,6 +23,7 @@
#include "zoom_func.h" #include "zoom_func.h"
#include "scope.h" #include "scope.h"
#include "debug_settings.h" #include "debug_settings.h"
#include "viewport_func.h"
#include "engine_base.h" #include "engine_base.h"
#include "industry.h" #include "industry.h"
@@ -1580,6 +1581,9 @@ struct SpriteAlignerWindow : Window {
case WID_SA_DOWN: case WID_SA_DOWN:
case WID_SA_LEFT: case WID_SA_LEFT:
case WID_SA_RIGHT: { case WID_SA_RIGHT: {
/* Make sure that there are no concurrent draw jobs executing */
ViewportDoDrawProcessAllPending();
/* /*
* Yes... this is a hack. * Yes... this is a hack.
* *
@@ -1593,19 +1597,21 @@ struct SpriteAlignerWindow : Window {
* used by someone and the sprite cache isn't big enough for that * used by someone and the sprite cache isn't big enough for that
* particular NewGRF developer. * particular NewGRF developer.
*/ */
Sprite *spr = const_cast<Sprite *>(GetSprite(this->current_sprite, SpriteType::Normal, 0)); Sprite *spr = const_cast<Sprite *>(GetSprite(this->current_sprite, SpriteType::Normal, UINT8_MAX));
/* Remember the original offsets of the current sprite, if not already in mapping. */ /* Remember the original offsets of the current sprite, if not already in mapping. */
if (this->offs_start_map.count(this->current_sprite) == 0) { if (this->offs_start_map.count(this->current_sprite) == 0) {
this->offs_start_map[this->current_sprite] = XyOffs(spr->x_offs, spr->y_offs); this->offs_start_map[this->current_sprite] = XyOffs(spr->x_offs, spr->y_offs);
} }
int amt = ScaleByZoom(_ctrl_pressed ? 8 : 1, SpriteAlignerWindow::zoom); int amt = ScaleByZoom(_ctrl_pressed ? 8 : 1, SpriteAlignerWindow::zoom);
for (Sprite *s = spr; s != nullptr; s = s->next) {
switch (widget) { switch (widget) {
/* Move eight 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 -= amt; break; case WID_SA_UP: s->y_offs -= amt; break;
case WID_SA_DOWN: spr->y_offs += amt; break; case WID_SA_DOWN: s->y_offs += amt; break;
case WID_SA_LEFT: spr->x_offs -= amt; break; case WID_SA_LEFT: s->x_offs -= amt; break;
case WID_SA_RIGHT: spr->x_offs += amt; break; case WID_SA_RIGHT: s->x_offs += amt; break;
}
} }
/* Of course, we need to redraw the sprite, but where is it used? /* Of course, we need to redraw the sprite, but where is it used?
* Everywhere is a safe bet. */ * Everywhere is a safe bet. */