Mercurial > might-and-magic-trilogy

diff Indoor.cpp @ 45:bcc051713d20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BLV render & seffects
author Nomad
date Mon, 22 Oct 2012 20:45:14 +0200
parents e62134245ab0
children fde5c5acb66e
line wrap: on
line diff
--- a/Indoor.cpp	Sun Oct 21 23:26:23 2012 +0600
+++ b/Indoor.cpp	Mon Oct 22 20:45:14 2012 +0200
@@ -48,7 +48,7 @@
 stru337 stru_F81018;
 stru167_wrap array_5118E8;
 stru170_stru2 stru_F8A590;
-stru170 *pStru170; // idb
+stru170 *pStru170 = new stru170; // idb
 stru141 stru_721530;
 stru352 stru_F83B80[480];
 
@@ -123,13 +123,13 @@
     if ( v8->uNumDecorations > 0 )
     {
       do
-        PrepareDecorationsRenderList_BLV((signed __int16)v9[v12++], v7);
+        PrepareDecorationsRenderList_BLV(v9[v12++], v7);
       while ( v12 < v8->uNumDecorations );
     }
     v6 = i + 1;
   }
   MessWithBillboards_BLV();
-  pGame->PushStru165s();
+  pGame->PrepareBloodsplats();
 }
 
 
@@ -4167,8 +4167,8 @@
       v0->vVelocity.x = 0;
       if ( BYTE2(v17[v18].uAttributes) & 0x40 )
       {
-        if ( v0->uAIState == 5 )
-          v0->uAIState = 11;
+        if (v0->uAIState == Dead)
+          v0->uAIState = Removed;
       }
 LABEL_123:
       ++v63;
@@ -4259,9 +4259,9 @@
         v33 = _46ED1B_collide_against_floor(v30, v31, v32, &stru_721530.uSectorID, &v60);
         v34 = pIndoor->pFaces[v60].uAttributes;
         v35 = v34 & 0x400000;
-        if ( v35 && v0->uAIState == 5 )
+        if (v35 && v0->uAIState == Dead)
         {
-          v0->uAIState = 11;
+          v0->uAIState = Removed;
           goto LABEL_120;
         }
         if ( v59 != v22 || v62 != v22 || v35 == v22 )