Explorar el Código

Merge branch 'master' of https://github.com/Eiyeron/Super-Hexagon-Casio into REFACTOR

Conflicts:
	hexagon.g1w
	struct.h
	wall.c
Adrien Boucaud hace 12 años
padre
commit
d75719b820
Se han modificado 3 ficheros con 6 adiciones y 3 borrados
  1. 1 1
      .gitignore
  2. 4 2
      hexagon.g1w
  3. 1 0
      wall.c

+ 1 - 1
.gitignore

@@ -22,6 +22,6 @@ INIT
 SDCard
 *.g1a
 *.G1A
-FXSH_Build.bat
+*.bat
 *.dlw
 *.dlr

+ 4 - 2
hexagon.g1w

@@ -13,11 +13,13 @@ LoadAddress=80000000:90100000
 
 [Files]
 SourceFile=:draw_states.c
-SourceFile=:ECode.c
-SourceFile=:hexagon.c
 SourceFile=:init_states.c
 SourceFile=:MonochromeLib.c
 SourceFile=:states.c
 SourceFile=:syscall.src
 SourceFile=:update_states.c
+SourceFile=:ECode.c
+SourceFile=:hexagon.c
+SourceFile=:MonochromeLib.c
+SourceFile=:syscall.src
 SourceFile=:wall.c

+ 1 - 0
wall.c

@@ -92,6 +92,7 @@ void drawWalls(Wall *list, Camera *cam)
 				const float sin1 = sin(angle);
 				const float sin2 = sin(angle + PI/3);
 				int i,j, x, y;
+
 				float dist = tmp->d - tmp->h + cam->zoom;
 				for(i = 0; i < tmp->h; ++i) {
 					if(dist <= 8) break;