Merge branch 'master' of https://github.com/kevinfra/orga2-tp3

kevinfra · Jul 7, 2016 · 15a7a00 · 15a7a00
2 parents 2db5ce1 + 511b364
commit 15a7a00
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/entregable/src/game.c b/entregable/src/game.c
@@ -454,10 +454,6 @@ void game_lanzar(unsigned int jugador) {
   }
 }
 
-void game_soy(unsigned int yoSoy) {
-
-}
-
 void game_donde(unsigned int* pos) {
 	tupla* posiciones = posTareaActual();
 	unsigned short posx = posiciones->x;
@@ -486,6 +482,15 @@ void game_mapear(int x, int y) {
 	}
 }
 
+void pintarTareasH(){
+	tupla posXY = tareaActual->posicion;
+	int soyH = tareaActual->duenoOriginal;
+	if(soyH == 2 && juegoEstaIniciado){
+		pintarTareaMadre(posXY.x, posXY.y, tareaActual->dueno, soyH);
+		pintarJugador(X_A, Y_A, 0);
+		pintarJugador(X_B, Y_B, 1);
+	}
+}
 
 void pintarTareaActual(){
 	int player = tareaActual->dueno;

diff --git a/entregable/src/game.h b/entregable/src/game.h
@@ -31,8 +31,6 @@ unsigned short dameTarea();
 
 void game_lanzar(unsigned int jugador);
 
-void game_soy(unsigned int soy);
-
 void game_donde(unsigned int* pos);
 
 char validarXY(int x, int y);

diff --git a/entregable/src/isr.asm b/entregable/src/isr.asm
@@ -27,6 +27,7 @@ extern game_mover_cursor
 extern game_lanzar
 extern pintarPuntajeAzul
 extern pintarPuntajeRojo
+extern pintarTareasH
 extern print_hex
 extern pintarTareaActual
 extern actualizarReloj
@@ -297,7 +298,7 @@ _isr32:
     call estaPintadoDebug
     cmp eax, 1
     je .salirDeReloj
-
+    call pintarTareasH
     call sched_proximo_indice
     ;xchg bx, bx
     shl eax, 3