From 92fc1d35669e6fa2305ecf3896a7034fb6231770 Mon Sep 17 00:00:00 2001 From: terminx Date: Fri, 3 Dec 2010 06:50:16 +0000 Subject: [PATCH] Fix digitalnumberz spacing and saving/loading of screen size git-svn-id: https://svn.eduke32.com/eduke32@1732 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 4 ++-- polymer/eduke32/source/osdcmds.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index f790de91f..ae6748e74 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -900,7 +900,7 @@ void G_DrawTXDigiNumZ(int32_t starttile, int32_t x,int32_t y,int32_t n,int32_t s for (k=i-1; k>=0; k--) { p = starttile+*(b+k)-'0'; - j += (1+tilesizx[p]*z)>>16; + j += ((1+tilesizx[p])*z)>>16; } if (cs&ROTATESPRITE_MAX) j<<=16; c = x-(j>>1); @@ -910,7 +910,7 @@ void G_DrawTXDigiNumZ(int32_t starttile, int32_t x,int32_t y,int32_t n,int32_t s { p = starttile+*(b+k)-'0'; rotatesprite((c+j)<>((cs&ROTATESPRITE_MAX)?0:16)); + j += (((1+tilesizx[p])*z)>>((cs&ROTATESPRITE_MAX)?0:16)); } } diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index ccab6120b..878f1d5da 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -1440,10 +1440,11 @@ int32_t registerosdcommands(void) { "r_drawweapon", "r_drawweapon: enable/disable weapon drawing", (void *)&ud.drawweapon, CVAR_INT, 0, 2 }, { "r_showfps", "r_showfps: show the frame rate counter", (void *)&ud.tickrate, CVAR_BOOL, 0, 1 }, { "r_shadows", "r_shadows: enable/disable sprite and model shadows", (void *)&ud.shadows, CVAR_BOOL, 0, 1 }, + { "r_size", "r_size: change size of viewable area", (void *)&ud.screen_size, CVAR_INT, 0, 64 }, { "r_precache", "r_precache: enable/disable the pre-level caching routine", (void *)&ud.config.useprecache, CVAR_BOOL, 0, 1 }, { "r_ambientlight", "r_ambientlight: sets the global map light level",(void *)&r_ambientlight, CVAR_FLOAT|CVAR_FUNCPTR, 0, 10 }, - { "r_maxfps", "r_maxfps: sets a framerate cap",(void *)&r_maxfps, CVAR_INT|CVAR_FUNCPTR, 0, 1000 }, + { "r_maxfps", "r_maxfps: limit the frame rate",(void *)&r_maxfps, CVAR_INT|CVAR_FUNCPTR, 0, 1000 }, { "sensitivity","sensitivity : changes the mouse sensitivity", (void *)&CONTROL_MouseSensitivity, CVAR_FLOAT|CVAR_FUNCPTR, 0, 25 },