From 442a9bbfef3944d0caf3c268f802a1af44ee86a0 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sat, 6 Dec 2014 21:05:36 +0000 Subject: [PATCH] voxmodel.c: fix Polymost rendering of voxels. This reverts/corrects two semantic changes of r4639 as far as what is now voxmodel.c (formerly part of mdsprite.c) is concerned. One correction ends up having no effect (m->bscale is always 1.f for voxel models, as far as I can see), but is the proper rewrite. Also, in osdcmds.c:registerosdcommands(), tweak two help strings. git-svn-id: https://svn.eduke32.com/eduke32@4800 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/voxmodel.c | 6 +++--- polymer/eduke32/source/lunatic/con_lang.lua | 2 +- polymer/eduke32/source/lunatic/lunacon.lua | 2 +- polymer/eduke32/source/osdcmds.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/build/src/voxmodel.c b/polymer/eduke32/build/src/voxmodel.c index 6317e6d09..96a54aef4 100644 --- a/polymer/eduke32/build/src/voxmodel.c +++ b/polymer/eduke32/build/src/voxmodel.c @@ -535,9 +535,9 @@ static int32_t loadkvx(const char *filnam) for (i=0; i<256; i++) { kread(fil, c, 3); -#if B_BIG_ENDIAN != 0 +//#if B_BIG_ENDIAN != 0 pal[i] = B_LITTLE32((((int32_t) c[0])<<18)+(((int32_t) c[1])<<10)+(((int32_t) c[2])<<2)+(i<<24)); -#endif +//#endif } yzsiz = voxsiz.y*voxsiz.z; i = ((voxsiz.x*yzsiz+31)>>3)+1; @@ -699,7 +699,7 @@ int32_t polymost_voxdraw(voxmodel_t *m, const spritetype *tspr) //} //if (globalorientation&4) { m0.y = -m0.y; a0.y = -a0.y; } //x-flipping - k0 = 1.f/(m->bscale * 64.f); + k0 = m->bscale / 64.f; f = (float) tspr->xrepeat * (256.f/320.f) * k0; if ((sprite[tspr->owner].cstat&48)==16) f *= 1.25f; diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index 008ec933c..db97049a0 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -900,7 +900,7 @@ StructAccessCode2 = } -- NOTE: These MUST be in reverse lexicographical order! --- Per CON syntax, valid identifiers names are disjunct from keywords, +-- Per CON syntax, valid identifiers names are disjoint from keywords, -- so that a rule like -- t_identifier = -con_keyword * (sp1 + "[") * t_identifier_all -- (from the final grammar in lunacon.lua) must match the longest diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua index 55ff60b78..3f176bbae 100644 --- a/polymer/eduke32/source/lunatic/lunacon.lua +++ b/polymer/eduke32/source/lunatic/lunacon.lua @@ -1701,7 +1701,7 @@ local tok = maybe_minus = (Pat("-") * sp0)^-1, number = Var("t_number"), - -- Valid identifier names are disjunct from keywords! + -- Valid identifier names are disjoint from keywords! -- XXX: CON is more permissive with identifier name characters: identifier = Var("t_identifier"), -- This one matches keywords, too: diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index 951d58a6d..457aa4073 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -1563,11 +1563,11 @@ int32_t registerosdcommands(void) }, { "in_mousedeadzone", "amount of mouse movement to filter out", (void *)&ud.config.MouseDeadZone, CVAR_INT, 0, 512 }, { "in_mouseflip", "invert vertical mouse movement", (void *)&ud.mouseflip, CVAR_BOOL, 0, 1 }, - { "in_mousemode", "like pressing U.", (void *)&g_myAimMode, CVAR_BOOL, 0, 1 }, + { "in_mousemode", "toggles vertical mouse view", (void *)&g_myAimMode, CVAR_BOOL, 0, 1 }, { "in_mousesmoothing", "enable/disable mouse input smoothing", (void *)&ud.config.SmoothInput, CVAR_BOOL, 0, 1 }, { "mus_enabled", "enables/disables music", (void *)&ud.config.MusicToggle, CVAR_BOOL, 0, 1 }, - { "mus_volume", "controls volume of midi music", (void *)&ud.config.MusicVolume, CVAR_INT, 0, 255 }, + { "mus_volume", "controls music volume", (void *)&ud.config.MusicVolume, CVAR_INT, 0, 255 }, { "osdhightile", "enable/disable hires art replacements for console text", (void *)&osdhightile, CVAR_BOOL, 0, 1 }, { "osdscale", "adjust console text size", (void *)&osdscale, CVAR_FLOAT|CVAR_FUNCPTR, 1, 4 },