diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b292bfc06c21f5ef02d6bb155ae4ab5e4ee6533c..ef23044104a5eb16ae9628933baee44086d0b52a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -159,6 +159,9 @@ stages:
Debian testing GCC:
stage: build
+
+ when: manual
+
image: debian:testing-slim
allow_failure: true
@@ -198,6 +201,8 @@ Debian testing GCC:
Windows x86:
stage: build
+ when: on_success
+
artifacts:
paths:
- "bin/"
@@ -228,6 +233,8 @@ Windows x86:
Debian stable:amd64:
stage: build
+ when: on_success
+
artifacts:
paths:
- "bin/"
@@ -270,6 +277,8 @@ Debian stable:amd64:
Debian stable:i386:
stage: build
+ when: manual
+
artifacts:
paths:
- "bin/"
@@ -311,6 +320,8 @@ Debian stable:i386:
Debian stable:arm64:
stage: build
+ when: manual
+
artifacts:
paths:
- "bin/"
@@ -345,7 +356,7 @@ Debian stable:arm64:
- - |
# make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1C || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 ARM64=1
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -353,6 +364,8 @@ Debian stable:arm64:
Windows x64:
stage: build
+ when: manual
+
artifacts:
paths:
- "bin/"
@@ -383,6 +396,8 @@ Windows x64:
Debian stable Clang:
stage: build
+ when: manual
+
allow_failure: true
artifacts:
@@ -419,9 +434,50 @@ Debian stable Clang:
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+Debian stable musl:
+ stage: build
+
+ when: manual
+
+ allow_failure: true
+
+ artifacts:
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-musl"
+
+ variables:
+ CC: musl-gcc
+ LDD: musl-ldd
+
+ script:
+ - - |
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - apt-get install gcc
+ - |
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+ - - |
+ # apt_development
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - apt-get install musl-tools
+ - |
+ # apt_development
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+ - - |
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 SDL=0 NOHW=1 NOZLIB=1 NOCURL=1 NOGME=1 NOOPENMPT=1
+ - |
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
Debian testing Clang:
extends: Debian stable Clang
+ when: manual
+
image: debian:testing-slim
artifacts:
@@ -432,3 +488,18 @@ Debian testing Clang:
WFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype
CFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype
LDFLAGS: -Wl,-fuse-ld=gold
+
+Debian testing musl:
+ extends: Debian stable musl
+
+ when: manual
+
+ image: debian:testing-slim
+
+ artifacts:
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-musl"
+
+ variables:
+ CC: musl-gcc
+ LDD: musl-ldd
+ LDFLAGS: -Wl,-fuse-ld=gold
diff --git a/appveyor.yml b/appveyor.yml
index 63d801b734719bf4ba47dfb42b1b7849c3a23189..d0d94b9828b56bc70f2e60bb18064bf9c933a099 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.13.{branch}-{build}
+version: 2.2.14.{branch}-{build}
os: MinGW
environment:
diff --git a/src/console.c b/src/console.c
index 21b608ce4df88ac5719cb8c43bb739e314450cbd..dbd7c938a0c3e922e50d39d800a00c10bc598bc3 100644
--- a/src/console.c
+++ b/src/console.c
@@ -543,13 +543,13 @@ static void CON_RecalcSize(void)
con_scalefactor = 1;
break;
case V_SMALLSCALEPATCH:
- con_scalefactor = vid.smalldupx;
+ con_scalefactor = vid.smalldup;
break;
case V_MEDSCALEPATCH:
- con_scalefactor = vid.meddupx;
+ con_scalefactor = vid.meddup;
break;
default: // Full scaling
- con_scalefactor = vid.dupx;
+ con_scalefactor = vid.dup;
break;
}
@@ -667,7 +667,7 @@ static void CON_MoveConsole(void)
}
// Not instant - Increment fracmovement fractionally
- fracmovement += FixedMul(cons_speed.value*vid.fdupy, renderdeltatics);
+ fracmovement += FixedMul(cons_speed.value*vid.fdup, renderdeltatics);
if (con_curlines < con_destlines) // Move the console downwards
{
@@ -1764,9 +1764,9 @@ static void CON_DrawBackpic(void)
con_backpic = W_CachePatchNum(piclump, PU_PATCH);
// Center the backpic, and draw a vertically cropped patch.
- w = (con_backpic->width * vid.dupx);
+ w = con_backpic->width * vid.dup;
x = (vid.width / 2) - (w / 2);
- h = con_curlines/vid.dupy;
+ h = con_curlines/vid.dup;
// If the patch doesn't fill the entire screen,
// then fill the sides with a solid color.
diff --git a/src/d_main.c b/src/d_main.c
index 80907a013d9c6586c3b0d7cb828404e8d5214d67..274e4ceb366511fe9b9e9d77a792b51f4f51bbba 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1614,6 +1614,9 @@ void D_SRB2Main(void)
if (D_CheckNetGame())
autostart = true;
+ if (!dedicated)
+ pickedchar = R_SkinAvailable(cv_defaultskin.string);
+
// check for a driver that wants intermission stats
// start the apropriate game based on parms
if (M_CheckParm("-metal"))
@@ -1627,8 +1630,6 @@ void D_SRB2Main(void)
autostart = true;
}
- pickedchar = R_SkinAvailable(cv_defaultskin.string);
-
// user settings come before "+" parameters.
if (dedicated)
COM_ImmedExecute(va("exec \"%s"PATHSEP"adedserv.cfg\"\n", srb2home));
diff --git a/src/d_player.h b/src/d_player.h
index 7ad5b9f811962cb56ffcf55030f2ff1d2aea331d..ca700d4e1f593c26423d3f0947a9dae1348fe903 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -607,6 +607,7 @@ typedef struct player_s
tic_t jointime; // Timer when player joins game to change skin/color
tic_t quittime; // Time elapsed since user disconnected, zero if connected
+ tic_t lastinputtime; // the last tic the player has made any input
#ifdef HWRENDER
fixed_t fovadd; // adjust FOV for hw rendering
#endif
diff --git a/src/deh_lua.c b/src/deh_lua.c
index 0b789547b266aeb238701ca6b34c4f8702c334fb..e596e166fb01d762a6bcc210634c599155fc7d4e 100644
--- a/src/deh_lua.c
+++ b/src/deh_lua.c
@@ -297,7 +297,8 @@ static int ScanConstants(lua_State *L, boolean mathlib, const char *word)
CacheAndPushConstant(L, word, (lua_Integer)PF_FULLSTASIS);
return 1;
}
- else if (fastcmp(p, "USEDOWN")) // Remove case when 2.3 nears release...
+ // TODO: 2.3: Delete this alias
+ else if (fastcmp(p, "USEDOWN"))
{
CacheAndPushConstant(L, word, (lua_Integer)PF_SPINDOWN);
return 1;
@@ -583,7 +584,8 @@ static int ScanConstants(lua_State *L, boolean mathlib, const char *word)
return 0;
}
- if (fastcmp(word, "BT_USE")) // Remove case when 2.3 nears release...
+ // TODO: 2.3: Delete this alias
+ if (fastcmp(word, "BT_USE"))
{
CacheAndPushConstant(L, word, (lua_Integer)BT_SPIN);
return 1;
@@ -771,8 +773,7 @@ int LUA_SOCLib(lua_State *L)
lua_register(L,"getActionName",lib_getActionName);
luaL_newmetatable(L, META_ACTION);
- lua_pushcfunction(L, action_call);
- lua_setfield(L, -2, "__call");
+ LUA_SetCFunctionField(L, "__call", action_call);
lua_pop(L, 1);
return 0;
diff --git a/src/deh_soc.c b/src/deh_soc.c
index 59eb0a9bd93e12e86f78a251408f401698ebc724..6162034de636e54ec8d35f5292720564de8de32d 100644
--- a/src/deh_soc.c
+++ b/src/deh_soc.c
@@ -911,6 +911,7 @@ static void readspriteframe(MYFILE *f, spriteinfo_t *sprinfo, UINT8 frame)
sprinfo->pivot[frame].x = value;
else if (fastcmp(word, "YPIVOT"))
sprinfo->pivot[frame].y = value;
+ // TODO: 2.3: Delete
else if (fastcmp(word, "ROTAXIS"))
deh_warning("SpriteInfo: ROTAXIS is deprecated and will be removed.");
else
@@ -1617,6 +1618,7 @@ void readlevelheader(MYFILE *f, INT32 num)
sizeof(mapheaderinfo[num-1]->musname), va("Level header %d: music", num));
}
}
+ // TODO: 2.3: Delete
else if (fastcmp(word, "MUSICSLOT"))
deh_warning("Level header %d: MusicSlot parameter is deprecated and will be removed.\nUse \"Music\" instead.", num);
else if (fastcmp(word, "MUSICTRACK"))
diff --git a/src/deh_tables.c b/src/deh_tables.c
index 7012ede466b2a1734fc9a47d9e63591ed900a05d..bf148d82b275801d0a0c142642e8819da3ca89df 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -1933,6 +1933,13 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_SMALLGRABCHAIN",
"S_BIGGRABCHAIN",
+ // Blue spring on a ball
+ "S_BLUESPRINGBALL",
+ "S_BLUESPRINGBALL2",
+ "S_BLUESPRINGBALL3",
+ "S_BLUESPRINGBALL4",
+ "S_BLUESPRINGBALL5",
+
// Yellow spring on a ball
"S_YELLOWSPRINGBALL",
"S_YELLOWSPRINGBALL2",
@@ -3891,6 +3898,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
"MT_BIGMACE", // Big Mace
"MT_SMALLGRABCHAIN", // Small Grab Chain
"MT_BIGGRABCHAIN", // Big Grab Chain
+ "MT_BLUESPRINGBALL", // Blue spring on a ball
"MT_YELLOWSPRINGBALL", // Yellow spring on a ball
"MT_REDSPRINGBALL", // Red spring on a ball
"MT_SMALLFIREBAR", // Small Firebar
diff --git a/src/f_finale.c b/src/f_finale.c
index 7afed27d07055038328eb44ce09ea6fe15355de3..68e9c3216948704d2e7f6ff0716edcdda08e2291 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1327,7 +1327,7 @@ void F_CreditDrawer(void)
y += 12<<FRACBITS;
break;
}
- if (FixedMul(y,vid.dupy) > vid.height)
+ if (FixedMul(y,vid.dup) > vid.height)
break;
}
}
@@ -1362,7 +1362,7 @@ void F_CreditTicker(void)
case 1: y += 30<<FRACBITS; break;
default: y += 12<<FRACBITS; break;
}
- if (FixedMul(y,vid.dupy) > vid.height)
+ if (FixedMul(y,vid.dup) > vid.height)
break;
}
@@ -2082,7 +2082,7 @@ void F_EndingDrawer(void)
if (goodending && finalecount >= TICRATE && finalecount < INFLECTIONPOINT)
{
INT32 workingtime = finalecount - TICRATE;
- fixed_t radius = ((vid.width/vid.dupx)*(INFLECTIONPOINT - TICRATE - workingtime))/(INFLECTIONPOINT - TICRATE);
+ fixed_t radius = ((vid.width/vid.dup)*(INFLECTIONPOINT - TICRATE - workingtime))/(INFLECTIONPOINT - TICRATE);
angle_t fa;
INT32 eemeralds_cur[4];
char patchname[7] = "CEMGx0";
@@ -2287,7 +2287,6 @@ void F_InitMenuPresValues(void)
void F_SkyScroll(const char *patchname)
{
INT32 x, basey = 0;
- INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
patch_t *pat;
if (rendermode == render_none)
@@ -2315,17 +2314,17 @@ void F_SkyScroll(const char *patchname)
curbgy %= pat->height * 16;
// Ooh, fancy frame interpolation
- x = ((curbgx*dupz) + FixedInt((rendertimefrac-FRACUNIT) * curbgxspeed*dupz)) / 16;
- basey = ((curbgy*dupz) + FixedInt((rendertimefrac-FRACUNIT) * curbgyspeed*dupz)) / 16;
+ x = ((curbgx*vid.dup) + FixedInt((rendertimefrac-FRACUNIT) * curbgxspeed*vid.dup)) / 16;
+ basey = ((curbgy*vid.dup) + FixedInt((rendertimefrac-FRACUNIT) * curbgyspeed*vid.dup)) / 16;
if (x > 0) // Make sure that we don't leave the left or top sides empty
- x -= pat->width * dupz;
+ x -= pat->width * vid.dup;
if (basey > 0)
- basey -= pat->height * dupz;
+ basey -= pat->height * vid.dup;
- for (; x < vid.width; x += pat->width * dupz)
+ for (; x < vid.width; x += pat->width * vid.dup)
{
- for (INT32 y = basey; y < vid.height; y += pat->height * dupz)
+ for (INT32 y = basey; y < vid.height; y += pat->height * vid.dup)
V_DrawScaledPatch(x, y, V_NOSCALESTART, pat);
}
@@ -2603,7 +2602,7 @@ static void F_LoadAlacroixGraphics(SINT8 newttscale)
static void F_FigureActiveTtScale(void)
{
- SINT8 newttscale = max(1, min(6, vid.dupx));
+ SINT8 newttscale = max(1, min(6, vid.dup));
SINT8 oldttscale = activettscale;
if (newttscale == testttscale)
@@ -4095,7 +4094,7 @@ static fixed_t F_GetPromptHideHudBound(void)
F_GetPageTextGeometry(&pagelines, &rightside, &boxh, &texth, &texty, &namey, &chevrony, &textx, &textr);
// calc boxheight (see V_DrawPromptBack)
- boxh *= vid.dupy;
+ boxh *= vid.dup;
boxh = (boxh * 4) + (boxh/2)*5; // 4 lines of space plus gaps between and some leeway
// return a coordinate to check
diff --git a/src/g_demo.c b/src/g_demo.c
index cb168dfd97ceed20b9eedd193f5406dd2fc7c361..7026c3391648e6619c3d76a48251c757b555e11b 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -1492,8 +1492,9 @@ void G_BeginRecording(void)
demo_p += 16;
// Skin
- for (i = 0; i < 16 && cv_skin.string[i]; i++)
- name[i] = cv_skin.string[i];
+ const char *skinname = skins[players[0].skin].name;
+ for (i = 0; i < 16 && skinname[i]; i++)
+ name[i] = skinname[i];
for (; i < 16; i++)
name[i] = '\0';
M_Memcpy(demo_p,name,16);
diff --git a/src/g_game.c b/src/g_game.c
index fae311694c0caa193b13131f31891a4b46e8df82..438428b90d9f1a69c126f3741c2d8bc925678ed1 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -51,6 +51,7 @@
#include "r_fps.h" // frame interpolation/uncapped
#include "lua_hud.h"
+#include "lua_libs.h"
gameaction_t gameaction;
gamestate_t gamestate = GS_NULL;
@@ -1170,7 +1171,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
// why build a ticcmd if we're paused?
// Or, for that matter, if we're being reborn.
// ...OR if we're blindfolded. No looking into the floor.
- if (paused || P_AutoPause() || (gamestate == GS_LEVEL && (player->playerstate == PST_REBORN || ((gametyperules & GTR_TAG)
+ if (ignoregameinputs || paused || P_AutoPause() || (gamestate == GS_LEVEL && (player->playerstate == PST_REBORN || ((gametyperules & GTR_TAG)
&& (leveltime < hidetime * TICRATE) && (player->pflags & PF_TAGIT)))))
{//@TODO splitscreen player
cmd->angleturn = ticcmd_oldangleturn[forplayer];
@@ -4346,7 +4347,7 @@ void G_LoadGameSettings(void)
}
#define GAMEDATA_ID 0x86E4A27C // Change every major version, as usual
-#define COMPAT_GAMEDATA_ID 0xFCAFE211 // Can be removed entirely for 2.3
+#define COMPAT_GAMEDATA_ID 0xFCAFE211 // TODO: 2.3: Delete
// G_LoadGameData
// Loads the main data file, which stores information such as emblems found, etc.
diff --git a/src/g_input.c b/src/g_input.c
index fa30c1984f6bcd02e9befaad37631b2be04849d2..8b50563313c77937822d68d2a170b1974fa3837d 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -18,6 +18,8 @@
#include "hu_stuff.h" // need HUFONT start & end
#include "netcode/d_net.h"
#include "console.h"
+#include "lua_script.h"
+#include "lua_libs.h"
#define MAXMOUSESENSITIVITY 100 // sensitivity steps
@@ -116,7 +118,10 @@ void G_MapEventsToControls(event_t *ev)
{
case ev_keydown:
if (ev->key < NUMINPUTS)
- gamekeydown[ev->key] = 1;
+ {
+ if (!ignoregameinputs)
+ gamekeydown[ev->key] = 1;
+ }
#ifdef PARANOIA
else
{
@@ -144,7 +149,7 @@ void G_MapEventsToControls(event_t *ev)
case ev_joystick: // buttons are virtual keys
i = ev->key;
- if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on)
+ if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on || ignoregameinputs)
break;
if (ev->x != INT32_MAX) joyxmove[i] = ev->x;
if (ev->y != INT32_MAX) joyymove[i] = ev->y;
@@ -152,7 +157,7 @@ void G_MapEventsToControls(event_t *ev)
case ev_joystick2: // buttons are virtual keys
i = ev->key;
- if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on)
+ if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on || ignoregameinputs)
break;
if (ev->x != INT32_MAX) joy2xmove[i] = ev->x;
if (ev->y != INT32_MAX) joy2ymove[i] = ev->y;
@@ -997,7 +1002,7 @@ static void setcontrol(INT32 (*gc)[2])
INT32 player = ((void*)gc == (void*)&gamecontrolbis ? 1 : 0);
boolean nestedoverride = false;
- // Update me for 2.3
+ // TODO: 2.3: Delete the "use" alias
namectrl = (stricmp(COM_Argv(1), "use")) ? COM_Argv(1) : "spin";
for (numctrl = 0; numctrl < NUM_GAMECONTROLS && stricmp(namectrl, gamecontrolname[numctrl]);
diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index eb0b9e332297a0219c1ef19f922dea5b8547d868..ec9dc76130425df42ade0d53b9d597494d8bd7f5 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -78,10 +78,8 @@ void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
// | /|
// |/ |
// 0--1
- float sdupx = FIXED_TO_FLOAT(vid.fdupx)*2.0f;
- float sdupy = FIXED_TO_FLOAT(vid.fdupy)*2.0f;
- float pdupx = FIXED_TO_FLOAT(vid.fdupx)*2.0f;
- float pdupy = FIXED_TO_FLOAT(vid.fdupy)*2.0f;
+ float sdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
+ float pdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
// make patch ready in hardware cache
HWR_GetPatch(gpatch);
@@ -90,25 +88,23 @@ void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
switch (option & V_SCALEPATCHMASK)
{
case V_NOSCALEPATCH:
- pdupx = pdupy = 2.0f;
+ pdup = 2.0f;
break;
case V_SMALLSCALEPATCH:
- pdupx = 2.0f * FIXED_TO_FLOAT(vid.fsmalldupx);
- pdupy = 2.0f * FIXED_TO_FLOAT(vid.fsmalldupy);
+ pdup = 2.0f * FIXED_TO_FLOAT(vid.fsmalldup);
break;
case V_MEDSCALEPATCH:
- pdupx = 2.0f * FIXED_TO_FLOAT(vid.fmeddupx);
- pdupy = 2.0f * FIXED_TO_FLOAT(vid.fmeddupy);
+ pdup = 2.0f * FIXED_TO_FLOAT(vid.fmeddup);
break;
}
if (option & V_NOSCALESTART)
- sdupx = sdupy = 2.0f;
+ sdup = 2.0f;
- v[0].x = v[3].x = (x*sdupx-(gpatch->leftoffset)*pdupx)/vid.width - 1;
- v[2].x = v[1].x = (x*sdupx+(gpatch->width-gpatch->leftoffset)*pdupx)/vid.width - 1;
- v[0].y = v[1].y = 1-(y*sdupy-(gpatch->topoffset)*pdupy)/vid.height;
- v[2].y = v[3].y = 1-(y*sdupy+(gpatch->height-gpatch->topoffset)*pdupy)/vid.height;
+ v[0].x = v[3].x = (x*sdup-(gpatch->leftoffset)*pdup)/vid.width - 1;
+ v[2].x = v[1].x = (x*sdup+(gpatch->width-gpatch->leftoffset)*pdup)/vid.width - 1;
+ v[0].y = v[1].y = 1-(y*sdup-(gpatch->topoffset)*pdup)/vid.height;
+ v[2].y = v[3].y = 1-(y*sdup+(gpatch->height-gpatch->topoffset)*pdup)/vid.height;
v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
@@ -137,7 +133,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
// | /|
// |/ |
// 0--1
- float dupx, dupy, fscalew, fscaleh, fwidth, fheight;
+ float dup, fscalew, fscaleh, fwidth, fheight;
UINT8 perplayershuffle = 0;
@@ -149,25 +145,21 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
hwrPatch = ((GLPatch_t *)gpatch->hardware);
- dupx = (float)vid.dupx;
- dupy = (float)vid.dupy;
+ dup = (float)vid.dup;
switch (option & V_SCALEPATCHMASK)
{
case V_NOSCALEPATCH:
- dupx = dupy = 1.0f;
+ dup = 1.0f;
break;
case V_SMALLSCALEPATCH:
- dupx = (float)vid.smalldupx;
- dupy = (float)vid.smalldupy;
+ dup = (float)vid.smalldup;
break;
case V_MEDSCALEPATCH:
- dupx = (float)vid.meddupx;
- dupy = (float)vid.meddupy;
+ dup = (float)vid.meddup;
break;
}
- dupx = dupy = (dupx < dupy ? dupx : dupy);
fscalew = fscaleh = FIXED_TO_FLOAT(pscale);
if (vscale != pscale)
fscaleh = FIXED_TO_FLOAT(vscale);
@@ -261,8 +253,8 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
if (!(option & V_NOSCALESTART))
{
- cx = cx * dupx;
- cy = cy * dupy;
+ cx = cx * dup;
+ cy = cy * dup;
if (!(option & V_SCALEPATCHMASK))
{
@@ -279,40 +271,40 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
}
}
// centre screen
- if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+ if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dup) > 1.0E-36f)
{
if (option & V_SNAPTORIGHT)
- cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+ cx += ((float)vid.width - ((float)BASEVIDWIDTH * dup));
else if (!(option & V_SNAPTOLEFT))
- cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/2;
+ cx += ((float)vid.width - ((float)BASEVIDWIDTH * dup))/2;
if (perplayershuffle & 4)
- cx -= ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4;
+ cx -= ((float)vid.width - ((float)BASEVIDWIDTH * dup))/4;
else if (perplayershuffle & 8)
- cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4;
+ cx += ((float)vid.width - ((float)BASEVIDWIDTH * dup))/4;
}
- if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+ if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dup) > 1.0E-36f)
{
if (option & V_SNAPTOBOTTOM)
- cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+ cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup));
else if (!(option & V_SNAPTOTOP))
- cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/2;
+ cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup))/2;
if (perplayershuffle & 1)
- cy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4;
+ cy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dup))/4;
else if (perplayershuffle & 2)
- cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4;
+ cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup))/4;
}
}
}
if (pscale != FRACUNIT || vscale != FRACUNIT || (splitscreen && option & V_PERPLAYER))
{
- fwidth = (float)(gpatch->width) * fscalew * dupx;
- fheight = (float)(gpatch->height) * fscaleh * dupy;
+ fwidth = (float)(gpatch->width) * fscalew * dup;
+ fheight = (float)(gpatch->height) * fscaleh * dup;
}
else
{
- fwidth = (float)(gpatch->width) * dupx;
- fheight = (float)(gpatch->height) * dupy;
+ fwidth = (float)(gpatch->width) * dup;
+ fheight = (float)(gpatch->height) * dup;
}
// positions of the cx, cy, are between 0 and vid.width/vid.height now, we need them to be between -1 and 1
@@ -379,7 +371,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
// | /|
// |/ |
// 0--1
- float dupx, dupy, fscalew, fscaleh, fwidth, fheight;
+ float dup, fscalew, fscaleh, fwidth, fheight;
UINT8 perplayershuffle = 0;
@@ -391,25 +383,21 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
hwrPatch = ((GLPatch_t *)gpatch->hardware);
- dupx = (float)vid.dupx;
- dupy = (float)vid.dupy;
+ dup = (float)vid.dup;
switch (option & V_SCALEPATCHMASK)
{
case V_NOSCALEPATCH:
- dupx = dupy = 1.0f;
+ dup = 1.0f;
break;
case V_SMALLSCALEPATCH:
- dupx = (float)vid.smalldupx;
- dupy = (float)vid.smalldupy;
+ dup = (float)vid.smalldup;
break;
case V_MEDSCALEPATCH:
- dupx = (float)vid.meddupx;
- dupy = (float)vid.meddupy;
+ dup = (float)vid.meddup;
break;
}
- dupx = dupy = (dupx < dupy ? dupx : dupy);
fscalew = fscaleh = FIXED_TO_FLOAT(pscale);
if (vscale != pscale)
fscaleh = FIXED_TO_FLOAT(vscale);
@@ -487,8 +475,8 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
if (!(option & V_NOSCALESTART))
{
- cx = cx * dupx;
- cy = cy * dupy;
+ cx = cx * dup;
+ cy = cy * dup;
if (!(option & V_SCALEPATCHMASK))
{
@@ -496,27 +484,27 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
// no the patch is cropped do not do this ever
// centre screen
- if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+ if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dup) > 1.0E-36f)
{
if (option & V_SNAPTORIGHT)
- cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+ cx += ((float)vid.width - ((float)BASEVIDWIDTH * dup));
else if (!(option & V_SNAPTOLEFT))
- cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/2;
+ cx += ((float)vid.width - ((float)BASEVIDWIDTH * dup))/2;
if (perplayershuffle & 4)
- cx -= ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4;
+ cx -= ((float)vid.width - ((float)BASEVIDWIDTH * dup))/4;
else if (perplayershuffle & 8)
- cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4;
+ cx += ((float)vid.width - ((float)BASEVIDWIDTH * dup))/4;
}
- if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+ if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dup) > 1.0E-36f)
{
if (option & V_SNAPTOBOTTOM)
- cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+ cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup));
else if (!(option & V_SNAPTOTOP))
- cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/2;
+ cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup))/2;
if (perplayershuffle & 1)
- cy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4;
+ cy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dup))/4;
else if (perplayershuffle & 2)
- cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4;
+ cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup))/4;
}
}
}
@@ -532,13 +520,13 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
if (pscale != FRACUNIT || vscale != FRACUNIT || (splitscreen && option & V_PERPLAYER))
{
- fwidth *= fscalew * dupx;
- fheight *= fscaleh * dupy;
+ fwidth *= fscalew * dup;
+ fheight *= fscaleh * dup;
}
else
{
- fwidth *= dupx;
- fheight *= dupy;
+ fwidth *= dup;
+ fheight *= dup;
}
// positions of the cx, cy, are between 0 and vid.width/vid.height now, we need them to be between -1 and 1
@@ -674,9 +662,9 @@ void HWR_DrawPic(INT32 x, INT32 y, lumpnum_t lumpnum)
// 0--1
v[0].x = v[3].x = 2.0f * (float)x/vid.width - 1;
- v[2].x = v[1].x = 2.0f * (float)(x + patch->width*FIXED_TO_FLOAT(vid.fdupx))/vid.width - 1;
+ v[2].x = v[1].x = 2.0f * (float)(x + patch->width*FIXED_TO_FLOAT(vid.fdup))/vid.width - 1;
v[0].y = v[1].y = 1.0f - 2.0f * (float)y/vid.height;
- v[2].y = v[3].y = 1.0f - 2.0f * (float)(y + patch->height*FIXED_TO_FLOAT(vid.fdupy))/vid.height;
+ v[2].y = v[3].y = 1.0f - 2.0f * (float)(y + patch->height*FIXED_TO_FLOAT(vid.fdup))/vid.height;
v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
@@ -866,35 +854,33 @@ void HWR_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color, UINT16 ac
if (!(color & V_NOSCALESTART))
{
- float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
+ fx *= vid.dup;
+ fy *= vid.dup;
+ fw *= vid.dup;
+ fh *= vid.dup;
- fx *= dupx;
- fy *= dupy;
- fw *= dupx;
- fh *= dupy;
-
- if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+ if (fabsf((float)vid.width - (float)BASEVIDWIDTH * vid.dup) > 1.0E-36f)
{
if (color & V_SNAPTORIGHT)
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup));
else if (!(color & V_SNAPTOLEFT))
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 2;
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup)) / 2;
if (perplayershuffle & 4)
- fx -= ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 4;
+ fx -= ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup)) / 4;
else if (perplayershuffle & 8)
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 4;
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup)) / 4;
}
- if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+ if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * vid.dup) > 1.0E-36f)
{
// same thing here
if (color & V_SNAPTOBOTTOM)
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup));
else if (!(color & V_SNAPTOTOP))
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 2;
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup)) / 2;
if (perplayershuffle & 1)
- fy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 4;
+ fy -= ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup)) / 4;
else if (perplayershuffle & 2)
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 4;
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup)) / 4;
}
}
@@ -1032,10 +1018,10 @@ void HWR_DrawViewBorder(INT32 clearlines)
clearlines = BASEVIDHEIGHT; // refresh all
// calc view size based on original game resolution
- baseviewwidth = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwidth), vid.fdupx)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
- baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewheight), vid.fdupy));
- top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowy), vid.fdupy));
- side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwindowx), vid.fdupx));
+ baseviewwidth = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwidth), vid.fdup)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
+ baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewheight), vid.fdup));
+ top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowy), vid.fdup));
+ side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwindowx), vid.fdup));
// top
HWR_DrawFlatFill(0, 0,
@@ -1250,35 +1236,35 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color, UINT32
if (!(color & V_NOSCALESTART))
{
- float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
+ float dup = (float)vid.dup;
- fx *= dupx;
- fy *= dupy;
- fw *= dupx;
- fh *= dupy;
+ fx *= dup;
+ fy *= dup;
+ fw *= dup;
+ fh *= dup;
- if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+ if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dup) > 1.0E-36f)
{
if (color & V_SNAPTORIGHT)
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * dup));
else if (!(color & V_SNAPTOLEFT))
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 2;
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * dup)) / 2;
if (perplayershuffle & 4)
- fx -= ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 4;
+ fx -= ((float)vid.width - ((float)BASEVIDWIDTH * dup)) / 4;
else if (perplayershuffle & 8)
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 4;
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * dup)) / 4;
}
- if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+ if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dup) > 1.0E-36f)
{
// same thing here
if (color & V_SNAPTOBOTTOM)
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup));
else if (!(color & V_SNAPTOTOP))
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 2;
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup)) / 2;
if (perplayershuffle & 1)
- fy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 4;
+ fy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dup)) / 4;
else if (perplayershuffle & 2)
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 4;
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dup)) / 4;
}
}
@@ -1416,8 +1402,6 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
if (!(color & V_NOSCALESTART))
{
- float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
-
if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
{
RGBA_t rgbaColour = V_GetColor(color);
@@ -1430,33 +1414,33 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
return;
}
- fx *= dupx;
- fy *= dupy;
- fw *= dupx;
- fh *= dupy;
+ fx *= vid.dup;
+ fy *= vid.dup;
+ fw *= vid.dup;
+ fh *= vid.dup;
- if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+ if (fabsf((float)vid.width - (float)BASEVIDWIDTH * vid.dup) > 1.0E-36f)
{
if (color & V_SNAPTORIGHT)
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup));
else if (!(color & V_SNAPTOLEFT))
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 2;
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup)) / 2;
if (perplayershuffle & 4)
- fx -= ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 4;
+ fx -= ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup)) / 4;
else if (perplayershuffle & 8)
- fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 4;
+ fx += ((float)vid.width - ((float)BASEVIDWIDTH * vid.dup)) / 4;
}
- if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+ if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * vid.dup) > 1.0E-36f)
{
// same thing here
if (color & V_SNAPTOBOTTOM)
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup));
else if (!(color & V_SNAPTOTOP))
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 2;
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup)) / 2;
if (perplayershuffle & 1)
- fy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 4;
+ fy -= ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup)) / 4;
else if (perplayershuffle & 2)
- fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 4;
+ fy += ((float)vid.height - ((float)BASEVIDHEIGHT * vid.dup)) / 4;
}
}
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index c1f0b34076f62cf9acacec8b1efda103839ed2b0..bcfdfa960d7b723ecb0be2437667bcf09b1030e9 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -341,6 +341,7 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_BMCH
&lspr[NOLIGHT], // SPR_SMCE
&lspr[NOLIGHT], // SPR_BMCE
+ &lspr[NOLIGHT], // SPR_BSPB
&lspr[NOLIGHT], // SPR_YSPB
&lspr[NOLIGHT], // SPR_RSPB
&lspr[REDBALL_L], // SPR_SFBR
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 090ddc53cd6be0ab74e256c0ade5e1ad591c0bee..6bbebd5ae1e74f1b5eb5ce5a2f0e6d251167e486 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -229,6 +229,8 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
// Clamp the light level, since it can sometimes go out of the 0-255 range from animations
light_level = min(max(light_level, 0), 255);
+ V_CubeApply(&tint_color.s.red, &tint_color.s.green, &tint_color.s.blue);
+ V_CubeApply(&fade_color.s.red, &fade_color.s.green, &fade_color.s.blue);
Surface->PolyColor.rgba = poly_color.rgba;
Surface->TintColor.rgba = tint_color.rgba;
Surface->FadeColor.rgba = fade_color.rgba;
diff --git a/src/info.c b/src/info.c
index 36389d849a38e21064e0f4e94b803cccfc9f7ef0..5790dd7c56ce3ee5f625f63581903a6d185a3a73 100644
--- a/src/info.c
+++ b/src/info.c
@@ -250,6 +250,7 @@ char sprnames[NUMSPRITES + 1][5] =
"BMCH", // Big Mace Chain
"SMCE", // Small Mace
"BMCE", // Big Mace
+ "BSPB", // Blue spring on a ball
"YSPB", // Yellow spring on a ball
"RSPB", // Red spring on a ball
"SFBR", // Small Firebar
@@ -2297,6 +2298,13 @@ state_t states[NUMSTATES] =
{SPR_SMCH, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SMALLGRABCHAIN
{SPR_BMCH, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BIGGRABCHAIN
+ // Blue spring on a ball
+ {SPR_BSPB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BLUESPRINGBALL
+ {SPR_BSPB, 4, 4, {A_Pain}, 0, 0, S_BLUESPRINGBALL3}, // S_BLUESPRINGBALL2
+ {SPR_BSPB, 3, 1, {NULL}, 0, 0, S_BLUESPRINGBALL4}, // S_BLUESPRINGBALL3
+ {SPR_BSPB, 2, 1, {NULL}, 0, 0, S_BLUESPRINGBALL5}, // S_BLUESPRINGBALL4
+ {SPR_BSPB, 1, 1, {NULL}, 0, 0, S_BLUESPRINGBALL}, // S_BLUESPRINGBALL5
+
// Yellow spring on a ball
{SPR_YSPB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWSPRINGBALL
{SPR_YSPB, 4, 4, {A_Pain}, 0, 0, S_YELLOWSPRINGBALL3}, // S_YELLOWSPRINGBALL2
@@ -11679,6 +11687,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_BLUESPRINGBALL
+ 1133, // doomednum
+ S_BLUESPRINGBALL, // spawnstate
+ 1000, // spawnhealth
+ S_BLUESPRINGBALL2, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_spring, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 24*FRACUNIT, // speed
+ 17*FRACUNIT, // radius
+ 34*FRACUNIT, // height
+ 1, // display offset
+ 11*FRACUNIT, // mass
+ 0, // damage
+ sfx_mswing, // activesound
+ MF_SCENERY|MF_SPRING|MF_NOGRAVITY, // flags
+ S_BLUESPRINGBALL2 // raisestate
+ },
+
{ // MT_YELLOWSPRINGBALL
1134, // doomednum
S_YELLOWSPRINGBALL, // spawnstate
diff --git a/src/info.h b/src/info.h
index 5c7a9f3fd428579c674c7f969db44f7d71b88f07..a2d87dbdc10644edaaf34187d45495d70ba49f85 100644
--- a/src/info.h
+++ b/src/info.h
@@ -797,6 +797,7 @@ typedef enum sprite
SPR_BMCH, // Big Mace Chain
SPR_SMCE, // Small Mace
SPR_BMCE, // Big Mace
+ SPR_BSPB, // Blue spring on a ball
SPR_YSPB, // Yellow spring on a ball
SPR_RSPB, // Red spring on a ball
SPR_SFBR, // Small Firebar
@@ -2744,6 +2745,13 @@ typedef enum state
S_SMALLGRABCHAIN,
S_BIGGRABCHAIN,
+ // Blue spring on a ball
+ S_BLUESPRINGBALL,
+ S_BLUESPRINGBALL2,
+ S_BLUESPRINGBALL3,
+ S_BLUESPRINGBALL4,
+ S_BLUESPRINGBALL5,
+
// Yellow spring on a ball
S_YELLOWSPRINGBALL,
S_YELLOWSPRINGBALL2,
@@ -4722,6 +4730,7 @@ typedef enum mobj_type
MT_BIGMACE, // Big Mace
MT_SMALLGRABCHAIN, // Small Grab Chain
MT_BIGGRABCHAIN, // Big Grab Chain
+ MT_BLUESPRINGBALL, // Blue spring on a ball
MT_YELLOWSPRINGBALL, // Yellow spring on a ball
MT_REDSPRINGBALL, // Red spring on a ball
MT_SMALLFIREBAR, // Small Firebar
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index b5c72fdd479486a547bd29fd02edb3cebb4d02b4..97bc9319c7aa5c40e9108764c684839b51e38148 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -1033,6 +1033,20 @@ static int lib_pRailThinker(lua_State *L)
return 1;
}
+static int lib_pCheckSkyHit(lua_State *L)
+{
+ mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ line_t *line = *((line_t **)luaL_checkudata(L, 2, META_LINE));
+ //HUDSAFE
+ INLEVEL
+ if (!mobj)
+ return LUA_ErrInvalid(L, "mobj_t");
+ if (!line)
+ return LUA_ErrInvalid(L, "line_t");
+ lua_pushboolean(L, P_CheckSkyHit(mobj, line));
+ return 1;
+}
+
static int lib_pXYMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
@@ -1427,6 +1441,18 @@ static int lib_pGivePlayerRings(lua_State *L)
return 0;
}
+static int lib_pGivePlayerSpheres(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ INT32 num_spheres = (INT32)luaL_checkinteger(L, 2);
+ NOHUD
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ P_GivePlayerSpheres(player, num_spheres);
+ return 0;
+}
+
static int lib_pGivePlayerLives(lua_State *L)
{
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
@@ -1569,6 +1595,19 @@ static int lib_pInstaThrust(lua_State *L)
return 0;
}
+static int lib_pInstaThrustEvenIn2D(lua_State *L)
+{
+ mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ angle_t angle = luaL_checkangle(L, 2);
+ fixed_t move = luaL_checkfixed(L, 3);
+ NOHUD
+ INLEVEL
+ if (!mo)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_InstaThrustEvenIn2D(mo, angle, move);
+ return 0;
+}
+
static int lib_pReturnThrustX(lua_State *L)
{
angle_t angle;
@@ -1669,6 +1708,17 @@ static int lib_pDoJump(lua_State *L)
return 0;
}
+static int lib_pDoSpinDashDust(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ NOHUD
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ P_DoSpinDashDust(player);
+ return 0;
+}
+
static int lib_pSpawnThokMobj(lua_State *L)
{
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
@@ -1719,6 +1769,48 @@ static int lib_pSwitchShield(lua_State *L)
return 0;
}
+static int lib_pDoTailsOverlay(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ mobj_t *tails = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ if (!tails)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_DoTailsOverlay(player, tails);
+ return 0;
+}
+
+static int lib_pDoMetalJetFume(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ mobj_t *fume = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ if (!fume)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_DoMetalJetFume(player, fume);
+ return 0;
+}
+
+static int lib_pDoFollowMobj(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ mobj_t *followmobj = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ if (!followmobj)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_DoFollowMobj(player, followmobj);
+ return 0;
+}
+
static int lib_pPlayerCanEnterSpinGaps(lua_State *L)
{
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
@@ -1790,6 +1882,7 @@ static int lib_pMove(lua_State *L)
return 2;
}
+// TODO: 2.3: Delete
static int lib_pTeleportMove(lua_State *L)
{
mobj_t *ptmthing = tmthing;
@@ -2220,6 +2313,21 @@ static int lib_pDoMatchSuper(lua_State *L)
return 0;
}
+static int lib_pTouchSpecialThing(lua_State *L)
+{
+ mobj_t *special = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *toucher = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+ boolean heightcheck = lua_optboolean(L, 3);
+ NOHUD
+ INLEVEL
+ if (!special || !toucher)
+ return LUA_ErrInvalid(L, "mobj_t");
+ if (!toucher->player)
+ return luaL_error(L, "P_TouchSpecialThing requires a valid toucher.player.");
+ P_TouchSpecialThing(special, toucher, heightcheck);
+ return 0;
+}
+
// P_SPEC
////////////
@@ -2236,6 +2344,40 @@ static int lib_pThrust(lua_State *L)
return 0;
}
+static int lib_pThrustEvenIn2D(lua_State *L)
+{
+ mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ angle_t angle = luaL_checkangle(L, 2);
+ fixed_t move = luaL_checkfixed(L, 3);
+ NOHUD
+ INLEVEL
+ if (!mo)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_ThrustEvenIn2D(mo, angle, move);
+ return 0;
+}
+
+static int lib_pVectorInstaThrust(lua_State *L)
+{
+ fixed_t xa = luaL_checkfixed(L, 1);
+ fixed_t xb = luaL_checkfixed(L, 2);
+ fixed_t xc = luaL_checkfixed(L, 3);
+ fixed_t ya = luaL_checkfixed(L, 4);
+ fixed_t yb = luaL_checkfixed(L, 5);
+ fixed_t yc = luaL_checkfixed(L, 6);
+ fixed_t za = luaL_checkfixed(L, 7);
+ fixed_t zb = luaL_checkfixed(L, 8);
+ fixed_t zc = luaL_checkfixed(L, 9);
+ fixed_t momentum = luaL_checkfixed(L, 10);
+ mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 11, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!mo)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_VectorInstaThrust(xa, xb, xc, ya, yb, yc, za, zb, zc, momentum, mo);
+ return 0;
+}
+
static int lib_pSetMobjStateNF(lua_State *L)
{
mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
@@ -2288,6 +2430,7 @@ static int lib_pMobjTouchingSectorSpecial(lua_State *L)
return 1;
}
+// TODO: 2.3: Delete
static int lib_pThingOnSpecial3DFloor(lua_State *L)
{
mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
@@ -3592,6 +3735,7 @@ static int lib_gAddPlayer(lua_State *L)
newplayer->jointime = 0;
newplayer->quittime = 0;
+ newplayer->lastinputtime = 0;
// Read the skin argument (defaults to Sonic)
if (!lua_isnoneornil(L, 1))
@@ -4101,6 +4245,7 @@ static luaL_Reg lib[] = {
{"P_CreateFloorSpriteSlope",lib_pCreateFloorSpriteSlope},
{"P_RemoveFloorSpriteSlope",lib_pRemoveFloorSpriteSlope},
{"P_RailThinker",lib_pRailThinker},
+ {"P_CheckSkyHit",lib_pCheckSkyHit},
{"P_XYMovement",lib_pXYMovement},
{"P_RingXYMovement",lib_pRingXYMovement},
{"P_SceneryXYMovement",lib_pSceneryXYMovement},
@@ -4133,6 +4278,7 @@ static luaL_Reg lib[] = {
{"P_SpawnShieldOrb",lib_pSpawnShieldOrb},
{"P_SpawnGhostMobj",lib_pSpawnGhostMobj},
{"P_GivePlayerRings",lib_pGivePlayerRings},
+ {"P_GivePlayerSpheres",lib_pGivePlayerSpheres},
{"P_GivePlayerLives",lib_pGivePlayerLives},
{"P_GiveCoopLives",lib_pGiveCoopLives},
{"P_ResetScore",lib_pResetScore},
@@ -4145,6 +4291,7 @@ static luaL_Reg lib[] = {
{"P_DoPlayerFinish",lib_pDoPlayerFinish},
{"P_DoPlayerExit",lib_pDoPlayerExit},
{"P_InstaThrust",lib_pInstaThrust},
+ {"P_InstaThrustEvenIn2D",lib_pInstaThrustEvenIn2D},
{"P_ReturnThrustX",lib_pReturnThrustX},
{"P_ReturnThrustY",lib_pReturnThrustY},
{"P_LookForEnemies",lib_pLookForEnemies},
@@ -4153,10 +4300,14 @@ static luaL_Reg lib[] = {
{"P_HomingAttack",lib_pHomingAttack},
{"P_SuperReady",lib_pSuperReady},
{"P_DoJump",lib_pDoJump},
+ {"P_DoSpinDashDust",lib_pDoSpinDashDust},
{"P_SpawnThokMobj",lib_pSpawnThokMobj},
{"P_SpawnSpinMobj",lib_pSpawnSpinMobj},
{"P_Telekinesis",lib_pTelekinesis},
{"P_SwitchShield",lib_pSwitchShield},
+ {"P_DoTailsOverlay",lib_pDoTailsOverlay},
+ {"P_DoMetalJetFume",lib_pDoMetalJetFume},
+ {"P_DoFollowMobj",lib_pDoFollowMobj},
{"P_PlayerCanEnterSpinGaps",lib_pPlayerCanEnterSpinGaps},
{"P_PlayerShouldUseSpinHeight",lib_pPlayerShouldUseSpinHeight},
@@ -4176,6 +4327,7 @@ static luaL_Reg lib[] = {
{"P_CeilingzAtPos",lib_pCeilingzAtPos},
{"P_GetSectorColormapAt",lib_pGetSectorColormapAt},
{"P_DoSpring",lib_pDoSpring},
+ {"P_TouchSpecialThing",lib_pTouchSpecialThing},
{"P_TryCameraMove", lib_pTryCameraMove},
{"P_TeleportCameraMove", lib_pTeleportCameraMove},
@@ -4199,6 +4351,8 @@ static luaL_Reg lib[] = {
// p_spec
{"P_Thrust",lib_pThrust},
+ {"P_ThrustEvenIn2D",lib_pThrustEvenIn2D},
+ {"P_VectorInstaThrust",lib_pVectorInstaThrust},
{"P_SetMobjStateNF",lib_pSetMobjStateNF},
{"P_DoSuperTransformation",lib_pDoSuperTransformation},
{"P_ExplodeMissile",lib_pExplodeMissile},
@@ -4323,8 +4477,7 @@ int LUA_BaseLib(lua_State *L)
// Set metatable for string
lua_pushliteral(L, ""); // dummy string
lua_getmetatable(L, -1); // get string metatable
- lua_pushcfunction(L,lib_concat); // push concatination function
- lua_setfield(L,-2,"__add"); // ... store it as mathematical addition
+ LUA_SetCFunctionField(L, "__add", lib_concat);
lua_pop(L, 2); // pop metatable and dummy string
lua_newtable(L);
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 0ab8ad9c348a14de25bb8cfc0fd2ad809bab15ee..1fabe2c00ae17bbd505b576635d7ef7c47a7fd94 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -194,6 +194,7 @@ static int lib_comAddCommand(lua_State *L)
if (lua_gettop(L) >= 3)
{ // For the third argument, only take a boolean or a number.
lua_settop(L, 3);
+ // TODO: 2.3: Remove boolean option
if (lua_type(L, 3) == LUA_TBOOLEAN)
{
CONS_Alert(CONS_WARNING,
@@ -374,6 +375,9 @@ static int lib_cvRegisterVar(lua_State *L)
size_t count = 0;
CV_PossibleValue_t *cvpv;
+ const char * const MINMAX[2] = {"MIN", "MAX"};
+ int minmax_unset = 3;
+
lua_pushnil(L);
while (lua_next(L, 4))
{
@@ -392,16 +396,45 @@ static int lib_cvRegisterVar(lua_State *L)
lua_pushnil(L);
while (lua_next(L, 4))
{
+ INT32 n;
+ const char * strval;
+
// stack: [...] PossibleValue table, index, value
// 4 5 6
if (lua_type(L, 5) != LUA_TSTRING
|| lua_type(L, 6) != LUA_TNUMBER)
FIELDERROR("PossibleValue", "custom PossibleValue table requires a format of string=integer, i.e. {MIN=0, MAX=9999}");
- cvpv[i].strvalue = Z_StrDup(lua_tostring(L, 5));
- cvpv[i].value = (INT32)lua_tonumber(L, 6);
- i++;
+
+ strval = lua_tostring(L, 5);
+
+ if (
+ stricmp(strval, MINMAX[n=0]) == 0 ||
+ stricmp(strval, MINMAX[n=1]) == 0
+ ){
+ /* need to shift forward */
+ if (minmax_unset == 3)
+ {
+ memmove(&cvpv[2], &cvpv[0],
+ i * sizeof *cvpv);
+ i += 2;
+ }
+ cvpv[n].strvalue = MINMAX[n];
+ minmax_unset &= ~(1 << n);
+ }
+ else
+ {
+ n = i++;
+ cvpv[n].strvalue = Z_StrDup(strval);
+ }
+
+ cvpv[n].value = (INT32)lua_tonumber(L, 6);
+
lua_pop(L, 1);
}
+
+ if (minmax_unset && minmax_unset != 3)
+ FIELDERROR("PossibleValue", "custom PossibleValue table requires requires both MIN and MAX keys if one is present");
+
cvpv[i].value = 0;
cvpv[i].strvalue = NULL;
cvar->PossibleValue = cvpv;
@@ -626,10 +659,7 @@ static int cvar_get(lua_State *L)
int LUA_ConsoleLib(lua_State *L)
{
// Metatable for consvar_t
- luaL_newmetatable(L, META_CVAR);
- lua_pushcfunction(L, cvar_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L,1);
+ LUA_RegisterUserdataMetatable(L, META_CVAR, cvar_get, NULL, NULL);
cvar_fields_ref = Lua_CreateFieldTable(L, cvar_opt);
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 6eec91273352db4adc598a80b7e0138795589640..0ec636468a5b68f448f138282fc41f3b50db9f14 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -1206,19 +1206,11 @@ static int libd_height(lua_State *L)
return 1;
}
-static int libd_dupx(lua_State *L)
+static int libd_dup(lua_State *L)
{
HUDONLY
- lua_pushinteger(L, vid.dupx); // push integral scale (patch scale)
- lua_pushfixed(L, vid.fdupx); // push fixed point scale (position scale)
- return 2;
-}
-
-static int libd_dupy(lua_State *L)
-{
- HUDONLY
- lua_pushinteger(L, vid.dupy); // push integral scale (patch scale)
- lua_pushfixed(L, vid.fdupy); // push fixed point scale (position scale)
+ lua_pushinteger(L, vid.dup); // push integral scale (patch scale)
+ lua_pushfixed(L, vid.fdup); // push fixed point scale (position scale)
return 2;
}
@@ -1338,8 +1330,8 @@ static luaL_Reg lib_draw[] = {
// properties
{"width", libd_width},
{"height", libd_height},
- {"dupx", libd_dupx},
- {"dupy", libd_dupy},
+ {"dupx", libd_dup},
+ {"dupy", libd_dup},
{"renderer", libd_renderer},
{"localTransFlag", libd_getlocaltransflag},
{"userTransFlag", libd_getusertransflag},
@@ -1404,52 +1396,16 @@ int LUA_HudLib(lua_State *L)
luaL_register(L, NULL, lib_draw);
lib_draw_ref = luaL_ref(L, LUA_REGISTRYINDEX);
- luaL_newmetatable(L, META_HUDINFO);
- lua_pushcfunction(L, hudinfo_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, hudinfo_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, hudinfo_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getHudInfo);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_hudinfolen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "hudinfo");
-
- luaL_newmetatable(L, META_COLORMAP);
- lua_pushcfunction(L, colormap_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L,1);
-
- luaL_newmetatable(L, META_PATCH);
- lua_pushcfunction(L, patch_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, patch_set);
- lua_setfield(L, -2, "__newindex");
- lua_pop(L,1);
+ LUA_RegisterUserdataMetatable(L, META_HUDINFO, hudinfo_get, hudinfo_set, hudinfo_num);
+ LUA_RegisterUserdataMetatable(L, META_COLORMAP, colormap_get, NULL, NULL);
+ LUA_RegisterUserdataMetatable(L, META_PATCH, patch_get, patch_set, NULL);
+ LUA_RegisterUserdataMetatable(L, META_CAMERA, camera_get, camera_set, NULL);
patch_fields_ref = Lua_CreateFieldTable(L, patch_opt);
-
- luaL_newmetatable(L, META_CAMERA);
- lua_pushcfunction(L, camera_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, camera_set);
- lua_setfield(L, -2, "__newindex");
- lua_pop(L,1);
-
camera_fields_ref = Lua_CreateFieldTable(L, camera_opt);
+ LUA_RegisterGlobalUserdata(L, "hudinfo", lib_getHudInfo, NULL, lib_hudinfolen);
+
luaL_register(L, "hud", lib_hud);
return 0;
}
diff --git a/src/lua_infolib.c b/src/lua_infolib.c
index 3764acf6a40945489506ce8d94b1b976fa771752..ed78811ce4867642e660dd433c3153958e68797a 100644
--- a/src/lua_infolib.c
+++ b/src/lua_infolib.c
@@ -318,6 +318,7 @@ static int PopPivotSubTable(spriteframepivot_t *pivot, lua_State *L, int stk, in
pivot[idx].x = (INT32)value;
else if (ikey == 2 || (key && fastcmp(key, "y")))
pivot[idx].y = (INT32)value;
+ // TODO: 2.3: Delete
else if (ikey == 3 || (key && fastcmp(key, "rotaxis")))
LUA_UsageWarning(L, "\"rotaxis\" is deprecated and will be removed.")
else if (ikey == -1 && (key != NULL))
@@ -571,6 +572,7 @@ static int framepivot_get(lua_State *L)
lua_pushinteger(L, framepivot->x);
else if (fastcmp("y", field))
lua_pushinteger(L, framepivot->y);
+ // TODO: 2.3: Delete
else if (fastcmp("rotaxis", field))
{
LUA_UsageWarning(L, "\"rotaxis\" is deprecated and will be removed.");
@@ -600,6 +602,7 @@ static int framepivot_set(lua_State *L)
framepivot->x = luaL_checkinteger(L, 3);
else if (fastcmp("y", field))
framepivot->y = luaL_checkinteger(L, 3);
+ // TODO: 2.3: delete
else if (fastcmp("rotaxis", field))
LUA_UsageWarning(L, "\"rotaxis\" is deprecated and will be removed.")
else
@@ -1914,206 +1917,28 @@ int LUA_InfoLib(lua_State *L)
lua_newtable(L);
lua_setfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
- luaL_newmetatable(L, META_STATE);
- lua_pushcfunction(L, state_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, state_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, state_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_MOBJINFO);
- lua_pushcfunction(L, mobjinfo_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, mobjinfo_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, mobjinfo_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
+ LUA_RegisterUserdataMetatable(L, META_STATE, state_get, state_set, state_num);
+ LUA_RegisterUserdataMetatable(L, META_MOBJINFO, mobjinfo_get, mobjinfo_set, mobjinfo_num);
+ LUA_RegisterUserdataMetatable(L, META_SKINCOLOR, skincolor_get, skincolor_set, skincolor_num);
+ LUA_RegisterUserdataMetatable(L, META_COLORRAMP, colorramp_get, colorramp_set, colorramp_len);
+ LUA_RegisterUserdataMetatable(L, META_SFXINFO, sfxinfo_get, sfxinfo_set, sfxinfo_num);
+ LUA_RegisterUserdataMetatable(L, META_SPRITEINFO, spriteinfo_get, spriteinfo_set, spriteinfo_num);
+ LUA_RegisterUserdataMetatable(L, META_PIVOTLIST, pivotlist_get, pivotlist_set, pivotlist_num);
+ LUA_RegisterUserdataMetatable(L, META_FRAMEPIVOT, framepivot_get, framepivot_set, framepivot_num);
+ LUA_RegisterUserdataMetatable(L, META_LUABANKS, lib_getluabanks, lib_setluabanks, lib_luabankslen);
mobjinfo_fields_ref = Lua_CreateFieldTable(L, mobjinfo_opt);
- luaL_newmetatable(L, META_SKINCOLOR);
- lua_pushcfunction(L, skincolor_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, skincolor_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, skincolor_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_COLORRAMP);
- lua_pushcfunction(L, colorramp_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, colorramp_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, colorramp_len);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
-
- luaL_newmetatable(L, META_SFXINFO);
- lua_pushcfunction(L, sfxinfo_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, sfxinfo_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, sfxinfo_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_SPRITEINFO);
- lua_pushcfunction(L, spriteinfo_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, spriteinfo_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, spriteinfo_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_PIVOTLIST);
- lua_pushcfunction(L, pivotlist_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, pivotlist_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, pivotlist_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_FRAMEPIVOT);
- lua_pushcfunction(L, framepivot_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, framepivot_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, framepivot_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSprname);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_sprnamelen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "sprnames");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSpr2name);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_spr2namelen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "spr2names");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSpr2default);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setSpr2default);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_spr2namelen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "spr2defaults");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getState);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setState);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_statelen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "states");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getMobjInfo);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setMobjInfo);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_mobjinfolen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "mobjinfo");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSkinColor);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setSkinColor);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_skincolorslen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "skincolors");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSfxInfo);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setSfxInfo);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_sfxlen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_pushvalue(L, -1);
- lua_setglobal(L, "S_sfx");
- lua_setglobal(L, "sfxinfo");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSpriteInfo);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setSpriteInfo);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_spriteinfolen);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "spriteinfo");
-
- luaL_newmetatable(L, META_LUABANKS);
- lua_pushcfunction(L, lib_getluabanks);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setluabanks);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_luabankslen);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
+ LUA_RegisterGlobalUserdata(L, "sprnames", lib_getSprname, NULL, lib_sprnamelen);
+ LUA_RegisterGlobalUserdata(L, "spr2names", lib_getSpr2name, NULL, lib_spr2namelen);
+ LUA_RegisterGlobalUserdata(L, "spr2defaults", lib_getSpr2default, lib_setSpr2default, lib_spr2namelen);
+ LUA_RegisterGlobalUserdata(L, "states", lib_getState, lib_setState, lib_statelen);
+ LUA_RegisterGlobalUserdata(L, "mobjinfo", lib_getMobjInfo, lib_setMobjInfo, lib_mobjinfolen);
+ LUA_RegisterGlobalUserdata(L, "skincolors", lib_getSkinColor, lib_setSkinColor, lib_skincolorslen);
+ LUA_RegisterGlobalUserdata(L, "spriteinfo", lib_getSpriteInfo, lib_setSpriteInfo, lib_spriteinfolen);
+ LUA_RegisterGlobalUserdata(L, "sfxinfo", lib_getSfxInfo, lib_setSfxInfo, lib_sfxlen);
+ // TODO: 2.3: Delete this alias
+ LUA_RegisterGlobalUserdata(L, "S_sfx", lib_getSfxInfo, lib_setSfxInfo, lib_sfxlen);
return 0;
}
diff --git a/src/lua_inputlib.c b/src/lua_inputlib.c
index 1f75ee6fe1bb99cc79a9bac9b93556c3e96f43db..ef3a9011f1c47a27dc8c75b3e43dc2cd47b9a2d8 100644
--- a/src/lua_inputlib.c
+++ b/src/lua_inputlib.c
@@ -20,6 +20,7 @@
#include "lua_libs.h"
boolean mousegrabbedbylua = true;
+boolean ignoregameinputs = false;
///////////////
// FUNCTIONS //
@@ -145,6 +146,51 @@ static luaL_Reg lib[] = {
{NULL, NULL}
};
+///////////////
+// VARIABLES //
+///////////////
+
+static int lib_get(lua_State *L)
+{
+ const char *field = luaL_checkstring(L, 2);
+
+ if (fastcmp(field, "mouse"))
+ {
+ LUA_PushUserdata(L, &mouse, META_MOUSE);
+ return 1;
+ }
+ else if (fastcmp(field, "mouse2"))
+ {
+ LUA_PushUserdata(L, &mouse2, META_MOUSE);
+ return 1;
+ }
+ else if (fastcmp(field, "ignoregameinputs"))
+ {
+ lua_pushboolean(L, ignoregameinputs);
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+static int lib_set(lua_State *L)
+{
+ const char *field = luaL_checkstring(L, 2);
+
+ if (fastcmp(field, "ignoregameinputs"))
+ {
+ ignoregameinputs = luaL_checkboolean(L, 3);
+ }
+ else
+ {
+ lua_rawset(L, 1);
+ }
+
+ return 0;
+}
+
///////////////////
// gamekeydown[] //
///////////////////
@@ -239,32 +285,18 @@ static int mouse_num(lua_State *L)
int LUA_InputLib(lua_State *L)
{
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getGameKeyDown);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_setGameKeyDown);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, lib_lenGameKeyDown);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "gamekeydown");
-
- luaL_newmetatable(L, META_KEYEVENT);
- lua_pushcfunction(L, keyevent_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L, 1);
+ LUA_RegisterUserdataMetatable(L, META_KEYEVENT, keyevent_get, NULL, NULL);
+ LUA_RegisterUserdataMetatable(L, META_MOUSE, mouse_get, NULL, mouse_num);
- luaL_newmetatable(L, META_MOUSE);
- lua_pushcfunction(L, mouse_get);
- lua_setfield(L, -2, "__index");
+ // Register the library, then add __index and __newindex
+ // metamethods to it to allow global variables
+ luaL_register(L, "input", lib);
+ LUA_CreateAndSetMetatable(L, lib_get, lib_set, NULL, false);
- lua_pushcfunction(L, mouse_num);
- lua_setfield(L, -2, "__len");
+ LUA_CreateAndSetUserdataField(L, -1, "gamekeydown", lib_getGameKeyDown, lib_setGameKeyDown, lib_lenGameKeyDown, false);
+ // TODO: 2.3: Delete this alias (moved to input library)
+ LUA_RegisterGlobalUserdata(L, "gamekeydown", lib_getGameKeyDown, lib_setGameKeyDown, lib_lenGameKeyDown);
lua_pop(L, 1);
- luaL_register(L, "input", lib);
return 0;
}
diff --git a/src/lua_libs.h b/src/lua_libs.h
index 65d5acb1bbf024483f60e5ba830b666506a756e0..26f919ad89fb0e7ecde8aa39903c1838cf0776e5 100644
--- a/src/lua_libs.h
+++ b/src/lua_libs.h
@@ -13,6 +13,7 @@
extern lua_State *gL;
extern boolean mousegrabbedbylua;
+extern boolean ignoregameinputs;
#define MUTABLE_TAGS
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index dad38a591754a3f645622b154340dbe0d8e4c095..2cc4ec2a26128e43b81edd3b32a4c33acd02347a 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -35,7 +35,7 @@ enum sector_e {
sector_floorpic,
sector_floorxoffset,
sector_flooryoffset,
- sector_floorangle,
+ sector_floorangle,
sector_ceilingpic,
sector_ceilingxoffset,
sector_ceilingyoffset,
@@ -43,7 +43,7 @@ enum sector_e {
sector_lightlevel,
sector_floorlightlevel,
sector_floorlightabsolute,
- sector_floorlightsec,
+ sector_floorlightsec,
sector_ceilinglightlevel,
sector_ceilinglightabsolute,
sector_ceilinglightsec,
@@ -78,14 +78,14 @@ static const char *const sector_opt[] = {
"ceilingpic",
"ceilingxoffset",
"ceilingyoffset",
- "ceilingangle",
+ "ceilingangle",
"lightlevel",
"floorlightlevel",
"floorlightabsolute",
"floorlightsec",
"ceilinglightlevel",
"ceilinglightabsolute",
- "ceilinglightsec",
+ "ceilinglightsec",
"special",
"tag",
"taglist",
@@ -665,11 +665,11 @@ static int sector_get(lua_State *L)
lua_pushfixed(L, sector->flooryoffset);
return 1;
}
- case sector_floorangle:
+ case sector_floorangle:
{
lua_pushangle(L, sector->floorangle);
return 1;
- }
+ }
case sector_ceilingpic: // ceilingpic
{
levelflat_t *levelflat = &levelflats[sector->ceilingpic];
@@ -693,7 +693,7 @@ static int sector_get(lua_State *L)
{
lua_pushangle(L, sector->ceilingangle);
return 1;
- }
+ }
case sector_lightlevel:
lua_pushinteger(L, sector->lightlevel);
return 1;
@@ -705,7 +705,7 @@ static int sector_get(lua_State *L)
return 1;
case sector_floorlightsec:
lua_pushinteger(L, sector->floorlightsec);
- return 1;
+ return 1;
case sector_ceilinglightlevel:
lua_pushinteger(L, sector->ceilinglightlevel);
return 1;
@@ -714,7 +714,7 @@ static int sector_get(lua_State *L)
return 1;
case sector_ceilinglightsec:
lua_pushinteger(L, sector->ceilinglightsec);
- return 1;
+ return 1;
case sector_special:
lua_pushinteger(L, sector->special);
return 1;
@@ -847,7 +847,7 @@ static int sector_set(lua_State *L)
break;
case sector_floorangle:
sector->floorangle = luaL_checkangle(L, 3);
- break;
+ break;
case sector_ceilingpic:
sector->ceilingpic = P_AddLevelFlatRuntime(luaL_checkstring(L, 3));
break;
@@ -871,7 +871,7 @@ static int sector_set(lua_State *L)
break;
case sector_floorlightsec:
sector->floorlightsec = (INT32)luaL_checkinteger(L, 3);
- break;
+ break;
case sector_ceilinglightlevel:
sector->ceilinglightlevel = (INT16)luaL_checkinteger(L, 3);
break;
@@ -880,7 +880,7 @@ static int sector_set(lua_State *L)
break;
case sector_ceilinglightsec:
sector->ceilinglightsec = (INT32)luaL_checkinteger(L, 3);
- break;
+ break;
case sector_special:
sector->special = (INT16)luaL_checkinteger(L, 3);
break;
@@ -1048,17 +1048,7 @@ static int line_get(lua_State *L)
lua_pushinteger(L, line->special);
return 1;
case line_tag:
- // HELLO
- // THIS IS LJ SONIC
- // HOW IS YOUR DAY?
- // BY THE WAY WHEN 2.3 OR 3.0 OR 4.0 OR SRB3 OR SRB4 OR WHATEVER IS OUT
- // YOU SHOULD REMEMBER TO CHANGE THIS SO IT ALWAYS RETURNS A UNSIGNED VALUE
- // HAVE A NICE DAY
- //
- //
- //
- //
- // you are ugly
+ // TODO: 2.3: Always return a unsigned value
lua_pushinteger(L, Tag_FGet(&line->tags));
return 1;
case line_taglist:
@@ -1113,6 +1103,7 @@ static int line_get(lua_State *L)
case line_polyobj:
LUA_PushUserdata(L, line->polyobj, META_POLYOBJ);
return 1;
+ // TODO: 2.3: Delete
case line_text:
{
if (udmf)
@@ -1246,6 +1237,7 @@ static int side_get(lua_State *L)
case side_repeatcnt:
lua_pushinteger(L, side->repeatcnt);
return 1;
+ // TODO: 2.3: Delete
case side_text:
{
if (udmf)
@@ -2848,170 +2840,36 @@ static int mapheaderinfo_get(lua_State *L)
int LUA_MapLib(lua_State *L)
{
- luaL_newmetatable(L, META_SECTORLINES);
- lua_pushcfunction(L, sectorlines_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, sectorlines_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_SECTOR);
- lua_pushcfunction(L, sector_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, sector_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, sector_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
+ LUA_RegisterUserdataMetatable(L, META_SECTORLINES, sectorlines_get, NULL, sectorlines_num);
+ LUA_RegisterUserdataMetatable(L, META_SECTOR, sector_get, sector_set, sector_num);
+ LUA_RegisterUserdataMetatable(L, META_SUBSECTOR, subsector_get, NULL, subsector_num);
+ LUA_RegisterUserdataMetatable(L, META_LINE, line_get, NULL, line_num);
+ LUA_RegisterUserdataMetatable(L, META_LINEARGS, lineargs_get, NULL, lineargs_len);
+ LUA_RegisterUserdataMetatable(L, META_LINESTRINGARGS, linestringargs_get, NULL, linestringargs_len);
+ LUA_RegisterUserdataMetatable(L, META_SIDENUM, sidenum_get, NULL, NULL);
+ LUA_RegisterUserdataMetatable(L, META_SIDE, side_get, side_set, side_num);
+ LUA_RegisterUserdataMetatable(L, META_VERTEX, vertex_get, NULL, vertex_num);
+ LUA_RegisterUserdataMetatable(L, META_FFLOOR, ffloor_get, ffloor_set, NULL);
+ LUA_RegisterUserdataMetatable(L, META_BBOX, bbox_get, NULL, NULL);
+ LUA_RegisterUserdataMetatable(L, META_SLOPE, slope_get, slope_set, NULL);
+ LUA_RegisterUserdataMetatable(L, META_VECTOR2, vector2_get, NULL, NULL);
+ LUA_RegisterUserdataMetatable(L, META_VECTOR3, vector3_get, NULL, NULL);
+ LUA_RegisterUserdataMetatable(L, META_MAPHEADER, mapheaderinfo_get, NULL, NULL);
sector_fields_ref = Lua_CreateFieldTable(L, sector_opt);
-
- luaL_newmetatable(L, META_SUBSECTOR);
- lua_pushcfunction(L, subsector_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, subsector_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
subsector_fields_ref = Lua_CreateFieldTable(L, subsector_opt);
-
- luaL_newmetatable(L, META_LINE);
- lua_pushcfunction(L, line_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, line_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
line_fields_ref = Lua_CreateFieldTable(L, line_opt);
-
- luaL_newmetatable(L, META_LINEARGS);
- lua_pushcfunction(L, lineargs_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lineargs_len);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_LINESTRINGARGS);
- lua_pushcfunction(L, linestringargs_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, linestringargs_len);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_SIDENUM);
- lua_pushcfunction(L, sidenum_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_SIDE);
- lua_pushcfunction(L, side_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, side_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, side_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
side_fields_ref = Lua_CreateFieldTable(L, side_opt);
-
- luaL_newmetatable(L, META_VERTEX);
- lua_pushcfunction(L, vertex_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, vertex_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
vertex_fields_ref = Lua_CreateFieldTable(L, vertex_opt);
-
- luaL_newmetatable(L, META_FFLOOR);
- lua_pushcfunction(L, ffloor_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, ffloor_set);
- lua_setfield(L, -2, "__newindex");
- lua_pop(L, 1);
-
ffloor_fields_ref = Lua_CreateFieldTable(L, ffloor_opt);
-
-#ifdef HAVE_LUA_SEGS
- luaL_newmetatable(L, META_SEG);
- lua_pushcfunction(L, seg_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, seg_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- seg_fields_ref = Lua_CreateFieldTable(L, seg_opt);
-
- luaL_newmetatable(L, META_NODE);
- lua_pushcfunction(L, node_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, node_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- node_fields_ref = Lua_CreateFieldTable(L, node_opt);
-
- luaL_newmetatable(L, META_NODEBBOX);
- //lua_pushcfunction(L, nodebbox_get);
- //lua_setfield(L, -2, "__index");
- lua_pushcfunction(L, nodebbox_call);
- lua_setfield(L, -2, "__call");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_NODECHILDREN);
- lua_pushcfunction(L, nodechildren_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L, 1);
-#endif
-
- luaL_newmetatable(L, META_BBOX);
- lua_pushcfunction(L, bbox_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_SLOPE);
- lua_pushcfunction(L, slope_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, slope_set);
- lua_setfield(L, -2, "__newindex");
- lua_pop(L, 1);
-
slope_fields_ref = Lua_CreateFieldTable(L, slope_opt);
-
- luaL_newmetatable(L, META_VECTOR2);
- lua_pushcfunction(L, vector2_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_VECTOR3);
- lua_pushcfunction(L, vector3_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_MAPHEADER);
- lua_pushcfunction(L, mapheaderinfo_get);
- lua_setfield(L, -2, "__index");
-
- //lua_pushcfunction(L, mapheaderinfo_num);
- //lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
mapheaderinfo_fields_ref = Lua_CreateFieldTable(L, mapheaderinfo_opt);
+ LUA_RegisterGlobalUserdata(L, "subsectors", lib_getSubsector, NULL, lib_numsubsectors);
+ LUA_RegisterGlobalUserdata(L, "sides", lib_getSide, NULL, lib_numsides);
+ LUA_RegisterGlobalUserdata(L, "vertexes", lib_getVertex, NULL, lib_numvertexes);
+ LUA_RegisterGlobalUserdata(L, "mapheaderinfo", lib_getMapheaderinfo, NULL, lib_nummapheaders);
+
LUA_PushTaggableObjectArray(L, "sectors",
lib_iterateSectors,
lib_getSector,
@@ -3020,16 +2878,6 @@ int LUA_MapLib(lua_State *L)
&numsectors, §ors,
sizeof (sector_t), META_SECTOR);
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSubsector);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numsubsectors);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "subsectors");
-
LUA_PushTaggableObjectArray(L, "lines",
lib_iterateLines,
lib_getLine,
@@ -3038,56 +2886,22 @@ int LUA_MapLib(lua_State *L)
&numlines, &lines,
sizeof (line_t), META_LINE);
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSide);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numsides);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "sides");
+#ifdef HAVE_LUA_SEGS
+ LUA_RegisterUserdataMetatable(L, META_SEG, seg_get, NULL, seg_num);
+ LUA_RegisterUserdataMetatable(L, META_NODE, node_get, NULL, node_num);
+ LUA_RegisterUserdataMetatable(L, META_NODECHILDREN, nodechildren_get, NULL, NULL);
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getVertex);
- lua_setfield(L, -2, "__index");
+ seg_fields_ref = Lua_CreateFieldTable(L, seg_opt);
+ node_fields_ref = Lua_CreateFieldTable(L, node_opt);
- lua_pushcfunction(L, lib_numvertexes);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "vertexes");
+ luaL_newmetatable(L, META_NODEBBOX);
+ //LUA_SetCFunctionField(L, "__index", nodebbox_get);
+ LUA_SetCFunctionField(L, "__call", nodebbox_call);
+ lua_pop(L, 1);
-#ifdef HAVE_LUA_SEGS
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSeg);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numsegs);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "segs");
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getNode);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numnodes);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "nodes");
+ LUA_RegisterGlobalUserdata(L, "segs", lib_getSeg, NULL, lib_numsegs);
+ LUA_RegisterGlobalUserdata(L, "nodes", lib_getNode, NULL, lib_numnodes);
#endif
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getMapheaderinfo);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_nummapheaders);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "mapheaderinfo");
return 0;
}
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index d0fe6863f19fc9e807024683b0418da4ef2385f1..1bc6019dee9a507ebc6350a541807e75e53726d7 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -125,6 +125,7 @@ static int lib_fixeddiv(lua_State *L)
return 1;
}
+// TODO: 2.3: Delete
static int lib_fixedrem(lua_State *L)
{
LUA_Deprecated(L, "FixedRem(a, b)", "a % b");
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index fddf958beb783e27671cb966c3afbc3e20b0c620..19f30b70e013666f60b5c61b6b9acea794ab976c 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -1163,43 +1163,12 @@ static int lib_nummapthings(lua_State *L)
int LUA_MobjLib(lua_State *L)
{
- luaL_newmetatable(L, META_MOBJ);
- lua_pushcfunction(L, mobj_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, mobj_set);
- lua_setfield(L, -2, "__newindex");
- lua_pop(L,1);
+ LUA_RegisterUserdataMetatable(L, META_MOBJ, mobj_get, mobj_set, NULL);
+ LUA_RegisterUserdataMetatable(L, META_THINGARGS, thingargs_get, NULL, thingargs_len);
+ LUA_RegisterUserdataMetatable(L, META_THINGSTRINGARGS, thingstringargs_get, NULL, thingstringargs_len);
+ LUA_RegisterUserdataMetatable(L, META_MAPTHING, mapthing_get, mapthing_set, mapthing_num);
mobj_fields_ref = Lua_CreateFieldTable(L, mobj_opt);
-
- luaL_newmetatable(L, META_THINGARGS);
- lua_pushcfunction(L, thingargs_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, thingargs_len);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_THINGSTRINGARGS);
- lua_pushcfunction(L, thingstringargs_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, thingstringargs_len);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_MAPTHING);
- lua_pushcfunction(L, mapthing_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, mapthing_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, mapthing_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
-
mapthing_fields_ref = Lua_CreateFieldTable(L, mapthing_opt);
LUA_PushTaggableObjectArray(L, "mapthings",
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 827e5a405fffb7fa1dda25f58aea049dc244bf38..d12aa1c3fae8f5e1e0e9171118c21b03d1310350 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -223,6 +223,7 @@ enum player_e
player_blocked,
player_jointime,
player_quittime,
+ player_lastinputtime,
player_ping,
#ifdef HWRENDER
player_fovadd,
@@ -371,6 +372,7 @@ static const char *const player_opt[] = {
"blocked",
"jointime",
"quittime",
+ "lastinputtime",
"ping",
#ifdef HWRENDER
"fovadd",
@@ -407,7 +409,7 @@ static int player_get(lua_State *L)
case player_realmo:
LUA_PushUserdata(L, plr->mo, META_MOBJ);
break;
- // Kept for backward-compatibility
+ // TODO: 2.3: Kept for backward-compatibility
// Should be fixed to work like "realmo" later
case player_mo:
if (plr->spectator)
@@ -826,6 +828,9 @@ static int player_get(lua_State *L)
case player_quittime:
lua_pushinteger(L, plr->quittime);
break;
+ case player_lastinputtime:
+ lua_pushinteger(L, plr->lastinputtime);
+ break;
case player_ping:
lua_pushinteger(L, playerpingtable[plr - players]);
break;
@@ -1349,6 +1354,9 @@ static int player_set(lua_State *L)
case player_quittime:
plr->quittime = (tic_t)luaL_checkinteger(L, 3);
break;
+ case player_lastinputtime:
+ plr->lastinputtime = (tic_t)luaL_checkinteger(L, 3);
+ break;
#ifdef HWRENDER
case player_fovadd:
plr->fovadd = luaL_checkfixed(L, 3);
@@ -1523,48 +1531,13 @@ static int ticcmd_set(lua_State *L)
int LUA_PlayerLib(lua_State *L)
{
- luaL_newmetatable(L, META_PLAYER);
- lua_pushcfunction(L, player_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, player_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, player_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
+ LUA_RegisterUserdataMetatable(L, META_PLAYER, player_get, player_set, player_num);
+ LUA_RegisterUserdataMetatable(L, META_POWERS, power_get, power_set, power_len);
+ LUA_RegisterUserdataMetatable(L, META_TICCMD, ticcmd_get, ticcmd_set, NULL);
player_fields_ref = Lua_CreateFieldTable(L, player_opt);
-
- luaL_newmetatable(L, META_POWERS);
- lua_pushcfunction(L, power_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, power_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, power_len);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
-
- luaL_newmetatable(L, META_TICCMD);
- lua_pushcfunction(L, ticcmd_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, ticcmd_set);
- lua_setfield(L, -2, "__newindex");
- lua_pop(L,1);
-
ticcmd_fields_ref = Lua_CreateFieldTable(L, ticcmd_opt);
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getPlayer);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_lenPlayer);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "players");
+ LUA_RegisterGlobalUserdata(L, "players", lib_getPlayer, NULL, lib_lenPlayer);
return 0;
}
diff --git a/src/lua_polyobjlib.c b/src/lua_polyobjlib.c
index c3d9d9d1ad96072061be6b7909b1233d25e488fd..6c016f8b2cb24c8bcf993f4c3250e02e020c2f54 100644
--- a/src/lua_polyobjlib.c
+++ b/src/lua_polyobjlib.c
@@ -447,41 +447,10 @@ static int lib_numPolyObjects(lua_State *L)
int LUA_PolyObjLib(lua_State *L)
{
- luaL_newmetatable(L, META_POLYOBJVERTICES);
- lua_pushcfunction(L, polyobjvertices_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, polyobjvertices_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_POLYOBJLINES);
- lua_pushcfunction(L, polyobjlines_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, polyobjlines_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L, 1);
-
- luaL_newmetatable(L, META_POLYOBJ);
- lua_pushcfunction(L, polyobj_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, polyobj_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, polyobj_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getPolyObject);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numPolyObjects);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "polyobjects");
+ LUA_RegisterUserdataMetatable(L, META_POLYOBJVERTICES, polyobjvertices_get, NULL, polyobjvertices_num);
+ LUA_RegisterUserdataMetatable(L, META_POLYOBJLINES, polyobjlines_get, NULL, polyobjlines_num);
+ LUA_RegisterUserdataMetatable(L, META_POLYOBJ, polyobj_get, polyobj_set, polyobj_num);
+
+ LUA_RegisterGlobalUserdata(L, "polyobjects", lib_getPolyObject, NULL, lib_numPolyObjects);
return 0;
}
diff --git a/src/lua_script.c b/src/lua_script.c
index c9884ebd547d8ddc34740e351b77ea8c15f81945..b0b6eeec79654768bb7aa1815800cb1afbb30c74 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -416,9 +416,11 @@ int LUA_PushGlobals(lua_State *L, const char *word)
} else if (fastcmp(word, "stagefailed")) {
lua_pushboolean(L, stagefailed);
return 1;
+ // TODO: 2.3: Deprecated (moved to the input library)
} else if (fastcmp(word, "mouse")) {
LUA_PushUserdata(L, &mouse, META_MOUSE);
return 1;
+ // TODO: 2.3: Deprecated (moved to the input library)
} else if (fastcmp(word, "mouse2")) {
LUA_PushUserdata(L, &mouse2, META_MOUSE);
return 1;
@@ -577,8 +579,7 @@ static void LUA_ClearState(void)
// lock the global namespace
lua_getmetatable(L, LUA_GLOBALSINDEX);
- lua_pushcfunction(L, setglobals);
- lua_setfield(L, -2, "__newindex");
+ LUA_SetCFunctionField(L, "__newindex", setglobals);
lua_newtable(L);
lua_setfield(L, -2, "__metatable");
lua_pop(L, 1);
@@ -1814,20 +1815,107 @@ void LUA_PushTaggableObjectArray
lua_newuserdata(L, 0);
lua_createtable(L, 0, 2);
lua_createtable(L, 0, 2);
- lua_pushcfunction(L, iterator);
- lua_setfield(L, -2, "iterate");
+ LUA_SetCFunctionField(L, "iterate", iterator);
LUA_InsertTaggroupIterator(L, garray,
max_elements, element_array, sizeof_element, meta);
lua_createtable(L, 0, 1);
- lua_pushcfunction(L, indexer);
- lua_setfield(L, -2, "__index");
+ LUA_SetCFunctionField(L, "__index", indexer);
lua_setmetatable(L, -2);
lua_setfield(L, -2, "__index");
- lua_pushcfunction(L, counter);
- lua_setfield(L, -2, "__len");
+ LUA_SetCFunctionField(L, "__len", counter);
lua_setmetatable(L, -2);
lua_setglobal(L, field);
}
+
+static void SetBasicMetamethods(
+ lua_State *L,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len
+)
+{
+ if (get)
+ LUA_SetCFunctionField(L, "__index", get);
+ if (set)
+ LUA_SetCFunctionField(L, "__newindex", set);
+ if (len)
+ LUA_SetCFunctionField(L, "__len", len);
+}
+
+void LUA_SetCFunctionField(lua_State *L, const char *name, lua_CFunction value)
+{
+ lua_pushcfunction(L, value);
+ lua_setfield(L, -2, name);
+}
+
+void LUA_RegisterUserdataMetatable(
+ lua_State *L,
+ const char *name,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len
+)
+{
+ luaL_newmetatable(L, name);
+ SetBasicMetamethods(L, get, set, len);
+ lua_pop(L, 1);
+}
+
+// If keep is true, leaves the metatable on the stack.
+// Otherwise, the stack size remains unchanged.
+void LUA_CreateAndSetMetatable(
+ lua_State *L,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len,
+ boolean keep
+)
+{
+ lua_newtable(L);
+ SetBasicMetamethods(L, get, set, len);
+
+ lua_pushvalue(L, -1);
+ lua_setmetatable(L, -3);
+
+ if (!keep)
+ lua_pop(L, 1);
+}
+
+// If keep is true, leaves the userdata and metatable on the stack.
+// Otherwise, the stack size remains unchanged.
+void LUA_CreateAndSetUserdataField(
+ lua_State *L,
+ int index,
+ const char *name,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len,
+ boolean keep
+)
+{
+ if (index < 0 && index > LUA_REGISTRYINDEX)
+ index -= 3;
+
+ lua_newuserdata(L, 0);
+ LUA_CreateAndSetMetatable(L, get, set, len, true);
+
+ lua_pushvalue(L, -2);
+ lua_setfield(L, index, name);
+
+ if (!keep)
+ lua_pop(L, 2);
+}
+
+void LUA_RegisterGlobalUserdata(
+ lua_State *L,
+ const char *name,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len
+)
+{
+ LUA_CreateAndSetUserdataField(L, LUA_GLOBALSINDEX, name, get, set, len, false);
+}
diff --git a/src/lua_script.h b/src/lua_script.h
index d0b06a719e32a254ba56c5f860252aba15484da0..53d848f8e878a4234b49fd8e38bbc94325488f61 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -73,6 +73,42 @@ void LUA_PushTaggableObjectArray
size_t sizeof_element,
const char *meta);
+void LUA_SetCFunctionField(lua_State *L, const char *name, lua_CFunction value);
+
+void LUA_RegisterUserdataMetatable(
+ lua_State *L,
+ const char *name,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len
+);
+
+void LUA_CreateAndSetMetatable(
+ lua_State *L,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len,
+ boolean keep
+);
+
+void LUA_CreateAndSetUserdataField(
+ lua_State *L,
+ int index,
+ const char *name,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len,
+ boolean keep
+);
+
+void LUA_RegisterGlobalUserdata(
+ lua_State *L,
+ const char *name,
+ lua_CFunction get,
+ lua_CFunction set,
+ lua_CFunction len
+);
+
void LUA_InsertTaggroupIterator
( lua_State *L,
taggroup_t *garray[],
diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index 041c5d59851f3669b03d45c899c20b3440e193f0..3debd3746947a252be8e27f0f2608a21739049d2 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -373,49 +373,14 @@ static int sprite_get(lua_State *L)
int LUA_SkinLib(lua_State *L)
{
- luaL_newmetatable(L, META_SKIN);
- lua_pushcfunction(L, skin_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, skin_set);
- lua_setfield(L, -2, "__newindex");
-
- lua_pushcfunction(L, skin_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
+ LUA_RegisterUserdataMetatable(L, META_SKIN, skin_get, skin_set, skin_num);
+ LUA_RegisterUserdataMetatable(L, META_SOUNDSID, soundsid_get, NULL, soundsid_num);
+ LUA_RegisterUserdataMetatable(L, META_SKINSPRITES, lib_getSkinSprite, NULL, lib_numSkinsSprites);
+ LUA_RegisterUserdataMetatable(L, META_SKINSPRITESLIST, sprite_get, NULL, NULL);
skin_fields_ref = Lua_CreateFieldTable(L, skin_opt);
- luaL_newmetatable(L, META_SOUNDSID);
- lua_pushcfunction(L, soundsid_get);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, soundsid_num);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
-
- luaL_newmetatable(L, META_SKINSPRITES);
- lua_pushcfunction(L, lib_getSkinSprite);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numSkinsSprites);
- lua_setfield(L, -2, "__len");
- lua_pop(L,1);
-
- luaL_newmetatable(L, META_SKINSPRITESLIST);
- lua_pushcfunction(L, sprite_get);
- lua_setfield(L, -2, "__index");
- lua_pop(L,1);
-
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSkin);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numSkins);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "skins");
+ LUA_RegisterGlobalUserdata(L, "skins", lib_getSkin, NULL, lib_numSkins);
return 0;
}
diff --git a/src/lua_taglib.c b/src/lua_taglib.c
index 2ba60df998cf88831ec85618f88f57af2746f594..9e73a050c9011f796be0a2ae41399d79f2a7f836 100644
--- a/src/lua_taglib.c
+++ b/src/lua_taglib.c
@@ -372,8 +372,7 @@ void LUA_InsertTaggroupIterator
lua_pushcclosure(L, lib_numTaggroupElements, 2);
lua_setfield(L, -2, "__len");
- lua_pushcfunction(L, element_iterator);
- lua_setfield(L, -2, "__call");
+ LUA_SetCFunctionField(L, "__call", element_iterator);
lua_pushcclosure(L, lib_getTaggroup, 1);
lua_setfield(L, -2, "tagged");
}
@@ -414,11 +413,9 @@ set_taglist_metatable(lua_State *L, const char *meta)
lua_setfenv(L, -2);
lua_setfield(L, -2, "__index");
- lua_pushcfunction(L, taglist_len);
- lua_setfield(L, -2, "__len");
+ LUA_SetCFunctionField(L, "__len", taglist_len);
- lua_pushcfunction(L, taglist_equal);
- lua_setfield(L, -2, "__eq");
+ LUA_SetCFunctionField(L, "__eq", taglist_equal);
#ifdef MUTABLE_TAGS
return luaL_ref(L, LUA_REGISTRYINDEX);
#endif
@@ -426,17 +423,11 @@ set_taglist_metatable(lua_State *L, const char *meta)
int LUA_TagLib(lua_State *L)
{
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_createtable(L, 0, 1);
- lua_pushcfunction(L, lib_iterateTags);
- lua_setfield(L, -2, "iterate");
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numTags);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "tags");
+ LUA_CreateAndSetUserdataField(L, LUA_GLOBALSINDEX, "tags", NULL, NULL, lib_numTags, true);
+ lua_createtable(L, 0, 1);
+ LUA_SetCFunctionField(L, "iterate", lib_iterateTags);
+ lua_setfield(L, -2, "__index");
+ lua_pop(L, 2);
open_taglist(L);
diff --git a/src/lua_thinkerlib.c b/src/lua_thinkerlib.c
index cff92f34d6e0a98dff5b1c76cc97ff358c11ff7d..f1be8c78933bab543d00388ae76b40512742d9aa 100644
--- a/src/lua_thinkerlib.c
+++ b/src/lua_thinkerlib.c
@@ -127,8 +127,7 @@ static int lib_startIterate(lua_State *L)
int LUA_ThinkerLib(lua_State *L)
{
luaL_newmetatable(L, META_ITERATIONSTATE);
- lua_pushcfunction(L, iterationState_gc);
- lua_setfield(L, -2, "__gc");
+ LUA_SetCFunctionField(L, "__gc", iterationState_gc);
lua_pop(L, 1);
lua_createtable(L, 0, 1);
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 90e4c69ce494a8450de083ab0ca7cb25c081f8f9..5bc7717e0f44a4293e52a8907c57b0cfda6eade5 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -462,7 +462,7 @@ static void GIF_headwrite(void)
// Image width/height
if (gif_downscale)
{
- scrbuf_downscaleamt = vid.dupx;
+ scrbuf_downscaleamt = vid.dup;
rwidth = (vid.width / scrbuf_downscaleamt);
rheight = (vid.height / scrbuf_downscaleamt);
}
diff --git a/src/m_menu.c b/src/m_menu.c
index 523430ed8e98145bd87dab952d75fa7fc8db376e..629f53d2460f70b00da78e0d1a31a6ce71892373 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -214,7 +214,7 @@ static fixed_t lsoffs[2];
#define lshli levelselectselect[2]
#define lshseperation 101
-#define lsbasevseperation ((62*vid.height)/(BASEVIDHEIGHT*vid.dupy)) //62
+#define lsbasevseperation ((62*vid.height)/(BASEVIDHEIGHT*vid.dup)) //62
#define lsheadingheight 16
#define getheadingoffset(row) (levelselect.rows[row].header[0] ? lsheadingheight : 0)
#define lsvseperation(row) (lsbasevseperation + getheadingoffset(row))
@@ -3574,16 +3574,16 @@ void M_Drawer(void)
{
if (customversionstring[0] != '\0')
{
- V_DrawThinString(vid.dupx, vid.height - 17*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, "Mod version:");
- V_DrawThinString(vid.dupx, vid.height - 9*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, customversionstring);
+ V_DrawThinString(vid.dup, vid.height - 17*vid.dup, V_NOSCALESTART|V_TRANSLUCENT, "Mod version:");
+ V_DrawThinString(vid.dup, vid.height - 9*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, customversionstring);
}
else
{
#ifdef DEVELOP // Development -- show revision / branch info
- V_DrawThinString(vid.dupx, vid.height - 17*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch);
- V_DrawThinString(vid.dupx, vid.height - 9*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
+ V_DrawThinString(vid.dup, vid.height - 17*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch);
+ V_DrawThinString(vid.dup, vid.height - 9*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
#else // Regular build
- V_DrawThinString(vid.dupx, vid.height - 9*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING));
+ V_DrawThinString(vid.dup, vid.height - 9*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING));
#endif
}
}
@@ -5757,16 +5757,15 @@ static void M_DrawRecordAttackForeground(void)
INT32 i;
INT32 height = (fg->height / 2);
- INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
for (i = -12; i < (BASEVIDHEIGHT/height) + 12; i++)
{
INT32 y = ((i*height) - (height - ((FixedInt(recatkdrawtimer*2))%height)));
// don't draw above the screen
{
- INT32 sy = FixedMul(y, dupz<<FRACBITS) >> FRACBITS;
- if (vid.height != BASEVIDHEIGHT * dupz)
- sy += (vid.height - (BASEVIDHEIGHT * dupz)) / 2;
+ INT32 sy = FixedMul(y, vid.dup<<FRACBITS) >> FRACBITS;
+ if (vid.height != BASEVIDHEIGHT * vid.dup)
+ sy += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 2;
if ((sy+height) < 0)
continue;
}
@@ -5790,13 +5789,12 @@ static void M_DrawRecordAttackForeground(void)
static void M_DrawNightsAttackMountains(void)
{
static fixed_t bgscrollx;
- INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
patch_t *background = W_CachePatchName(curbgname, PU_PATCH);
INT16 w = background->width;
INT32 x = FixedInt(-bgscrollx) % w;
INT32 y = BASEVIDHEIGHT - (background->height * 2);
- if (vid.height != BASEVIDHEIGHT * dupz)
+ if (vid.height != BASEVIDHEIGHT * vid.dup)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 158);
V_DrawFill(0, y+50, vid.width, BASEVIDHEIGHT, V_SNAPTOLEFT|31);
@@ -5952,7 +5950,7 @@ static void M_DrawLevelPlatterMenu(void)
}
// draw from top to bottom
- while (y < (vid.height/vid.dupy))
+ while (y < (vid.height/vid.dup))
{
M_DrawLevelPlatterRow(iter, y);
y += lsvseperation(iter);
@@ -7799,9 +7797,9 @@ static void M_DrawSoundTest(void)
}
}
- y = (BASEVIDWIDTH-(vid.width/vid.dupx))/2;
+ y = (BASEVIDWIDTH-(vid.width/vid.dup))/2;
- V_DrawFill(y, 20, vid.width/vid.dupx, 24, 159);
+ V_DrawFill(y, 20, vid.width/vid.dup, 24, 159);
{
static fixed_t st_scroll = -FRACUNIT;
const char* titl;
@@ -8371,8 +8369,8 @@ static void M_DrawLoadGameData(void)
INT32 i, prev_i = 1, savetodraw, x, y, hsep = 90;
skin_t *charskin = NULL;
- if (vid.width != BASEVIDWIDTH*vid.dupx)
- hsep = (hsep*vid.width)/(BASEVIDWIDTH*vid.dupx);
+ if (vid.width != BASEVIDWIDTH*vid.dup)
+ hsep = (hsep*vid.width)/(BASEVIDWIDTH*vid.dup);
for (i = 2; prev_i; i = -(i + ((UINT32)i >> 31))) // draws from outwards in; 2, -2, 1, -1, 0
{
@@ -9357,7 +9355,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
INT16 bgwidth = charbg->width;
INT16 fgwidth = charfg->width;
INT32 x, y;
- INT32 w = (vid.width/vid.dupx);
+ INT32 w = (vid.width/vid.dup);
if (abs(char_scroll) > FRACUNIT/4)
char_scroll -= FixedMul((char_scroll>>2), renderdeltatics);
@@ -9393,7 +9391,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
// Background and borders
V_DrawFill(0, 0, bgwidth, vid.height, V_SNAPTOTOP|colormap[101]);
{
- INT32 sw = (BASEVIDWIDTH * vid.dupx);
+ INT32 sw = (BASEVIDWIDTH * vid.dup);
INT32 bw = (vid.width - sw) / 2;
col = colormap[106];
if (bw)
@@ -10815,7 +10813,7 @@ void M_DrawMarathon(void)
const char *cvstring;
char *work;
angle_t fa;
- INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy), xspan = (vid.width/dupz), yspan = (vid.height/dupz), diffx = (xspan - BASEVIDWIDTH)/2, diffy = (yspan - BASEVIDHEIGHT)/2, maxy = BASEVIDHEIGHT + diffy;
+ INT32 xspan = (vid.width/vid.dup), yspan = (vid.height/vid.dup), diffx = (xspan - BASEVIDWIDTH)/2, diffy = (yspan - BASEVIDHEIGHT)/2, maxy = BASEVIDHEIGHT + diffy;
curbgxspeed = 0;
curbgyspeed = 18;
@@ -10888,16 +10886,17 @@ void M_DrawMarathon(void)
INT32 trans = V_60TRANS+((cnt&~3)<<(V_ALPHASHIFT-2));
INT32 height = fg->height / 2;
char patchname[7] = "CEMGx0";
+ INT32 dup;
- dupz = (w*7)/6; //(w*42*120)/(360*6); -- I don't know why this works but I'm not going to complain.
- dupz = ((dupz>>FRACBITS) % height);
+ dup = (w*7)/6; //(w*42*120)/(360*6); -- I don't know why this works but I'm not going to complain.
+ dup = ((dup>>FRACBITS) % height);
y = height/2;
- while (y+dupz >= -diffy)
+ while (y+dup >= -diffy)
y -= height;
- while (y-2-dupz < maxy)
+ while (y-2-dup < maxy)
{
- V_DrawFixedPatch(((BASEVIDWIDTH-190)<<(FRACBITS-1)), (y-2-dupz)<<FRACBITS, FRACUNIT/2, trans, fg, NULL);
- V_DrawFixedPatch(((BASEVIDWIDTH+190)<<(FRACBITS-1)), (y+dupz)<<FRACBITS, FRACUNIT/2, trans|V_FLIP, fg, NULL);
+ V_DrawFixedPatch(((BASEVIDWIDTH-190)<<(FRACBITS-1)), (y-2-dup)<<FRACBITS, FRACUNIT/2, trans, fg, NULL);
+ V_DrawFixedPatch(((BASEVIDWIDTH+190)<<(FRACBITS-1)), (y+dup)<<FRACBITS, FRACUNIT/2, trans|V_FLIP, fg, NULL);
y += height;
}
@@ -10915,16 +10914,16 @@ void M_DrawMarathon(void)
}
height = 18; // prevents the need for the next line
- //dupz = (w*height)/18;
- dupz = ((w>>FRACBITS) % height);
- y = dupz+(height/4);
- x = 105+dupz;
+ //dup = (w*height)/18;
+ dup = ((w>>FRACBITS) % height);
+ y = dup+(height/4);
+ x = 105+dup;
while (y >= -diffy)
{
x -= height;
y -= height;
}
- while (y-dupz < maxy && x < (xspan/2))
+ while (y-dup < maxy && x < (xspan/2))
{
V_DrawFill((BASEVIDWIDTH/2)-x-height, -diffy, height, diffy+y+height, 153);
V_DrawFill((BASEVIDWIDTH/2)+x, (maxy-y)-height, height, height+y, 153);
diff --git a/src/m_misc.c b/src/m_misc.c
index 68bc5205546b262e87dec91902ddbf390988a81c..923a188c62346d4c9d72ea1759898fa78aa867ac 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -989,7 +989,7 @@ static inline boolean M_PNGLib(void)
static void M_PNGFrame(png_structp png_ptr, png_infop png_info_ptr, png_bytep png_buf)
{
- png_uint_16 downscale = apng_downscale ? vid.dupx : 1;
+ png_uint_16 downscale = apng_downscale ? vid.dup : 1;
png_uint_32 pitch = png_get_rowbytes(png_ptr, png_info_ptr);
PNG_CONST png_uint_32 width = vid.width / downscale;
@@ -1055,7 +1055,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
apng_downscale = (!!cv_apng_downscale.value);
- downscale = apng_downscale ? vid.dupx : 1;
+ downscale = apng_downscale ? vid.dup : 1;
apng_FILE = fopen(filename,"wb+"); // + mode for reading
if (!apng_FILE)
diff --git a/src/netcode/d_clisrv.c b/src/netcode/d_clisrv.c
index f06192f2c8500bc1a35600b43ed502e69a222400..7804b068f7f8d262bd7fab535539af82675bd639 100644
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@@ -113,6 +113,7 @@ consvar_t cv_blamecfail = CVAR_INIT ("blamecfail", "Off", CV_SAVE|CV_NETVAR, CV_
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
consvar_t cv_playbackspeed = CVAR_INIT ("playbackspeed", "1", 0, playbackspeed_cons_t, NULL);
+consvar_t cv_idletime = CVAR_INIT ("idletime", "0", CV_SAVE, CV_Unsigned, NULL);
consvar_t cv_dedicatedidletime = CVAR_INIT ("dedicatedidletime", "10", CV_SAVE, CV_Unsigned, NULL);
void ResetNode(INT32 node)
@@ -226,6 +227,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
newplayer->jointime = 0;
newplayer->quittime = 0;
+ newplayer->lastinputtime = 0;
READSTRINGN(*p, player_names[newplayernum], MAXPLAYERNAME);
@@ -492,6 +494,10 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
HU_AddChatText(va("\x82*%s has been banned (%s)", player_names[pnum], reason), false);
kickreason = KR_BAN;
break;
+ case KICK_MSG_IDLE:
+ HU_AddChatText(va("\x82*%s has left the game (Inactive for too long)", player_names[pnum]), false);
+ kickreason = KR_TIMEOUT;
+ break;
}
if (pnum == consoleplayer)
@@ -507,6 +513,8 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
M_StartMessage(M_GetText("Server closed connection\n(synch failure)\nPress ESC\n"), NULL, MM_NOTHING);
else if (msg == KICK_MSG_PING_HIGH)
M_StartMessage(M_GetText("Server closed connection\n(Broke ping limit)\nPress ESC\n"), NULL, MM_NOTHING);
+ else if (msg == KICK_MSG_IDLE)
+ M_StartMessage(M_GetText("Server closed connection\n(Inactive for too long)\nPress ESC\n"), NULL, MM_NOTHING);
else if (msg == KICK_MSG_BANNED)
M_StartMessage(M_GetText("You have been banned by the server\n\nPress ESC\n"), NULL, MM_NOTHING);
else if (msg == KICK_MSG_CUSTOM_KICK)
@@ -1267,6 +1275,32 @@ static void UpdatePingTable(void)
}
}
+static void IdleUpdate(void)
+{
+ INT32 i;
+ if (!server || !netgame)
+ return;
+
+ for (i = 1; i < MAXPLAYERS; i++)
+ {
+ if (cv_idletime.value && playeringame[i] && playernode[i] != UINT8_MAX && !players[i].quittime && !players[i].spectator && !players[i].bot && !IsPlayerAdmin(i) && i != serverplayer)
+ {
+ if (players[i].cmd.forwardmove || players[i].cmd.sidemove || players[i].cmd.buttons)
+ players[i].lastinputtime = 0;
+ else
+ players[i].lastinputtime++;
+
+ if (players[i].lastinputtime > (tic_t)cv_idletime.value * TICRATE * 60)
+ {
+ players[i].lastinputtime = 0;
+ SendKick(i, KICK_MSG_IDLE | KICK_MSG_KEEP_BODY);
+ }
+ }
+ else
+ players[i].lastinputtime = 0;
+ }
+}
+
// Handle timeouts to prevent definitive freezes from happenning
static void HandleNodeTimeouts(void)
{
@@ -1299,6 +1333,8 @@ void NetKeepAlive(void)
GetPackets();
+ IdleUpdate();
+
#ifdef MASTERSERVER
MasterClient_Ticker();
#endif
@@ -1419,6 +1455,8 @@ void NetUpdate(void)
GetPackets(); // get packet from client or from server
+ IdleUpdate();
+
// The client sends the command after receiving from the server
// The server sends it before because this is better in single player
diff --git a/src/netcode/d_clisrv.h b/src/netcode/d_clisrv.h
index d87ead9ecbf5e71f280f13f3598ada1a1592a524..db9a780cd915bf38065391d3b0030c09c60bda4e 100644
--- a/src/netcode/d_clisrv.h
+++ b/src/netcode/d_clisrv.h
@@ -48,7 +48,7 @@ typedef enum
KR_TIMEOUT = 4, //Connection Timeout
KR_BAN = 5, //Banned by server
KR_LEAVE = 6, //Quit the game
-
+ KR_IDLE = 7, //Remained still for too long
} kickreason_t;
/* the max number of name changes in some time period */
@@ -73,7 +73,7 @@ extern UINT32 realpingtable[MAXPLAYERS];
extern UINT32 playerpingtable[MAXPLAYERS];
extern tic_t servermaxping;
-extern consvar_t cv_netticbuffer, cv_resynchattempts, cv_blamecfail, cv_playbackspeed, cv_dedicatedidletime;
+extern consvar_t cv_netticbuffer, cv_resynchattempts, cv_blamecfail, cv_playbackspeed, cv_idletime, cv_dedicatedidletime;
// Used in d_net, the only dependence
void D_ClientServerInit(void);
diff --git a/src/netcode/d_netcmd.c b/src/netcode/d_netcmd.c
index 5afa955610a6aee452790fe0ca74b13fc7007d86..9b87e8cfe80ca9f02fadffa48199ab17cd83cd6b 100644
--- a/src/netcode/d_netcmd.c
+++ b/src/netcode/d_netcmd.c
@@ -601,6 +601,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_showjoinaddress);
CV_RegisterVar(&cv_blamecfail);
CV_RegisterVar(&cv_dedicatedidletime);
+ CV_RegisterVar(&cv_idletime);
COM_AddCommand("ping", Command_Ping_f, COM_LUA);
CV_RegisterVar(&cv_nettimeout);
@@ -1241,7 +1242,7 @@ static void SetColorLocal(INT32 playernum, UINT16 color)
//
static void SendNameAndColor(void)
{
- char buf[MAXPLAYERNAME+6];
+ char buf[MAXPLAYERNAME+7];
char *p;
p = buf;
diff --git a/src/netcode/protocol.h b/src/netcode/protocol.h
index a992e3b69db1ac1eb981c15b24d41e4ffac156eb..c084d920cfa4dc14d3e0cf475b3c62ea7226020d 100644
--- a/src/netcode/protocol.h
+++ b/src/netcode/protocol.h
@@ -331,6 +331,7 @@ typedef struct
#define KICK_MSG_PING_HIGH 6
#define KICK_MSG_CUSTOM_KICK 7
#define KICK_MSG_CUSTOM_BAN 8
+#define KICK_MSG_IDLE 9
#define KICK_MSG_KEEP_BODY 0x80
#endif
diff --git a/src/p_local.h b/src/p_local.h
index 714a8d94e9e8107cf19e450b7b3eed314fed5d39..d0afc77d0761facdf2a4f966dbabb58cd9b23d44 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -204,6 +204,7 @@ void P_Earthquake(mobj_t *inflictor, mobj_t *source, fixed_t radius);
boolean P_HomingAttack(mobj_t *source, mobj_t *enemy); /// \todo doesn't belong in p_user
boolean P_SuperReady(player_t *player);
void P_DoJump(player_t *player, boolean soundandstate);
+void P_DoSpinDashDust(player_t *player);
#define P_AnalogMove(player) (P_ControlStyle(player) == CS_LMAOGALOG)
boolean P_TransferToNextMare(player_t *player);
UINT8 P_FindLowestMare(void);
@@ -214,6 +215,10 @@ void P_SpawnThokMobj(player_t *player);
void P_SpawnSpinMobj(player_t *player, mobjtype_t type);
void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range);
+void P_DoTailsOverlay(player_t *player, mobj_t *tails);
+void P_DoMetalJetFume(player_t *player, mobj_t *fume);
+void P_DoFollowMobj(player_t *player, mobj_t *followmobj);
+
void P_PlayLivesJingle(player_t *player);
#define P_PlayRinglossSound(s) S_StartSound(s, (mariomode) ? sfx_mario8 : sfx_altow1 + P_RandomKey(4));
#define P_PlayDeathSound(s) S_StartSound(s, sfx_altdi1 + P_RandomKey(4));
@@ -298,6 +303,7 @@ void P_RunOverlays(void);
void P_HandleMinecartSegments(mobj_t *mobj);
void P_MobjThinker(mobj_t *mobj);
boolean P_RailThinker(mobj_t *mobj);
+boolean P_CheckSkyHit(mobj_t *mo, line_t *line);
void P_PushableThinker(mobj_t *mobj);
void P_SceneryThinker(mobj_t *mobj);
@@ -539,6 +545,9 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
boolean P_SetMobjStateNF(mobj_t *mobj, statenum_t state);
boolean P_CheckMissileSpawn(mobj_t *th);
void P_Thrust(mobj_t *mo, angle_t angle, fixed_t move);
+void P_ThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move);
+void P_VectorInstaThrust(fixed_t xa, fixed_t xb, fixed_t xc, fixed_t ya, fixed_t yb, fixed_t yc,
+ fixed_t za, fixed_t zb, fixed_t zc, fixed_t momentum, mobj_t *mo);
void P_DoSuperTransformation(player_t *player, boolean giverings);
void P_ExplodeMissile(mobj_t *mo);
void P_CheckGravity(mobj_t *mo, boolean affect);
diff --git a/src/p_map.c b/src/p_map.c
index 2170d2910e7b68ff7a39de4d2de00a396c5717a6..ff600ad2e1d709e8e7d1d3a41321b9f31ab50579 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -3073,11 +3073,14 @@ static boolean P_ThingHeightClip(mobj_t *thing)
if (!rover || ((rover->fofflags & FOF_EXISTS) && (rover->fofflags & FOF_SOLID)))
{
hitfloor = bouncing;
- if (thing->eflags & MFE_VERTICALFLIP)
- thing->pmomz = thing->ceilingz - (thing->z + thing->height);
- else
- thing->pmomz = thing->floorz - thing->z;
- thing->eflags |= MFE_APPLYPMOMZ;
+ if (!(thing->player) || !(thing->player->pflags & PF_JUMPED || bouncing))
+ {
+ if (thing->eflags & MFE_VERTICALFLIP)
+ thing->pmomz = thing->ceilingz - (thing->z + thing->height);
+ else
+ thing->pmomz = thing->floorz - thing->z;
+ thing->eflags |= MFE_APPLYPMOMZ;
+ }
if (thing->eflags & MFE_VERTICALFLIP)
thing->z = thing->ceilingz - thing->height;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index a81845918b64f5ceb74f41f303c43da579bafc55..7a5aaf42497c422f9d5d745aee99dafff011ae6f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1779,14 +1779,15 @@ bustupdone:
//
// P_CheckSkyHit
//
-static boolean P_CheckSkyHit(mobj_t *mo)
-{
- if (ceilingline && ceilingline->backsector
- && ceilingline->backsector->ceilingpic == skyflatnum
- && ceilingline->frontsector
- && ceilingline->frontsector->ceilingpic == skyflatnum
- && (mo->z >= ceilingline->frontsector->ceilingheight
- || mo->z >= ceilingline->backsector->ceilingheight))
+boolean P_CheckSkyHit(mobj_t *mo, line_t *line)
+{
+ if (line && (line->special == 41 ||
+ (line->backsector
+ && line->backsector->ceilingpic == skyflatnum
+ && line->frontsector
+ && line->frontsector->ceilingpic == skyflatnum
+ && (mo->z >= line->frontsector->ceilingheight
+ || mo->z >= line->backsector->ceilingheight))))
return true;
return false;
}
@@ -1893,7 +1894,7 @@ void P_XYMovement(mobj_t *mo)
mo->fuse += ((5 - mo->threshold) * TICRATE);
// Check for hit against sky here
- if (P_CheckSkyHit(mo))
+ if (P_CheckSkyHit(mo, ceilingline))
{
// Hack to prevent missiles exploding
// against the sky.
@@ -1913,7 +1914,7 @@ void P_XYMovement(mobj_t *mo)
mo->flags &= ~MF_STICKY; //Don't check again!
// Check for hit against sky here
- if (P_CheckSkyHit(mo))
+ if (P_CheckSkyHit(mo, ceilingline))
{
// Hack to prevent missiles exploding
// against the sky.
@@ -1972,7 +1973,7 @@ void P_XYMovement(mobj_t *mo)
else if (mo->flags & MF_MISSILE)
{
// explode a missile
- if (P_CheckSkyHit(mo))
+ if (P_CheckSkyHit(mo, ceilingline))
{
// Hack to prevent missiles exploding
// against the sky.
@@ -10544,6 +10545,7 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing)
case MT_SMALLGRABCHAIN:
case MT_BIGGRABCHAIN:
+ case MT_BLUESPRINGBALL:
case MT_YELLOWSPRINGBALL:
case MT_REDSPRINGBALL:
@@ -10571,14 +10573,14 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing)
case MT_EXPLOSIONRING:
case MT_SCATTERRING:
case MT_GRENADERING:
-
+
case MT_BOUNCEPICKUP:
case MT_RAILPICKUP:
case MT_AUTOPICKUP:
case MT_EXPLODEPICKUP:
case MT_SCATTERPICKUP:
case MT_GRENADEPICKUP:
-
+
case MT_REDRING:
case MT_THROWNBOUNCE:
case MT_THROWNINFINITY:
@@ -13319,7 +13321,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
return true;
}
-// Pre-UDMF backwards compatibility stuff. Remove for 2.3
+// TODO: 2.3: Delete (Pre-UDMF backwards compatibility stuff)
static void P_SetAmbush(mapthing_t *mthing, mobj_t *mobj)
{
if (mobj->type == MT_NIGHTSBUMPER
diff --git a/src/p_saveg.c b/src/p_saveg.c
index faecd13770b3d81b992017af51b4b663487aa50d..4aa2318fd2902d172c7a35a82a1c9d54dcf113ad 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -175,7 +175,7 @@ static void P_NetArchivePlayers(void)
WRITEUINT16(save_p, players[i].flashpal);
WRITEUINT16(save_p, players[i].flashcount);
- WRITEUINT8(save_p, players[i].skincolor);
+ WRITEUINT16(save_p, players[i].skincolor);
WRITEINT32(save_p, players[i].skin);
WRITEUINT32(save_p, players[i].availabilities);
WRITEUINT32(save_p, players[i].score);
@@ -404,7 +404,7 @@ static void P_NetUnArchivePlayers(void)
players[i].flashpal = READUINT16(save_p);
players[i].flashcount = READUINT16(save_p);
- players[i].skincolor = READUINT8(save_p);
+ players[i].skincolor = READUINT16(save_p);
players[i].skin = READINT32(save_p);
players[i].availabilities = READUINT32(save_p);
players[i].score = READUINT32(save_p);
diff --git a/src/p_saveg.h b/src/p_saveg.h
index 73fcfd5836e4c5283d3fb56c7f397e9b774c5405..545008e7efc6af656fe94864a4ebcf8ea28e5f27 100644
--- a/src/p_saveg.h
+++ b/src/p_saveg.h
@@ -18,7 +18,7 @@
#pragma interface
#endif
-#define NEWSKINSAVES (INT16_MAX) // Purely for backwards compatibility, remove this for 2.3
+#define NEWSKINSAVES (INT16_MAX) // TODO: 2.3: Delete (Purely for backwards compatibility)
// Persistent storage/archiving.
// These are the load / save game routines.
diff --git a/src/p_setup.c b/src/p_setup.c
index 0390761b61a5e064b0b9b55daead7ebd1488ac49..7f6fcd36cd96126d38fec4ac8aa07b03f18218e0 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1679,7 +1679,7 @@ static void ParseTextmapSectorParameter(UINT32 i, const char *param, const char
if ((id = strchr(id, ' ')))
id++;
}
- }
+ }
else if (fastcmp(param, "xpanningfloor"))
sectors[i].floorxoffset = FLOAT_TO_FIXED(atof(val));
else if (fastcmp(param, "ypanningfloor"))
@@ -6132,6 +6132,7 @@ static void P_ConvertBinarySectorTypes(void)
case 14: //Non-ramp sector
sectors[i].specialflags |= SSF_NOSTEPDOWN;
break;
+ // TODO: 2.3: Delete
case 15: //Bouncy FOF
CONS_Alert(CONS_WARNING, M_GetText("Deprecated bouncy FOF sector type detected. Please use linedef type 76 instead.\n"));
break;
@@ -6166,12 +6167,14 @@ static void P_ConvertBinarySectorTypes(void)
sectors[i].flags |= MSF_TRIGGERLINE_PLANE;
sectors[i].triggerer = TO_PLAYER;
break;
+ // TODO: 2.3: Delete
case 6: //Trigger linedef executor (Emerald check)
CONS_Alert(CONS_WARNING, M_GetText("Deprecated emerald check sector type detected. Please use linedef types 337-339 instead.\n"));
sectors[i].triggertag = tag;
sectors[i].flags &= ~MSF_TRIGGERLINE_PLANE;
sectors[i].triggerer = TO_PLAYEREMERALDS;
break;
+ // TODO: 2.3: Delete
case 7: //Trigger linedef executor (NiGHTS mare)
CONS_Alert(CONS_WARNING, M_GetText("Deprecated NiGHTS mare sector type detected. Please use linedef types 340-342 instead.\n"));
sectors[i].triggertag = tag;
@@ -6181,9 +6184,11 @@ static void P_ConvertBinarySectorTypes(void)
case 8: //Check for linedef executor on FOFs
sectors[i].flags |= MSF_TRIGGERLINE_MOBJ;
break;
+ // TODO: 2.3: Delete
case 10: //Special stage time/spheres requirements
CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for special stage requirements detected. Please use the SpecialStageTime and SpecialStageSpheres level header options instead.\n"));
break;
+ // TODO: 2.3: Delete
case 11: //Custom global gravity
CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for global gravity detected. Please use the Gravity level header option instead.\n"));
break;
@@ -6822,7 +6827,7 @@ static void P_ConvertBinaryThingTypes(void)
default:
break;
}
-
+
// Clear binary thing height hacks, to prevent interfering with UDMF-only flags
mapthings[i].options &= 0xF;
}
diff --git a/src/p_spec.c b/src/p_spec.c
index 28ecc60f4dedb5f67f9aa33e092232eb0b3782f6..aa4ee37cf76f22eedcaed4367635ce654dca51bc 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2661,7 +2661,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
titlemapcameraref = altview;
else if (!mo->player->awayviewtics || mo->player->awayviewmobj != altview) {
P_SetTarget(&mo->player->awayviewmobj, altview);
-
+
if (mo->player == &players[displayplayer])
P_ResetCamera(mo->player, &camera); // reset p1 camera on p1 getting an awayviewmobj
else if (splitscreen && mo->player == &players[secondarydisplayplayer])
@@ -4178,6 +4178,7 @@ sector_t *P_MobjTouchingSectorSpecial(mobj_t *mo, INT32 section, INT32 number)
return NULL;
}
+// TODO: 2.3: Delete
// Deprecated in favor of P_MobjTouchingSectorSpecial
// Kept for Lua backwards compatibility only
sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo)
@@ -6229,6 +6230,7 @@ void P_SpawnSpecials(boolean fromnetsave)
sector->flags |= MSF_TRIGGERSPECIAL_TOUCH;
}
+ // TODO: 2.3: Delete everything below
// Process deprecated binary sector specials
if (udmf || !sector->special)
continue;
diff --git a/src/p_tick.c b/src/p_tick.c
index 444b68d2fda3d5ca60ab958715754b9e164fb82c..1bc7b78bf1a39499576794b8e80d7181f58cd43c 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -843,16 +843,7 @@ void P_Ticker(boolean run)
countdown2--;
if (quake.time)
- {
- fixed_t ir = quake.intensity>>1;
- /// \todo Calculate distance from epicenter if set and modulate the intensity accordingly based on radius.
- quake.x = M_RandomRange(-ir,ir);
- quake.y = M_RandomRange(-ir,ir);
- quake.z = M_RandomRange(-ir,ir);
--quake.time;
- }
- else
- quake.x = quake.y = quake.z = 0;
if (metalplayback)
G_ReadMetalTic(metalplayback);
diff --git a/src/p_user.c b/src/p_user.c
index 5730d476d551d84039e42e942e49236a6dab25d8..c0e87bf73f8b9888420b22150e9a49e4c00af750 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -106,8 +106,7 @@ void P_Thrust(mobj_t *mo, angle_t angle, fixed_t move)
mo->momy += FixedMul(move, FINESINE(angle));
}
-#if 0
-static inline void P_ThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move)
+void P_ThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move)
{
angle >>= ANGLETOFINESHIFT;
@@ -115,7 +114,7 @@ static inline void P_ThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move)
mo->momy += FixedMul(move, FINESINE(angle));
}
-static inline void P_VectorInstaThrust(fixed_t xa, fixed_t xb, fixed_t xc, fixed_t ya, fixed_t yb, fixed_t yc,
+void P_VectorInstaThrust(fixed_t xa, fixed_t xb, fixed_t xc, fixed_t ya, fixed_t yb, fixed_t yc,
fixed_t za, fixed_t zb, fixed_t zc, fixed_t momentum, mobj_t *mo)
{
fixed_t a1, b1, c1, a2, b2, c2, i, j, k;
@@ -145,7 +144,6 @@ static inline void P_VectorInstaThrust(fixed_t xa, fixed_t xb, fixed_t xc, fixed
mo->momy = j;
mo->momz = k;
}
-#endif
//
// P_InstaThrust
@@ -2775,6 +2773,7 @@ static void P_CheckBouncySectors(player_t *player)
if (!(rover->fofflags & FOF_EXISTS))
continue; // FOFs should not be bouncy if they don't even "exist"
+ // TODO: 2.3: Delete
// Handle deprecated bouncy FOF sector type
if (!udmf && GETSECSPECIAL(rover->master->frontsector->special, 1) == 15)
{
@@ -4603,7 +4602,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
}
}
-static void P_DoSpinDashDust(player_t *player)
+void P_DoSpinDashDust(player_t *player)
{
UINT32 i;
mobj_t *particle;
@@ -11193,7 +11192,7 @@ static void P_MinecartThink(player_t *player)
}
// Handle Tails' fluff
-static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
+void P_DoTailsOverlay(player_t *player, mobj_t *tails)
{
// init...
boolean smilesonground = P_IsObjectOnGround(player->mo);
@@ -11390,7 +11389,7 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
tails->y = player->mo->y + P_ReturnThrustY(tails, tails->angle, FixedMul(backwards, tails->scale));
tails->z = player->mo->z + zoffs;
P_SetThingPosition(tails);
-
+
if (player->mo->flags2 & MF2_SHADOW)
tails->flags2 |= MF2_SHADOW;
else
@@ -11398,7 +11397,7 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
}
// Metal Sonic's jet fume
-static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
+void P_DoMetalJetFume(player_t *player, mobj_t *fume)
{
static const UINT8 FUME_SKINCOLORS[] =
{
@@ -11536,6 +11535,30 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
}
}
+// Handle Followmobj behavior
+void P_DoFollowMobj(player_t *player, mobj_t *followmobj)
+{
+ if (LUA_HookFollowMobj(player, followmobj) || P_MobjWasRemoved(followmobj))
+ {;}
+ else
+ {
+ switch (followmobj->type)
+ {
+ case MT_TAILSOVERLAY: // c:
+ P_DoTailsOverlay(player, followmobj);
+ break;
+ case MT_METALJETFUME:
+ P_DoMetalJetFume(player, followmobj);
+ break;
+ default:
+ var1 = 1;
+ var2 = 0;
+ A_CapeChase(followmobj);
+ break;
+ }
+ }
+}
+
//
// P_PlayerThink
//
@@ -11606,7 +11629,7 @@ void P_PlayerThink(player_t *player)
P_SetTarget(&player->awayviewmobj, NULL); // remove awayviewmobj asap if invalid
player->awayviewtics = 1; // reset to one, the below code will immediately set it to zero
}
-
+
if (player->awayviewtics && player->awayviewtics != -1)
{
player->awayviewtics--;
@@ -12278,11 +12301,11 @@ void P_PlayerThink(player_t *player)
if (!(player->stronganim))
player->stronganim = player->panim;
else if (player->panim != player->stronganim)
- player->powers[pw_strong] = STR_NONE;
- }
+ player->powers[pw_strong] = STR_NONE;
+ }
else if (player->stronganim)
player->stronganim = 0;
-
+
//pw_super acts as a timer now
if (player->powers[pw_super]
&& (player->mo->state < &states[S_PLAY_SUPER_TRANS1]
@@ -12389,7 +12412,7 @@ void P_PlayerThink(player_t *player)
if (player->jumpfactor < FixedMul(skins[player->skin].jumpfactor, 5*FRACUNIT/4)) // Boost jump height.
player->jumpfactor += FRACUNIT/300;
- if ((player->charflags & SF_MACHINE) && (!(player->powers[pw_strong] == STR_METAL)))
+ if ((player->charflags & SF_MACHINE) && (!(player->powers[pw_strong] == STR_METAL)))
player->powers[pw_strong] = STR_METAL;
}
@@ -13012,27 +13035,7 @@ void P_PlayerAfterThink(player_t *player)
}
if (player->followmobj)
- {
- if (LUA_HookFollowMobj(player, player->followmobj) || P_MobjWasRemoved(player->followmobj))
- {;}
- else
- {
- switch (player->followmobj->type)
- {
- case MT_TAILSOVERLAY: // c:
- P_DoTailsOverlay(player, player->followmobj);
- break;
- case MT_METALJETFUME:
- P_DoMetalJetFume(player, player->followmobj);
- break;
- default:
- var1 = 1;
- var2 = 0;
- A_CapeChase(player->followmobj);
- break;
- }
- }
- }
+ P_DoFollowMobj(player, player->followmobj);
}
P_DoPlayerHeadSigns(player); // Spawn Tag/CTF signs over player's head
diff --git a/src/r_main.c b/src/r_main.c
index 0655bd06f04536931dfe3baaa1435b9c847fe091..6c7bedbf1039fc47efe29f6fb0271c0ad35fd907 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1085,6 +1085,7 @@ void R_SetupFrame(player_t *player)
{
camera_t *thiscam;
boolean chasecam = R_ViewpointHasChasecam(player);
+ boolean ispaused = paused || P_AutoPause();
if (splitscreen && player == &players[secondarydisplayplayer] && player != &players[consoleplayer])
thiscam = &camera2;
@@ -1135,6 +1136,30 @@ void R_SetupFrame(player_t *player)
}
}
}
+
+ if (quake.time && !ispaused)
+ {
+ fixed_t ir = quake.intensity>>1;
+
+ if (quake.epicenter) {
+ // Calculate 3D distance from epicenter, using the camera.
+ fixed_t xydist = R_PointToDist2(thiscam->x, thiscam->y, quake.epicenter->x, quake.epicenter->y);
+ fixed_t dist = R_PointToDist2(0, thiscam->z, xydist, quake.epicenter->z);
+
+ // More effect closer to epicenter, outside of radius = no effect
+ if (!quake.radius || dist > quake.radius)
+ ir = 0;
+ else
+ ir = FixedMul(ir, FRACUNIT - FixedDiv(dist, quake.radius));
+ }
+
+ quake.x = M_RandomRange(-ir,ir);
+ quake.y = M_RandomRange(-ir,ir);
+ quake.z = M_RandomRange(-ir,ir);
+ }
+ else if (!ispaused)
+ quake.x = quake.y = quake.z = 0;
+
newview->z += quake.z;
newview->player = player;
diff --git a/src/r_sky.c b/src/r_sky.c
index c47029f0b34416fda4dabd2f43a62550e3e31fdf..edde4c218b1c62717055852de7d35f6cd3c747d4 100644
--- a/src/r_sky.c
+++ b/src/r_sky.c
@@ -75,6 +75,6 @@ void R_SetupSkyDraw(void)
*/
void R_SetSkyScale(void)
{
- fixed_t difference = vid.fdupx-(vid.dupx<<FRACBITS);
- skyscale = FixedDiv(fovtan, vid.fdupx+difference);
+ fixed_t difference = vid.fdup-(vid.dup<<FRACBITS);
+ skyscale = FixedDiv(fovtan, vid.fdup+difference);
}
diff --git a/src/s_sound.c b/src/s_sound.c
index ada1a0fd2f399f09849a7330cf14ca283c7b1784..a579292ff3aa791176b389d686901799c47c89a1 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -513,7 +513,7 @@ void S_StartCaption(sfxenum_t sfx_id, INT32 cnum, UINT16 lifespan)
closedcaptions[set].c = ((cnum == -1) ? NULL : &channels[cnum]);
closedcaptions[set].s = sfx;
closedcaptions[set].t = lifespan;
- closedcaptions[set].b = 2; // bob
+ closedcaptions[set].b = 3; // bob
}
void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
diff --git a/src/screen.c b/src/screen.c
index 3f249f8d314c481dbd911e70b7c1f24ce6ca8c56..3c50ec67eadef1d4e43441498f4ea96df0542f8d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -494,7 +494,7 @@ void SCR_CalculateFPS(void)
void SCR_DisplayTicRate(void)
{
INT32 ticcntcolor = 0;
- const INT32 h = vid.height-(8*vid.dupy);
+ const INT32 h = vid.height-(8*vid.dup);
UINT32 cap = R_GetFramerateCap();
double fps = round(averageFPS);
@@ -530,7 +530,7 @@ void SCR_DisplayTicRate(void)
width = V_StringWidth(drawnstr, V_NOSCALESTART);
- V_DrawString(vid.width - ((7 * 8 * vid.dupx) + V_StringWidth("FPS: ", V_NOSCALESTART)), h,
+ V_DrawString(vid.width - ((7 * 8 * vid.dup) + V_StringWidth("FPS: ", V_NOSCALESTART)), h,
V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "FPS:");
V_DrawString(vid.width - width, h,
ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, drawnstr);
@@ -552,7 +552,7 @@ void SCR_ClosedCaptions(void)
{
UINT8 i;
boolean gamestopped = (paused || P_AutoPause());
- INT32 basey = BASEVIDHEIGHT;
+ INT32 basey = BASEVIDHEIGHT - 20;
if (gamestate != wipegamestate)
return;
@@ -572,7 +572,8 @@ void SCR_ClosedCaptions(void)
for (i = 0; i < NUMCAPTIONS; i++)
{
- INT32 flags, y;
+ INT32 flags;
+ fixed_t y;
char dot;
boolean music;
@@ -585,14 +586,19 @@ void SCR_ClosedCaptions(void)
continue;
flags = V_SNAPTORIGHT|V_SNAPTOBOTTOM|V_ALLOWLOWERCASE;
- y = basey-((i + 2)*10);
+ y = (basey-(i*10)) * FRACUNIT;
if (closedcaptions[i].b)
{
- y -= closedcaptions[i].b * vid.dupy;
if (renderisnewtic)
- {
closedcaptions[i].b--;
+
+ if (closedcaptions[i].b) // If the caption hasn't reached its final destination...
+ {
+ y -= closedcaptions[i].b * 4 * FRACUNIT; // ...move it per tic...
+ y += (rendertimefrac % FRACUNIT) * 4; // ...and interpolate it per frame
+ // We have to modulo it by FRACUNIT, so that it won't be a tic ahead with interpolation disabled
+ // Unlike everything else, captions are (intentionally) interpolated from T to T+1 instead of T-1 to T
}
}
@@ -606,7 +612,7 @@ void SCR_ClosedCaptions(void)
else
dot = ' ';
- V_DrawRightAlignedString(BASEVIDWIDTH - 20, y, flags,
+ V_DrawRightAlignedStringAtFixed((BASEVIDWIDTH-20) * FRACUNIT, y, flags,
va("%c [%s]", dot, (closedcaptions[i].s->caption[0] ? closedcaptions[i].s->caption : closedcaptions[i].s->name)));
}
}
@@ -639,9 +645,9 @@ void SCR_DisplayMarathonInfo(void)
#define PRIMEV1 13
#define PRIMEV2 17 // I can't believe it! I'm on TV!
antisplice[0] += (entertic - oldentertics)*PRIMEV2;
- antisplice[0] %= PRIMEV1*((vid.width/vid.dupx)+1);
+ antisplice[0] %= PRIMEV1*((vid.width/vid.dup)+1);
antisplice[1] += (entertic - oldentertics)*PRIMEV1;
- antisplice[1] %= PRIMEV1*((vid.width/vid.dupx)+1);
+ antisplice[1] %= PRIMEV1*((vid.width/vid.dup)+1);
str = va("%i:%02i:%02i.%02i",
G_TicsToHours(marathontime),
G_TicsToMinutes(marathontime, false),
diff --git a/src/screen.h b/src/screen.h
index 65e82ff4df2bff3701a0f57d4667ee32a34784f5..46c1b99c6ca962a18944e2e41fcd4c6d147d5327 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -59,19 +59,19 @@ typedef struct viddef_s
} u;
INT32 recalc; // if true, recalc vid-based stuff
UINT8 *direct; // linear frame buffer, or vga base mem.
- INT32 dupx, dupy; // scale 1, 2, 3 value for menus & overlays
- INT32/*fixed_t*/ fdupx, fdupy; // same as dupx, dupy, but exact value when aspect ratio isn't 320/200
+ INT32 dup; // scale 1, 2, 3 value for menus & overlays
+ INT32/*fixed_t*/ fdup; // same as dup, but exact value when aspect ratio isn't 320/200
INT32 bpp; // BYTES per pixel: 1 = 256color, 2 = highcolor
INT32 baseratio; // Used to get the correct value for lighting walls
// for Win32 version
DNWH WndParent; // handle of the application's window
- UINT8 smalldupx, smalldupy; // factor for a little bit of scaling
- UINT8 meddupx, meddupy; // factor for moderate, but not full, scaling
+ UINT8 smalldup; // factor for a little bit of scaling
+ UINT8 meddup; // factor for moderate, but not full, scaling
#ifdef HWRENDER
- INT32/*fixed_t*/ fsmalldupx, fsmalldupy;
- INT32/*fixed_t*/ fmeddupx, fmeddupy;
+ INT32/*fixed_t*/ fsmalldup;
+ INT32/*fixed_t*/ fmeddup;
INT32 glstate;
#endif
} viddef_t;
diff --git a/src/st_stuff.c b/src/st_stuff.c
index de19c468fcdcc4cc09ea3fb06eb34002b1fdf143..a975379785570a6dca859031932c0f749c75dc70 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -513,10 +513,10 @@ static void ST_drawDebugInfo(void)
#define VFLAGS V_MONOSPACE|V_SNAPTOTOP|V_SNAPTORIGHT
- if ((moviemode == MM_GIF && cv_gif_downscale.value) || vid.dupx == 1)
+ if ((moviemode == MM_GIF && cv_gif_downscale.value) || vid.dup == 1)
{
textfunc = V_DrawRightAlignedString;
- lowh = ((vid.height/vid.dupy) - 16);
+ lowh = ((vid.height/vid.dup) - 16);
}
else
{
diff --git a/src/v_video.c b/src/v_video.c
index 3f958b286cdfdcc275a23c5822605812d218c242..30aef92cc3c3f2df107f6de3104c78a86fca9e5c 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -505,7 +505,7 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
UINT32 blendmode = ((scrn & V_BLENDMASK) >> V_BLENDSHIFT);
fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
- INT32 dupx, dupy;
+ INT32 dup;
const column_t *column;
UINT8 *desttop, *dest, *deststart, *destend;
const UINT8 *source, *deststop;
@@ -555,30 +555,23 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
patchdrawfunc = (v_translevel) ? transmappedpdraw : mappedpdraw;
}
- dupx = vid.dupx;
- dupy = vid.dupy;
- if (scrn & V_SCALEPATCHMASK) switch ((scrn & V_SCALEPATCHMASK) >> V_SCALEPATCHSHIFT)
+ dup = vid.dup;
+ if (scrn & V_SCALEPATCHMASK) switch (scrn & V_SCALEPATCHMASK)
{
- case 1: // V_NOSCALEPATCH
- dupx = dupy = 1;
- break;
- case 2: // V_SMALLSCALEPATCH
- dupx = vid.smalldupx;
- dupy = vid.smalldupy;
+ case V_NOSCALEPATCH:
+ dup = 1;
break;
- case 3: // V_MEDSCALEPATCH
- dupx = vid.meddupx;
- dupy = vid.meddupy;
+ case V_SMALLSCALEPATCH:
+ dup = vid.smalldup;
break;
- default:
+ case V_MEDSCALEPATCH:
+ dup = vid.meddup;
break;
}
- // only use one dup, to avoid stretching (har har)
- dupx = dupy = (dupx < dupy ? dupx : dupy);
- fdup = vdup = FixedMul(dupx<<FRACBITS, pscale);
+ fdup = vdup = pscale * dup;
if (vscale != pscale)
- vdup = FixedMul(dupx<<FRACBITS, vscale);
+ vdup = vscale * dup;
colfrac = FixedDiv(FRACUNIT, fdup);
rowfrac = FixedDiv(FRACUNIT, vdup);
@@ -684,8 +677,8 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
}
else
{
- x = FixedMul(x,dupx<<FRACBITS);
- y = FixedMul(y,dupy<<FRACBITS);
+ x *= dup;
+ y *= dup;
x >>= FRACBITS;
y >>= FRACBITS;
@@ -703,30 +696,30 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
}
}
- if (vid.width != BASEVIDWIDTH * dupx)
+ if (vid.width != BASEVIDWIDTH * dup)
{
- // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
+ // dup adjustments pretend that screen width is BASEVIDWIDTH * dup,
// so center this imaginary screen
if (scrn & V_SNAPTORIGHT)
- x += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * dup));
else if (!(scrn & V_SNAPTOLEFT))
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * dup)) / 2;
if (perplayershuffle & 4)
- x -= (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x -= (vid.width - (BASEVIDWIDTH * dup)) / 4;
else if (perplayershuffle & 8)
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x += (vid.width - (BASEVIDWIDTH * dup)) / 4;
}
- if (vid.height != BASEVIDHEIGHT * dupy)
+ if (vid.height != BASEVIDHEIGHT * dup)
{
// same thing here
if (scrn & V_SNAPTOBOTTOM)
- y += (vid.height - (BASEVIDHEIGHT * dupy));
+ y += (vid.height - (BASEVIDHEIGHT * dup));
else if (!(scrn & V_SNAPTOTOP))
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
+ y += (vid.height - (BASEVIDHEIGHT * dup)) / 2;
if (perplayershuffle & 1)
- y -= (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y -= (vid.height - (BASEVIDHEIGHT * dup)) / 4;
else if (perplayershuffle & 2)
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y += (vid.height - (BASEVIDHEIGHT * dup)) / 4;
}
}
@@ -737,11 +730,11 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
{
pwidth = patch->width<<FRACBITS;
pwidth = FixedMul(pwidth, pscale);
- pwidth = FixedMul(pwidth, dupx<<FRACBITS);
+ pwidth *= dup;
pwidth >>= FRACBITS;
}
else
- pwidth = patch->width * dupx;
+ pwidth = patch->width * dup;
deststart = desttop;
destend = desttop + pwidth;
@@ -797,7 +790,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, IN
// boolean flip = false;
fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
- INT32 dupx, dupy;
+ INT32 dup;
const column_t *column;
UINT8 *desttop, *dest;
const UINT8 *source, *deststop;
@@ -845,30 +838,23 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, IN
patchdrawfunc = (v_translevel) ? transmappedpdraw : mappedpdraw;
}
- dupx = vid.dupx;
- dupy = vid.dupy;
- if (scrn & V_SCALEPATCHMASK) switch ((scrn & V_SCALEPATCHMASK) >> V_SCALEPATCHSHIFT)
+ dup = vid.dup;
+ if (scrn & V_SCALEPATCHMASK) switch (scrn & V_SCALEPATCHMASK)
{
- case 1: // V_NOSCALEPATCH
- dupx = dupy = 1;
- break;
- case 2: // V_SMALLSCALEPATCH
- dupx = vid.smalldupx;
- dupy = vid.smalldupy;
+ case V_NOSCALEPATCH:
+ dup = 1;
break;
- case 3: // V_MEDSCALEPATCH
- dupx = vid.meddupx;
- dupy = vid.meddupy;
+ case V_SMALLSCALEPATCH:
+ dup = vid.smalldup;
break;
- default:
+ case V_MEDSCALEPATCH:
+ dup = vid.meddup;
break;
}
- // only use one dup, to avoid stretching (har har)
- dupx = dupy = (dupx < dupy ? dupx : dupy);
- fdup = vdup = FixedMul(dupx<<FRACBITS, pscale);
+ fdup = vdup = pscale * dup;
if (vscale != pscale)
- vdup = FixedMul(dupx<<FRACBITS, vscale);
+ vdup = vscale * dup;
colfrac = FixedDiv(FRACUNIT, fdup);
rowfrac = FixedDiv(FRACUNIT, vdup);
@@ -960,8 +946,8 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, IN
}
else
{
- x = FixedMul(x,dupx<<FRACBITS);
- y = FixedMul(y,dupy<<FRACBITS);
+ x *= dup;
+ y *= dup;
x >>= FRACBITS;
y >>= FRACBITS;
@@ -971,30 +957,30 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, IN
// if it's meant to cover the whole screen, black out the rest
// no the patch is cropped do not do this ever
- if (vid.width != BASEVIDWIDTH * dupx)
+ if (vid.width != BASEVIDWIDTH * dup)
{
- // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
+ // dup adjustments pretend that screen width is BASEVIDWIDTH * dup,
// so center this imaginary screen
if (scrn & V_SNAPTORIGHT)
- x += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * dup));
else if (!(scrn & V_SNAPTOLEFT))
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * dup)) / 2;
if (perplayershuffle & 4)
- x -= (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x -= (vid.width - (BASEVIDWIDTH * dup)) / 4;
else if (perplayershuffle & 8)
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x += (vid.width - (BASEVIDWIDTH * dup)) / 4;
}
- if (vid.height != BASEVIDHEIGHT * dupy)
+ if (vid.height != BASEVIDHEIGHT * dup)
{
// same thing here
if (scrn & V_SNAPTOBOTTOM)
- y += (vid.height - (BASEVIDHEIGHT * dupy));
+ y += (vid.height - (BASEVIDHEIGHT * dup));
else if (!(scrn & V_SNAPTOTOP))
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
+ y += (vid.height - (BASEVIDHEIGHT * dup)) / 2;
if (perplayershuffle & 1)
- y -= (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y -= (vid.height - (BASEVIDHEIGHT * dup)) / 4;
else if (perplayershuffle & 2)
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y += (vid.height - (BASEVIDHEIGHT * dup)) / 4;
}
}
@@ -1150,22 +1136,22 @@ static void V_BlitScaledPic(INT32 rx1, INT32 ry1, INT32 scrn, pic_t * pic)
dest = screens[scrn] + max(0, ry1 * vid.width) + max(0, rx1);
// y cliping to the screen
- if (ry1 + height * vid.dupy >= vid.width)
- height = (vid.width - ry1) / vid.dupy - 1;
+ if (ry1 + height * vid.dup >= vid.width)
+ height = (vid.width - ry1) / vid.dup - 1;
// WARNING no x clipping (not needed for the moment)
- for (y = max(0, -ry1 / vid.dupy); y < height; y++)
+ for (y = max(0, -ry1 / vid.dup); y < height; y++)
{
- for (dupy = vid.dupy; dupy; dupy--)
+ for (dupy = vid.dup; dupy; dupy--)
{
src = pic->data + y * width;
for (x = 0; x < width; x++)
{
- for (dupx = vid.dupx; dupx; dupx--)
+ for (dupx = vid.dup; dupx; dupx--)
*dest++ = *src;
src++;
}
- dest += vid.width - vid.dupx * width;
+ dest += vid.width - vid.dup * width;
}
}
}
@@ -1262,44 +1248,42 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
if (!(c & V_NOSCALESTART))
{
- INT32 dupx = vid.dupx, dupy = vid.dupy;
-
if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
{ // Clear the entire screen, from dest to deststop. Yes, this really works.
memset(screens[0], (c&255), vid.width * vid.height * vid.bpp);
return;
}
- x *= dupx;
- y *= dupy;
- w *= dupx;
- h *= dupy;
+ x *= vid.dup;
+ y *= vid.dup;
+ w *= vid.dup;
+ h *= vid.dup;
// Center it if necessary
- if (vid.width != BASEVIDWIDTH * dupx)
+ if (vid.width != BASEVIDWIDTH * vid.dup)
{
- // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
+ // dup adjustments pretend that screen width is BASEVIDWIDTH * dup,
// so center this imaginary screen
if (c & V_SNAPTORIGHT)
- x += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * vid.dup));
else if (!(c & V_SNAPTOLEFT))
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * vid.dup)) / 2;
if (perplayershuffle & 4)
- x -= (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x -= (vid.width - (BASEVIDWIDTH * vid.dup)) / 4;
else if (perplayershuffle & 8)
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x += (vid.width - (BASEVIDWIDTH * vid.dup)) / 4;
}
- if (vid.height != BASEVIDHEIGHT * dupy)
+ if (vid.height != BASEVIDHEIGHT * vid.dup)
{
// same thing here
if (c & V_SNAPTOBOTTOM)
- y += (vid.height - (BASEVIDHEIGHT * dupy));
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup));
else if (!(c & V_SNAPTOTOP))
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 2;
if (perplayershuffle & 1)
- y -= (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y -= (vid.height - (BASEVIDHEIGHT * vid.dup)) / 4;
else if (perplayershuffle & 2)
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 4;
}
}
@@ -1336,32 +1320,33 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
// This is now a function since it's otherwise repeated 2 times and honestly looks retarded:
static UINT32 V_GetHWConsBackColor(void)
{
- UINT32 hwcolor;
+ UINT8 r, g, b;
switch (cons_backcolor.value)
{
- case 0: hwcolor = 0xffffff00; break; // White
- case 1: hwcolor = 0x80808000; break; // Black
- case 2: hwcolor = 0xdeb88700; break; // Sepia
- case 3: hwcolor = 0x40201000; break; // Brown
- case 4: hwcolor = 0xfa807200; break; // Pink
- case 5: hwcolor = 0xff69b400; break; // Raspberry
- case 6: hwcolor = 0xff000000; break; // Red
- case 7: hwcolor = 0xffd68300; break; // Creamsicle
- case 8: hwcolor = 0xff800000; break; // Orange
- case 9: hwcolor = 0xdaa52000; break; // Gold
- case 10: hwcolor = 0x80800000; break; // Yellow
- case 11: hwcolor = 0x00ff0000; break; // Emerald
- case 12: hwcolor = 0x00800000; break; // Green
- case 13: hwcolor = 0x4080ff00; break; // Cyan
- case 14: hwcolor = 0x4682b400; break; // Steel
- case 15: hwcolor = 0x1e90ff00; break; // Periwinkle
- case 16: hwcolor = 0x0000ff00; break; // Blue
- case 17: hwcolor = 0xff00ff00; break; // Purple
- case 18: hwcolor = 0xee82ee00; break; // Lavender
+ case 0: r = 0xff; g = 0xff; b = 0xff; break; // White
+ case 1: r = 0x80; g = 0x80; b = 0x80; break; // Black
+ case 2: r = 0xde; g = 0xb8; b = 0x87; break; // Sepia
+ case 3: r = 0x40; g = 0x20; b = 0x10; break; // Brown
+ case 4: r = 0xfa; g = 0x80; b = 0x72; break; // Pink
+ case 5: r = 0xff; g = 0x69; b = 0xb4; break; // Raspberry
+ case 6: r = 0xff; g = 0x00; b = 0x00; break; // Red
+ case 7: r = 0xff; g = 0xd6; b = 0x83; break; // Creamsicle
+ case 8: r = 0xff; g = 0x80; b = 0x00; break; // Orange
+ case 9: r = 0xda; g = 0xa5; b = 0x20; break; // Gold
+ case 10: r = 0x80; g = 0x80; b = 0x00; break; // Yellow
+ case 11: r = 0x00; g = 0xff; b = 0x00; break; // Emerald
+ case 12: r = 0x00; g = 0x80; b = 0x00; break; // Green
+ case 13: r = 0x40; g = 0x80; b = 0xff; break; // Cyan
+ case 14: r = 0x46; g = 0x82; b = 0xb4; break; // Steel
+ case 15: r = 0x1e; g = 0x90; b = 0xff; break; // Periwinkle
+ case 16: r = 0x00; g = 0x00; b = 0xff; break; // Blue
+ case 17: r = 0xff; g = 0x00; b = 0xff; break; // Purple
+ case 18: r = 0xee; g = 0x82; b = 0xee; break; // Lavender
// Default green
- default: hwcolor = 0x00800000; break;
+ default: r = 0x00; g = 0x80; b = 0x00; break;
}
- return hwcolor;
+ V_CubeApply(&r, &g, &b);
+ return (r << 24) | (g << 16) | (b << 8);
}
#endif
@@ -1473,38 +1458,36 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
if (!(c & V_NOSCALESTART))
{
- INT32 dupx = vid.dupx, dupy = vid.dupy;
-
- x *= dupx;
- y *= dupy;
- w *= dupx;
- h *= dupy;
+ x *= vid.dup;
+ y *= vid.dup;
+ w *= vid.dup;
+ h *= vid.dup;
// Center it if necessary
- if (vid.width != BASEVIDWIDTH * dupx)
+ if (vid.width != BASEVIDWIDTH * vid.dup)
{
- // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
+ // dup adjustments pretend that screen width is BASEVIDWIDTH * dup,
// so center this imaginary screen
if (c & V_SNAPTORIGHT)
- x += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * vid.dup));
else if (!(c & V_SNAPTOLEFT))
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * vid.dup)) / 2;
if (perplayershuffle & 4)
- x -= (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x -= (vid.width - (BASEVIDWIDTH * vid.dup)) / 4;
else if (perplayershuffle & 8)
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x += (vid.width - (BASEVIDWIDTH * vid.dup)) / 4;
}
- if (vid.height != BASEVIDHEIGHT * dupy)
+ if (vid.height != BASEVIDHEIGHT * vid.dup)
{
// same thing here
if (c & V_SNAPTOBOTTOM)
- y += (vid.height - (BASEVIDHEIGHT * dupy));
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup));
else if (!(c & V_SNAPTOTOP))
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 2;
if (perplayershuffle & 1)
- y -= (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y -= (vid.height - (BASEVIDHEIGHT * vid.dup)) / 4;
else if (perplayershuffle & 2)
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 4;
}
}
@@ -1657,38 +1640,36 @@ void V_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c, UINT16 color, U
if (!(c & V_NOSCALESTART))
{
- INT32 dupx = vid.dupx, dupy = vid.dupy;
-
- x *= dupx;
- y *= dupy;
- w *= dupx;
- h *= dupy;
+ x *= vid.dup;
+ y *= vid.dup;
+ w *= vid.dup;
+ h *= vid.dup;
// Center it if necessary
- if (vid.width != BASEVIDWIDTH * dupx)
+ if (vid.width != BASEVIDWIDTH * vid.dup)
{
- // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
+ // dup adjustments pretend that screen width is BASEVIDWIDTH * dup,
// so center this imaginary screen
if (c & V_SNAPTORIGHT)
- x += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * vid.dup));
else if (!(c & V_SNAPTOLEFT))
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * vid.dup)) / 2;
if (perplayershuffle & 4)
- x -= (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x -= (vid.width - (BASEVIDWIDTH * vid.dup)) / 4;
else if (perplayershuffle & 8)
- x += (vid.width - (BASEVIDWIDTH * dupx)) / 4;
+ x += (vid.width - (BASEVIDWIDTH * vid.dup)) / 4;
}
- if (vid.height != BASEVIDHEIGHT * dupy)
+ if (vid.height != BASEVIDHEIGHT * vid.dup)
{
// same thing here
if (c & V_SNAPTOBOTTOM)
- y += (vid.height - (BASEVIDHEIGHT * dupy));
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup));
else if (!(c & V_SNAPTOTOP))
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 2;
if (perplayershuffle & 1)
- y -= (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y -= (vid.height - (BASEVIDHEIGHT * vid.dup)) / 4;
else if (perplayershuffle & 2)
- y += (vid.height - (BASEVIDHEIGHT * dupy)) / 4;
+ y += (vid.height - (BASEVIDHEIGHT * vid.dup)) / 4;
}
}
@@ -1734,7 +1715,7 @@ void V_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c, UINT16 color, U
//
void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
{
- INT32 u, v, dupx, dupy;
+ INT32 u, v;
fixed_t dx, dy, xfrac, yfrac;
const UINT8 *src, *deststop;
UINT8 *flat, *dest;
@@ -1753,29 +1734,27 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
flat = W_CacheLumpNum(flatnum, PU_CACHE);
- dupx = dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
-
- dest = screens[0] + y*dupy*vid.width + x*dupx;
+ dest = screens[0] + y*vid.dup*vid.width + x*vid.dup;
deststop = screens[0] + vid.rowbytes * vid.height;
// from V_DrawScaledPatch
- if (vid.width != BASEVIDWIDTH * dupx)
+ if (vid.width != BASEVIDWIDTH * vid.dup)
{
- // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
+ // dup adjustments pretend that screen width is BASEVIDWIDTH * dup,
// so center this imaginary screen
- dest += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ dest += (vid.width - (BASEVIDWIDTH * vid.dup)) / 2;
}
- if (vid.height != BASEVIDHEIGHT * dupy)
+ if (vid.height != BASEVIDHEIGHT * vid.dup)
{
// same thing here
- dest += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width / 2;
+ dest += (vid.height - (BASEVIDHEIGHT * vid.dup)) * vid.width / 2;
}
- w *= dupx;
- h *= dupy;
+ w *= vid.dup;
+ h *= vid.dup;
- dx = FixedDiv(FRACUNIT, dupx<<(FRACBITS-2));
- dy = FixedDiv(FRACUNIT, dupy<<(FRACBITS-2));
+ dx = FixedDiv(FRACUNIT, vid.dup<<(FRACBITS-2));
+ dy = FixedDiv(FRACUNIT, vid.dup<<(FRACBITS-2));
yfrac = 0;
for (v = 0; v < h; v++, dest += vid.width)
@@ -1798,8 +1777,7 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
//
void V_DrawPatchFill(patch_t *pat)
{
- INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
- INT32 x, y, pw = pat->width * dupz, ph = pat->height * dupz;
+ INT32 x, y, pw = pat->width * vid.dup, ph = pat->height * vid.dup;
for (x = 0; x < vid.width; x += pw)
{
@@ -1875,11 +1853,11 @@ void V_DrawPromptBack(INT32 boxheight, INT32 color)
boxheight = -boxheight;
else // 4 lines of space plus gaps between and some leeway
boxheight = ((boxheight * 4) + (boxheight/2)*5);
- V_DrawFill((BASEVIDWIDTH-(vid.width/vid.dupx))/2, BASEVIDHEIGHT-boxheight, (vid.width/vid.dupx),boxheight, (color-256)|V_SNAPTOBOTTOM);
+ V_DrawFill((BASEVIDWIDTH-(vid.width/vid.dup))/2, BASEVIDHEIGHT-boxheight, (vid.width/vid.dup),boxheight, (color-256)|V_SNAPTOBOTTOM);
return;
}
- boxheight *= vid.dupy;
+ boxheight *= vid.dup;
if (color == INT32_MAX)
color = cons_backcolor.value;
@@ -2098,7 +2076,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
//
void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, center = 0, left = 0;
+ INT32 w, c, cx = x, cy = y, dup, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = (option & V_CHARCOLORMASK);
const UINT8 *colormap = NULL;
@@ -2109,20 +2087,19 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
switch (option & V_SPACINGMASK)
{
@@ -2154,9 +2131,9 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
cx = x;
if (option & V_RETURN8)
- cy += 8*dupy;
+ cy += 8*dup;
else
- cy += 12*dupy;
+ cy += 12*dup;
continue;
}
@@ -2169,17 +2146,17 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
// character does not exist or is a space
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
{
- cx += spacewidth * dupx;
+ cx += spacewidth * dup;
continue;
}
if (charwidth)
{
- w = charwidth * dupx;
- center = w/2 - hu_font[c]->width*dupx/2;
+ w = charwidth * dup;
+ center = w/2 - hu_font[c]->width*dup/2;
}
else
- w = hu_font[c]->width * dupx;
+ w = hu_font[c]->width * dup;
if (cx > scrwidth)
continue;
@@ -2214,7 +2191,7 @@ void V_DrawRightAlignedString(INT32 x, INT32 y, INT32 option, const char *string
//
void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, center = 0, left = 0;
+ INT32 w, c, cx = x, cy = y, dup, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -2225,20 +2202,19 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
charflags = (option & V_CHARCOLORMASK);
@@ -2272,9 +2248,9 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
cx = x;
if (option & V_RETURN8)
- cy += 4*dupy;
+ cy += 4*dup;
else
- cy += 6*dupy;
+ cy += 6*dup;
continue;
}
@@ -2286,17 +2262,17 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
{
- cx += spacewidth * dupx;
+ cx += spacewidth * dup;
continue;
}
if (charwidth)
{
- w = charwidth * dupx;
- center = w/2 - hu_font[c]->width*dupx/4;
+ w = charwidth * dup;
+ center = w/2 - hu_font[c]->width*dup/4;
}
else
- w = hu_font[c]->width * dupx / 2;
+ w = hu_font[c]->width * dup / 2;
if (cx > scrwidth)
continue;
@@ -2332,7 +2308,7 @@ void V_DrawRightAlignedSmallString(INT32 x, INT32 y, INT32 option, const char *s
//
void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, left = 0;
+ INT32 w, c, cx = x, cy = y, dup, scrwidth, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -2343,20 +2319,19 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
charflags = (option & V_CHARCOLORMASK);
@@ -2390,9 +2365,9 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
cx = x;
if (option & V_RETURN8)
- cy += 8*dupy;
+ cy += 8*dup;
else
- cy += 12*dupy;
+ cy += 12*dup;
continue;
}
@@ -2404,14 +2379,14 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
if (c < 0 || c >= HU_FONTSIZE || !tny_font[c])
{
- cx += spacewidth * dupx;
+ cx += spacewidth * dup;
continue;
}
if (charwidth)
- w = charwidth * dupx;
+ w = charwidth * dup;
else
- w = tny_font[c]->width * dupx;
+ w = tny_font[c]->width * dup;
if (cx > scrwidth)
continue;
@@ -2470,7 +2445,7 @@ void V_DrawRightAlignedSmallThinString(INT32 x, INT32 y, INT32 option, const cha
void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{
fixed_t cx = x, cy = y;
- INT32 w, c, dupx, dupy, scrwidth, center = 0, left = 0;
+ INT32 w, c, dup, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -2481,20 +2456,19 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
charflags = (option & V_CHARCOLORMASK);
@@ -2528,9 +2502,9 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
cx = x;
if (option & V_RETURN8)
- cy += (8*dupy)<<FRACBITS;
+ cy += (8*dup)<<FRACBITS;
else
- cy += (12*dupy)<<FRACBITS;
+ cy += (12*dup)<<FRACBITS;
continue;
}
@@ -2543,17 +2517,17 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
// character does not exist or is a space
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
{
- cx += (spacewidth * dupx)<<FRACBITS;
+ cx += (spacewidth * dup)<<FRACBITS;
continue;
}
if (charwidth)
{
- w = charwidth * dupx;
- center = w/2 - hu_font[c]->width*(dupx/2);
+ w = charwidth * dup;
+ center = w/2 - hu_font[c]->width*(dup/2);
}
else
- w = hu_font[c]->width * dupx;
+ w = hu_font[c]->width * dup;
if ((cx>>FRACBITS) > scrwidth)
continue;
@@ -2586,7 +2560,7 @@ void V_DrawRightAlignedStringAtFixed(fixed_t x, fixed_t y, INT32 option, const c
void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{
fixed_t cx = x, cy = y;
- INT32 w, c, dupx, dupy, scrwidth, center = 0, left = 0;
+ INT32 w, c, dup, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -2597,20 +2571,19 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
charflags = (option & V_CHARCOLORMASK);
@@ -2644,9 +2617,9 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
cx = x;
if (option & V_RETURN8)
- cy += (4*dupy)<<FRACBITS;
+ cy += (4*dup)<<FRACBITS;
else
- cy += (6*dupy)<<FRACBITS;
+ cy += (6*dup)<<FRACBITS;
continue;
}
@@ -2659,17 +2632,17 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
// character does not exist or is a space
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
{
- cx += (spacewidth * dupx)<<FRACBITS;
+ cx += (spacewidth * dup)<<FRACBITS;
continue;
}
if (charwidth)
{
- w = charwidth * dupx;
- center = w/2 - hu_font[c]->width*(dupx/4);
+ w = charwidth * dup;
+ center = w/2 - hu_font[c]->width*(dup/4);
}
else
- w = hu_font[c]->width * dupx / 2;
+ w = hu_font[c]->width * dup / 2;
if ((cx>>FRACBITS) > scrwidth)
break;
@@ -2703,7 +2676,7 @@ void V_DrawRightAlignedSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, co
void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{
fixed_t cx = x, cy = y;
- INT32 w, c, dupx, dupy, scrwidth, center = 0, left = 0;
+ INT32 w, c, dup, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -2714,20 +2687,19 @@ void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *str
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
charflags = (option & V_CHARCOLORMASK);
@@ -2761,9 +2733,9 @@ void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *str
cx = x;
if (option & V_RETURN8)
- cy += (8*dupy)<<FRACBITS;
+ cy += (8*dup)<<FRACBITS;
else
- cy += (12*dupy)<<FRACBITS;
+ cy += (12*dup)<<FRACBITS;
continue;
}
@@ -2776,17 +2748,17 @@ void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *str
// character does not exist or is a space
if (c < 0 || c >= HU_FONTSIZE || !tny_font[c])
{
- cx += (spacewidth * dupx)<<FRACBITS;
+ cx += (spacewidth * dup)<<FRACBITS;
continue;
}
if (charwidth)
{
- w = charwidth * dupx;
- center = w/2 - tny_font[c]->width*(dupx/2);
+ w = charwidth * dup;
+ center = w/2 - tny_font[c]->width*(dup/2);
}
else
- w = tny_font[c]->width * dupx;
+ w = tny_font[c]->width * dup;
if ((cx>>FRACBITS) > scrwidth)
break;
@@ -2820,7 +2792,7 @@ void V_DrawRightAlignedThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, con
void V_DrawSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{
fixed_t cx = x, cy = y;
- INT32 w, c, dupx, dupy, scrwidth, center = 0, left = 0;
+ INT32 w, c, dup, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -2831,20 +2803,19 @@ void V_DrawSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx<<FRACBITS;
- dupy = vid.dupy<<FRACBITS;
+ dup = vid.dup<<FRACBITS;
scrwidth = vid.width;
}
else
{
- dupx = dupy = FRACUNIT;
- scrwidth = FixedDiv(vid.width<<FRACBITS, vid.dupx);
+ dup = FRACUNIT;
+ scrwidth = FixedDiv(vid.width<<FRACBITS, vid.dup);
left = ((scrwidth - (BASEVIDWIDTH<<FRACBITS))/2);
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
charflags = (option & V_CHARCOLORMASK);
@@ -2878,9 +2849,9 @@ void V_DrawSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char
cx = x;
if (option & V_RETURN8)
- cy += 4*dupy;
+ cy += 4*dup;
else
- cy += 6*dupy;
+ cy += 6*dup;
continue;
}
@@ -2893,17 +2864,17 @@ void V_DrawSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char
// character does not exist or is a space
if (c < 0 || c >= HU_FONTSIZE || !tny_font[c])
{
- cx += FixedMul(spacewidth, dupx);
+ cx += FixedMul(spacewidth, dup);
continue;
}
if (charwidth)
{
- w = FixedMul(charwidth, dupx);
- center = w/2 - tny_font[c]->width*(dupx/4);
+ w = FixedMul(charwidth, dup);
+ center = w/2 - tny_font[c]->width*(dup/4);
}
else
- w = tny_font[c]->width * dupx / 2;
+ w = tny_font[c]->width * dup / 2;
if (cx > scrwidth)
break;
@@ -2940,7 +2911,7 @@ void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
boolean neg;
if (flags & (V_NOSCALESTART|V_NOSCALEPATCH))
- w *= vid.dupx;
+ w *= vid.dup;
if ((neg = num < 0))
num = -num;
@@ -2965,7 +2936,7 @@ void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
INT32 w = tallnum[0]->width;
if (flags & (V_NOSCALESTART|V_NOSCALEPATCH))
- w *= vid.dupx;
+ w *= vid.dup;
if (num < 0)
num = -num;
@@ -3000,7 +2971,7 @@ void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, UINT8 num)
//
void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
{
- INT32 w, c, dupx, dupy, scrwidth = BASEVIDWIDTH;
+ INT32 w, c, dup, scrwidth = BASEVIDWIDTH;
fixed_t cx = x, cy = y;
const char *ch = string;
@@ -3010,15 +2981,14 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
- dupx = dupy = 1;
+ dup = 1;
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
for (;;)
{
@@ -3028,18 +2998,18 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
if (c == '\n')
{
cx = x;
- cy += (12*dupy)<<FRACBITS;
+ cy += (12*dup)<<FRACBITS;
continue;
}
c = toupper(c) - CRED_FONTSTART;
if (c < 0 || c >= CRED_FONTSIZE)
{
- cx += (16*dupx)<<FRACBITS;
+ cx += (16*dup)<<FRACBITS;
continue;
}
- w = cred_font[c]->width * dupx;
+ w = cred_font[c]->width * dup;
if ((cx>>FRACBITS) > scrwidth)
continue;
@@ -3053,7 +3023,7 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
static void V_DrawNameTagLine(INT32 x, INT32 y, INT32 option, fixed_t scale, UINT8 *basecolormap, UINT8 *outlinecolormap, const char *string)
{
fixed_t cx, cy, w;
- INT32 c, dupx, dupy, scrwidth, left = 0;
+ INT32 c, dup, scrwidth, left = 0;
const char *ch = string;
if (option & V_CENTERNAMETAG)
@@ -3065,20 +3035,19 @@ static void V_DrawNameTagLine(INT32 x, INT32 y, INT32 option, fixed_t scale, UIN
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
for (;;ch++)
{
@@ -3087,7 +3056,7 @@ static void V_DrawNameTagLine(INT32 x, INT32 y, INT32 option, fixed_t scale, UIN
if (*ch == '\n')
{
cx = x<<FRACBITS;
- cy += FixedMul((21*dupy)*FRACUNIT, scale);
+ cy += FixedMul((21*dup)*FRACUNIT, scale);
continue;
}
@@ -3097,11 +3066,11 @@ static void V_DrawNameTagLine(INT32 x, INT32 y, INT32 option, fixed_t scale, UIN
// character does not exist or is a space
if (c < 0 || c >= NT_FONTSIZE || !ntb_font[c] || !nto_font[c])
{
- cx += FixedMul((4 * dupx)*FRACUNIT, scale);
+ cx += FixedMul((4 * dup)*FRACUNIT, scale);
continue;
}
- w = FixedMul(((ntb_font[c]->width)+2 * dupx) * FRACUNIT, scale);
+ w = FixedMul(((ntb_font[c]->width)+2 * dup) * FRACUNIT, scale);
if (FixedInt(cx) > scrwidth)
continue;
@@ -3276,27 +3245,26 @@ INT32 V_CreditStringWidth(const char *string)
//
void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, left = 0;
+ INT32 w, c, cx = x, cy = y, dup, scrwidth, left = 0;
const char *ch = string;
INT32 charflags = (option & V_CHARCOLORMASK);
const UINT8 *colormap = NULL;
if (option & V_NOSCALESTART)
{
- dupx = vid.dupx;
- dupy = vid.dupy;
+ dup = vid.dup;
scrwidth = vid.width;
}
else
{
- dupx = dupy = 1;
- scrwidth = vid.width/vid.dupx;
+ dup = 1;
+ scrwidth = vid.width/vid.dup;
left = (scrwidth - BASEVIDWIDTH)/2;
scrwidth -= left;
}
if (option & V_NOSCALEPATCH)
- scrwidth *= vid.dupx;
+ scrwidth *= vid.dup;
for (;;ch++)
{
@@ -3312,18 +3280,18 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
if (*ch == '\n')
{
cx = x;
- cy += 12*dupy;
+ cy += 12*dup;
continue;
}
c = *ch - LT_FONTSTART;
if (c < 0 || c >= LT_FONTSIZE || !lt_font[c])
{
- cx += 16*dupx;
+ cx += 16*dup;
continue;
}
- w = lt_font[c]->width * dupx;
+ w = lt_font[c]->width * dup;
if (cx > scrwidth)
continue;
@@ -3434,7 +3402,7 @@ INT32 V_StringWidth(const char *string, INT32 option)
}
if (option & (V_NOSCALESTART|V_NOSCALEPATCH))
- w *= vid.dupx;
+ w *= vid.dup;
return w;
}
@@ -3681,7 +3649,7 @@ Unoptimized version
{
// Shift this row of pixels to the right by 2
tmpscr[y*vid.width] = srcscr[y*vid.width];
- M_Memcpy(&tmpscr[y*vid.width+vid.dupx], &srcscr[y*vid.width], vid.width-vid.dupx);
+ M_Memcpy(&tmpscr[y*vid.width+vid.dup], &srcscr[y*vid.width], vid.width-vid.dup);
}
else
M_Memcpy(&tmpscr[y*vid.width], &srcscr[y*vid.width], vid.width);
@@ -3782,31 +3750,23 @@ void V_Recalc(void)
{
// scale 1,2,3 times in x and y the patches for the menus and overlays...
// calculated once and for all, used by routines in v_video.c and v_draw.c
- vid.dupx = vid.width / BASEVIDWIDTH;
- vid.dupy = vid.height / BASEVIDHEIGHT;
- vid.dupx = vid.dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
- vid.fdupx = FixedDiv(vid.width*FRACUNIT, BASEVIDWIDTH*FRACUNIT);
- vid.fdupy = FixedDiv(vid.height*FRACUNIT, BASEVIDHEIGHT*FRACUNIT);
-#ifdef HWRENDER
- //if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl
- // 13/11/18:
- // The above is no longer necessary, since we want OpenGL to be just like software now
- // -- Monster Iestyn
-#endif
- vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
-
- vid.meddupx = (UINT8)(vid.dupx >> 1) + 1;
- vid.meddupy = (UINT8)(vid.dupy >> 1) + 1;
-#ifdef HWRENDER
- vid.fmeddupx = vid.meddupx*FRACUNIT;
- vid.fmeddupy = vid.meddupy*FRACUNIT;
-#endif
+ // Set dup based on width or height, whichever is less
+ if (((vid.width*FRACUNIT) / BASEVIDWIDTH) < ((vid.height*FRACUNIT) / BASEVIDHEIGHT))
+ {
+ vid.dup = vid.width / BASEVIDWIDTH;
+ vid.fdup = (vid.width*FRACUNIT) / BASEVIDWIDTH;
+ }
+ else
+ {
+ vid.dup = vid.height / BASEVIDHEIGHT;
+ vid.fdup = (vid.height*FRACUNIT) / BASEVIDHEIGHT;
+ }
- vid.smalldupx = (UINT8)(vid.dupx / 3) + 1;
- vid.smalldupy = (UINT8)(vid.dupy / 3) + 1;
+ vid.meddup = (UINT8)(vid.dup >> 1) + 1;
+ vid.smalldup = (UINT8)(vid.dup / 3) + 1;
#ifdef HWRENDER
- vid.fsmalldupx = vid.smalldupx*FRACUNIT;
- vid.fsmalldupy = vid.smalldupy*FRACUNIT;
+ vid.fmeddup = vid.meddup*FRACUNIT;
+ vid.fsmalldup = vid.smalldup*FRACUNIT;
#endif
}
diff --git a/src/v_video.h b/src/v_video.h
index ff03836b597bec40f8712f534afef32bd46a2db8..80936f3ee9f6f6585b0a3d4208a43dda266e8635 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -36,7 +36,7 @@ cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation,
// Allocates buffer screens, call before R_Init.
void V_Init(void);
-// Recalculates the viddef (dupx, dupy, etc.) according to the current screen resolution.
+// Recalculates the viddef (dup, fdup, etc.) according to the current screen resolution.
void V_Recalc(void);
// Color look-up table
diff --git a/src/version.h b/src/version.h
index 3242cad672df6757e74741ca482a403f7544e31b..8d8f8978e7ea3cf593247a73a9460ed139193c10 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,4 +1,4 @@
-#define SRB2VERSION "2.2.13"/* this must be the first line, for cmake !! */
+#define SRB2VERSION "2.2.14"/* this must be the first line, for cmake !! */
// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/members/?key=ms_admin ).
// DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
@@ -9,7 +9,7 @@
// it's only for detection of the version the player is using so the MS can alert them of an update.
// Only set it higher, not lower, obviously.
// Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1".
-#define MODVERSION 54
+#define MODVERSION 55
// Define this as a prerelease version suffix (pre#, RC#)
-//#define BETAVERSION "pre1"
+#define BETAVERSION "nightly"
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index b699007463ad3f37527367b40e4a1c29411012ab..9ee9b7d3f32dd3fcb9e5e2b2dac370e176d97df1 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -77,8 +77,8 @@ END
#include "../doomdef.h" // Needed for version string
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,13,0
- PRODUCTVERSION 2,2,13,0
+ FILEVERSION 2,2,14,0
+ PRODUCTVERSION 2,2,14,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/y_inter.c b/src/y_inter.c
index 69dc931ba8cfde0c816baeb8508ce02f758c10bb..369ec390442642b1a52c185bbf0804b3c0c1a106 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -536,7 +536,7 @@ void Y_IntermissionDrawer(void)
if (animatetic && (tic_t)intertic >= animatetic)
{
- const INT32 scradjust = (vid.width/vid.dupx)>>3; // 40 for BASEVIDWIDTH
+ const INT32 scradjust = (vid.width/vid.dup)>>3; // 40 for BASEVIDWIDTH
INT32 animatetimer = (intertic - animatetic);
if (animatetimer <= 16)
{
@@ -687,7 +687,7 @@ void Y_IntermissionDrawer(void)
if (intertic > 1)
{
- if (stagefailed && data.spec.emeraldy < (vid.height/vid.dupy)+16)
+ if (stagefailed && data.spec.emeraldy < (vid.height/vid.dup)+16)
{
emeraldx += intertic - 6;
}
@@ -1163,7 +1163,7 @@ void Y_Ticker(void)
}
else
{
- if (data.spec.emeraldy < (vid.height/vid.dupy)+16)
+ if (data.spec.emeraldy < (vid.height/vid.dup)+16)
{
data.spec.emeraldy += (++data.spec.emeraldmomy);
}