Mercurial > mm7

changeset 1069:e32e2287d491

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fixes
author zipi
date Fri, 24 May 2013 19:55:34 +0100
parents 6cbf4eb0f953
children 944e8d715a3e
files Player.cpp SpriteObject.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Fri May 24 16:58:43 2013 +0100
+++ b/Player.cpp	Fri May 24 19:55:34 2013 +0100
@@ -5828,7 +5828,7 @@
           v58 = v56 & 0x3F;
           for ( j = 0; j < (signed int)v57; ++j )
               {
-              if ( lvl_avl[i] )
+              if ( lvl_avl[j] )
                   v70 += v58;
               }
           }
--- a/SpriteObject.cpp	Fri May 24 16:58:43 2013 +0100
+++ b/SpriteObject.cpp	Fri May 24 19:55:34 2013 +0100
@@ -740,7 +740,7 @@
             v39b = pActors;//[0].word_000086_some_monster_id;
             do
             {
-              _46DF1A_collide_against_actor(v42++, *((short *)&pMonsterList->pMonsters[*(short *)v39b] - 73));
+              _46DF1A_collide_against_actor(v42++, *((short *)&pMonsterList->pMonsters[v39b->word_000086_some_monster_id] - 73));
               ++v39b;
             }
             while ( v42 < (signed int)uNumActors );