Mercurial > mm7

changeset 2022:03d9336e862f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SOUND_WalkingOnTo3DModel
author Ritor1
date Wed, 13 Nov 2013 17:41:12 +0600
parents b60eaf28bf0c
children beb97b20c3ed
files AudioPlayer.h NPC.cpp UI/UIHouses.cpp UI/UIMainMenu.cpp mm7_3.cpp
diffstat 5 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/AudioPlayer.h	Mon Nov 11 23:57:02 2013 +0600
+++ b/AudioPlayer.h	Wed Nov 13 17:41:12 2013 +0600
@@ -79,7 +79,7 @@
   SOUND_8 = 0x8,
   SOUND_24 = 24,
   SOUND_error = 27,
-  SOUND_64 = 64,
+  SOUND_WalkingOnTo3DModel = 64,
   SOUND_Button = 66,
   SOUND_67 = 67,
   SOUND_71 = 71,
@@ -90,7 +90,7 @@
   SOUND_83 = 83,
   SOUND_84 = 84,
   SOUND_85 = 85,
-  SOUND_103 = 103,
+  SOUND_WalkingBackTo3DModel = 103,
   SOUND_Arcomage_LoseResources = 0x78,
   SOUND_Arcomage_AddResources = 0x79,
   SOUND_Arcomage_TowerWallDamage = 0x7A,
--- a/NPC.cpp	Mon Nov 11 23:57:02 2013 +0600
+++ b/NPC.cpp	Wed Nov 13 17:41:12 2013 +0600
@@ -1650,11 +1650,11 @@
       for ( i = 0; i < uNumDialogueNPCPortraits; ++i )
         HouseNPCPortraitsButtonsList[i]->Release();
     }
-    pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0);
-    pBtn_ExitCancel = pDialogueWindow->CreateButton(  471u,  445u,  169u, 35u,  1,   0, UIMSG_Escape,  0,  0,
+    pDialogueWindow = GUIWindow::Create(0, 0, 640, 345, WINDOW_MainMenu, 0, 0);
+    pBtn_ExitCancel = pDialogueWindow->CreateButton(  471,  445,  169, 35,  1,   0, UIMSG_Escape,  0,  0,
                    pGlobalTXT_LocalizationStrings[74],// "End Conversation"
                    pIcons_LOD->GetTexture(uExitCancelTextureId),   0);
-    pDialogueWindow->CreateButton(8u, 8u, 0x1C2u, 0x140u, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
+    pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
     if ( pDialogueNPCCount == 1 && dword_591080 )
     {
       InitializaDialogueOptions(in_current_building_type);
--- a/UI/UIHouses.cpp	Mon Nov 11 23:57:02 2013 +0600
+++ b/UI/UIHouses.cpp	Wed Nov 13 17:41:12 2013 +0600
@@ -2046,16 +2046,17 @@
       {
         Party::TakeGold(pPriceRoom);
         PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
-        //dialog_menu_id = HOUSE_DIALOGUE_NULL;
+        dialog_menu_id = HOUSE_DIALOGUE_NULL;
         HouseDialogPressCloseBtn();
         GetHouseGoodbyeSpeech();
         pVideoPlayer->Unload();
-        if ( pMessageQueue_50CBD0->uNumMessages )
+        /*if ( pMessageQueue_50CBD0->uNumMessages )
           pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
         pMessageQueue_50CBD0->pMessages[0].eType = UIMSG_RentRoom;
         pMessageQueue_50CBD0->pMessages[0].param = (int)window_SpeakInHouse->ptr_1C;//107
         pMessageQueue_50CBD0->pMessages[0].field_8 = 1;
-        ++pMessageQueue_50CBD0->uNumMessages;
+        ++pMessageQueue_50CBD0->uNumMessages;*/
+        pMessageQueue_50CBD0->AddMessage(UIMSG_RentRoom, (int)window_SpeakInHouse->ptr_1C, 1);
         window_SpeakInHouse->Release();
         window_SpeakInHouse = 0;
         return;
--- a/UI/UIMainMenu.cpp	Mon Nov 11 23:57:02 2013 +0600
+++ b/UI/UIMainMenu.cpp	Wed Nov 13 17:41:12 2013 +0600
@@ -105,17 +105,17 @@
   pPrimaryWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
   pPrimaryWindow->CreateButton(7, 8, 460, 343, 1, 0, UIMSG_MouseLeftClickInGame, 0, 0, "", 0);
 
-  pPrimaryWindow->CreateButton(61, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
-  pPrimaryWindow->CreateButton(177, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
+  pPrimaryWindow->CreateButton(61, 424, 31, 80, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);//buttons for portraits
+  pPrimaryWindow->CreateButton(177, 424, 31, 80, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
   pPrimaryWindow->CreateButton(292, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 3, '3', "", 0);
   pPrimaryWindow->CreateButton(407, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
 
-  pPrimaryWindow->CreateButton(24, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);
+  pPrimaryWindow->CreateButton(24, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);//buttons for HP
   pPrimaryWindow->CreateButton(139, 404, 5, 49, 1, 93, UIMSG_0, 2, 0, "", 0);
   pPrimaryWindow->CreateButton(255, 404, 5, 49, 1, 93, UIMSG_0, 3, 0, "", 0);
   pPrimaryWindow->CreateButton(370, 404, 5, 49, 1, 93, UIMSG_0, 4, 0, "", 0);
 
-  pPrimaryWindow->CreateButton(97, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);
+  pPrimaryWindow->CreateButton(97, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);//buttons for SP
   pPrimaryWindow->CreateButton(212, 404, 5, 49, 1, 93, UIMSG_0, 2, 0, "", 0);
   pPrimaryWindow->CreateButton(328, 404, 5, 49, 1, 93, UIMSG_0, 3, 0, "", 0);
   pPrimaryWindow->CreateButton(443, 404, 5, 49, 1, 93, UIMSG_0, 4, 0, "", 0);
--- a/mm7_3.cpp	Mon Nov 11 23:57:02 2013 +0600
+++ b/mm7_3.cpp	Wed Nov 13 17:41:12 2013 +0600
@@ -2933,14 +2933,14 @@
 		  if ( !is_not_on_bmodel
 			&& !(BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20) )
 		  {
-            pAudioPlayer->PlaySound(SOUND_64, 804, 1, -1, 0, 0, 0, 0);
+            pAudioPlayer->PlaySound(SOUND_WalkingOnTo3DModel, 804, 1, -1, 0, 0, 0, 0);//хождение вперёд на 3D Modelи
 		  }
 		  else
 		  {
 			//v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1;
 			//v64 = WorldPosToGridCellX(pParty->vPosition.x);
 			v87 = pOutdoor->GetSoundIdByPosition(WorldPosToGridCellX(pParty->vPosition.x), WorldPosToGridCellZ(pParty->vPosition.y) - 1, 1);
-			pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0);
+			pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0);//хождение по земле
 		  }
 		}
 		else
@@ -2953,10 +2953,10 @@
 				//v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1;
 				//v64 = WorldPosToGridCellX(pParty->vPosition.x);
 				v87 = pOutdoor->GetSoundIdByPosition(WorldPosToGridCellX(pParty->vPosition.x), WorldPosToGridCellZ(pParty->vPosition.y) - 1, 0);
-				pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0);
+				pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0);// при заднем ходе на земле
 			  }
 			  else
-                pAudioPlayer->PlaySound(SOUND_103, 804, 1, -1, 0, 0, 0, 0);
+                pAudioPlayer->PlaySound(SOUND_WalkingBackTo3DModel, 804, 1, -1, 0, 0, 0, 0);// при заднем ходе на 3D Modelи
 			}
 			else
 			{