Mercurial > mm7

comparison mm7_5.cpp @ 296:af7e848d6def

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 19 Feb 2013 13:31:50 +0200
parents 640a176c030f a672f297c163
children 0f2541245f65 3dcc9d945eeb
comparison
equal deleted inserted replaced
295:640a176c030f 296:af7e848d6def
2261 dword_6BE364_game_settings_1 |= v0; 2261 dword_6BE364_game_settings_1 |= v0;
2262 uGameState = 2; 2262 uGameState = 2;
2263 _5B65A8_npcdata_uflags_or_other = pNPCData4->uFlags; 2263 _5B65A8_npcdata_uflags_or_other = pNPCData4->uFlags;
2264 _5B65AC_npcdata_fame_or_other = pNPCData4->fame; 2264 _5B65AC_npcdata_fame_or_other = pNPCData4->fame;
2265 _5B65B0_npcdata_rep_or_other = pNPCData4->rep; 2265 _5B65B0_npcdata_rep_or_other = pNPCData4->rep;
2266 _5B65B4_npcdata_loword_house_or_other = LOWORD(pNPCData4->house); 2266 _5B65B4_npcdata_loword_house_or_other = LOWORD(pNPCData4->Location2D);
2267 _5B65B8_npcdata_hiword_house_or_other = HIWORD(pNPCData4->house); 2267 _5B65B8_npcdata_hiword_house_or_other = HIWORD(pNPCData4->Location2D);
2268 dword_5B65C0 = v0; 2268 dword_5B65C0 = v0;
2269 } 2269 }
2270 else 2270 else
2271 { 2271 {
2272 pParty->vPosition.x = pNPCData4->uFlags; 2272 pParty->vPosition.x = pNPCData4->uFlags;
2273 pParty->vPosition.y = pNPCData4->fame; 2273 pParty->vPosition.y = pNPCData4->fame;
2274 pParty->vPosition.z = pNPCData4->rep; 2274 pParty->vPosition.z = pNPCData4->rep;
2275 pParty->uFallStartY = pParty->vPosition.z; 2275 pParty->uFallStartY = pParty->vPosition.z;
2276 pParty->sRotationY = LOWORD(pNPCData4->house); 2276 pParty->sRotationY = LOWORD(pNPCData4->Location2D);
2277 pParty->sRotationX = HIWORD(pNPCData4->house); 2277 pParty->sRotationX = HIWORD(pNPCData4->Location2D);
2278 } 2278 }
2279 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 2279 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
2280 { 2280 {
2281 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 2281 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
2282 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v0; 2282 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v0;
2301 pNPCData4->pName = (char *)v62; 2301 pNPCData4->pName = (char *)v62;
2302 pNPCData2->uPortraitID = HIDWORD(v62); 2302 pNPCData2->uPortraitID = HIDWORD(v62);
2303 pNPCData2->uFlags = pParty->vPosition.x; 2303 pNPCData2->uFlags = pParty->vPosition.x;
2304 pNPCData2->fame = pParty->vPosition.y; 2304 pNPCData2->fame = pParty->vPosition.y;
2305 pNPCData2->rep = pParty->vPosition.z; 2305 pNPCData2->rep = pParty->vPosition.z;
2306 LOWORD(pNPCData2->house) = LOWORD(pParty->sRotationY); 2306 LOWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationY);
2307 HIWORD(pNPCData2->house) = LOWORD(pParty->sRotationX); 2307 HIWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationX);
2308 if ( (signed int)pGames_LOD->uNumSubIndices / 2 <= 0 ) 2308 if ( (signed int)pGames_LOD->uNumSubIndices / 2 <= 0 )
2309 continue; 2309 continue;
2310 uAction = 0; 2310 uAction = 0;
2311 while ( _strcmpi((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) ) 2311 while ( _strcmpi((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) )
2312 { 2312 {
7284 v244 = (*ppPlayer)->uFace; 7284 v244 = (*ppPlayer)->uFace;
7285 pRenderer->ResetClip(); 7285 pRenderer->ResetClip();
7286 pRenderer->DrawTextureIndexed(0x1D3u, 0, (Texture *)(uTextureID_BACKDOLL != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BACKDOLL] : 0));//Подложка 7286 pRenderer->DrawTextureIndexed(0x1D3u, 0, (Texture *)(uTextureID_BACKDOLL != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BACKDOLL] : 0));//Подложка
7287 if ( !IsPlayerWearingWatersuit[uPlayerID_] ) 7287 if ( !IsPlayerWearingWatersuit[uPlayerID_] )
7288 { 7288 {
7289 v21 = pPlayer->pEquipment.uBow; //сначало рисуется лук 7289 v21 = pPlayer->pEquipment.uBow; //сначала рисуется лук
7290 if ( !v21 ) 7290 if ( !v21 )
7291 goto LABEL_59; 7291 goto LABEL_59;
7292 v230 = pPlayer->pEquipment.uBow; 7292 v230 = pPlayer->pEquipment.uBow;
7293 v22 = (int)&v217->pInventoryItems[v21-1]; 7293 v22 = (int)&v217->pInventoryItems[v21-1];
7294 v23 = *(int *)v22; 7294 v23 = *(int *)v22;
13532 v2 = pStru179.field_0[dword_506528]; 13532 v2 = pStru179.field_0[dword_506528];
13533 a1.uFrameWidth = 460; 13533 a1.uFrameWidth = 460;
13534 a1.uFrameX = 8; 13534 a1.uFrameX = 8;
13535 a1.uFrameY = 8; 13535 a1.uFrameY = 8;
13536 a1.uFrameHeight = 344; 13536 a1.uFrameHeight = 344;
13537 v3 = (const char *)pStorylineText->StoreLine[v2].pText;//field_4[]; 13537 v3 = (const char *)pStorylineText->StoreLine[v2].pPageTitle;//field_4[];
13538 a1.uFrameZ = 467; 13538 a1.uFrameZ = 467;
13539 a1.uFrameW = 351; 13539 a1.uFrameW = 351;
13540 if ( v3 ) 13540 if ( v3 )
13541 a1.DrawTitleText(pBook2Font, 0, 0x16u, 0, v3, 3u); 13541 a1.DrawTitleText(pBook2Font, 0, 0x16u, 0, v3, 3u);
13542 } 13542 }