From 4239e358d286e45602556359759a3d3a525b6a8c Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 22 Oct 2010 16:16:04 +0000
Subject: [PATCH] ops
git-svn-id: http://svn.net-core.org/repos/t-engine4@1603 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/utils.lua | 18 +++++++++---------
game/modules/tome/class/Object.lua | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/game/engines/default/engine/utils.lua b/game/engines/default/engine/utils.lua
index b24cb1e856..f040011f84 100644
--- a/game/engines/default/engine/utils.lua
+++ b/game/engines/default/engine/utils.lua
@@ -455,15 +455,6 @@ end
tstring = {}
tstring.is_tstring = true
-local tsmeta = {__index=tstring}
-
-setmetatable(tstring, {
- __call = function(self, t)
- setmetatable(t, tsmeta)
- return t
- end,
- __tostring = tstring.toString,
-})
function tstring:add(...)
local v = {...}
@@ -695,6 +686,15 @@ function tstring:drawOnSurface(s, max_width, max_lines, font, x, y, r, g, b)
end
end
+-- Make tstring into an object
+local tsmeta = {__index=tstring, __tostring = tstring.toString}
+setmetatable(tstring, {
+ __call = function(self, t)
+ setmetatable(t, tsmeta)
+ return t
+ end,
+})
+
dir_to_coord = {
[1] = {-1, 1},
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index f83f0b98f9..848581bd93 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -412,7 +412,7 @@ function _M:getDesc(name_param)
local c, _ = self:getDisplayColor()
local desc = tstring{}
if not self:isIdentified() then
- desc:add({"color", unpack(c)}, self:getName(name_param), {"color", "WHITE"})
+ desc:add({"color", unpack(c)}, self:getName(name_param), {"color", "WHITE"}, true)
else
desc:add({"color", unpack(c)}, self:getName(name_param), {"color", "WHITE"}, true)
desc:merge(self.desc)
--
GitLab