diff mm7_2.cpp @ 1940:a50511e4f3c6

Слияние
author Ritor1
date Thu, 24 Oct 2013 15:31:22 +0600
parents 1cbfb6e50e48
children 7fd4bfa175fd
line wrap: on
line diff
--- a/mm7_2.cpp	Thu Oct 24 15:28:33 2013 +0600
+++ b/mm7_2.cpp	Thu Oct 24 15:31:22 2013 +0600
@@ -22,6 +22,7 @@
 #include "GammaControl.h"
 #include "stru6.h"
 
+#include "Actor.h"
 #include "Vis.h"
 #include "MapInfo.h"
 #include "Game.h"
@@ -600,7 +601,7 @@
   {
     monster_y = pMonsterArenaPlacements[i].y;
     v21 = rand();
-    _4BBF61_summon_actor((unsigned __int16)monster_ids[v21 % num_monsters], pMonsterArenaPlacements[i].x, monster_y, 1);
+    Actor::_4BBF61_summon_actor((unsigned __int16)monster_ids[v21 % num_monsters], pMonsterArenaPlacements[i].x, monster_y, 1);
   }
   pAudioPlayer->PlaySound((SoundID)14060, 0, 0, -1, 0, 0, 0, 0);
 }