Mercurial > mm7

comparison mm7_6.cpp @ 189:038a4d09406f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new texts file, fix text rendender error
author Gloval
date Sat, 16 Feb 2013 00:33:21 +0400
parents d1dde383af89
children 9b77686e2239
comparison
equal deleted inserted replaced
185:16d257ffc802 189:038a4d09406f
37 #include "TurnEngine.h" 37 #include "TurnEngine.h"
38 #include "stru277.h" 38 #include "stru277.h"
39 #include "Weather.h" 39 #include "Weather.h"
40 #include "stru272.h" 40 #include "stru272.h"
41 #include "stru298.h" 41 #include "stru298.h"
42 #include "texts.h"
42 #include "StorylineTextTable.h" 43 #include "StorylineTextTable.h"
43 #include "Events2D.h" 44 #include "Events2D.h"
44 45
45 #include "mm7_data.h" 46 #include "mm7_data.h"
46 47
1413 { 1414 {
1414 Dst.Reset(); 1415 Dst.Reset();
1415 Dst.uItemID = pActor->uCarriedItemID; 1416 Dst.uItemID = pActor->uCarriedItemID;
1416 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName; 1417 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
1417 if ( v14 ) 1418 if ( v14 )
1418 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v9); 1419 sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[490], v14, v9);
1419 else 1420 else
1420 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v9); 1421 sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], v9);
1421 ShowStatusBarString(pTmpBuf2, 2u); 1422 ShowStatusBarString(pTmpBuf2, 2u);
1422 v4 = Dst.uItemID; 1423 v4 = Dst.uItemID;
1423 v5 = Dst.uItemID; 1424 v5 = Dst.uItemID;
1424 if ( pItemsTable->pItems[Dst.uItemID].uEquipType == 12 ) 1425 if ( pItemsTable->pItems[Dst.uItemID].uEquipType == 12 )
1425 { 1426 {
6473 party_finds_gold(*((int *)v449 + 3), 0); 6474 party_finds_gold(*((int *)v449 + 3), 0);
6474 viewparams->bRedrawGameUI = 1; 6475 viewparams->bRedrawGameUI = 1;
6475 } 6476 }
6476 else 6477 else
6477 { 6478 {
6478 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName); 6479 sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName);
6479 ShowStatusBarString(pTmpBuf2, 2u); 6480 ShowStatusBarString(pTmpBuf2, 2u);
6480 if ( !pParty->AddItem(&pLayingItems[v445].stru_24) ) 6481 if ( !pParty->AddItem(&pLayingItems[v445].stru_24) )
6481 pParty->SetHoldingItem(&pLayingItems[v445].stru_24); 6482 pParty->SetHoldingItem(&pLayingItems[v445].stru_24);
6482 } 6483 }
6483 LayingItem::_42F933(v445); 6484 LayingItem::_42F933(v445);