diff --git a/Board.java b/Board.java index f13dd36..4370838 100644 --- a/Board.java +++ b/Board.java @@ -130,7 +130,7 @@ else if (dying==1) if (dying!=1) temp=100; else - temp=100;; + temp=100; /* If it's time to draw a new death frame... */ if (currTime-timer>=temp) { @@ -266,13 +266,13 @@ else if (New==4) } /* Drawing optimization */ /* Optimiza a los Amigos */ - //if(l!=null) { - // for (int i=0; i - - $PROJECT_DIR$/out/artifacts/Comecoco_jar - - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/.idea/codeStyleSettings.xml b/out/production/Comecoco/.idea/codeStyleSettings.xml deleted file mode 100644 index f2277e1..0000000 --- a/out/production/Comecoco/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/.idea/compiler.xml b/out/production/Comecoco/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/out/production/Comecoco/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/.idea/copyright/profiles_settings.xml b/out/production/Comecoco/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/out/production/Comecoco/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/out/production/Comecoco/.idea/misc.xml b/out/production/Comecoco/.idea/misc.xml deleted file mode 100644 index 757ea42..0000000 --- a/out/production/Comecoco/.idea/misc.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/.idea/modules.xml b/out/production/Comecoco/.idea/modules.xml deleted file mode 100644 index cb6e839..0000000 --- a/out/production/Comecoco/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/.idea/vcs.xml b/out/production/Comecoco/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/out/production/Comecoco/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/.idea/workspace.xml b/out/production/Comecoco/.idea/workspace.xml deleted file mode 100644 index 0102834..0000000 --- a/out/production/Comecoco/.idea/workspace.xml +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1462102678551 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.7 - - - - - - - - Comecoco - - - - - - - - 1.8 - - - - - - - - Comecoco - - - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/ClientePac.class b/out/production/Comecoco/ClientePac.class deleted file mode 100644 index 5acdd9a..0000000 Binary files a/out/production/Comecoco/ClientePac.class and /dev/null differ diff --git a/out/production/Comecoco/Comecoco.iml b/out/production/Comecoco/Comecoco.iml deleted file mode 100644 index b107a2d..0000000 --- a/out/production/Comecoco/Comecoco.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/Comecoco/GameSounds.class b/out/production/Comecoco/GameSounds.class deleted file mode 100644 index 7730fc0..0000000 Binary files a/out/production/Comecoco/GameSounds.class and /dev/null differ diff --git a/out/production/Comecoco/Ghost.class b/out/production/Comecoco/Ghost.class deleted file mode 100644 index 6a13194..0000000 Binary files a/out/production/Comecoco/Ghost.class and /dev/null differ diff --git a/out/production/Comecoco/ImageS.class b/out/production/Comecoco/ImageS.class deleted file mode 100644 index 20ecf79..0000000 Binary files a/out/production/Comecoco/ImageS.class and /dev/null differ diff --git a/out/production/Comecoco/META-INF/MANIFEST.MF b/out/production/Comecoco/META-INF/MANIFEST.MF deleted file mode 100644 index fd5b5b4..0000000 --- a/out/production/Comecoco/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: ClientePac - diff --git a/out/production/Comecoco/Makefile b/out/production/Comecoco/Makefile deleted file mode 100644 index 51aa20b..0000000 --- a/out/production/Comecoco/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -########### -# Default # -########### -all: clean compilacion -################ -# Compila todo # -################ -compilacion: - javac *.java -############################ -# Registo del servidor RMI # -############################ -registro: - # export CLASSPATH=$PWD # Solo es necesario una vez - rmiregistry 55555 -####################### -# Ejecuta el servidor # -####################### -server: - # Eliminada la necesidad de comando de permisos - # java -Djava.security.policy=servidor.permisos ServidorPac 55555 - # java ServidorPac 55555 localhost # Eliminado eleccion del puerto - java ServidorPac -# Ejecuta el servidor en red local # -#################################### -slocal: - # Eliminada la necesidad de comando de permisos - # java -Djava.security.policy=servidor.permisos ServidorPac 55555 - # java ServidorPac 55555 192.168.1.2 # Eliminado eleccion del puerto - java ServidorPac 192.168.1.2 -##################### -# Ejecuta Cliente 1 # -##################### -cliente: - # Eliminada la necesidad de comando de permisos - # java -Djava.security.policy=cliente.permisos ClientePac localhost 55555 Adri - # java ClientePac localhost 55555 Adri # Eliminado eleccion del puerto - java ClientePac localhost Adri -##################### -# Ejecuta Cliente # -##################### -cliente2: - # Eliminada la necesidad de comando de permisos - # java -Djava.security.policy=cliente.permisos ClientePac localhost 55555 KaeL - # java ClientePac localhost 55555 KaeL # Eliminado eleccion del puerto - java ClientePac localhost KaeL -#################################### -# Crea un jar para la demostracion # -#################################### -jar: - # No funciona usar Intellij - # jar cvfm ComecocosC.jar highScores.txt ClientePac.class BoardS.class Board.class Player.class img/ sounds/ -############ -# Limpieza # -############ -clean: - rm -fr *.class 2>/dev/null - - - diff --git a/out/production/Comecoco/Mover.class b/out/production/Comecoco/Mover.class deleted file mode 100644 index 2ae522e..0000000 Binary files a/out/production/Comecoco/Mover.class and /dev/null differ diff --git a/out/production/Comecoco/Pacman$1.class b/out/production/Comecoco/Pacman$1.class deleted file mode 100644 index a04e556..0000000 Binary files a/out/production/Comecoco/Pacman$1.class and /dev/null differ diff --git a/out/production/Comecoco/Pacman.class b/out/production/Comecoco/Pacman.class deleted file mode 100644 index 61d312e..0000000 Binary files a/out/production/Comecoco/Pacman.class and /dev/null differ diff --git a/out/production/Comecoco/Player.class b/out/production/Comecoco/Player.class deleted file mode 100644 index 184438f..0000000 Binary files a/out/production/Comecoco/Player.class and /dev/null differ diff --git a/out/production/Comecoco/README.md b/out/production/Comecoco/README.md deleted file mode 100644 index 78bc0aa..0000000 --- a/out/production/Comecoco/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# ComecocoRMI - -## "Compile" -make -or -make compilacion -## Launch Server -make registro & make server -## Launch Clients -java ClientePac Host Name -or -java -jar Comecoco.jar diff --git a/out/production/Comecoco/ServicioPac.class b/out/production/Comecoco/ServicioPac.class deleted file mode 100644 index a57c067..0000000 Binary files a/out/production/Comecoco/ServicioPac.class and /dev/null differ diff --git a/out/production/Comecoco/ServicioPacImpl.class b/out/production/Comecoco/ServicioPacImpl.class deleted file mode 100644 index 8a47fd4..0000000 Binary files a/out/production/Comecoco/ServicioPacImpl.class and /dev/null differ diff --git a/out/production/Comecoco/ServidorPac.class b/out/production/Comecoco/ServidorPac.class deleted file mode 100644 index 01850d0..0000000 Binary files a/out/production/Comecoco/ServidorPac.class and /dev/null differ diff --git a/out/production/Comecoco/cliente.permisos b/out/production/Comecoco/cliente.permisos deleted file mode 100644 index 60600a3..0000000 --- a/out/production/Comecoco/cliente.permisos +++ /dev/null @@ -1 +0,0 @@ -grant { permission java.security.AllPermission; }; diff --git a/out/production/Comecoco/highScores.txt b/out/production/Comecoco/highScores.txt deleted file mode 100644 index 83b33d2..0000000 --- a/out/production/Comecoco/highScores.txt +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/out/production/Comecoco/img/gameOver.jpg b/out/production/Comecoco/img/gameOver.jpg deleted file mode 100644 index 8f415d9..0000000 Binary files a/out/production/Comecoco/img/gameOver.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost10.jpg b/out/production/Comecoco/img/ghost10.jpg deleted file mode 100644 index 441d926..0000000 Binary files a/out/production/Comecoco/img/ghost10.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost11.jpg b/out/production/Comecoco/img/ghost11.jpg deleted file mode 100644 index 90352c5..0000000 Binary files a/out/production/Comecoco/img/ghost11.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost20.jpg b/out/production/Comecoco/img/ghost20.jpg deleted file mode 100644 index d7badbc..0000000 Binary files a/out/production/Comecoco/img/ghost20.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost21.jpg b/out/production/Comecoco/img/ghost21.jpg deleted file mode 100644 index 7033873..0000000 Binary files a/out/production/Comecoco/img/ghost21.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost30.jpg b/out/production/Comecoco/img/ghost30.jpg deleted file mode 100644 index d01c2f7..0000000 Binary files a/out/production/Comecoco/img/ghost30.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost31.jpg b/out/production/Comecoco/img/ghost31.jpg deleted file mode 100644 index 87e9362..0000000 Binary files a/out/production/Comecoco/img/ghost31.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost40.jpg b/out/production/Comecoco/img/ghost40.jpg deleted file mode 100644 index a0d66ec..0000000 Binary files a/out/production/Comecoco/img/ghost40.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/ghost41.jpg b/out/production/Comecoco/img/ghost41.jpg deleted file mode 100644 index 505e171..0000000 Binary files a/out/production/Comecoco/img/ghost41.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/pacman.jpg b/out/production/Comecoco/img/pacman.jpg deleted file mode 100644 index cfe2a9e..0000000 Binary files a/out/production/Comecoco/img/pacman.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/pacmandown.jpg b/out/production/Comecoco/img/pacmandown.jpg deleted file mode 100644 index ef8c18a..0000000 Binary files a/out/production/Comecoco/img/pacmandown.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/pacmanleft.jpg b/out/production/Comecoco/img/pacmanleft.jpg deleted file mode 100644 index 502ba37..0000000 Binary files a/out/production/Comecoco/img/pacmanleft.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/pacmanright.jpg b/out/production/Comecoco/img/pacmanright.jpg deleted file mode 100644 index dbf7c8e..0000000 Binary files a/out/production/Comecoco/img/pacmanright.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/pacmanup.jpg b/out/production/Comecoco/img/pacmanup.jpg deleted file mode 100644 index 6ceeb80..0000000 Binary files a/out/production/Comecoco/img/pacmanup.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/titleScreen.jpg b/out/production/Comecoco/img/titleScreen.jpg deleted file mode 100644 index 067ccc7..0000000 Binary files a/out/production/Comecoco/img/titleScreen.jpg and /dev/null differ diff --git a/out/production/Comecoco/img/winScreen.jpg b/out/production/Comecoco/img/winScreen.jpg deleted file mode 100644 index 6d18584..0000000 Binary files a/out/production/Comecoco/img/winScreen.jpg and /dev/null differ diff --git a/out/production/Comecoco/servidor.permisos b/out/production/Comecoco/servidor.permisos deleted file mode 100644 index 60600a3..0000000 --- a/out/production/Comecoco/servidor.permisos +++ /dev/null @@ -1 +0,0 @@ -grant { permission java.security.AllPermission; }; diff --git a/out/production/Comecoco/sounds/death.wav b/out/production/Comecoco/sounds/death.wav deleted file mode 100644 index d48ec88..0000000 Binary files a/out/production/Comecoco/sounds/death.wav and /dev/null differ diff --git a/out/production/Comecoco/sounds/newGame.wav b/out/production/Comecoco/sounds/newGame.wav deleted file mode 100644 index 30e087a..0000000 Binary files a/out/production/Comecoco/sounds/newGame.wav and /dev/null differ diff --git a/out/production/Comecoco/sounds/nomnom.wav b/out/production/Comecoco/sounds/nomnom.wav deleted file mode 100644 index be91dcd..0000000 Binary files a/out/production/Comecoco/sounds/nomnom.wav and /dev/null differ