# HG changeset patch
# User Thibaut Girka <thib@sitedethib.com>
# Date 1318266083 -7200
# Node ID 4684d311a32db3ddb814c4a52b21daa2da5ad233
# Parent  7769ce7be03cb9f166b7f5f82ee9d8f521f5473f
Remove remaining pop_enemy/new_enemy mess

diff --git a/pytouhou/game/enemy.py b/pytouhou/game/enemy.py
--- a/pytouhou/game/enemy.py
+++ b/pytouhou/game/enemy.py
@@ -22,7 +22,7 @@ from math import cos, sin, atan2, pi
 
 
 class Enemy(object):
-    def __init__(self, pos, life, _type, bonus_dropped, anm_wrapper, game, pop_enemy):
+    def __init__(self, pos, life, _type, bonus_dropped, anm_wrapper, game):
         self._game = game
         self._anm_wrapper = anm_wrapper
         self._sprite = None
@@ -71,8 +71,6 @@ class Enemy(object):
         self.hitbox_half_size = (0, 0)
         self.screen_box = None
 
-        self.pop_enemy = pop_enemy
-
 
     def set_bullet_attributes(self, type_, anim, sprite_idx_offset,
                               bullets_per_shot, number_of_shots, speed, speed2,
diff --git a/pytouhou/game/game.py b/pytouhou/game/game.py
--- a/pytouhou/game/game.py
+++ b/pytouhou/game/game.py
@@ -65,8 +65,8 @@ class Game(object):
         self.bullets = []
 
 
-    def new_enemy(self, pos, life, instr_type, bonus_dropped, pop_enemy):
-        enemy = Enemy(pos, life, instr_type, bonus_dropped, self.enm_anm_wrapper, self, pop_enemy)
+    def new_enemy(self, pos, life, instr_type, bonus_dropped):
+        enemy = Enemy(pos, life, instr_type, bonus_dropped, self.enm_anm_wrapper, self)
         self.enemies.append(enemy)
         return enemy
 
diff --git a/pytouhou/vm/eclrunner.py b/pytouhou/vm/eclrunner.py
--- a/pytouhou/vm/eclrunner.py
+++ b/pytouhou/vm/eclrunner.py
@@ -69,7 +69,7 @@ class ECLMainRunner(object):
                 y = self._game.prng.rand_double() * 416
             if z < -990: #102h.exe@0x411881
                 y = self._game.prng.rand_double() * 800
-        enemy = self._game.new_enemy((x, y), life, instr_type, bonus_dropped, self._pop_enemy)
+        enemy = self._game.new_enemy((x, y), life, instr_type, bonus_dropped)
         process = ECLRunner(self._ecl, sub, enemy, self._game)
         self.processes.append(process)
         process.run_iteration()
@@ -682,7 +682,7 @@ class ECLRunner(object):
 
     @instruction(95)
     def pop_enemy(self, sub, x, y, z, life, bonus_dropped, unknown2):
-        self._enemy.pop_enemy(sub, 0, self._getval(x), self._getval(y), 0, life, bonus_dropped, unknown2, 0) # TODO: check about unknown values
+        self._game.ecl_runner._pop_enemy(sub, 0, self._getval(x), self._getval(y), 0, life, bonus_dropped, unknown2, 0) # TODO: check about unknown values
 
 
     @instruction(96)