From 600f57405f36a49b1725be4c7429a42c3c0e4577 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 5 Mar 2017 00:28:15 +0100 Subject: [PATCH 1/2] - fixed typo in TexMan.GetSize. --- src/textures/texturemanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp index bbbb016ea..39948f732 100644 --- a/src/textures/texturemanager.cpp +++ b/src/textures/texturemanager.cpp @@ -1208,7 +1208,7 @@ DEFINE_ACTION_FUNCTION(_TexMan, GetSize) } else x = y = -1; if (numret > 0) ret[0].SetInt(x); - if (numret > 1) ret[1].SetInt(x); + if (numret > 1) ret[1].SetInt(y); return MIN(numret, 2); } From f07bd5ec654d571845a53e7f78f4be50f962c5b0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 5 Mar 2017 00:36:32 +0100 Subject: [PATCH 2/2] - fixed some mess by two nearly similarly named flags. --- src/g_game.cpp | 2 +- src/g_level.h | 2 +- src/g_mapinfo.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/g_game.cpp b/src/g_game.cpp index 4391a0571..e0fbd9854 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -1350,7 +1350,7 @@ void G_PlayerFinishLevel (int player, EFinishLevelType mode, int flags) if (item->ItemFlags & IF_INVBAR && item->Amount > item->InterHubAmount) { item->Amount = item->InterHubAmount; - if ((level.flags3 & LEVEL3_RESETINVENTORY) && !(item->ItemFlags & IF_UNDROPPABLE)) + if ((level.flags3 & LEVEL3_REMOVEITEMS) && !(item->ItemFlags & IF_UNDROPPABLE)) { todelete.Push(item); } diff --git a/src/g_level.h b/src/g_level.h index 06a91259a..fd66527a7 100644 --- a/src/g_level.h +++ b/src/g_level.h @@ -223,7 +223,7 @@ enum ELevelFlags : unsigned int // More flags! LEVEL3_FORCEFAKECONTRAST = 0x00000001, // forces fake contrast even with fog enabled - LEVEL3_RESETINVENTORY = 0x00000002, // kills all INVBAR items on map change. + LEVEL3_REMOVEITEMS = 0x00000002, // kills all INVBAR items on map change. }; diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index 7a7960115..44b21bfd8 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -1277,7 +1277,7 @@ MapFlagHandlers[] = { "laxmonsteractivation", MITYPE_SETFLAG2, LEVEL2_LAXMONSTERACTIVATION, LEVEL2_LAXACTIVATIONMAPINFO }, { "additive_scrollers", MITYPE_COMPATFLAG, COMPATF_BOOMSCROLL, 0 }, { "keepfullinventory", MITYPE_SETFLAG2, LEVEL2_KEEPFULLINVENTORY, 0 }, - { "resetitems", MITYPE_SETFLAG3, LEVEL2_RESETINVENTORY, 0 }, + { "resetitems", MITYPE_SETFLAG3, LEVEL3_REMOVEITEMS, 0 }, { "monsterfallingdamage", MITYPE_SETFLAG2, LEVEL2_MONSTERFALLINGDAMAGE, 0 }, { "nomonsterfallingdamage", MITYPE_CLRFLAG2, LEVEL2_MONSTERFALLINGDAMAGE, 0 }, { "clipmidtextures", MITYPE_SETFLAG2, LEVEL2_CLIPMIDTEX, 0 },