Mercurial > mm7

diff UI/UIHouses.h @ 1572:19f1735fca80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 08 Sep 2013 17:07:58 +0600
parents 61458df2cb4f
children 6d759814a817
line wrap: on
line diff
--- a/UI/UIHouses.h	Sun Sep 08 17:07:47 2013 +0600
+++ b/UI/UIHouses.h	Sun Sep 08 17:07:58 2013 +0600
@@ -32,8 +32,8 @@
   HOUSE_DIALOGUE_LEARN_SKILLS = 96,
   HOUSE_DIALOGUE_97 = 97,
   HOUSE_DIALOGUE_98 = 98,
-  HOUSE_DIALOGUE_TOWNHALL_99 = 99,
-  HOUSE_DIALOGUE_TOWNHALL_100 = 100,
+  HOUSE_DIALOGUE_TOWNHALL_MESSAGE = 99,
+  HOUSE_DIALOGUE_TOWNHALL_PAY_FINE = 100,
   HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN = 101,
   HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RULES = 102,
   HOUSE_DIALOGUE_TAVERN_ARCOMAGE_VICTORY_CONDITIONS = 103,