Mi Juego

UnitecProgra3 · Feb 20, 2015 · 99d77b1 · 99d77b1
1 parent 6166a1b
commit 99d77b1
Show file tree

Hide file tree

Showing 31 changed files with 74 additions and 1 deletion.
diff --git a/EnemigoAzul.cpp b/EnemigoAzul.cpp
@@ -7,6 +7,11 @@ EnemigoAzul::EnemigoAzul(SDL_Renderer* renderer, list<Personaje*> *personajes)
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoAzul/standing/3.png"));
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoAzul/standing/4.png"));
 
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoAzul/standing_left/1.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoAzul/standing_left/2.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoAzul/standing_left/3.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoAzul/standing_left/4.png"));
+
     rect.x = 100;
     rect.y = 250;
 

diff --git a/EnemigoAzul/standing_left/1.png b/EnemigoAzul/standing_left/1.png
diff --git a/EnemigoAzul/standing_left/2.png b/EnemigoAzul/standing_left/2.png
diff --git a/EnemigoAzul/standing_left/3.png b/EnemigoAzul/standing_left/3.png
diff --git a/EnemigoAzul/standing_left/4.png b/EnemigoAzul/standing_left/4.png
diff --git a/EnemigoRojo.cpp b/EnemigoRojo.cpp
@@ -6,6 +6,11 @@ EnemigoRojo::EnemigoRojo(SDL_Renderer* renderer, list<Personaje*> *personajes)
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoRojo/standing/2.png"));
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoRojo/standing/3.png"));
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoRojo/standing/4.png"));
+
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoRojo/standing_left/1.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoRojo/standing_left/2.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoRojo/standing_left/3.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoRojo/standing_left/4.png"));
 
     rect.x = 750;
     rect.y = 250;

diff --git a/EnemigoRojo/standing_left/1.png b/EnemigoRojo/standing_left/1.png
diff --git a/EnemigoRojo/standing_left/2.png b/EnemigoRojo/standing_left/2.png
diff --git a/EnemigoRojo/standing_left/3.png b/EnemigoRojo/standing_left/3.png
diff --git a/EnemigoRojo/standing_left/4.png b/EnemigoRojo/standing_left/4.png
diff --git a/EnemigoVerde.cpp b/EnemigoVerde.cpp
@@ -6,6 +6,11 @@ EnemigoVerde::EnemigoVerde(SDL_Renderer* renderer, list<Personaje*> *personajes)
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoVerde/standing/2.png"));
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoVerde/standing/3.png"));
     texturas.push_back(IMG_LoadTexture(renderer,"EnemigoVerde/standing/4.png"));
+
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoVerde/standing_left/1.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoVerde/standing_left/2.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoVerde/standing_left/3.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"EnemigoVerde/standing_left/4.png"));
 
     rect.x = 500;
     rect.y = 250;

diff --git a/EnemigoVerde/standing_left/1.png b/EnemigoVerde/standing_left/1.png
diff --git a/EnemigoVerde/standing_left/2.png b/EnemigoVerde/standing_left/2.png
diff --git a/EnemigoVerde/standing_left/3.png b/EnemigoVerde/standing_left/3.png
diff --git a/EnemigoVerde/standing_left/4.png b/EnemigoVerde/standing_left/4.png
diff --git a/Personaje.cpp b/Personaje.cpp
@@ -14,7 +14,7 @@ Personaje::~Personaje()
 
 void Personaje::draw(SDL_Renderer* renderer)
 {
-    SDL_RenderCopy(renderer, texturas[animacion], NULL, &rect);
+    SDL_RenderCopy(renderer, texturas_left[animacion], NULL, &rect);
     if(frame%100==0)
     {
         animacion++;

diff --git a/Personaje.h b/Personaje.h
@@ -13,6 +13,8 @@ class Personaje
     public:
         list<Personaje*> *personajes;
         vector<SDL_Texture*>texturas;
+        vector<SDL_Texture*>texturas_left;
+        vector<SDL_Texture*>texturas_right;
         SDL_Texture* hitbox_azul;
         SDL_Texture* hitbox_roja;
         SDL_Rect rect,hitbox;

diff --git a/SDL2Testground.depend b/SDL2Testground.depend
@@ -608,3 +608,54 @@
 1423856120 source:/home/turupawn/Projects/Clases/Progra3/SDL2TestSimple-master/Personaje.cpp
 	"Personaje.h"
 
+1423853174 source:/home/rnexer/Programacion 3/beatemup/Enemigo.cpp
+	"Enemigo.h"
+
+1423853174 /home/rnexer/Programacion 3/beatemup/Enemigo.h
+	"Personaje.h"
+
+1424454142 /home/rnexer/Programacion 3/beatemup/Personaje.h
+	<SDL2/SDL.h>
+	<SDL2/SDL_image.h>
+	<vector>
+	<list>
+	<iostream>
+
+1424454296 source:/home/rnexer/Programacion 3/beatemup/EnemigoAzul.cpp
+	"EnemigoAzul.h"
+
+1423855667 /home/rnexer/Programacion 3/beatemup/EnemigoAzul.h
+	"Enemigo.h"
+
+1424454296 source:/home/rnexer/Programacion 3/beatemup/EnemigoRojo.cpp
+	"EnemigoRojo.h"
+
+1423855667 /home/rnexer/Programacion 3/beatemup/EnemigoRojo.h
+	"Enemigo.h"
+
+1424454296 source:/home/rnexer/Programacion 3/beatemup/EnemigoVerde.cpp
+	"EnemigoVerde.h"
+
+1423855667 /home/rnexer/Programacion 3/beatemup/EnemigoVerde.h
+	"Enemigo.h"
+
+1424453696 source:/home/rnexer/Programacion 3/beatemup/main.cpp
+	<SDL2/SDL.h>
+	<SDL2/SDL_image.h>
+	<iostream>
+	<vector>
+	<list>
+	"Sho.h"
+	"EnemigoAzul.h"
+	"EnemigoVerde.h"
+	"EnemigoRojo.h"
+
+1423855667 /home/rnexer/Programacion 3/beatemup/Sho.h
+	"Personaje.h"
+
+1424454333 source:/home/rnexer/Programacion 3/beatemup/Personaje.cpp
+	"Personaje.h"
+
+1424454142 source:/home/rnexer/Programacion 3/beatemup/Sho.cpp
+	"Sho.h"
+
diff --git a/Sho.cpp b/Sho.cpp
@@ -6,6 +6,11 @@ Sho::Sho(SDL_Renderer* renderer,list<Personaje*> *personajes)
     texturas.push_back(IMG_LoadTexture(renderer,"Sho/standing/2.png"));
     texturas.push_back(IMG_LoadTexture(renderer,"Sho/standing/3.png"));
     texturas.push_back(IMG_LoadTexture(renderer,"Sho/standing/4.png"));
+
+    texturas_left.push_back(IMG_LoadTexture(renderer,"Sho/standing_left/1.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"Sho/standing_left/2.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"Sho/standing_left/3.png"));
+    texturas_left.push_back(IMG_LoadTexture(renderer,"Sho/standing_left/4.png"));
 
     rect.x = 100;
     rect.y = 250;

diff --git a/Sho/standing_left/1.png b/Sho/standing_left/1.png
diff --git a/Sho/standing_left/2.png b/Sho/standing_left/2.png
diff --git a/Sho/standing_left/3.png b/Sho/standing_left/3.png
diff --git a/Sho/standing_left/4.png b/Sho/standing_left/4.png
diff --git a/bin/Debug/SDL2Testground b/bin/Debug/SDL2Testground
diff --git a/obj/Debug/Enemigo.o b/obj/Debug/Enemigo.o
diff --git a/obj/Debug/EnemigoAzul.o b/obj/Debug/EnemigoAzul.o
diff --git a/obj/Debug/EnemigoRojo.o b/obj/Debug/EnemigoRojo.o
diff --git a/obj/Debug/EnemigoVerde.o b/obj/Debug/EnemigoVerde.o
diff --git a/obj/Debug/Personaje.o b/obj/Debug/Personaje.o
diff --git a/obj/Debug/Sho.o b/obj/Debug/Sho.o
diff --git a/obj/Debug/main.o b/obj/Debug/main.o