diff --git a/src/g_game.cpp b/src/g_game.cpp index 4391a05710..e0fbd9854c 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 06a91259a5..fd66527a74 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 7a7960115e..44b21bfd81 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 }, diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp index bbbb016ea0..39948f7327 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); }