From 4f6c987d77e80e25ff46098f1df18cbaa5271477 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Fri, 18 Jan 2013 21:29:10 -0200
Subject: [PATCH] Fix regression in market

---
 data/particles/shiny.otps              | 52 --------------------------
 modules/game_market/marketprotocol.lua |  8 ++--
 2 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 data/particles/shiny.otps

diff --git a/data/particles/shiny.otps b/data/particles/shiny.otps
deleted file mode 100644
index de322a67..00000000
--- a/data/particles/shiny.otps
+++ /dev/null
@@ -1,52 +0,0 @@
-Particle
-  name: shiny_star
-
-  min-position-radius: 0
-  max-position-radius: 8
-  min-position-angle: 0
-  max-position-angle: 360
-  velocity: 4
-  min-velocity-angle: 0
-  max-velocity-angle: 360
-
-  particle-size: 4 4
-  texture: shiny_star.png
-  composition-mode: addition
-
-Effect
-  name: Shiny3
-  description: 3 Shiny stars derping aroud
-
-  System
-    position: 0 0
-
-    Emitter
-      position: 0 0
-      delay: 0
-      duration: 0
-      burstRate: 0
-      burstCount: 3
-      particle-type: shiny_star
-
-    AttractionAffector
-      position: 0 0
-      acceleration: 2
-
-Effect
-  name: Shiny5
-  description: 5 Shiny stars derping aroud
-
-  System
-    position: 0 0
-
-    Emitter
-      position: 0 0
-      delay: 0
-      duration: 0
-      burstRate: 0
-      burstCount: 5
-      particle-type: shiny_star
-
-    AttractionAffector
-      position: 0 0
-      acceleration: 2
diff --git a/modules/game_market/marketprotocol.lua b/modules/game_market/marketprotocol.lua
index 9f60df1e..1caac3c7 100644
--- a/modules/game_market/marketprotocol.lua
+++ b/modules/game_market/marketprotocol.lua
@@ -37,7 +37,7 @@ local function readMarketOffer(msg, action, var)
 end
 
 -- parsing protocols
-local function parseMarketEnter(msg)
+local function parseMarketEnter(protocol, msg)
   local balance
   if g_game.getProtocolVersion() >= 973 then
     balance = msg:getU64()
@@ -64,12 +64,12 @@ local function parseMarketEnter(msg)
   return true
 end
 
-local function parseMarketLeave(msg)
+local function parseMarketLeave(protocol, msg)
   Market.onMarketLeave()
   return true
 end
 
-local function parseMarketDetail(msg)
+local function parseMarketDetail(protocol, msg)
   local itemId = msg:getU16()
 
   local descriptions = {}
@@ -110,7 +110,7 @@ local function parseMarketDetail(msg)
   return true
 end
 
-local function parseMarketBrowse(msg)
+local function parseMarketBrowse(protocol, msg)
   local var = msg:getU16()
   local offers = {}