Mercurial > mm7

comparison mm7_5.cpp @ 308:6d584c95dcf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Wed, 20 Feb 2013 00:28:52 +0400
parents e33f5a1cdc46
children 2a09e1d6fc8f
comparison
equal deleted inserted replaced
307:72faa54ff319 308:6d584c95dcf8
2278 pParty->sRotationY = LOWORD(pNPCData4->Location2D); 2278 pParty->sRotationY = LOWORD(pNPCData4->Location2D);
2279 pParty->sRotationX = HIWORD(pNPCData4->Location2D); 2279 pParty->sRotationX = HIWORD(pNPCData4->Location2D);
2280 } 2280 }
2281 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 2281 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
2282 { 2282 {
2283 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 2283 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_Escape;
2284 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v0; 2284 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v0;
2285 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 2285 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
2286 ++pMessageQueue_50CBD0->uNumMessages; 2286 ++pMessageQueue_50CBD0->uNumMessages;
2287 } 2287 }
2288 //crt_deconstruct_ptr_6A0118(); 2288 //crt_deconstruct_ptr_6A0118();
3501 sprintf(pTmpBuf, "%d:%02d%s %s %d %s %d", pNPCData4, pParty->uCurrentMinute, aAMPMNames[uNumSeconds], aDayNames[pParty->uDaysPlayed % 7], 3501 sprintf(pTmpBuf, "%d:%02d%s %s %d %s %d", pNPCData4, pParty->uCurrentMinute, aAMPMNames[uNumSeconds], aDayNames[pParty->uDaysPlayed % 7],
3502 7 * pParty->uCurrentMonthWeek + pParty->uDaysPlayed % 7 + 1, aMonthNames[pParty->uCurrentMonth], pParty->uCurrentYear); 3502 7 * pParty->uCurrentMonthWeek + pParty->uDaysPlayed % 7 + 1, aMonthNames[pParty->uCurrentMonth], pParty->uCurrentYear);
3503 sub_41C0B8_set_status_string(pTmpBuf); 3503 sub_41C0B8_set_status_string(pTmpBuf);
3504 continue; 3504 continue;
3505 case UIMSG_ShowStatus_Food: 3505 case UIMSG_ShowStatus_Food:
3506 v173 = (char *)pParty->uNumFoodRations; 3506 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[501], pParty->uNumFoodRations); // "You have %lu food"
3507 v157 = pGlobalTXT_LocalizationStrings[501];// You have %lu food" 3507 sub_41C0B8_set_status_string(pTmpBuf);
3508 goto _sprintex_2args_draw_status_and_continue; 3508 continue;
3509 case UIMSG_ShowStatus_Player: 3509 case UIMSG_ShowStatus_Player:
3510 pPlayer5 = pPlayers[uMessageParam]; 3510 pPlayer5 = pPlayers[uMessageParam];
3511 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s" 3511 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
3512 strcat(pTmpBuf, ": "); 3512 strcat(pTmpBuf, ": ");
3513 v107 = pPlayer5->GetMajorConditionIdx(); 3513 v107 = pPlayer5->GetMajorConditionIdx();