From 2d05545acfae6364d0542efd8d748eaa1e0b57e8 Mon Sep 17 00:00:00 2001
From: "Valeriano A.R" <valen.alfonso@gmail.com>
Date: Fri, 22 Aug 2014 23:23:56 +0200
Subject: [PATCH] Mover juego de pruebas a su propio directorio

---
 GameEnts.c => Game/GameEnts.c | 18 +++++++++---------
 GameEnts.h => Game/GameEnts.h |  0
 GameMap.c => Game/GameMap.c   |  0
 GameMap.h => Game/GameMap.h   |  0
 main.c => Game/main.c         |  2 +-
 Makefile.common               | 21 +++++++++++----------
 6 files changed, 21 insertions(+), 20 deletions(-)
 rename GameEnts.c => Game/GameEnts.c (98%)
 rename GameEnts.h => Game/GameEnts.h (100%)
 rename GameMap.c => Game/GameMap.c (100%)
 rename GameMap.h => Game/GameMap.h (100%)
 rename main.c => Game/main.c (97%)

diff --git a/GameEnts.c b/Game/GameEnts.c
similarity index 98%
rename from GameEnts.c
rename to Game/GameEnts.c
index f9783bf..7850bda 100644
--- a/GameEnts.c
+++ b/Game/GameEnts.c
@@ -42,8 +42,6 @@ DrawImg img_axe[2];
 DrawImg img_goatMan[2];
 DrawImg img_Princess[2];
 
-	float grav=0.5f;
-	float vTerminal=10.0f;
 Entity ent_Wizard;
 Entity ent_MagikBall;
 Entity ent_Earth;
@@ -67,6 +65,8 @@ Entity ent_Princess;
 
 
 int EntityApplyGravity(Entity e){
+	float grav=10.0f;
+	float vTerminal=50.0f;
 	vec2 vGrav;
 
 	// Only apply gravity to some entity types
@@ -171,11 +171,11 @@ void player_proc(Entity e,int ft){
 
 
 
-	float acel=1.0f;
-	float maxVel=6.0f;
-	float jumpVel=8.0f;
-	float shootVel=10.0f;
 void wizard_proc(Entity e,int ft){
+	float acel=8.0f;
+	float maxVel=30.0f;
+	float jumpVel=50.0f;
+	float shootVel=50.0f;
 
 	if(Input_GetKey(InputKey_Jump)==InputKey_Pressed ||
 		Input_GetKey(InputKey_Up)==InputKey_Pressed)
@@ -233,7 +233,7 @@ void wizard_proc(Entity e,int ft){
 
 
 	// Scroll View
-	GameLib_MoveToPosH(e->pos,0.1f);
+	GameLib_MoveToPosH(e->pos,0.6f);
 }
 
 
@@ -362,7 +362,6 @@ void bunny_proc(Entity e,int ft){
 		vec2_set(left,-acel,0.0f);
 		Entity_AddVelLimit(e,left,maxVel);
 
-
 		AnimPlay_SetImg(&e->anim,img_bunny[0]);
 	}
 	if(e->A==1){
@@ -602,6 +601,7 @@ void GameEnts_Init(){
 	ent_Wizard->radius=24;
 	ent_Wizard->width=24;
 	ent_Wizard->height=58;
+	ent_Wizard->elast=0.1f;
 	ent_Wizard->fric_static=0.0f;
 	ent_Wizard->fric_dynamic=0.2f;
 	ent_Wizard->child=ent_MagikBall;
@@ -636,7 +636,7 @@ void GameEnts_Init(){
 	ent_StoneBrick->width=32;
 	ent_StoneBrick->height=32;
 	ent_StoneBrick->fric_static=0.0f;
-	ent_StoneBrick->fric_dynamic=0.2f;
+	ent_StoneBrick->fric_dynamic=-0.01f;
 
 	// FIXME: Stone Bricks back
 
diff --git a/GameEnts.h b/Game/GameEnts.h
similarity index 100%
rename from GameEnts.h
rename to Game/GameEnts.h
diff --git a/GameMap.c b/Game/GameMap.c
similarity index 100%
rename from GameMap.c
rename to Game/GameMap.c
diff --git a/GameMap.h b/Game/GameMap.h
similarity index 100%
rename from GameMap.h
rename to Game/GameMap.h
diff --git a/main.c b/Game/main.c
similarity index 97%
rename from main.c
rename to Game/main.c
index 7176f70..c9c0204 100644
--- a/main.c
+++ b/Game/main.c
@@ -60,7 +60,7 @@ int main(int argc,char *argv[]){
 		}
 	}
 
-	GameLib_Init(640,480,"Game",60,60);
+	GameLib_Init(640,480,"Game",20,60);
 
 
 
diff --git a/Makefile.common b/Makefile.common
index d6fdc31..16ca4ae 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -29,11 +29,11 @@ RES_GAMELIB_OUT = $(BUILDDIR)/$(RES_GAMELIB)
 #####################
 # Game Declarations #
 #####################
-GAME_HEADS = $(GAMELIB_HEADS) GameEnts.h GameMap.h
+GAME_HEADS = $(GAMELIB_HEADS) Game/GameEnts.h Game/GameMap.h
 GAME_OBJS = \
-	$(BUILDDIR)/GameEnts.o \
-	$(BUILDDIR)/GameMap.o \
-	$(BUILDDIR)/main.o
+	$(BUILDDIR)/Game/GameEnts.o \
+	$(BUILDDIR)/Game/GameMap.o \
+	$(BUILDDIR)/Game/main.o
 RES_GAME_OUT = $(BUILDDIR)/$(RES_GAME)
 
 
@@ -45,6 +45,7 @@ all: $(BUILDDIR) $(RES_GAME_OUT)
 $(BUILDDIR):
 	$(MKDIR) $(BUILDDIR)
 	$(MKDIR) $(BUILDDIR)/GameLib
+	$(MKDIR) $(BUILDDIR)/Game
 
 clean:
 	$(RM) $(GAMELIBS_OBJS) $(RES_GAMELIB_OUT) $(GAME_OBJS) $(RES_GAME_OUT)
@@ -81,14 +82,14 @@ $(BUILDDIR)/GameLib/GameLib.o: GameLib/GameLib.c $(HEADS)
 # Game Rules #
 ##############
 
-$(BUILDDIR)/GameEnts.o: GameEnts.c $(HEADS)
-	$(CC) -c GameEnts.c -o $(BUILDDIR)/GameEnts.o $(CFLAGS)
+$(BUILDDIR)/Game/GameEnts.o: Game/GameEnts.c $(HEADS)
+	$(CC) -c Game/GameEnts.c -o $(BUILDDIR)/Game/GameEnts.o $(CFLAGS)
 
-$(BUILDDIR)/GameMap.o: GameMap.c $(HEADS)
-	$(CC) -c GameMap.c -o $(BUILDDIR)/GameMap.o $(CFLAGS)
+$(BUILDDIR)/Game/GameMap.o: Game/GameMap.c $(HEADS)
+	$(CC) -c Game/GameMap.c -o $(BUILDDIR)/Game/GameMap.o $(CFLAGS)
 
-$(BUILDDIR)/main.o: main.c $(HEADS)
-	$(CC) -c main.c -o $(BUILDDIR)/main.o $(CFLAGS)
+$(BUILDDIR)/Game/main.o: Game/main.c $(HEADS)
+	$(CC) -c Game/main.c -o $(BUILDDIR)/Game/main.o $(CFLAGS)
 
 
 ################