Mercurial > mm7

diff UI/UIGuilds.cpp @ 1756:dc5d8edf629a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Mon, 30 Sep 2013 18:06:01 +0600
parents 421c29d4ab3e
children 24e756a50073
line wrap: on
line diff
--- a/UI/UIGuilds.cpp	Mon Sep 30 18:05:50 2013 +0600
+++ b/UI/UIGuilds.cpp	Mon Sep 30 18:06:01 2013 +0600
@@ -223,7 +223,7 @@
       DrawTextAtStatusBar(statusbar_string, 0);
       if ( !v8 )
       {
-        working_window.DrawCurrentTime(pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C] - pParty->uTimePlayed);//"Приходите через 14 дней"
+        working_window.DrawCurrentTime(pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C] - pParty->uTimePlayed);//"Приходите через 14 дней"
         return;
       }
       v12 = pMouse->GetCursorPos(&v51);
@@ -249,7 +249,7 @@
       {
         sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[403], pClassNames[dialog_menu_id - 16]); //"You already know the %s skill"
         ShowStatusBarString(pTmpBuf.data(), 2);
-        pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0);
+        pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
       }
       else
       {