hum

git-svn-id: http://svn.net-core.org/repos/t-engine4@4097 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Store.lua

@@ -57,13 +57,11 @@ function _M:loadup(level, zone, force_nb)
 	if not self:canRestock() then return end
 	local inven = self:getInven("INVEN")
 
-	if s.empty_before_restock then
-		for i = #inven, 1, -1 do
-			local e = inven[i]
-			inven[i] = nil
-			if not e.__store_forget then
-				e:removed()
-			end
+	for i = #inven, 1, -1 do
+		local e = inven[i]
+		inven[i] = nil
+		if (s.empty_before_restock and not e.__store_forget) or (e.__force_store_forget) then
+			e:removed()
 		end
 	end
 

game/modules/tome/class/Store.lua

@@ -127,7 +127,7 @@ function _M:onSell(who, o, item, nb, before)
 	if price <= 0 or nb <= 0 then return end
 	price = math.min(price * nb, self.store.purse * nb)
 	who:incMoney(price)
-	o:forAllStack(function(so) so.__store_forget = true end) -- Make sure the store does never forget about it
+	o:forAllStack(function(so) so.__force_store_forget = true end) -- Make sure the store does forget about it when it restocks
 end
 
 --- Override the default