From 5407575ef416b6f11578f3bbc3888785db109ad8 Mon Sep 17 00:00:00 2001 From: avolkov Date: Mon, 10 Nov 2008 06:03:16 +0000 Subject: [PATCH] Allow reaching 999.9 over X in HSpace; Y fixed symmetrically and would be relevant if weren't inverted; bug #628 git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3098 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/sc2code/units.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 18dfa0341..42d3c90d1 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.7: +- Allow reaching 999.9:999.9 in HyperSpace (bug #628), from Nic - Use system getopt_long() when available - SvdB - Added --addondir commandline option - Mika - Case insensitive matching when looking for .zip/.uqm/.rmp files - SvdB diff --git a/sc2/src/sc2code/units.h b/sc2/src/sc2code/units.h index 72fc08047..fbc76280b 100644 --- a/sc2/src/sc2code/units.h +++ b/sc2/src/sc2code/units.h @@ -76,11 +76,11 @@ extern int ScreenHeight; #define MAX_Y_UNIVERSE 9999 #define MAX_X_LOGICAL \ ((UNIVERSE_TO_LOGX (MAX_X_UNIVERSE + 1) > UNIVERSE_TO_LOGX (-1) ? \ - UNIVERSE_TO_LOGX (MAX_X_UNIVERSE) : UNIVERSE_TO_LOGX (-1)) \ + UNIVERSE_TO_LOGX (MAX_X_UNIVERSE + 1) : UNIVERSE_TO_LOGX (-1)) \ - 1L) #define MAX_Y_LOGICAL \ ((UNIVERSE_TO_LOGY (MAX_Y_UNIVERSE + 1) > UNIVERSE_TO_LOGY (-1) ? \ - UNIVERSE_TO_LOGY (MAX_Y_UNIVERSE) : UNIVERSE_TO_LOGY (-1)) \ + UNIVERSE_TO_LOGY (MAX_Y_UNIVERSE + 1) : UNIVERSE_TO_LOGY (-1)) \ - 1L) #define SECTOR_WIDTH 195 #define SECTOR_HEIGHT 25