Mercurial > mm7

comparison UIPopup.cpp @ 848:ceef50611567

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* AI fixed (temporary) * PID_ID, PID_TYPE replaces * >> 7 error in AudioPlayer
author zipi
date Sun, 31 Mar 2013 10:44:43 +0100
parents dfd683c4f538
children 4dc2252e0b03
comparison
equal deleted inserted replaced
847:e398541aee60 848:ceef50611567
2129 if (PID_TYPE(v6) == OBJECT_Actor) 2129 if (PID_TYPE(v6) == OBJECT_Actor)
2130 { 2130 {
2131 if ( pRenderer->uNumSceneBegins ) 2131 if ( pRenderer->uNumSceneBegins )
2132 { 2132 {
2133 pWindow.DrawMessageBox(1); 2133 pWindow.DrawMessageBox(1);
2134 MonsterPopup_Draw(v6 >> 3, &pWindow); 2134 MonsterPopup_Draw(PID_ID(v6), &pWindow);
2135 } 2135 }
2136 else 2136 else
2137 { 2137 {
2138 pRenderer->BeginScene(); 2138 pRenderer->BeginScene();
2139 pWindow.DrawMessageBox(1); 2139 pWindow.DrawMessageBox(1);
2140 MonsterPopup_Draw(v6 >> 3, &pWindow); 2140 MonsterPopup_Draw(PID_ID(v6), &pWindow);
2141 pRenderer->EndScene(); 2141 pRenderer->EndScene();
2142 } 2142 }
2143 } 2143 }
2144 } 2144 }
2145 else 2145 else
2146 { 2146 {
2147 v7 = v6 >> 3; 2147 v7 = PID_ID(v6);
2148 if ( ! (pObjectList->pObjects[pSpriteObjects[v7].uObjectDescID].uFlags & 0x10 ) ) 2148 if ( ! (pObjectList->pObjects[pSpriteObjects[v7].uObjectDescID].uFlags & 0x10 ) )
2149 { 2149 {
2150 v8 = &pSpriteObjects[v7].stru_24; 2150 v8 = &pSpriteObjects[v7].stru_24;
2151 GameUI_DrawItemInfo(v8); 2151 GameUI_DrawItemInfo(v8);
2152 } 2152 }