From df062b56fd77105ccea863ff2dd118d48e5716a7 Mon Sep 17 00:00:00 2001
From: sundance <19597322+Sundance@users.noreply.github.com>
Date: Sat, 17 Jul 2021 15:44:24 +0200
Subject: [PATCH] fix inconsistent variable names for !shop talkaction (#479)

---
 Lua/TFS_10/revscriptsys/shopsystem_talkaction.lua | 10 +++++-----
 Lua/TFS_10/talkaction shopsystem/znoteshop.lua    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Lua/TFS_10/revscriptsys/shopsystem_talkaction.lua b/Lua/TFS_10/revscriptsys/shopsystem_talkaction.lua
index 3c98b3f..cdbe44d 100644
--- a/Lua/TFS_10/revscriptsys/shopsystem_talkaction.lua
+++ b/Lua/TFS_10/revscriptsys/shopsystem_talkaction.lua
@@ -92,17 +92,17 @@ function talkaction.onSay(player)
 				end
 
 				-- ORDER TYPE 7 (Direct house purchase)
-				if orderType == 7 then
+				if q_type == 7 then
 					served = true
-					local house = House(orderItemId)
+					local house = House(q_itemid)
 					-- Logged in player is not necessarily the player that bough the house. So we need to load player from db.
-					local buyerQuery = db.storeQuery("SELECT `name` FROM `players` WHERE `id` = "..orderCount.." LIMIT 1")
+					local buyerQuery = db.storeQuery("SELECT `name` FROM `players` WHERE `id` = "..q_count.." LIMIT 1")
 					if buyerQuery ~= false then
 						local buyerName = result.getString(buyerQuery, "name")
 						result.free(buyerQuery)
 						if house then
-							db.query("DELETE FROM `znote_shop_orders` WHERE `id` = " .. orderId .. ";")
-							house:setOwnerGuid(orderCount)
+							db.query("DELETE FROM `znote_shop_orders` WHERE `id` = " .. q_id .. ";")
+							house:setOwnerGuid(q_count)
 							player:sendTextMessage(MESSAGE_INFO_DESCR, "You have successfully bought the house "..house:getName().." on "..buyerName..", be sure to have the money for the rent in the bank.")
 							print("Process complete. [".. buyerName .."] has received house: ["..house:getName().."]")
 						end
diff --git a/Lua/TFS_10/talkaction shopsystem/znoteshop.lua b/Lua/TFS_10/talkaction shopsystem/znoteshop.lua
index c53abb5..8f3981b 100644
--- a/Lua/TFS_10/talkaction shopsystem/znoteshop.lua	
+++ b/Lua/TFS_10/talkaction shopsystem/znoteshop.lua	
@@ -92,17 +92,17 @@ function onSay(player, words, param)
 				end
 
 				-- ORDER TYPE 7 (Direct house purchase)
-				if orderType == 7 then
+				if q_type == 7 then
 					served = true
-					local house = House(orderItemId)
+					local house = House(q_itemid)
 					-- Logged in player is not necessarily the player that bough the house. So we need to load player from db.
-					local buyerQuery = db.storeQuery("SELECT `name` FROM `players` WHERE `id` = "..orderCount.." LIMIT 1")
+					local buyerQuery = db.storeQuery("SELECT `name` FROM `players` WHERE `id` = "..q_count.." LIMIT 1")
 					if buyerQuery ~= false then
 						local buyerName = result.getString(buyerQuery, "name")
 						result.free(buyerQuery)
 						if house then
-							db.query("DELETE FROM `znote_shop_orders` WHERE `id` = " .. orderId .. ";")
-							house:setOwnerGuid(orderCount)
+							db.query("DELETE FROM `znote_shop_orders` WHERE `id` = " .. q_id .. ";")
+							house:setOwnerGuid(q_count)
 							player:sendTextMessage(MESSAGE_INFO_DESCR, "You have successfully bought the house "..house:getName().." on "..buyerName..", be sure to have the money for the rent in the bank.")
 							print("Process complete. [".. buyerName .."] has received house: ["..house:getName().."]")
 						end