zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-04 19:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed the workaround to make Lunatic Fringe not glitch.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-20 15:47:26 +01:00
parent c141c89cfd
commit 756ed1c14b
5 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
source/core/maphack.cpp
View file

@ -41,7 +41,6 @@
#include "mapinfo.h" #include "mapinfo.h"
static TArray<usermaphack_t> usermaphacks; static TArray<usermaphack_t> usermaphacks;
TArray<TArray<int>> blockingpairs;
void AddUserMapHack(usermaphack_t& mhk) void AddUserMapHack(usermaphack_t& mhk)
{ {
@ -143,17 +142,6 @@ static int32_t LoadMapHack(const char *filename, SpawnSpriteDef& sprites)
} }
else currentsector = -1; else currentsector = -1;
} }
else if (sc.Compare("blocks"))
{
if (sc.CheckNumber() && validateWall())
{
if (blockingpairs.Size() < (unsigned)numwalls)
{
blockingpairs.Resize(numwalls);
}
blockingpairs[currentwall].Push(sc.Number);
}
}
else if (sc.Compare("sector")) else if (sc.Compare("sector"))
{ {
if (sc.CheckNumber()) if (sc.CheckNumber())
@ -383,7 +371,6 @@ static int32_t LoadMapHack(const char *filename, SpawnSpriteDef& sprites)
void loadMapHack(const char* filename, const unsigned char* md4, SpawnSpriteDef& sprites) void loadMapHack(const char* filename, const unsigned char* md4, SpawnSpriteDef& sprites)
{ {
hw_ClearSplitSector(); hw_ClearSplitSector();
blockingpairs.Reset();
FString internal = "engine/compatibility/"; FString internal = "engine/compatibility/";
for (int j = 0; j < 16; ++j) for (int j = 0; j < 16; ++j)

2
source/core/maploader.cpp
View file

@ -379,8 +379,6 @@ static void ReadSpriteV5(FileReader& fr, spritetype& spr, int& secno)
} }
void addBlockingPairs();
// allocates global map storage. Blood will also call this. // allocates global map storage. Blood will also call this.
void allocateMapArrays(int numsprites) void allocateMapArrays(int numsprites)
{ {

2
source/core/rendering/scene/hw_bunchdrawer.cpp
View file

@ -46,7 +46,6 @@
#include "hw_sections.h" #include "hw_sections.h"
#include "coreactor.h" #include "coreactor.h"
extern TArray<TArray<int>> blockingpairs;
//========================================================================== //==========================================================================
// //
// //
@ -338,7 +337,6 @@ void BunchDrawer::ProcessBunch(int bnch)
int ww = sectionLines[i].wall; int ww = sectionLines[i].wall;
if (ww != -1) if (ww != -1)
{ {
//if (blockingpairs.Size() > 0) for (auto p : blockingpairs[ww]) blockwall.Set(sectionLines[p].wall);
show2dwall.Set(ww); show2dwall.Set(ww);
if (!gotwall[i]) if (!gotwall[i])

7
wadsrc/static/engine/compatibility/d19081afa18bf00c9f151e51104358ee.mhk
View file

@ -1,7 +0,0 @@
// Lunatic Fringe v1.3 + v1.5
wall 682 blocks 755 blocks 756 blocks 757
wall 683 blocks 755 blocks 756 blocks 757
wall 684 blocks 755 blocks 756 blocks 757
wall 694 blocks 739 blocks 740 blocks 741
wall 695 blocks 739 blocks 740 blocks 741
wall 696 blocks 739 blocks 740 blocks 741

7
wadsrc/static/engine/compatibility/dea84af1e11afd14e38a619728a5f57b.mhk
View file

@ -1,7 +0,0 @@
// Lunatic Fringe WT
wall 682 blocks 755 blocks 756 blocks 757
wall 683 blocks 755 blocks 756 blocks 757
wall 684 blocks 755 blocks 756 blocks 757
wall 694 blocks 739 blocks 740 blocks 741
wall 695 blocks 739 blocks 740 blocks 741
wall 696 blocks 739 blocks 740 blocks 741