diff --git a/orao.py b/orao.py index eb09c45..4db5df6 100755 --- a/orao.py +++ b/orao.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # -*- coding: utf8 -*- import pygame, numpy, sys, datetime diff --git a/orao/cpu.py b/orao/cpu.py index b0db759..ee7b7b0 100755 --- a/orao/cpu.py +++ b/orao/cpu.py @@ -136,7 +136,9 @@ class CPU(object): self.sp = (self.sp + 1) & 0xFF return self.get_byte(256 + self.sp) - def stack_push_word(self, val): map(self.stack_push, [(val >> 8) & 0xFF, val & 0xFF]) + def stack_push_word(self, val): + self.stack_push((val >> 8) & 0xFF) + self.stack_push(val & 0xFF) def stack_pop_word(self): return self.stack_pop() + (self.stack_pop() << 8) ########################################################################### diff --git a/orao/keyboard.py b/orao/keyboard.py index efc1fa2..3fb1817 100644 --- a/orao/keyboard.py +++ b/orao/keyboard.py @@ -20,7 +20,7 @@ _kbd = { def listener(event, cpu): if event.type in [pygame.KEYDOWN, pygame.KEYUP]: - for address, keycodes in _kbd.iteritems(): - keys = map(pygame.key.get_pressed().__getitem__, keycodes) + for address, keycodes in _kbd.items(): + keys = list(map(pygame.key.get_pressed().__getitem__, keycodes)) cpu.memory[address] = ~numpy.dot(keys, [16, 32, 64, 128][:len(keys)]) & 0xFF diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..0689d7e --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +numpy==1.26.1 +pygame==2.5.2 +Wave==0.0.2