mm7: mm7_2.cpp comparison

comparison mm7_2.cpp @ 611:7bae884b7cd0

Слияние

author	Ritor1
date	Wed, 06 Mar 2013 20:16:06 +0600
parents	42d5777c2f47 a463d7784d33
children	5bf285f56fa8

comparison

equal deleted inserted replaced

-:c615ff03b144
+:7bae884b7cd0
 v24 = -1;
 v23 = 0;
 v22 = 0;
 v21 = (SoundID)11090;
 }
-goto LABEL_40;
+pAudioPlayer->PlaySound(v21, v22, v23, v24, v25, v27, v29, v31);
+return 0;
 }
 if ( a1 == 10 )
 {
 v18 = pParty->pPlayers;
 do
 v2 = 0;
 for(int i=0; i<12; ++i)
 {
 //v3 = p2DEvents_minus1___00[26 * (unsigned int)ptr_507BC0->ptr_1C];
 v3 = p2DEvents[window_SpeakInHouse->par1C - 1].uType;
-if ( v3 < 5 )
+if ( v3 >= 5 )
-goto LABEL_12;
+	{
-if ( v3 <= 13 )
+		if ( v3 <= 13 )
-{
+		{
-v0 = rand() % word_4F0F30[(signed int)v1]
+		  v0 = rand() % word_4F0F30[(signed int)v1]
-//+ 11 * p2DEvents_minus1___00[26 * (unsigned int)ptr_507BC0->ptr_1C]
+			 //+ 11 * p2DEvents_minus1___00[26 * (unsigned int)ptr_507BC0->ptr_1C]
-+ 11 * p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType
+			 + 11 * p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType
-+ 345;
+			 + 345;
-}
+		}
-else
+		else
-{
+		{
-if ( v3 == 14 )
+		  if ( v3 == 14 )
-{
+		  {
-v4 = rand() % 4;
+			v4 = rand() % 4;
-}
+		  }
-else
+		  else if ( v3 == 15 )
-{
+		  {
-if ( v3 == 15 )
+			  v4 = rand() % 3 + 4;
-{
+		  }
-v4 = rand() % 3 + 4;
+		  else if ( v3 == 16 )
-}
+			v4 = rand() % 2 + 7;
-else
+		  if( v3 <= 16 )
-{
+			v0 = rand() % word_4F0F30[(signed int)v1] + 11 * v4 + 400;
-if ( v3 != 16 )
+		}
-goto LABEL_12;
+	}
-v4 = rand() % 2 + 7;
-}
-}
-v0 = rand() % word_4F0F30[(signed int)v1] + 11 * v4 + 400;
-}
-LABEL_12:
 if ( v0 == 487 )
 {
 if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 239) )
 v0 = 486;
 }
 if ( !pDialogueWindow->pNumPresenceButton )
 return;
 pRenderer->ClearZBuffer(0, 479);
 //v3 = dword_F8B198;
 if ( dword_F8B19C != 1 )
-goto LABEL_13;
+{
-if ( in_current_building_type == BildingType_Training )
+	v8 = window_SpeakInHouse;
-{
+}
-if ( uMessageParam == 17 )
+else
 {
-v4 = 0;
+	  if ( in_current_building_type == BildingType_Training )
-v5 = 0;
+	  {
-//v6 = pPlayers[uActiveCharacter];
+		if ( uMessageParam == 17 )
-//v7 = pPlayers[uActiveCharacter]->uLevel;
+		{
-if ( pPlayers[uActiveCharacter]->uLevel > 0 )
+		  v4 = 0;
-{
+		  v5 = 0;
-do
+		  //v6 = pPlayers[uActiveCharacter];
-v4 += v5++ + 1;
+		  //v7 = pPlayers[uActiveCharacter]->uLevel;
-while ( v5 < pPlayers[uActiveCharacter]->uLevel );
+		  if ( pPlayers[uActiveCharacter]->uLevel > 0 )
-}
+		  {
-if ( pPlayers[uActiveCharacter]->uLevel < (unsigned __int16)word_4F0866[(unsigned int)window_SpeakInHouse->ptr_1C]
+			do
-&& (signed __int64)pPlayers[uActiveCharacter]->uExperience < 1000 * v4 )
+			  v4 += v5++ + 1;
-return;
+			while ( v5 < pPlayers[uActiveCharacter]->uLevel );
-}
+		  }
-goto LABEL_9;
+		  if ( pPlayers[uActiveCharacter]->uLevel < (unsigned __int16)word_4F0866[(unsigned int)window_SpeakInHouse->ptr_1C]
-}
+			&& (signed __int64)pPlayers[uActiveCharacter]->uExperience < 1000 * v4 )
-v8 = window_SpeakInHouse;
+			return;
-if ( (in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats)
+		}
-&& (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7))
+		pDialogueWindow->Release();
-|| in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
+		pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, v1, v1);
-{
+		pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, v1, 0x71u, v1, v1, pGlobalTXT_LocalizationStrings[74],// "End Conversation"
-LABEL_9:
+					   (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), v1);
-pDialogueWindow->Release();
+		pDialogueWindow->CreateButton(8u, 8u, 0x1C2u, 0x140u, 1, v1, 0x51u, v1, v1, "", (Texture *)v1);
-pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, v1, v1);
+//	LABEL_10:
-pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, v1, 0x71u, v1, v1, pGlobalTXT_LocalizationStrings[74],// "End Conversation"
+		//v3 = dword_F8B198;
-(Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), v1);
+		v8 = window_SpeakInHouse;
-pDialogueWindow->CreateButton(8u, 8u, 0x1C2u, 0x140u, 1, v1, 0x51u, v1, v1, "", (Texture *)v1);
+	  }
-LABEL_10:
+	  else
-//v3 = dword_F8B198;
+	  {
-v8 = window_SpeakInHouse;
+		  v8 = window_SpeakInHouse;
-goto LABEL_11;
+		  if ( (in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats)
-}
+			&& (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7))
-if ( uActiveCharacter != v1 )
+			|| in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
-{
+		  {
-if ( !pPlayers[uActiveCharacter]->_4B6FF9() )
+		//LABEL_9:
-return;
+			pDialogueWindow->Release();
-goto LABEL_10;
+			pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, v1, v1);
-}
+			pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, v1, 0x71u, v1, v1, pGlobalTXT_LocalizationStrings[74],// "End Conversation"
-LABEL_11:
+						   (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), v1);
-dword_F8B19C = uMessageParam;
+			pDialogueWindow->CreateButton(8u, 8u, 0x1C2u, 0x140u, 1, v1, 0x51u, v1, v1, "", (Texture *)v1);
-if ( in_current_building_type < BildingType_19 )
+	//	LABEL_10:
-{
+			//v3 = dword_F8B198;
-v9 = pIcons_LOD->LoadTexture(off_4F03B8[in_current_building_type], TEXTURE_16BIT_PALETTE);
+			v8 = window_SpeakInHouse;
-//v3 = dword_F8B198;
+		  }
-ShopTexture = &pIcons_LOD->pTextures[v9];
+		  else if ( uActiveCharacter != v1 )
-LABEL_13:
+		  {
-v8 = window_SpeakInHouse;
+			if ( !pPlayers[uActiveCharacter]->_4B6FF9() )
+			  return;
+			v8 = window_SpeakInHouse;
+		  }
+	  }
+	//LABEL_11:
+	  dword_F8B19C = uMessageParam;
+	  if ( in_current_building_type < BildingType_19 )
+	  {
+		v9 = pIcons_LOD->LoadTexture(off_4F03B8[in_current_building_type], TEXTURE_16BIT_PALETTE);
+		//v3 = dword_F8B198;
+		ShopTexture = &pIcons_LOD->pTextures[v9];
+	//LABEL_13:
+		v8 = window_SpeakInHouse;
+	  }
 }
 if ( in_current_building_type > BildingType_Tavern )
 {
 if ( in_current_building_type == BildingType_Bank )
 {
 pParty->field_75A[v25] = v13;
 }
 v1 = 0;
 dword_F8B1A4 = pNPCTopics[352].pText;
 }
-goto LABEL_196;
+}
-}
+else if ( uMessageParam == 100 )
-if ( uMessageParam == 100 )
 {
 pKeyActionMap->EnterText(1, 10, v8);
-goto LABEL_196;
 }
 }
 }
 }
 if ( uMessageParam > 95 )
 if ( v0 && v0 != 1 )
 {
 if ( v0 == -1 )
 {
 _4B4224_UpdateNPCTopics((int)((char *)pDialogueNPCCount - 1));
-LABEL_33:
+//LABEL_33:
 pVideoPlayer->_4BF5B2();
 return 1;
 }
 if ( v0 != 94 && v0 != 96 && v0 != 101 )
 {
 else
 {
 if ( v0 != 102 && v0 != 103 && v0 != 104 )
 {
 pVideoPlayer->_4BF5B2();
-LABEL_28:
+//LABEL_28:
 dword_F8B19C = 1;
 sub_4B3B42(in_current_building_type);
 return 1;
 }
 pVideoPlayer->_4BF5B2();
 }
 return 1;
 }
 pVideoPlayer->_4BF5B2();
 UI_CreateEndConversationButton();
-goto LABEL_28;
+	  dword_F8B19C = 1;
+	  sub_4B3B42(in_current_building_type);
+	  return 1;
 }
 pDialogueNPCCount = 0;
 pDialogueWindow->Release();
 dword_F8B19C = 0;
 pDialogueWindow = 0;
 ++v2;
 v3 += 100;
 }
 while ( (signed int)v2 < uNumDialogueNPCPortraits );
 }
-goto LABEL_33;
+pVideoPlayer->_4BF5B2();
+return 1;
 }
 }
 return 0;
 }
 ItemGen *_this; // [sp+B0h] [bp-4h]@13
 v0 = pPlayers[uActiveCharacter];
 v77 = pPlayers[uActiveCharacter];
 if ( pCurrentScreen == SCREEN_E )
-goto LABEL_73;
+{
+sub_421EA6_OnInventoryLeftClick();
+return;
+}
 if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
 {
 v56 = 0;
 v52 = 0;
 v50 = 0;
 v49 = 0;
 v48 = -1;
 v47 = 0;
 v46 = 0;
-goto LABEL_87;
+pAudioPlayer->PlaySound(SOUND_27, v46, v47, v48, v49, v50, v52, v56);
+return;
 }
 if ( dword_F8B19C > 18 )
 {
 if ( dword_F8B19C < 36 )
 return;
 v13 = window_SpeakInHouse->ptr_1C;
 if ( in_current_building_type == BildingType_Training )
 v55 = 4;
 else
 v55 = 2;
-goto LABEL_84;
+HousePlaySomeSound((unsigned int)v13, v55);
+return;
 }
 Party::TakeGold(v44);
 v53 = 0;
 dword_F8B1E4 = 1;
 *pSkill = 1;
 v51 = 78;
-goto LABEL_80;
+v27 = v0;
+		  v27->PlaySound((PlayerSpeech)v51, v53);
+		  return;
 }
 }
 return;
 }
 if ( dword_F8B19C != 94 )
 if ( dword_F8B19C != 95 )
 return;
 goto LABEL_49;
 }
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
-LABEL_73:
+//LABEL_73:
 sub_421EA6_OnInventoryLeftClick();
 return;
 }
 if ( dword_F8B19C == 18 )
 {
 v80 = v23;
 GetAsyncKeyState(VK_CONTROL);
 if ( pParty->uNumGold < v23 )
 {
 v24 = 2;
-LABEL_62:
+//LABEL_62:
 HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, v24);
 v9 = pGlobalTXT_LocalizationStrings[155];
 v54 = 2;
-goto LABEL_71;
+ShowStatusBarString(v9, v54);
+return;
 }
 v25 = v0->AddItem(0xFFFFFFFFu, v20->uItemID);
 if ( v25 )
 {
 v26 = 1;
 v20->SetIdentified();
 memcpy(&v0->pInventoryItems[v25-1], v20, 0x24u);
-goto LABEL_42;
+dword_F8B1E4 = v26;
+Party::TakeGold(v80);
+viewparams->bRedrawGameUI = v26;
+_this->Reset();
+pRenderer->ClearZBuffer(0, 479);
+v27 = v77;
+v53 = 0;
+v51 = SPEECH_75;
+v27->PlaySound((PlayerSpeech)v51, v53);
+return;
 }
 v0->PlaySound(SPEECH_NoRoom, 0);
 v54 = 5;
-LABEL_70:
+//LABEL_70:
 v9 = pGlobalTXT_LocalizationStrings[563];   // "Pack is Full!"
-goto LABEL_71;
+ShowStatusBarString(v9, v54);
+return;
 }
 if ( dword_F8B19C == 2 )
 {
 LABEL_49:
 v28 = pMouse->GetCursorPos(&v59);
 {
 v24 = 2;
 if ( uNumSeconds != 2 )
 {
 if ( uNumSeconds != 1 )
-goto LABEL_62;
+		{
+		  HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, v24);
+		  v9 = pGlobalTXT_LocalizationStrings[155];
+		  v54 = 2;
+ShowStatusBarString(v9, v54);
+return;
+		}
 }
 }
 v39 = v0->AddItem(0xFFFFFFFFu, v32->uItemID);
 if ( v39 )
 {
 v41 = uNumSeconds;
 if ( uNumSeconds == 1 || uNumSeconds == 2 )
 {
 *(char *)(v40 + 517) |= 1u;
 sub_4B1447_party_fine((int)window_SpeakInHouse->ptr_1C, v41, a6);
-goto LABEL_43;
+		    viewparams->bRedrawGameUI = v26;
+		    _this->Reset();
+		    pRenderer->ClearZBuffer(0, 479);
+		    v27 = v77;
+		    v53 = 0;
+		    v51 = SPEECH_75;
+		    v27->PlaySound((PlayerSpeech)v51, v53);
+		    return;
 }
 }
 }
-LABEL_42:
+//LABEL_42:
 dword_F8B1E4 = v26;
 Party::TakeGold(v80);
-LABEL_43:
+//LABEL_43:
 viewparams->bRedrawGameUI = v26;
 _this->Reset();
 pRenderer->ClearZBuffer(0, 479);
 v27 = v77;
 v53 = 0;
 v51 = SPEECH_75;
-LABEL_81:
+//LABEL_81:
 v27->PlaySound((PlayerSpeech)v51, v53);
 return;
 }
 v0->PlaySound(SPEECH_NoRoom, 0);
 v54 = 2;
-goto LABEL_70;
+v9 = pGlobalTXT_LocalizationStrings[563];   // "Pack is Full!"
+ShowStatusBarString(v9, v54);
+return;
 }
 if ( dword_F8B19C == 3 )
 {
 v14 = pMouse->GetCursorPos(&v71)->x - 14;
 v79 = (v14 >> 5) + 14 * ((pMouse->GetCursorPos(&v69)->y - 17) >> 5);
 v0->_4BE2DD(v79, (int)((char *)v77 - 1), (int)v16->ptr_1C);
 viewparams->bRedrawGameUI = 1;
 pRenderer->ClearZBuffer(0, 479);
 v53 = 0;
 v51 = 77;
-goto LABEL_80;
+v27 = v0;
-}
+v27->PlaySound((PlayerSpeech)v51, v53);
+return;
+	}
 v0->PlaySound(SPEECH_79, 0);
 v56 = 0;
 v52 = 0;
 v50 = 0;
 v49 = 0;
 v48 = -1;
 v47 = 0;
 v46 = 0;
-LABEL_87:
+//LABEL_87:
 pAudioPlayer->PlaySound(SOUND_27, v46, v47, v48, v49, v50, v52, v56);
 return;
 }
 if ( dword_F8B19C == 4 )
 {
 dword_F8B1E4 = 1;
 Party::TakeGold(v80);
 *(int *)(v12 + 20) |= 1u;
 v0->PlaySound(SPEECH_73, 0);
 v9 = pGlobalTXT_LocalizationStrings[569];
-goto LABEL_25;
+v54 = 2;
+ShowStatusBarString(v9, v54);
+return;
 }
-goto LABEL_26;
+v13 = _this;
+v55 = 2;
+HousePlaySomeSound((unsigned int)v13, v55);
+return;
 }
 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0);
 v53 = 0;
-goto LABEL_28;
+v51 = 79;
+v27 = v0;
+	        v27->PlaySound((PlayerSpeech)v51, v53);
+		    return;
 }
 v53 = 0;
-LABEL_30:
+//LABEL_30:
 v51 = 76;
-goto LABEL_80;
+v27 = v0;
-}
+	      v27->PlaySound((PlayerSpeech)v51, v53);
+		  return;
+		}
 }
 }
 }
 else
 {
 v8 = *(int *)(v3 + 20);
 LOBYTE(v8) = v8 & 0xFD;
 *(int *)(v3 + 20) = v8 | 1;
 v0->PlaySound(SPEECH_74, 0);
 v9 = pGlobalTXT_LocalizationStrings[570];
-LABEL_25:
+//LABEL_25:
 v54 = 2;
-LABEL_71:
+//LABEL_71:
 ShowStatusBarString(v9, v54);
 return;
 }
-LABEL_26:
+//LABEL_26:
 v13 = _this;
 v55 = 2;
-LABEL_84:
+//LABEL_84:
 HousePlaySomeSound((unsigned int)v13, v55);
 return;
 }
 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0);
 v53 = 0;
-LABEL_28:
+//LABEL_28:
 v51 = 79;
-LABEL_80:
+//LABEL_80:
 v27 = v0;
-goto LABEL_81;
+			  v27->PlaySound((PlayerSpeech)v51, v53);
+			return;
 }
 v53 = 0;
-goto LABEL_30;
+v51 = 76;
-}
+v27 = v0;
+	        v27->PlaySound((PlayerSpeech)v51, v53);
+		    return;
+		  }
 }
 }
 }
 }
 }
 {
 v5 = v2[v7];
 *v2 = v5;
 if ( !v5 )
 {
-LABEL_23:
+//LABEL_23:
 *v2 = 0;
 break;
 }
 if ( v5 == ',' )
 {
 if ( v3 )
-goto LABEL_18;
+		{
-*v2 = 0;
+if ( v4 )
+{
+stru_F8B5E8.pProperties[stru_F8B5E8.field_0] = v2;
+++stru_F8B5E8.field_0;
+}
+v4 = 0;
+	    }
+		else
+		{
+*v2 = 0;
+		  v4 = 1;
+		}
 }
 else
 {
 if ( v5 != '\t' )
 {
 {
 stru_F8B5E8.pProperties[stru_F8B5E8.field_0] = v2;
 ++stru_F8B5E8.field_0;
 }
 }
-goto LABEL_21;
 }
-LABEL_18:
+		  else
-if ( v4 )
+		  {
-{
+//LABEL_18:
-stru_F8B5E8.pProperties[stru_F8B5E8.field_0] = v2;
+			  if ( v4 )
-++stru_F8B5E8.field_0;
+			  {
-}
+				stru_F8B5E8.pProperties[stru_F8B5E8.field_0] = v2;
-v4 = 0;
+				++stru_F8B5E8.field_0;
-goto LABEL_21;
+			  }
-}
+			  v4 = 0;
-if ( v3 )
+		  }
-goto LABEL_18;
+}
-*v2 = 0;
+		else
-if ( v4 )
+		{
-{
+			if ( v3 )
-stru_F8B5E8.pProperties[stru_F8B5E8.field_0] = v2;
+			{
-++stru_F8B5E8.field_0;
+			  if ( v4 )
-}
+			  {
+				stru_F8B5E8.pProperties[stru_F8B5E8.field_0] = v2;
+				++stru_F8B5E8.field_0;
+			  }
+			  v4 = 0;
+			}
+			else
+			{
+				*v2 = 0;
+				if ( v4 )
+				{
+				  stru_F8B5E8.pProperties[stru_F8B5E8.field_0] = v2;
+				  ++stru_F8B5E8.field_0;
+				}
+				v4 = 1;
+			}
+		}
 }
-v4 = 1;
+//LABEL_21:
-LABEL_21:
 if ( stru_F8B5E8.field_0 < 30 )
 {
 ++v2;
 if ( (unsigned int)v2 < (unsigned int)&unk_F8B5E0 )
 continue;
 }
-goto LABEL_23;
+*v2 = 0;
+break;
 }
 }
 result = a2;
 memcpy(a2, &stru_F8B5E8, 0x7Cu);
 return result;
 }
 pWindow_MainMenu->Release();
 pIcons_LOD->_4114F2();
 }
 //----- (004637EB) --------------------------------------------------------
 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam)
 {
 unsigned int v4; // esi@1
 Render *v5; // ecx@14
 pGame->pGammaController->Initialize(uGammaPos * 0.1 + 0.6);
 if ( ReadWindowsRegistryInt("Bloodsplats", 1) )
 pGame->uFlags2 |= GAME_FLAGS_2_DRAW_BLOODSPLATS;
 else
-pGame->uFlags2 &= ~GAME_FLAGS_2_DRAW_BLOODSPLATS;
+pGame->uFlags2 &= GAME_FLAGS_2_DRAW_BLOODSPLATS;
 uTurnSpeed = ReadWindowsRegistryInt("TurnDelta", 0);
 dword_6BE384_2dacceloff = ReadWindowsRegistryInt("2dacceloff", 0);
 if (!bNoSound)

Mercurial > mm7

comparison mm7_2.cpp @ 611:7bae884b7cd0