From 14094ebeb941d3d529802290be5d76fcfb299ac2 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 12 Dec 2018 10:15:53 +0200 Subject: [PATCH 1/6] - fixed crash on invoking vid_setsize CCMD with one argument --- src/v_video.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v_video.cpp b/src/v_video.cpp index 658e70fe9..7c2adec6c 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -924,7 +924,7 @@ void ScaleWithAspect (int &w, int &h, int Width, int Height) CCMD(vid_setsize) { - if (argv.argc() < 2) + if (argv.argc() < 3) { Printf("Usage: vid_setsize width height\n"); } From 172b4bb8466d49c1b09415d1dc4ce48c44dba655 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 12 Dec 2018 11:22:53 -0500 Subject: [PATCH 2/6] - added a number of darken2.wad maps to rebuild nodes in compatibility.txt --- wadsrc/static/compatibility.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index 03d8b3223..d303967f0 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -167,6 +167,26 @@ AF40D0E49BD1B76D4B1AADD8212ADC46 // MAP01 (the wad that shall not be named =P) pointonline } +920F8D876ECD96D8C2A978FF1AB2B401 // Darken2.wad map01 - Nodes go out of bounds/beyond normal sector boundaries +CFEDB7FA89885E24856CAC9A2FB3CE58 // Darken2.wad map03 - GZDoomBuilder crashes when displaying Nodes +8E961FA7029761D5FAB3932C40F10CD2 // Darken2.wad map04 - Nodes go out of bounds/beyond normal sector boundaries +DEA5E9C6253FFF8FDB2D5E5BADE13A9D // Darken2.wad map06 - Nodes go out of bounds/beyond normal sector boundaries +0E72254C0C26F721333A1C56E3648D68 // Darken2.wad map07 - Nodes go out of bounds/beyond normal sector boundaries +1437B40F2D56DF82346366814E9729D9 // Darken2.wad map08 - Nodes go out of bounds/beyond normal sector boundaries +8B15F89E47E422780FBF2D6CDE3AA050 // Darken2.wad map09 - GZDoomBuilder crashes when displaying Nodes +5A2FD43D23B45191229E5C74E9398D36 // Darken2.wad map10 - Nodes go out of bounds/beyond normal sector boundaries +FA25A78B3DFD7CC44E9B10C7B78EADAE // Darken2.wad map11 - Nodes go out beyond normal sector boundaries +01592ACF001C534076556D9E1B5D85E7 // Darken2.wad map12 - Nodes go out of bounds/beyond normal sector boundaries +16A2ED2917A68B2FD8D264BE4D64EA09 // Darken2.wad map13 - Nodes go out of bounds/beyond normal sector boundaries +F5DA2AA0C7112E090167A6B2F6D4A079 // Darken2.wad map15 - Nodes go out beyond normal sector boundaries +A40A4472AB0FDBE2D55ADADA7D9005C8 // Darken2.wad map16 - Nodes go out of bounds/beyond normal sector boundaries +244701904E6B754A02842415AB183EBE // Darken2.wad map17 - Nodes go out beyond normal sector boundaries +661D3C9221114A1CD16674CBFF239DDF // Darken2.wad map19 - Nodes go out of bounds/beyond normal sector boundaries +1FB559C4C37CCE8C3883057C963952A8 // Darken2.wad map20 - Nodes go out beyond normal sector boundaries +D36E7D121F28F77A3780A5BD88425FB4 // Darken2.wad map21 - Nodes go out beyond normal sector boundaries +3253B280FB7A4A04284FE08A6D9F222D // Darken2.wad map22 - Nodes go out beyond normal sector boundaries +E0E5517B7928E88B88F6A5B77AC449DF // Darken2.wad map23 - Nodes go out of bounds/beyond normal sector boundaries +6DD76422593381E3234FA703C155C493 // Darken2.wad map24 - Nodes go out of bounds/beyond normal sector boundaries 8B2AC8D4DB4A49A5DCCBB067E04434D6 // The Hell Factory Hub One, map04 65A1EB4C87386F290816660A52932FF1 // Master Levels, garrison.wad 3DEE4EFEFAF3260C800A30734F54CE75 // Hellbound, map14 From 74ec789d0e3a0c9824985b6a520710415e809904 Mon Sep 17 00:00:00 2001 From: Player701 Date: Thu, 13 Dec 2018 21:35:28 +0300 Subject: [PATCH 3/6] - Force node rebuild for Plutonia 2 MAP29 to fix BSP glitches --- wadsrc/static/compatibility.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index d303967f0..2ab378ba3 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -196,6 +196,7 @@ D5F64E02679A81B82006AF34A6A8EAC3 // plutonia.wad map32 BA4860C7A2F5D705DB32A1A38DB77EC4 // pl2.wad map10 EDA5CE7C462BD171BF8110AC56B67857 // pl2.wad map11 A9A9A728E689266939C1B71655F320CA // pl2.wad map25 +62CA74092FC88C1E7FE2D0B1A8034E29 // pl2.wad map29 { rebuildnodes } From 4a83f4d25120927618d410656b99b0b2057fccc9 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 14 Dec 2018 15:52:40 +0200 Subject: [PATCH 4/6] - disable music playback if WinMM stream cannot be opened https://forum.zdoom.org/viewtopic.php?t=62888 --- src/sound/mididevices/music_win_mididevice.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sound/mididevices/music_win_mididevice.cpp b/src/sound/mididevices/music_win_mididevice.cpp index f9820033f..b6ddd46a2 100644 --- a/src/sound/mididevices/music_win_mididevice.cpp +++ b/src/sound/mididevices/music_win_mididevice.cpp @@ -198,6 +198,10 @@ int WinMIDIDevice::Open(MidiCallback callback, void *userdata) } } } + else + { + return 1; + } } return 0; } From f373752b4fd9d8e14f4e9092121153e84edcbbca Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 14 Dec 2018 19:59:19 +0100 Subject: [PATCH 5/6] - fixed incorrect alignment of scaled world panned textures combined with per-sidedef scaling in the hardware renderer This particular case incorrectly factored in the sidedef's scaling factor for how to calculate the offset. Fortunately this is a very rare case - a quick check yielded no maps depending on it. Should any map surface that depends on this bug a compatibility option may be needed but it doesn't seem likely that this may be the case. --- src/textures/texture.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp index 85b57798d..bd2b87054 100644 --- a/src/textures/texture.cpp +++ b/src/textures/texture.cpp @@ -1576,7 +1576,7 @@ float FTexCoordInfo::RowOffset(float rowoffset) const } else { - if (mWorldPanning) return rowoffset / tscale; + if (mWorldPanning) return rowoffset; else return rowoffset / scale; } } @@ -1598,7 +1598,7 @@ float FTexCoordInfo::TextureOffset(float textureoffset) const } else { - if (mWorldPanning) return textureoffset / tscale; + if (mWorldPanning) return textureoffset; else return textureoffset / scale; } } From 013d3e236849d591757e6921e0eda191e820caf2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 14 Dec 2018 22:34:28 +0100 Subject: [PATCH 6/6] - code simplification. --- src/textures/texture.cpp | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp index bd2b87054..304be17d5 100644 --- a/src/textures/texture.cpp +++ b/src/textures/texture.cpp @@ -1566,19 +1566,9 @@ CCMD (printspans) float FTexCoordInfo::RowOffset(float rowoffset) const { - float tscale = fabs(mTempScale.Y); float scale = fabs(mScale.Y); - - if (tscale == 1.f) - { - if (scale == 1.f || mWorldPanning) return rowoffset; - else return rowoffset / scale; - } - else - { - if (mWorldPanning) return rowoffset; - else return rowoffset / scale; - } + if (scale == 1.f || mWorldPanning) return rowoffset; + else return rowoffset / scale; } //=========================================================================== @@ -1589,18 +1579,9 @@ float FTexCoordInfo::RowOffset(float rowoffset) const float FTexCoordInfo::TextureOffset(float textureoffset) const { - float tscale = fabs(mTempScale.X); float scale = fabs(mScale.X); - if (tscale == 1.f) - { - if (scale == 1.f || mWorldPanning) return textureoffset; - else return textureoffset / scale; - } - else - { - if (mWorldPanning) return textureoffset; - else return textureoffset / scale; - } + if (scale == 1.f || mWorldPanning) return textureoffset; + else return textureoffset / scale; } //===========================================================================