From 87148823922f69ccce885d52b89f24b7d4dbed64 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 2 Nov 2010 12:46:29 +0000
Subject: [PATCH] plop
git-svn-id: http://svn.net-core.org/repos/t-engine4@1756 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 2 +-
.../tome/data/{calendar_rivendell.lua => calendar_allied.lua} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename game/modules/tome/data/{calendar_rivendell.lua => calendar_allied.lua} (100%)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index a30ce83f8f..a8be69bec9 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -86,7 +86,7 @@ function _M:run()
self.player_display = PlayerDisplay.new(0, 220, 200, self.h * 0.8 - 220, {30,30,0})
self.hotkeys_display = HotkeysDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
self.npcs_display = ActorsSeenDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
- self.calendar = Calendar.new("/data/calendar_rivendell.lua", "Today is the %s %s of the %s year of the Age of Ascendancy of Maj'Eyal.\nThe time is %02d:%02d.", 122, 167)
+ self.calendar = Calendar.new("/data/calendar_allied.lua", "Today is the %s %s of the %s year of the Age of Ascendancy of Maj'Eyal.\nThe time is %02d:%02d.", 122, 167)
self.tooltip = Tooltip.new(nil, nil, {255,255,255}, {30,30,30})
self.flyers = FlyingText.new()
self:setFlyingText(self.flyers)
diff --git a/game/modules/tome/data/calendar_rivendell.lua b/game/modules/tome/data/calendar_allied.lua
similarity index 100%
rename from game/modules/tome/data/calendar_rivendell.lua
rename to game/modules/tome/data/calendar_allied.lua
--
GitLab