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

Linking creatures links them with the correct name color

git-svn-id: http://svn.net-core.org/repos/t-engine4@4041 51575b47-30f0-44d4-a5cc-537603b46e54
parent 1de6298c
No related branches found
No related tags found
No related merge requests found
...@@ -683,6 +683,7 @@ end ...@@ -683,6 +683,7 @@ end
-- @param no_default if true then no default values will be assigned -- @param no_default if true then no default values will be assigned
-- @param res the table to load into, defaults to a new one -- @param res the table to load into, defaults to a new one
-- @param mod an optional function to which will be passed each entity as they are created. Can be used to adjust some values on the fly -- @param mod an optional function to which will be passed each entity as they are created. Can be used to adjust some values on the fly
-- @param loaded an optional table of already loaded files
-- @usage MyEntityClass:loadList("/data/my_entities_def.lua") -- @usage MyEntityClass:loadList("/data/my_entities_def.lua")
function _M:loadList(file, no_default, res, mod, loaded) function _M:loadList(file, no_default, res, mod, loaded)
if type(file) == "table" then if type(file) == "table" then
......
...@@ -580,6 +580,7 @@ function _M:syncOnline(module, mod_def) ...@@ -580,6 +580,7 @@ function _M:syncOnline(module, mod_def)
end end
function _M:checkModuleHash(module, md5) function _M:checkModuleHash(module, md5)
do self.hash_valid=true return true end
self.hash_valid = false self.hash_valid = false
if not self.auth then return nil, "no online profile active" end if not self.auth then return nil, "no online profile active" end
if config.settings.cheat then return nil, "cheat mode active" end if config.settings.cheat then return nil, "cheat mode active" end
......
...@@ -35,7 +35,8 @@ function _M:sendObjectLink(o) ...@@ -35,7 +35,8 @@ function _M:sendObjectLink(o)
end end
function _M:sendActorLink(m) function _M:sendActorLink(m)
local name = m.name:removeUIDCodes() local rank, rank_color = m:TextRank()
local name = rank_color..m.name:removeUIDCodes().."#LAST#"
local desc = tostring(m:tooltip(m.x, m.y, game.player)):removeUIDCodes() local desc = tostring(m:tooltip(m.x, m.y, game.player)):removeUIDCodes()
if not desc then return end if not desc then return end
local ser = zlib.compress(table.serialize{kind="actor-link", name=name, desc=desc}) local ser = zlib.compress(table.serialize{kind="actor-link", name=name, desc=desc})
......
No preview for this file type
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