Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/UIPopup.cpp	Sat Mar 30 19:36:05 2013 +0400
+++ b/UIPopup.cpp	Sun Mar 31 10:44:43 2013 +0100
@@ -2131,20 +2131,20 @@
                         if ( pRenderer->uNumSceneBegins )
                             {
                             pWindow.DrawMessageBox(1);
-                            MonsterPopup_Draw(v6 >> 3, &pWindow);
+                            MonsterPopup_Draw(PID_ID(v6), &pWindow);
                             }
                         else
                             {
                             pRenderer->BeginScene();
                             pWindow.DrawMessageBox(1);
-                            MonsterPopup_Draw(v6 >> 3, &pWindow);
+                            MonsterPopup_Draw(PID_ID(v6), &pWindow);
                             pRenderer->EndScene();
                             }
                         }
                     }
                 else
                     {
-                    v7 = v6 >> 3;
+                    v7 = PID_ID(v6);
                     if ( ! (pObjectList->pObjects[pSpriteObjects[v7].uObjectDescID].uFlags & 0x10 ) )
                         {
                         v8 = &pSpriteObjects[v7].stru_24;