Merge branch 'account_manager-andmore'

data/events/events.xml

@@ -35,6 +35,7 @@
 	<event class="Player" method="onNetworkMessage" enabled="1" />
 	<event class="Player" method="onUpdateStorage" enabled="1" />
 	<event class="Player" method="onUpdateInventory" enabled="1" />
+	<event class="Player" method="onAccountManager" enabled="1" />
 
 	<!-- Monster methods -->
 	<event class="Monster" method="onDropLoot" enabled="1" />

data/events/scripts/player.lua

@@ -125,9 +125,9 @@ end
 function Player:onNetworkMessage(recvByte, msg)
 	local handler = PacketHandlers[recvByte]
 	if not handler then
-		io.write(string.format(
-			         "Player: %s sent an unknown packet header: 0x%02X with %d bytes!\n",
-			         self:getName(), recvByte, msg:len()))
+		print(string.format(
+			      "Player: %s sent an unknown packet header: 0x%02X with %d bytes!\n",
+			      self:getName(), recvByte, msg:len()))
 		return
 	end
 
@@ -145,3 +145,7 @@ function Player:onUpdateInventory(item, slot, equip)
 		Event.onUpdateInventory(self, item, slot, equip)
 	end
 end
+
+function Player:onAccountManager(text)
+	if hasEvent.onAccountManager then Event.onAccountManager(self, text) end
+end

data/global.lua

@@ -111,6 +111,17 @@ string.trim = function(str)
 	return str:match '^()%s*$' and '' or str:match '^%s*(.*%S)'
 end
 
+do
+	local function tchelper(first, rest) return first:upper() .. rest:lower() end
+
+	-- Add extra characters to the pattern if you need to. _ and ' are
+	--  found in the middle of identifiers and English words.
+	-- We must also put %w_' into [%w_'] to make it handle normal stuff
+	-- and extra stuff the same.
+	-- This also turns hex numbers into, eg. 0Xa7d4
+	string.titleCase = function(str) return str:gsub("(%a)([%w_']*)", tchelper) end
+end
+
 if not nextUseStaminaTime then nextUseStaminaTime = {} end
 
 function getPlayerDatabaseInfo(name_or_guid)

data/lib/core/combat.lua

@@ -1,17 +1,17 @@
 function Combat:getPositions(creature, variant)
 	local positions = {}
-	function onTargetTile(creature, position) positions[#positions + 1] = position end
+	local function callback(creature, position) positions[#positions + 1] = position end
 
-	self:setCallback(CALLBACK_PARAM_TARGETTILE, "onTargetTile")
+	self:setCallback(CallBackParam.TARGETTILE, callback)
 	self:execute(creature, variant)
 	return positions
 end
 
 function Combat:getTargets(creature, variant)
 	local targets = {}
-	function onTargetCreature(creature, target) targets[#targets + 1] = target end
+	local function callback(creature, target) targets[#targets + 1] = target end
 
-	self:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
+	self:setCallback(CallBackParam.TARGETCREATURE, callback)
 	self:execute(creature, variant)
 	return targets
 end