From 4e4e2f16d839ecd7ee72151b3fb7054c507629ab Mon Sep 17 00:00:00 2001 From: helixhorned Date: Mon, 31 Aug 2009 13:43:13 +0000 Subject: [PATCH] 4x bigger max. zoom in 2d mode at Gambini's request git-svn-id: https://svn.eduke32.com/eduke32@1491 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/build.c | 6 +++--- polymer/eduke32/source/astub.c | 2 +- polymer/eduke32/source/mapster32.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index fd580bb0c..e31d216b5 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -111,7 +111,7 @@ extern int16_t searchsector, searchwall, searchstat; //search output int32_t osearchx, osearchy; //old search input extern int16_t pointhighlight, linehighlight, highlightcnt; -int16_t grid = 3, gridlock = 1, showtags = 1; +int32_t grid = 3, gridlock = 1, showtags = 1; int32_t zoom = 768, gettilezoom = 1; int32_t lastpm16time = 0; @@ -2833,7 +2833,7 @@ SKIP: bstatus &= ~16; } - if ((keystatus[buildkeys[BK_MOVEUP]] || (bstatus&16)) && (zoom < 16384)) + if ((keystatus[buildkeys[BK_MOVEUP]] || (bstatus&16)) && (zoom < 65536)) { zoom += synctics*(zoom>>4); if (zoom < 24) zoom += 2; @@ -2844,7 +2844,7 @@ SKIP: pos.x = mousxplc; pos.y = mousyplc; } - if (zoom > 16384) zoom = 16384; + if (zoom > 65536) zoom = 65536; _printmessage16("Zoom: %d",zoom); } if ((keystatus[buildkeys[BK_MOVEDOWN]] || (bstatus&32)) && (zoom > 8)) diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 397833fd1..2c03e17d8 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -8068,7 +8068,7 @@ static void Keys2d(void) if (autogrid) { grid = zoom+512; - if (grid > 16384) grid = 16384; + if (grid > 65536) grid = 65536; grid = scale(grid,6,6144); if (grid > 7) grid = 7; if (grid < 0) grid = 0; diff --git a/polymer/eduke32/source/mapster32.h b/polymer/eduke32/source/mapster32.h index 3baa81150..01eb0caf3 100644 --- a/polymer/eduke32/source/mapster32.h +++ b/polymer/eduke32/source/mapster32.h @@ -106,7 +106,7 @@ static inline void SetSLIMEPalette(); static inline void SetWATERPalette(); static inline void SetGAMEPalette(); -extern int16_t grid; +extern int32_t grid; static void EditSpriteData(int16_t spritenum); static void EditWallData(int16_t wallnum);