From 0e6a09be2b47e0f896c20da8d5f5261e36c102b2 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Mon, 14 Aug 2023 03:35:25 +0200 Subject: [PATCH 01/14] Don't discard zero alpha fog block fragments. see: https://git.do.srb2.org/Hannu_Hanhi/SRB2/-/commit/80172ee93214969cf446ceac5d66e1fb5f56b068 --- src/hardware/r_opengl/r_opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 04fe8783e..fab81c3da 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1405,7 +1405,7 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags) // Sryder: Fog // multiplies input colour by input alpha, and destination colour by input colour, then adds them pglBlendFunc(GL_SRC_ALPHA, GL_SRC_COLOR); - pglAlphaFunc(GL_NOTEQUAL, 0.0f); + pglAlphaFunc(GL_ALWAYS, 0.0f); // Don't discard zero alpha fragments break; default : // must be 0, otherwise it's an error // No blending -- 2.54.0 From f85bd9f5ea428196069cef3527ab321b021fdf47 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Mon, 14 Aug 2023 03:37:02 +0200 Subject: [PATCH 02/14] Make min Sector brightness with shaders changable finally can see shit in the dark with shaders, or not :p its also added to the options aswell kinda hope this is the right way to do this, but it works so lul --- src/hardware/hw_main.c | 8 +++++++- src/hardware/hw_main.h | 1 + src/m_menu.c | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 0221aa4d4..a5fe85221 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -94,6 +94,11 @@ consvar_t cv_grportals = {"gr_portals", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, consvar_t cv_nostencil = {"nostencil", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_portalline = {"portalline", "0", 0, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_portalonly = {"portalonly", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + +CV_PossibleValue_t secbright_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}}; +consvar_t cv_secbright = {"secbright", "0", CV_SAVE, secbright_cons_t, + NULL, 0, NULL, NULL, 0, 0, NULL}; + // values for the far clipping plane static float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f}; // values for bsp culling @@ -441,7 +446,7 @@ 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); + light_level = min(max(light_level, cv_secbright.value), 255); Surface->PolyColor.rgba = poly_color.rgba; Surface->TintColor.rgba = tint_color.rgba; @@ -5995,6 +6000,7 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_nostencil); CV_RegisterVar(&cv_portalline); CV_RegisterVar(&cv_portalonly); + CV_RegisterVar(&cv_secbright); } // -------------------------------------------------------------------------- diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index ef461a094..0ee107048 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -177,6 +177,7 @@ extern consvar_t cv_grrenderdistance; extern consvar_t cv_grusecustomshaders; extern consvar_t cv_grportals; extern consvar_t cv_nostencil; +extern consvar_t cv_secbright; extern CV_PossibleValue_t granisotropicmode_cons_t[]; diff --git a/src/m_menu.c b/src/m_menu.c index e38d73622..104dc18c8 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1688,8 +1688,9 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Serverqueue waittime", &cv_connectawaittime, 40}, {IT_STRING | IT_CVAR, NULL, "Addon Download Speed", &cv_downloadspeed, 55}, {IT_STRING | IT_CVAR, NULL, "Less Flicker effects", &cv_lessflicker, 70}, - {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 90}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 105}, + {IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 80}, + {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 100}, + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 115}, //{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 130}, }; -- 2.54.0 From 3906030c2f0ac13832a8f48f7cd00bee758dc4da Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Mon, 14 Aug 2023 15:47:36 +0200 Subject: [PATCH 03/14] Cool that kart stripped those down to make them even more confusing --- src/hardware/hw_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 0221aa4d4..30c198d98 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4588,7 +4588,7 @@ static int CompareDrawNodes(const void *p1, const void *p2) v1 = sortnode[n1].polyplane->drawcount; else if (sortnode[n1].wall) v1 = sortnode[n1].wall->drawcount; - else I_Error("n1 unknown"); + else I_Error("CompareDrawNodes: n1 unknown"); if (sortnode[n2].plane) v2 = sortnode[n2].plane->drawcount; @@ -4596,10 +4596,10 @@ static int CompareDrawNodes(const void *p1, const void *p2) v2 = sortnode[n2].polyplane->drawcount; else if (sortnode[n2].wall) v2 = sortnode[n2].wall->drawcount; - else I_Error("n2 unknown"); + else I_Error("CompareDrawNodes: n2 unknown"); diff = v2 - v1; - if (diff == 0) I_Error("diff is zero"); + if (diff == 0) I_Error("CompareDrawNodes: diff is zero"); return diff; } @@ -4607,8 +4607,8 @@ static int CompareDrawNodePlanes(const void *p1, const void *p2) { size_t n1 = *(const size_t*)p1; size_t n2 = *(const size_t*)p2; - if (!sortnode[n1].plane) I_Error("Uh.. This isn't a plane! (n1)"); - if (!sortnode[n2].plane) I_Error("Uh.. This isn't a plane! (n2)"); + if (!sortnode[n1].plane) I_Error("CompareDrawNodePlanes: Uh.. This isn't a plane! (n1)"); + if (!sortnode[n2].plane) I_Error("CompareDrawNodePlanes: Uh.. This isn't a plane! (n2)"); return ABS(sortnode[n2].plane->fixedheight - viewz) - ABS(sortnode[n1].plane->fixedheight - viewz); } -- 2.54.0 From d954a7f54fbe80e03c4a78a82034b0e2dcb6c5ec Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Mon, 14 Aug 2023 15:50:22 +0200 Subject: [PATCH 04/14] Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile - Fix compile with msvcrt - Fix compile with SDL 2.28.2 see:https://git.do.srb2.org/KartKrew/Kart-Public/-/commit/0b55e8df7bca2510275be4c7ad1123625e867fff --- src/doomtype.h | 12 ++++++++---- src/string.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/doomtype.h b/src/doomtype.h index f4f32edc8..27278f0cf 100644 --- a/src/doomtype.h +++ b/src/doomtype.h @@ -164,9 +164,13 @@ char *strcasestr(const char *in, const char *what); #define HAVE_DOSSTR_FUNCS #endif -// glibc 2.38: added strlcpy and strlcat to _DEFAULT_SOURCE -#if defined (__APPLE__) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) -#define HAVE_STRLCPY +#if defined (__APPLE__) + #define SRB2_HAVE_STRLCPY +#elif defined (__GLIBC_PREREQ) + // glibc 2.38: added strlcpy and strlcat to _DEFAULT_SOURCE + #if __GLIBC_PREREQ(2, 38) + #define SRB2_HAVE_STRLCPY + #endif #endif #ifndef HAVE_DOSSTR_FUNCS @@ -176,7 +180,7 @@ int strlwr(char *n); // from dosstr.c #include // for size_t -#ifndef HAVE_STRLCPY +#ifndef SRB2_HAVE_STRLCPY size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz); #endif diff --git a/src/string.c b/src/string.c index 34c5e71aa..c919ec804 100644 --- a/src/string.c +++ b/src/string.c @@ -16,7 +16,7 @@ #include #include "doomdef.h" -#ifndef HAVE_STRLCPY +#ifndef SRB2_HAVE_STRLCPY // Like the OpenBSD version, but it doesn't check for src not being a valid // C string. -- 2.54.0 From 78a182a8a1aea0d7d47cf8975d45956bef6befc4 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 05:14:18 +0200 Subject: [PATCH 05/14] oopsie --- src/hardware/hw_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 30c198d98..a56660f81 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4936,7 +4936,9 @@ void HWR_ProjectSprite(mobj_t *thing) float gz, gzt; spritedef_t *sprdef; spriteframe_t *sprframe; +#ifdef ROTSPRITE spriteinfo_t *sprinfo; +#endif size_t lumpoff; unsigned rot; UINT8 flip; @@ -5025,6 +5027,9 @@ void HWR_ProjectSprite(mobj_t *thing) thing->sprite = states[S_UNKNOWN].sprite; thing->frame = states[S_UNKNOWN].frame; sprdef = &sprites[thing->sprite]; +#ifdef ROTSPRITE + sprinfo = &spriteinfo[thing->sprite]; +#endif rot = thing->frame&FF_FRAMEMASK; thing->state->sprite = thing->sprite; thing->state->frame = thing->frame; -- 2.54.0 From 660b66c98010bb07d81fc42d25578589e39b4e3c Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 05:18:52 +0200 Subject: [PATCH 06/14] fix splitscreen slope rolling. bruh how did i forget this lmao --- src/k_kart.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 115eabea0..1f62f7c72 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3037,12 +3037,24 @@ static void K_StretchPlayerGravity(player_t *p) } } +static INT32 K_FindPlayerNum(player_t *plyr) +{ + INT32 i; + for(i = 0; i < 4; i++) + { + if (plyr == &players[displayplayers[i]]) + return i; + } + return 0; // technically defaulting to player 1 but fuck it +} + static angle_t K_GetSlopeRollAngle(player_t *p, boolean dontflip, boolean useReserves) { angle_t lookAngle = 0; angle_t zangle = 0; angle_t xydirection = 0; angle_t an; + INT32 pNum = K_FindPlayerNum(p); I_Assert(p != NULL); I_Assert(p->mo != NULL); @@ -3054,7 +3066,7 @@ static angle_t K_GetSlopeRollAngle(player_t *p, boolean dontflip, boolean useRes I_Assert(p->mo->reservexydir != NULL); } - lookAngle = R_PointToAngle(p->mo->x, p->mo->y); + lookAngle = R_PointToAngle2(camera[pNum].x, camera[pNum].y, p->mo->x, p->mo->y); if (!R_PointToDist(p->mo->x, p->mo->y)) @@ -3084,11 +3096,14 @@ static angle_t K_GetSlopeRollAngle(player_t *p, boolean dontflip, boolean useRes return FixedMul(zangle, FINESINE(an>>ANGLETOFINESHIFT)); } -static void K_RollPlayerBySlopes(player_t *p, boolean usedistance) { +static void K_RollPlayerBySlopes(player_t *p, boolean usedistance) +{ I_Assert(p->mo->subsector != NULL); I_Assert(p->mo->subsector->sector != NULL); - fixed_t p_dist = R_PointToDist(p->mo->x,p->mo->y); + INT32 pNum = K_FindPlayerNum(p); + + fixed_t p_dist = R_PointToDist2(p->mo->x, p->mo->y, camera[pNum].x, camera[pNum].y); fixed_t mos = mapobjectscale; fixed_t rolldist = cv_sloperolldist.value*mos; -- 2.54.0 From 8c2f85c9e6746890ffcf6f65d3762e44641d3012 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 05:54:00 +0200 Subject: [PATCH 07/14] Player afterimages are now affected by scaling/slope rolling too Ghost Mobjs are now affected by Sloperolling too and the Sprite scaling/stretching functions also now work with it they look cooler now --- src/p_user.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/p_user.c b/src/p_user.c index cb4403433..50b3955c1 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1692,8 +1692,16 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->tics = -1; ghost->frame &= ~FF_TRANSMASK; ghost->frame |= tr_trans50<sloperoll = mobj->sloperoll; + + ghost->spritexscale = mobj->realxscale; + ghost->spriteyscale = mobj->realyscale; + ghost->spritexoffset = mobj->spritexoffset; + ghost->spriteyoffset = mobj->spriteyoffset; + ghost->fuse = ghost->info->damage; ghost->skin = mobj->skin; + //ghost->standingslope = mobj->standingslope; if (mobj->flags2 & MF2_OBJECTFLIP) ghost->flags |= MF2_OBJECTFLIP; -- 2.54.0 From 6b7aa3d75768790077b8eb31dee78684146a467b Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 06:08:59 +0200 Subject: [PATCH 08/14] match out code oops --- src/p_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 50b3955c1..4b9f6d3bd 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1694,10 +1694,10 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->frame |= tr_trans50<sloperoll = mobj->sloperoll; - ghost->spritexscale = mobj->realxscale; + ghost->spritexscale = mobj->realyscale = mobj->scale; ghost->spriteyscale = mobj->realyscale; ghost->spritexoffset = mobj->spritexoffset; - ghost->spriteyoffset = mobj->spriteyoffset; + ghost->spriteyoffset = mobj->spriteyoffset = 0; ghost->fuse = ghost->info->damage; ghost->skin = mobj->skin; -- 2.54.0 From 1a88bb6e2098e6f80e0126108952f892b7bf0f65 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 06:21:08 +0200 Subject: [PATCH 09/14] We dont need those things for dropshadows --- src/p_mobj.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 8d923b30f..f29a63f43 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10016,9 +10016,7 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster) } // Sprite rendering - mobj->realxscale = mobj->realyscale = mobj->scale; - mobj->spritexscale = mobj->realxscale; - mobj->spriteyscale = mobj->realyscale; + mobj->spritexscale = mobj->spriteyscale = mobj->scale; mobj->spritexoffset = mobj->spriteyoffset = 0; // set subsector and/or block links -- 2.54.0 From fb41c1766310a4492309678bd75356dbbb62345b Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 06:50:47 +0200 Subject: [PATCH 10/14] Change some defaults Turn off all the music stuff from Galaxy/Bird Turn off Player Stretching by default Enable Amiga resampler and disable Tracker module filters (as recommended by OpenMPT) Set addon download speed to max --- src/d_clisrv.c | 2 +- src/g_game.c | 8 ++++---- src/s_sound.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 775034fa8..ebd126b46 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3888,7 +3888,7 @@ consvar_t cv_noticedownload = {"noticedownload", "Off", CV_SAVE, CV_OnOff, NULL, // Speed of file downloading (in packets per tic) static CV_PossibleValue_t downloadspeed_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}}; -consvar_t cv_downloadspeed = {"downloadspeed", "MAX", CV_SAVE, downloadspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_downloadspeed = {"downloadspeed", "300", CV_SAVE, downloadspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t connectawaittime_cons_t[] = {{1, "MIN"}, {60, "MAX"}, {0, "Inf"}, {0, NULL}}; consvar_t cv_connectawaittime = {"connectawaittime", "5", CV_SAVE, connectawaittime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/g_game.c b/src/g_game.c index 69fd74cf0..5a619d4b8 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -538,7 +538,7 @@ static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"} consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t stretchfactor_t[] = {{FRACUNIT/5, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}}; -consvar_t cv_gravstretch = {"gravstretch", "1", CV_FLOAT | CV_SAVE, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_gravstretch = {"gravstretch", "0", CV_FLOAT | CV_SAVE, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -556,9 +556,9 @@ consvar_t cv_invincmusicfade = {"invincmusicfade", "300", CV_SAVE, CV_Unsigned, consvar_t cv_growmusicfade = {"growmusicfade", "500", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_respawnfademusicout = {"respawnfademusicout", "1000", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_respawnfademusicback = {"respawnfademusicback", "500", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_resetspecialmusic = {"resetspecialmusic", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_resume = {"resume", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_fading = {"fading", "On", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_resetspecialmusic = {"resetspecialmusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_resume = {"resume", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_fading = {"fading", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; #if MAXPLAYERS > 16 #error "please update player_name table using the new value for MAXPLAYERS" diff --git a/src/s_sound.c b/src/s_sound.c index f00d704bf..2a5edad80 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -138,10 +138,10 @@ consvar_t cv_music_resync_powerups_only = {"music_resync_powerups_only", "No", C #ifdef HAVE_OPENMPT openmpt_module *openmpt_mhandle = NULL; static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}}; -consvar_t cv_modfilter = {"modfilter", "0", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_modfilter = {"modfilter", "1", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t amigafilter_cons_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}}; -consvar_t cv_amigafilter = {"amigafilter", "0", CV_SAVE|CV_CALL, amigafilter_cons_t, AmigaFilter_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_amigafilter = {"amigafilter", "1", CV_SAVE|CV_CALL, amigafilter_cons_t, AmigaFilter_OnChange, 0, NULL, NULL, 0, 0, NULL}; #endif #define S_MAX_VOLUME 127 -- 2.54.0 From 283d1b74f4a23d21ff15707ba99d09443eff9803 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 06:54:08 +0200 Subject: [PATCH 11/14] eh cubic better im dumbass --- src/s_sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s_sound.c b/src/s_sound.c index 2a5edad80..8627903d5 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -138,7 +138,7 @@ consvar_t cv_music_resync_powerups_only = {"music_resync_powerups_only", "No", C #ifdef HAVE_OPENMPT openmpt_module *openmpt_mhandle = NULL; static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}}; -consvar_t cv_modfilter = {"modfilter", "1", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_modfilter = {"modfilter", "4", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t amigafilter_cons_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}}; consvar_t cv_amigafilter = {"amigafilter", "1", CV_SAVE|CV_CALL, amigafilter_cons_t, AmigaFilter_OnChange, 0, NULL, NULL, 0, 0, NULL}; -- 2.54.0 From 50e6f5ad981a618f7b076b4ec4fc56da3e828390 Mon Sep 17 00:00:00 2001 From: Alug <136046486+alufolie91@users.noreply.github.com> Date: Tue, 15 Aug 2023 06:56:25 +0200 Subject: [PATCH 12/14] Update README.md AAAAAAA --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36659251d..7e90f7db9 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - Visual Portals from haya´s HEP Client - Everything that galaxy has -Techical Stuff: +## Technical Stuff: - ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it) - Fof´s intersecting with slopes have less issues and now render correctly in Opengl -- 2.54.0 From 8b780b6b6ed33fd0aea4f7c5a78cb5be2da714d5 Mon Sep 17 00:00:00 2001 From: Alug <136046486+alufolie91@users.noreply.github.com> Date: Tue, 15 Aug 2023 06:59:18 +0200 Subject: [PATCH 13/14] Update README.md smh --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7e90f7db9..64012b510 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ [SRB2Kart](https://srb2.org/mods/) is a kart racing mod based on the 3D Sonic the Hedgehog fangame [Sonic Robo Blast 2](https://srb2.org/), based on a modified version of [Doom Legacy](http://doomlegacy.sourceforge.net/). ## Saturn Features -- Player rotation on Slopes, funny squish when landing, Sprite scaling and all that +- Player rotation on slopes, funny squish when landing, Sprite scaling and all that - Kart Hud offsets are user changable -- Access for `mobj_t` and `player_t` fields from Lua has been completely rewritten, much better performance +- Access for `mobj_t` and `player_t` fields from Lua has been completely rewritten, for much better performance with many Lua scripts - Lua shows tracebacks whenever an error occurs - The Lua perfstat page now has multiple pages and is more organized (ps_thinkframe_page X) - "addfilelocal" Command, for those who want to use their custom hud in netgames (Same as addfile but completely client sided) @@ -15,16 +15,16 @@ - Lua hooks for Intermission - Timeout for waiting to join a full server is configurable now - Higher/configurable addon download speed -- Visual Portals from haya´s HEP Client -- Everything that galaxy has +- Visual Portals from Haya´s HEP Client +- Everything that Galaxy has ## Technical Stuff: - ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it) - Fof´s intersecting with slopes have less issues and now render correctly in Opengl -- Midtextures on slopes in Opengl arent broken anymore, all those weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone. +- Midtextures on slopes in Opengl are fixed, all those weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone - Multiple other fixes/optimizations like 3D floor clipping in software mode -- Zone memory allocations have been rewritten +- Zone memory allocations have been rewritten, speeds up some map loading, and may improve performance on busy maps - The annoying depraction messages for "P_TeleportMove" and "P_AproxDistance" have been silenced ## Bugs -- 2.54.0 From 31fa7c4af0a594b51033271aa6fa2bb49ccd9ba4 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 15 Aug 2023 16:54:50 +0200 Subject: [PATCH 14/14] We dont need those --- src/p_user.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 4b9f6d3bd..700671ef6 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1694,14 +1694,8 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->frame |= tr_trans50<sloperoll = mobj->sloperoll; - ghost->spritexscale = mobj->realyscale = mobj->scale; - ghost->spriteyscale = mobj->realyscale; - ghost->spritexoffset = mobj->spritexoffset; - ghost->spriteyoffset = mobj->spriteyoffset = 0; - ghost->fuse = ghost->info->damage; ghost->skin = mobj->skin; - //ghost->standingslope = mobj->standingslope; if (mobj->flags2 & MF2_OBJECTFLIP) ghost->flags |= MF2_OBJECTFLIP; -- 2.54.0