fix: being able to carry objects while swimming, when lift glove isn't swim-capable

Author: EmilyV99

resources/include/std_zh/std_constants.zh

@@ -3960,6 +3960,7 @@ enum //for Hero->LiftFlags[]
 {
 	LIFTFL_DISABLE_SHIELD,
 	LIFTFL_DISABLE_ITEMS,
+	LIFTFL_NO_SWIMMING,
 	LIFTFL_MAX
 };
 

src/base/qrs.h

@@ -182,6 +182,7 @@ enum
 	qr_BROKEN_LIGHTBEAM_HITBOX, qr_BROKEN_SWORD_SPIN_TRIGGERS, qr_SCRIPT_CONTHP_IS_HEARTS, qr_MULTI_PLATFORM_FFC,
 	//54
 	qr_SEPARATE_BOMBABLE_TAPPING_SFX, qr_BROKEN_BOMB_AMMO_COSTS, qr_CONVEYORS_ALL_LAYERS, qr_OLD_BROKEN_WARPEX_MUSIC,
+	qr_BROKEN_LIFTSWIM,
 	//EMILY SPOT
 	//60
 	//CONNOR SPOT qr_ = 60*8,

src/base/zdefs.h

@@ -230,7 +230,7 @@ enum {ENC_METHOD_192B104=0, ENC_METHOD_192B105, ENC_METHOD_192B185, ENC_METHOD_2
 #define V_SFX              8
 #define V_FAVORITES        4
 
-#define V_COMPATRULE       62
+#define V_COMPATRULE       63
 #define V_ZINFO            3
 
 //= V_SHOPS is under V_MISC
@@ -1531,7 +1531,8 @@ struct guydata
 
 #define LIFTFL_DIS_SHIELD             0x00000001
 #define LIFTFL_DIS_ITEMS              0x00000002
-#define NUM_LIFTFL 2
+#define LIFTFL_DIS_SWIMMING           0x00000004
+#define NUM_LIFTFL 3
 
 class refInfo
 {

src/dialog/quest_rules.cpp

@@ -949,6 +949,9 @@ static GUI::ListData compatRulesList
 	{ "Broken Subscreen Ammo Costs", qr_BROKEN_BOMB_AMMO_COSTS,
 		"If enabled, bombs/super bombs will check the bomb/sbomb counters to be usable,"
 		" regardless of what their Cost Counters are set to." },
+	{ "Broken Lifting/Swimming", qr_BROKEN_LIFTSWIM,
+		"If enabled, lifted objects won't be dropped when swimming, even when lift gloves are set"
+		" to not allow lifting while swimming." },
 };
 
 static GUI::ListData enemiesRulesList
@@ -1775,7 +1778,7 @@ void applyRuleTemplate(int32_t ruleTemplate, byte* qrptr)
 		}
 		default: return;
 	}
-	if(qrptr == quest_rules)
+	if(qrptr == quest_rules || !qrptr)
 		saved = false;
 }
 

src/qst.cpp

@@ -3733,6 +3733,8 @@ int32_t readrules(PACKFILE *f, zquestheader *Header)
 		set_qr(qr_BROKEN_BOMB_AMMO_COSTS,1);
 	if(compatrule_version < 62)
 		set_qr(qr_OLD_BROKEN_WARPEX_MUSIC,1);
+	if(compatrule_version < 63)
+		set_qr(qr_BROKEN_LIFTSWIM,1);
 
 	set_qr(qr_ANIMATECUSTOMWEAPONS,0);
 	if (s_version < 16)

src/zc/hero.cpp

@@ -369,6 +369,7 @@ void HeroClass::set_liftflags(int liftid)
 	if(unsigned(liftid) >= MAXITEMS)
 		return;
 	itemdata const& itm = itemsbuf[liftid];
+	SETFLAG(liftflags, LIFTFL_DIS_SWIMMING, !(itm.flags & ITEM_FLAG2));
 	SETFLAG(liftflags, LIFTFL_DIS_SHIELD, itm.flags & ITEM_FLAG3);
 	SETFLAG(liftflags, LIFTFL_DIS_ITEMS, itm.flags & ITEM_FLAG4);
 }
@@ -10084,6 +10085,8 @@ heroanimate_skip_liftwpn:;
 		action=falling; FFCore.setHeroAction(falling);
 	}
 
+	if(isSwimming() && (liftflags&LIFTFL_DIS_SWIMMING) && !get_qr(qr_BROKEN_LIFTSWIM))
+		drop_liftwpn();
 	handle_passive_buttons();
 	if(liftclk)
 	{