diff --git a/JAMath.py b/JAMath.py index f1ee669..e18c014 100644 --- a/JAMath.py +++ b/JAMath.py @@ -10,6 +10,7 @@ from juego import Game from sugar3.activity.activity import Activity +from sugar3.activity.activity import get_activity_root from sugar3.graphics.toolbarbox import ToolbarBox from sugar3.activity.widgets import ActivityToolbarButton from sugar3.activity.widgets import StopButton @@ -21,8 +22,8 @@ def __init__(self, handle): Activity.__init__(self, handle) self.max_participants = 1 - - self.jamath_activity = Game() + + self.jamath_activity = Game(get_activity_root()) self.build_toolbar() self._pygamecanvas = sugargame.canvas.PygameCanvas(self, main=self.jamath_activity.run, diff --git a/juego.py b/juego.py index 794f7a3..d455aad 100644 --- a/juego.py +++ b/juego.py @@ -9,8 +9,6 @@ import pygame from pygame.locals import * -from sugar3.activity.activity import get_activity_root - class number(pygame.sprite.Sprite): @@ -67,8 +65,8 @@ def cargar_imagen(nombre,trasnparent=False): class Game(): - def __init__(self): - + def __init__(self, get_activity_root): + self.activity_root = get_activity_root pass @@ -80,7 +78,7 @@ def sy(coord_y): return coord_y * scale_y def main(self): - sonido_menu = load_sound("menu.ogg") + sonido_menu = load_sound("menu.ogg", self.activity_root) jugar = self.fuente_130.render("JUGAR",True,(0,0,255)) level = self.fuente_130.render("NIVEL",True,(0,0,255)) quit = self.fuente_130.render("SALIR",True,(0,0,255)) @@ -134,7 +132,7 @@ def main(self): def choose_level(self): - sonido_menu = load_sound("menu.ogg") + sonido_menu = load_sound("menu.ogg", self.activity_root) facil = self.fuente_130.render("facil",True,(0,0,255)) medio = self.fuente_130.render("medio",True,(0,0,255)) dificil = self.fuente_130.render("dificil",True,(0,0,255)) @@ -201,11 +199,11 @@ def play(self, level): another_quest = True - right_sound = load_sound("right.ogg") - wrong_sound = load_sound("wrong.ogg") + right_sound = load_sound("right.ogg", self.activity_root) + wrong_sound = load_sound("wrong.ogg", self.activity_root) fondo = load_image(str(1) + ".jpg") score = 0 - puntuacionalta = load_puntuacionalta() + puntuacionalta = load_puntuacionalta(self.activity_root) while self.running: time = self.clock.tick(30) / 1000. @@ -235,7 +233,7 @@ def play(self, level): break for event in pygame.event.get(): if event.type == QUIT: - save_puntuacionalta(score) + save_puntuacionalta(score, self.activity_root) self.running = False return if event.type == MOUSEBUTTONDOWN: @@ -294,8 +292,8 @@ def load_image(name): return pygame.image.load(path).convert_alpha() # Funcion para cargar Sonidos -def load_sound(name): - path = os.path.join(get_activity_root(),'data',name) +def load_sound(name, activity_root): + path = os.path.join(activity_root,'data',name) try: sound = pygame.mixer.Sound(path) return sound @@ -303,8 +301,8 @@ def load_sound(name): print 'Warning, unable to load: ',path # Funcion para guardar puntuaciones altas -def save_puntuacionalta(score): - file_path = os.path.join(get_activity_root(),'data', 'PuntajeAlto') +def save_puntuacionalta(score, activity_root): + file_path = os.path.join(activity_root,'data', 'PuntajeAlto') print file_path puntuacionalta = [] puntuacionalta.append(0) @@ -318,8 +316,8 @@ def save_puntuacionalta(score): File.write(str(score)) File.close() -def load_puntuacionalta(): - file_path = os.path.join(get_activity_root(),'data', 'PuntajeAlto') +def load_puntuacionalta(activity_root): + file_path = os.path.join(activity_root,'data', 'PuntajeAlto') print file_path if os.path.exists(file_path): try: