Mercurial > touhou

comparison pytouhou/vm/eclrunner.py @ 159:4684d311a32d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove remaining pop_enemy/new_enemy mess
author Thibaut Girka <thib@sitedethib.com>
date Mon, 10 Oct 2011 19:01:23 +0200
parents 7769ce7be03c
children 606468ab4f7b
comparison
equal deleted inserted replaced
158:7769ce7be03c 159:4684d311a32d
67 x = self._game.prng.rand_double() * 368 67 x = self._game.prng.rand_double() * 368
68 if y < -990: #102h.exe@0x41184b 68 if y < -990: #102h.exe@0x41184b
69 y = self._game.prng.rand_double() * 416 69 y = self._game.prng.rand_double() * 416
70 if z < -990: #102h.exe@0x411881 70 if z < -990: #102h.exe@0x411881
71 y = self._game.prng.rand_double() * 800 71 y = self._game.prng.rand_double() * 800
72 enemy = self._game.new_enemy((x, y), life, instr_type, bonus_dropped, self._pop_enemy) 72 enemy = self._game.new_enemy((x, y), life, instr_type, bonus_dropped)
73 process = ECLRunner(self._ecl, sub, enemy, self._game) 73 process = ECLRunner(self._ecl, sub, enemy, self._game)
74 self.processes.append(process) 74 self.processes.append(process)
75 process.run_iteration() 75 process.run_iteration()
76 76
77 77
680 self._game.change_bullets_into_star_items() 680 self._game.change_bullets_into_star_items()
681 681
682 682
683 @instruction(95) 683 @instruction(95)
684 def pop_enemy(self, sub, x, y, z, life, bonus_dropped, unknown2): 684 def pop_enemy(self, sub, x, y, z, life, bonus_dropped, unknown2):
685 self._enemy.pop_enemy(sub, 0, self._getval(x), self._getval(y), 0, life, bonus_dropped, unknown2, 0) # TODO: check about unknown values 685 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
686 686
687 687
688 @instruction(96) 688 @instruction(96)
689 def kill_enemies(self): 689 def kill_enemies(self):
690 for enemy in self._game.enemies: 690 for enemy in self._game.enemies: