From 7e8a41ebcafe3a1fdaf47abff006af01e211114a Mon Sep 17 00:00:00 2001
From: miguel <miguel@debian-acer.softwarefools.com>
Date: Thu, 21 Sep 2017 18:20:03 +0200
Subject: porting to emscripten

---
 Makefile      |   5 +++++
 gridder03.bmp | Bin 0 -> 1322 bytes
 main.cpp      |  14 +++++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 gridder03.bmp

diff --git a/Makefile b/Makefile
index a1445b2..1892665 100644
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,8 @@ game: World.o main.o
 clean: 
 	rm -f game
 	rm -f *.o
+
+browser-game:
+	emcc --std=c++11 -O2 World.cpp -o World.bc
+	emcc --std=c++11 -O2 main.cpp -o main.bc
+	emcc -O2 World.bc main.bc -o out.html -s USE_SDL=2 --preload-file coin.bmp --preload-file earth01.bmp --preload-file fonts.bmp --preload-file gridder01.bmp --preload-file guy01.bmp --preload-file guy02.bmp --preload-file gridder02.bmp
diff --git a/gridder03.bmp b/gridder03.bmp
new file mode 100644
index 0000000..9aa82a2
Binary files /dev/null and b/gridder03.bmp differ
diff --git a/main.cpp b/main.cpp
index f796cd0..309c184 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,7 @@
 #include <sstream>
+#include <cmath>
+
+//#include <emscripten.h>
 
 #include <SDL.h>
 
@@ -197,6 +200,7 @@ int main(int, char**){
 	textures.push_back(sdl_load_texture("earth01.bmp",0,0,0,ren));
 	textures.push_back(sdl_load_texture("gridder01.bmp",255,255,255,ren));
 	textures.push_back(sdl_load_texture("gridder02.bmp",255,255,255,ren));
+	textures.push_back(sdl_load_texture("gridder03.bmp",255,255,255,ren));
 	
 	// init world LEVEL 1
 	World world(1);
@@ -282,13 +286,13 @@ int main(int, char**){
 			int tile_col=i-world.player.x+show_tiles_back;
 			if(i<0||i>=world.bricks.size())continue;
 
-			SDL_Rect rect={tile_col*show_tiles_size-show_tiles_size*world.player.x2,(show_tiles_vertical_move-world.coins_pos[i])*show_tiles_size,show_tiles_size,show_tiles_size};
+			SDL_Rect rect={(int)(tile_col*show_tiles_size-show_tiles_size*world.player.x2),(show_tiles_vertical_move-world.coins_pos[i])*show_tiles_size,show_tiles_size,show_tiles_size};
 			SDL_RenderCopy(ren,textures[2],NULL,&rect);
 
 
 			for(int j=0;j<world.bricks[i].size();j++)
 			{
-				SDL_Rect rect={tile_col*show_tiles_size-show_tiles_size*world.player.x2,(show_tiles_vertical_move-world.bricks[i][j].altitude)*show_tiles_size,show_tiles_size,show_tiles_size};
+				SDL_Rect rect={(int)(tile_col*show_tiles_size-show_tiles_size*world.player.x2),(show_tiles_vertical_move-world.bricks[i][j].altitude)*show_tiles_size,show_tiles_size,show_tiles_size};
 					
 				switch(world.bricks[i][j].type)
 				{
@@ -309,7 +313,7 @@ int main(int, char**){
 						SDL_RenderCopy(ren,textures[6],NULL,&rect);
 						break;
 					case 4:
-						SDL_RenderCopyEx(ren,textures[6],NULL,&rect,90,NULL,SDL_FLIP_NONE);
+						SDL_RenderCopy(ren,textures[7],NULL,&rect);
 						break;
 				}
 						
@@ -320,12 +324,12 @@ int main(int, char**){
 
 			// water level
 			SDL_SetRenderDrawColor(ren, 100*(i%2),100*(i%2),255,  255);
-			SDL_Rect rect2={tile_col*show_tiles_size-show_tiles_size*world.player.x2,show_tiles_vertical_move*show_tiles_size-show_tiles_water_level*show_tiles_size+std::sin(frameTime/1000.0+i)*show_tiles_size*0.33,show_tiles_size,show_tiles_max_height};
+			SDL_Rect rect2={(int)(tile_col*show_tiles_size-show_tiles_size*world.player.x2),(int)(show_tiles_vertical_move*show_tiles_size-show_tiles_water_level*show_tiles_size+sin(frameTime/1000.0+i)*show_tiles_size*0.33),show_tiles_size,show_tiles_max_height};
 			SDL_RenderFillRect(ren,&rect2);
 		}
 
 		// render player char
-		SDL_Rect rect={(show_tiles_back-0.5)*show_tiles_size,(show_tiles_vertical_move-world.player.y)*show_tiles_size-world.player.y2*show_tiles_size,show_tiles_size,show_tiles_size};
+		SDL_Rect rect={(int)((show_tiles_back-0.5)*show_tiles_size),(int)((show_tiles_vertical_move-world.player.y)*show_tiles_size-world.player.y2*show_tiles_size),show_tiles_size,show_tiles_size};
 		if(world.player.anim==0)SDL_RenderCopy(ren,textures[0],NULL,&rect);
 		else SDL_RenderCopy(ren,textures[1],NULL,&rect);
 
-- 
cgit v1.2.3