Skip to content
Snippets Groups Projects
Commit f811e298 authored by dg's avatar dg
Browse files

stuff

git-svn-id: http://svn.net-core.org/repos/t-engine4@5796 51575b47-30f0-44d4-a5cc-537603b46e54
parent 8898b141
No related branches found
No related tags found
No related merge requests found
......@@ -736,6 +736,19 @@ function _M:newProfile(Login, Name, Password, Email)
self:performlogin(Login, Password)
end
function _M:entityVaultPoke(module, kind, name, desc, data)
if not data then return end
if not self.auth then return end
core.profile.pushOrder(table.serialize{o="EntityPoke",
module=module,
kind=kind,
name=name,
desc=desc,
data=data,
})
print("[ONLINE PROFILE] poke entity vault", module, kind, name)
end
function _M:isDonator(s)
s = s or 1
if not self.auth or not tonumber(self.auth.donated) or tonumber(self.auth.donated) <= s then return false else return true end
......
......@@ -47,5 +47,4 @@ for x, yy in pairs(grids) do for y, _ in pairs(yy) do
g.on_stand_safe = true
game.zone:addEntity(game.level, g, "terrain", x, y)
end end
game.log("==== FONT at %dx%d", x,y)
return true
......@@ -86,7 +86,7 @@ function _M:use(item)
elseif act == "chat-link" then
profile.chat.uc_ext:sendObjectLink(self.object)
else
self:triggerHook{"UseItemMenu:use", actor=self.actor, object=self.object, inven=self.inven, item=self.item, act=act}
self:triggerHook{"UseItemMenu:use", actor=self.actor, object=self.object, inven=self.inven, item=self.item, act=act, onuse=self.onuse}
end
end
......
......@@ -23,7 +23,7 @@ local UserChat = require "profile-thread.UserChat"
module(..., package.seeall, class.make)
local debug = true
local debug = false
local mport = debug and 2259 or 2257
local pport = debug and 2260 or 2258
......@@ -477,8 +477,10 @@ function _M:orderEntityInfos(o)
end
function _M:orderEntityPoke(o)
self:command("EVLT", "POKE", o.data:len(), o.module, o.kind, o.name)
if not self:read("200") then return end
self:command("EVLT", "POKE", o.desc:len(), o.data:len(), o.module, o.kind, o.name)
if not self:read("200") then return cprofile.pushEvent("e='EntityPoke' ok=false") end
self.sock:send(o.desc)
if not self:read("200") then return cprofile.pushEvent("e='EntityPoke' ok=false") end
self.sock:send(o.data)
cprofile.pushEvent("e='EntityPoke' ok=true")
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment