Mercurial > mm7

comparison UI/UIPopup.cpp @ 2154:9bd7522cdbbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Render decoupling. Unsorted variables cleaning.
author Nomad
date Thu, 09 Jan 2014 14:36:48 +0200
parents d28d3c006077
children 0a1438c16c2b
comparison
equal deleted inserted replaced
2153:d28d3c006077 2154:9bd7522cdbbb
1432 LOWORD(v5) = pGame->pVisInstance->get_picked_object_zbuf_val(); 1432 LOWORD(v5) = pGame->pVisInstance->get_picked_object_zbuf_val();
1433 else 1433 else
1434 v5 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]]; 1434 v5 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]];
1435 if (PID_TYPE((unsigned __int16)v5) == OBJECT_Actor) 1435 if (PID_TYPE((unsigned __int16)v5) == OBJECT_Actor)
1436 { 1436 {
1437 if ( pRenderer->uNumSceneBegins ) 1437 /*if ( pRenderer->uNumSceneBegins )
1438 { 1438 {
1439 popup_window.DrawMessageBox(1); 1439 popup_window.DrawMessageBox(1);
1440 MonsterPopup_Draw(PID_ID((unsigned __int16)v5), &popup_window); 1440 MonsterPopup_Draw(PID_ID((unsigned __int16)v5), &popup_window);
1441 } 1441 }
1442 else 1442 else*/
1443 { 1443 {
1444 pRenderer->BeginScene(); 1444 pRenderer->BeginScene();
1445 popup_window.DrawMessageBox(1); 1445 popup_window.DrawMessageBox(1);
1446 MonsterPopup_Draw(PID_ID((unsigned __int16)v5), &popup_window); 1446 MonsterPopup_Draw(PID_ID((unsigned __int16)v5), &popup_window);
1447 pRenderer->EndScene(); 1447 pRenderer->EndScene();