From 7edfdf932577b8576776ade8ea2f49b715bbe084 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 15 Jan 2024 13:47:13 +0100 Subject: [PATCH 1/8] forgor --- src/hardware/hw_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index b2a4bdde8..49a9a6ce7 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5945,8 +5945,8 @@ static void HWR_PortalClipping(gl_portal_t *portal) line_t *line = &lines[portal->clipline]; - angle1 = R_PointToAngleEx64(viewx, viewy, line->v1->x, line->v1->y); - angle2 = R_PointToAngleEx64(viewx, viewy, line->v2->x, line->v2->y); + angle1 = R_PointToAngleEx(viewx, viewy, line->v1->x, line->v1->y); + angle2 = R_PointToAngleEx(viewx, viewy, line->v2->x, line->v2->y); // clip things that are not inside the portal window from our viewpoint gld_clipper_SafeAddClipRange(angle2, angle1); From e2a4fdc39525109b64e799671fd6b9cb9913abfc Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 15 Jan 2024 15:57:17 +0100 Subject: [PATCH 2/8] Revert "Localskins on replays" This reverts commit e1f821e121c5032fbafee7d0eefc9f2cbd3efc20. --- src/g_game.c | 29 ++--------------------------- src/g_game.h | 1 - src/r_things.c | 2 -- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index dceaafa29..38f063f62 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3012,9 +3012,6 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost) } P_MovePlayerToSpawn(playernum, spawnpoint); - // TODO: This is so dumb. - demo_extradata[playernum] |= DXD_LOCALSKIN; - #ifdef HAVE_BLUA LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :) #endif @@ -3350,7 +3347,7 @@ void G_AddPlayer(INT32 playernum) p->jointime = 0; p->playerstate = PST_REBORN; - demo_extradata[playernum] |= DXD_PLAYSTATE|DXD_COLOR|DXD_NAME|DXD_SKIN|DXD_LOCALSKIN; // Set everything + demo_extradata[playernum] |= DXD_PLAYSTATE|DXD_COLOR|DXD_NAME|DXD_SKIN; // Set everything } void G_ExitLevel(void) @@ -5349,14 +5346,7 @@ void G_ReadDemoExtraData(void) else if (G_RaceGametype()) P_CheckRacers(); // also SRB2Kart } - if (extradata & DXD_LOCALSKIN) - { - // TODO: Does this work just fine? - M_Memcpy(name, demo_p, 16); - //CONS_Printf("Loaded localskin data from replay: %s\n", name); - demo_p += 16; - SetLocalPlayerSkin(p, name, NULL); - } + p = READUINT8(demo_p); } @@ -5443,21 +5433,6 @@ void G_WriteDemoExtraData(void) else WRITEUINT8(demo_p, DXD_PST_PLAYING); } - if (demo_extradata[i] & DXD_LOCALSKIN) - { - // Skin - memset(name, 0, 16); - // check for different localskin conditions - if (players[i].skinlocal && players[i].localskin > 0) - strncpy(name, localskins[players[i].localskin - 1].name, 16); - else if (!players[i].skinlocal && players[i].localskin > 0) - strncpy(name, skins[players[i].localskin - 1].name, 16); - else - strncpy(name, "none", 16); - //CONS_Printf("Saved localskin data to replay: %s\n", name); - M_Memcpy(demo_p,name,16); - demo_p += 16; - } } demo_extradata[i] = 0; diff --git a/src/g_game.h b/src/g_game.h index 6491472e6..a57468a2e 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -297,7 +297,6 @@ extern UINT8 demo_writerng; #define DXD_NAME 0x04 // name changed #define DXD_COLOR 0x08 // color changed #define DXD_PLAYSTATE 0x10 // state changed between playing, spectating, or not in-game -#define DXD_LOCALSKIN 0x20 // localskin changed #define DXD_PST_PLAYING 0x01 #define DXD_PST_SPECTATING 0x02 diff --git a/src/r_things.c b/src/r_things.c index e7670ce88..b9fb384f8 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -3274,8 +3274,6 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar) CV_StealthSet(cvar, "none"); } } - - demo_extradata[playernum] |= DXD_LOCALSKIN; } // Same as SetPlayerSkin, but uses the skin #. From a0eab7d5f80ba7ee86b87202d2eb568c5d49eca6 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 16 Jan 2024 07:17:05 +0100 Subject: [PATCH 3/8] Revert "invert encore remap is 12 not 15?" This reverts commit 8e6023d85060a82b0311a3e862b56f53d6440272. --- src/r_bsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_bsp.c b/src/r_bsp.c index 8750c2ee3..2de30d2ab 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -39,7 +39,7 @@ INT32 doorclosed; boolean R_NoEncore(sector_t *sector, boolean ceiling) { - boolean invertencore = (GETSECSPECIAL(sector->special, 2) == 12); + boolean invertencore = (GETSECSPECIAL(sector->special, 2) == 15); #if 0 // perfect implementation INT32 val = GETSECSPECIAL(sector->special, 3); if (val != 1 && val != 3 // spring panel From 8f6cc895a016504f82f5e7062c15c3fecd924093 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 16 Jan 2024 16:22:30 +0100 Subject: [PATCH 4/8] fix ogl shearing with flipcam --- src/hardware/r_opengl/r_opengl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 2fbd9071e..965e55513 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -3951,6 +3951,8 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform) if (shearing) { float dy = FIXED_TO_FLOAT(AIMINGTODY(stransform->viewaiming)) * 2; //screen_width/BASEVIDWIDTH; + if (stransform->flip) + dy *= -1.0f; pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f); } From 68354baf283f461d38e2231c91bb55b8922cd04c Mon Sep 17 00:00:00 2001 From: Chearii Date: Tue, 16 Jan 2024 13:46:30 -0500 Subject: [PATCH 5/8] Add ``getSpritePatch`` --- src/lua_hudlib.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index 04bbaa928..da798ccbc 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -11,6 +11,7 @@ /// \brief custom HUD rendering library for Lua scripting #include "doomdef.h" +#include "fastcmp.h" #ifdef HAVE_BLUA #include "r_defs.h" #include "r_local.h" @@ -346,6 +347,79 @@ static int libd_cachePatch(lua_State *L) return 1; } +// v.getSpritePatch(sprite, [frame, [angle, [rollangle]]]) +static int libd_getSpritePatch(lua_State *L) +{ + UINT32 i; // sprite prefix + UINT32 frame = 0; // 'A' + UINT8 angle = 0; + spritedef_t *sprdef; + spriteframe_t *sprframe; + HUDONLY + + if (lua_isnumber(L, 1)) // sprite number given, e.g. SPR_THOK + { + i = lua_tonumber(L, 1); + if (i >= NUMSPRITES) + return 0; + } + else if (lua_isstring(L, 1)) // sprite prefix name given, e.g. "THOK" + { + const char *name = lua_tostring(L, 1); + for (i = 0; i < NUMSPRITES; i++) + if (fastcmp(name, sprnames[i])) + break; + if (i >= NUMSPRITES) + return 0; + } + else + return 0; + + // TODO: figure out a means of getting playersprites without crashes + if (i == SPR_PLAY) // not for players + return luaL_error(L, "Player sprites are not supported."); + + sprdef = &sprites[i]; + + // set frame number + frame = luaL_optinteger(L, 2, 0); + frame &= FF_FRAMEMASK; // ignore any bits that are not the actual frame, just in case + if (frame >= sprdef->numframes) + return 0; + // set angle number + sprframe = &sprdef->spriteframes[frame]; + angle = luaL_optinteger(L, 3, 1); + + // convert WAD editor angle numbers (1-8) to internal angle numbers (0-7) + // keep 0 the same since we'll make it default to angle 1 (which is internally 0) + // in case somebody didn't know that angle 0 really just maps all 8 angles to the same patch + if (angle != 0) + angle--; + + if (angle >= 8) // out of range? + angle = (angle & 7); // modulus angle by 8 + + // rotsprite????? + if (lua_isnumber(L, 4) && (cv_spriteroll.value)) + { + angle_t rollangle = luaL_checkangle(L, 4); + INT32 rot = R_GetRollAngle(rollangle); + + if (rot) { + patch_t *rotsprite = Patch_GetRotatedSprite(sprframe, frame, angle, sprframe->flip & (1<lumppat[angle], PU_STATIC), META_PATCH); + lua_pushboolean(L, (sprframe->flip & (1< Date: Tue, 16 Jan 2024 14:47:48 -0500 Subject: [PATCH 6/8] Player sprite support. --- src/lua_hudlib.c | 51 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index da798ccbc..e272bef59 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -347,16 +347,46 @@ static int libd_cachePatch(lua_State *L) return 1; } -// v.getSpritePatch(sprite, [frame, [angle, [rollangle]]]) +// this is structured like getSprite2Patch in vanilla 2.2 +// v.getSpritePatch(skin, sprite, [frame, [angle, [rollangle]]]) static int libd_getSpritePatch(lua_State *L) { UINT32 i; // sprite prefix + INT32 skn = -1; // skin number UINT32 frame = 0; // 'A' UINT8 angle = 0; spritedef_t *sprdef; spriteframe_t *sprframe; +#ifdef ROTSPRITE + spriteinfo_t *sprinfo; +#endif HUDONLY + // mashing together the stuff from getSprite2Patch: + // get skin first! + if (!lua_isnoneornil(L, 1)) // ONLY do this if we have a skin + { + if (lua_isnumber(L, 1)) // find skin by number + { + skn = lua_tonumber(L, 1); + if (skn < 0 || skn >= MAXSKINS) + return luaL_error(L, "skin number %d out of range (0 - %d)", skn, MAXSKINS-1); + if (skn >= numskins) + return 0; + } + else // find skin by name + { + const char *name = luaL_checkstring(L, 1); + for (skn = 0; skn < numskins; skn++) + if (fastcmp(skins[skn].name, name)) + break; + if (skn >= numskins) + return 0; + } + } + + lua_remove(L, 1); // remove skin now + if (lua_isnumber(L, 1)) // sprite number given, e.g. SPR_THOK { i = lua_tonumber(L, 1); @@ -375,11 +405,20 @@ static int libd_getSpritePatch(lua_State *L) else return 0; - // TODO: figure out a means of getting playersprites without crashes - if (i == SPR_PLAY) // not for players - return luaL_error(L, "Player sprites are not supported."); + // get outta dodge if we're a playersprite and have no skin + if ((i == SPR_PLAY) && (skn < 0)) + return luaL_error(L, "You must provide a skin for player sprites!"); - sprdef = &sprites[i]; + if (skn < 0) + { + sprdef = &sprites[i]; + sprinfo = &spriteinfo[i]; + } + else + { + sprdef = &skins[skn].spritedef; + sprinfo = &skins[skn].sprinfo; + } // set frame number frame = luaL_optinteger(L, 2, 0); @@ -406,7 +445,7 @@ static int libd_getSpritePatch(lua_State *L) INT32 rot = R_GetRollAngle(rollangle); if (rot) { - patch_t *rotsprite = Patch_GetRotatedSprite(sprframe, frame, angle, sprframe->flip & (1<flip & (1< Date: Tue, 16 Jan 2024 15:01:08 -0500 Subject: [PATCH 7/8] Add some labeling --- src/lua_hudlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index e272bef59..c7b1ec38e 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -409,12 +409,12 @@ static int libd_getSpritePatch(lua_State *L) if ((i == SPR_PLAY) && (skn < 0)) return luaL_error(L, "You must provide a skin for player sprites!"); - if (skn < 0) + if (skn < 0) // standard sprite { sprdef = &sprites[i]; sprinfo = &spriteinfo[i]; } - else + else // player skin { sprdef = &skins[skn].spritedef; sprinfo = &skins[skn].sprinfo; From b9115aa5f8c422d047081cf6911a72404d433e04 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 17 Jan 2024 12:11:32 +0100 Subject: [PATCH 8/8] (hopefully) fix overflow in R_DrawRepeatMaskedColumn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit well this fixes the game hanging in software renderer on Marsh´s Marble Zone --- src/r_segs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_segs.c b/src/r_segs.c index 4623d3b0e..8eb3c9b41 100644 --- a/src/r_segs.c +++ b/src/r_segs.c @@ -690,7 +690,7 @@ static void R_DrawRepeatMaskedColumn(column_t *col) { while (sprtopscreen < sprbotscreen) { R_DrawMaskedColumn(col); - if ((INT64)sprtopscreen + dc_texheight*spryscale > (INT64)INT32_MAX) // prevent overflow + if (sprtopscreen + (INT64)dc_texheight*spryscale > (INT64)INT32_MAX) // prevent overflow sprtopscreen = INT32_MAX; else sprtopscreen += dc_texheight*spryscale;