Mercurial > mm7

comparison mm7_2.cpp @ 457:e5cf03a3d98e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Sun, 24 Feb 2013 20:39:03 +0600
parents 17c90e543e28
children c0ab5f64b37b
comparison
equal deleted inserted replaced
456:20d96ec810c8 457:e5cf03a3d98e
4309 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 4309 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
4310 pKeyActionMap->_459ED1(3); 4310 pKeyActionMap->_459ED1(3);
4311 pKeyActionMap->ResetKeys(); 4311 pKeyActionMap->ResetKeys();
4312 _5C3420_pDecoration = 0; 4312 _5C3420_pDecoration = 0;
4313 ptr_F8B1E8 = 0; 4313 ptr_F8B1E8 = 0;
4314 if ( array_5913D8[6] ) 4314 if ( pDialogueNPCCount )
4315 { 4315 {
4316 v0 = dword_F8B19C; 4316 v0 = dword_F8B19C;
4317 if ( dword_F8B19C != 2 4317 if ( dword_F8B19C != 2
4318 && dword_F8B19C != 3 4318 && dword_F8B19C != 3
4319 && dword_F8B19C != 97 4319 && dword_F8B19C != 97
4327 } 4327 }
4328 if ( v0 && v0 != 1 ) 4328 if ( v0 && v0 != 1 )
4329 { 4329 {
4330 if ( v0 == -1 ) 4330 if ( v0 == -1 )
4331 { 4331 {
4332 _4B4224_UpdateNPCTopics((int)((char *)array_5913D8[6] - 1)); 4332 _4B4224_UpdateNPCTopics((int)((char *)pDialogueNPCCount - 1));
4333 LABEL_33: 4333 LABEL_33:
4334 pVideoPlayer->_4BF5B2(); 4334 pVideoPlayer->_4BF5B2();
4335 return 1; 4335 return 1;
4336 } 4336 }
4337 if ( v0 != 94 && v0 != 96 && v0 != 101 ) 4337 if ( v0 != 94 && v0 != 96 && v0 != 101 )
4361 } 4361 }
4362 pVideoPlayer->_4BF5B2(); 4362 pVideoPlayer->_4BF5B2();
4363 UI_CreateEndConversationButton(); 4363 UI_CreateEndConversationButton();
4364 goto LABEL_28; 4364 goto LABEL_28;
4365 } 4365 }
4366 array_5913D8[6] = 0; 4366 pDialogueNPCCount = 0;
4367 pDialogueWindow->Release(); 4367 pDialogueWindow->Release();
4368 dword_F8B19C = 0; 4368 dword_F8B19C = 0;
4369 pDialogueWindow = 0; 4369 pDialogueWindow = 0;
4370 pIcons_LOD->_40F9C5(); 4370 pIcons_LOD->_40F9C5();
4371 v1 = uNumDialogueNPCPortraits; 4371 v1 = uNumDialogueNPCPortraits;
4376 if ( uNumDialogueNPCPortraits > 0 ) 4376 if ( uNumDialogueNPCPortraits > 0 )
4377 { 4377 {
4378 v3 = byte_591180; 4378 v3 = byte_591180;
4379 do 4379 do
4380 { 4380 {
4381 array_5913D8[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2], 4381 HouseNPCData[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2],
4382 0x3Fu, 0x49u, 1, 0, 0x19Au, v2, 0, v3, 0, 0, 0); 4382 0x3Fu, 0x49u, 1, 0, 0x19Au, v2, 0, v3, 0, 0, 0);
4383 v1 = uNumDialogueNPCPortraits; 4383 v1 = uNumDialogueNPCPortraits;
4384 ++v2; 4384 ++v2;
4385 v3 += 100; 4385 v3 += 100;
4386 } 4386 }
11955 dword_507B98_ctrl_pressed = 1; 11955 dword_507B98_ctrl_pressed = 1;
11956 return 0; 11956 return 0;
11957 } 11957 }
11958 if ( wParam == 27 ) 11958 if ( wParam == 27 )
11959 { 11959 {
11960 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, !v12, 0); 11960 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
11961 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 11961 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
11962 { 11962 {
11963 v12 = window_SpeakInHouse == 0; 11963 v12 = window_SpeakInHouse == 0;
11964 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 11964 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
11965 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = !v12; 11965 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = !v12;