upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 18:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #10219:

Browse Source 
increased the precision of the mouse in the top row of the editor

changelog update
This commit is contained in:
Mark de Wever 2007-12-15 19:20:32 +00:00
parent 23f0c09c1d
commit 4270dcb8e8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -47,6 +47,9 @@ Version 1.3.12+svn:
* fixed a crash when the attacker dies while performing a desparate attack.
The crash seemed only to happen under Windows but valgrind also
complained (bug #10496)
* loading a content with invalid wml does not terminate the game
* increased the precission off the mouse in the top row of the editor
(closes bug #10219)
Version 1.3.12:
* campaigns:

15
src/display.cpp
View File

@ -183,6 +183,14 @@ const gamemap::location display::pixel_position_to_hex(int x, int y,
// adjust for the border
x -= static_cast<int>(theme_.border().size * hex_width());
y -= static_cast<int>(theme_.border().size * hex_size());
// The editor can modify the border and this will result in a negative y
// value. Instead of adding extra cases we just shift the hex. Since the
// editor doesn't use the direction this is no problem.
const int offset = y < 0 ? 1 : 0;
if(offset) {
x += hex_width();
y += hex_size();
}
const int s = hex_size();
const int tesselation_x_size = hex_width() * 2;
const int tesselation_y_size = s;
@ -198,11 +206,6 @@ const gamemap::location display::pixel_position_to_hex(int x, int y,
if ((x_mod * 2 + y_mod) < (s / 2)) {
x_modifier = -1;
y_modifier = -1;
// @todo this hack allows the editor to modify the odd border tiles
// but the selection still has glitches.
} else if (y_mod < 0 && (x_mod * 2 - y_mod) < (s * 3 / 2)) {
x_modifier = 0;
y_modifier = -1;
} else if ((x_mod * 2 - y_mod) < (s * 3 / 2)) {
x_modifier = 0;
y_modifier = 0;
@ -224,7 +227,7 @@ const gamemap::location display::pixel_position_to_hex(int x, int y,
}
}
const gamemap::location res(x_base + x_modifier, y_base + y_modifier);
const gamemap::location res(x_base + x_modifier - offset, y_base + y_modifier - offset);
if(nearest_hex != NULL) {
// Our x and y use the map_area as reference.