--- a/mm7_5.cpp	Thu Jul 18 17:07:49 2013 +0200
+++ b/mm7_5.cpp	Thu Jul 18 17:29:20 2013 +0200
@@ -1245,7 +1245,7 @@
                     case SCREEN_REST://close rest screen
                       if ( dword_506F14 )
                       {
-                        Rest(_506F18_num_hours_to_sleep);
+                        Rest(_506F18_num_minutes_to_sleep);
                         pParty->pPlayers[3].pConditions[2] = 0i64;
                         pParty->pPlayers[2].pConditions[2] = 0i64;
                         pParty->pPlayers[1].pConditions[2] = 0i64;
@@ -1257,7 +1257,7 @@
                       pTexture_RestUI_CurrentSkyFrame = 0;
                       pIcons_LOD->SyncLoadedFilesCount();
                       pIcons_LOD->_4114F2();
-                      _506F18_num_hours_to_sleep = 0;
+                      _506F18_num_minutes_to_sleep = 0;
                       dword_506F14 = 0;
                       dword_507B94 = 1;
                       if ( pGUIWindow_Settings )
@@ -2463,7 +2463,7 @@
           GUIWindow::Create(pButton_RestUI_Wait5Minutes->uX, pButton_RestUI_Wait5Minutes->uY, 0, 0, WINDOW_PressedButton2,
             (int)pButton_RestUI_Wait5Minutes, pGlobalTXT_LocalizationStrings[238]);// "Wait 5 Minutes"
           dword_506F14 = 1;
-          _506F18_num_hours_to_sleep = 5;
+          _506F18_num_minutes_to_sleep = 5;
           continue;
         case UIMSG_Wait1Hour:
           if ( dword_506F14 == 2 )
@@ -2475,15 +2475,15 @@
           GUIWindow::Create(pButton_RestUI_Wait1Hour->uX, pButton_RestUI_Wait1Hour->uY, 0, 0, WINDOW_PressedButton2,
             (int)pButton_RestUI_Wait1Hour, pGlobalTXT_LocalizationStrings[239]);// "Wait 1 Hour"
           dword_506F14 = 1;
-          _506F18_num_hours_to_sleep = 60;
+          _506F18_num_minutes_to_sleep = 60;
           continue;
         case UIMSG_RentRoom:
           dword_506F14 = 2;
           RestUI_Load();
           v86 = 60 * (_494820_training_time(pParty->uCurrentHour) + 1) - pParty->uCurrentMinute;
-          _506F18_num_hours_to_sleep = v86;
-          if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 )
-            _506F18_num_hours_to_sleep = v86 + 720;
+          _506F18_num_minutes_to_sleep = v86;
+          if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 ) // 107 = Emerald Isle tavern
+            _506F18_num_minutes_to_sleep = v86 + 12 * 60;
           dword_506F14 = 2;
           pParty->RestAndHeal();
           pParty->days_played_without_rest = 0;
@@ -2577,7 +2577,7 @@
                 HIDWORD(pParty->pPlayers[pPlayerNum].pConditions[2]) = 0;
                 v95 = rand();
                 Rest(v95 % 6 + 60);
-                _506F18_num_hours_to_sleep = 0;
+                _506F18_num_minutes_to_sleep = 0;
                 dword_506F14 = 0;
                 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
                 {
@@ -2593,7 +2593,7 @@
               }
             }
             Party::TakeFood(uRestUI_FoodRequiredToRest);
-            _506F18_num_hours_to_sleep = 480;
+            _506F18_num_minutes_to_sleep = 480;
             dword_506F14 = 2;
             pParty->RestAndHeal();
             pParty->days_played_without_rest = 0;
@@ -2614,7 +2614,7 @@
             (int)pButton_RestUI_WaitUntilDawn, pGlobalTXT_LocalizationStrings[237]);// "Wait until Dawn"
           v97 = _494820_training_time(pParty->uCurrentHour);
           dword_506F14 = 1;
-          _506F18_num_hours_to_sleep = 60 * v97 - pParty->uCurrentMinute;
+          _506F18_num_minutes_to_sleep = 60 * v97 - pParty->uCurrentMinute;
           continue;
         case UIMSG_HintSelectRemoveQuickSpellBtn:
           if ( quick_spell_at_page && byte_506550 )