some files moved to 'core' directory

pmurias · Sep 1, 2011 · 6c0ccca · 6c0ccca
1 parent 8fb425c
commit 6c0ccca
Show file tree

Hide file tree

Showing 32 changed files with 22 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 all: luke
 CC=gcc
-CFLAGS=-c -std=gnu99 -Wall -O2 -Wfatal-errors -Werror -g
+CFLAGS=-c -std=gnu99 -I./core/ -Wall -O2 -Wfatal-errors -Werror -g
 
 ifeq ($(OS),Windows_NT)
 	CLIBS=-lglfw -lopengl32 -lpng -lz -lws2_32
@@ -10,21 +10,21 @@ endif
 
 # core modules
 SOURCES= \
-	window.c \
-	texture.c \
-	hashmap.c \
-	str.c \
-	queue.c \
-	array.c \
-	socket.c \
-	blit.c \
-	anim.c \
-	iso.c \
-	font.c \
-	single_player.c \
-	tcp_client_state.c \
-	tcp_server_state.c \
-	rand.c
+	core/window.c \
+	core/texture.c \
+	core/hashmap.c \
+	core/str.c \
+	core/queue.c \
+	core/array.c \
+	core/socket.c \
+	core/blit.c \
+	core/anim.c \
+	core/iso.c \
+	core/font.c \
+	core/single_player.c \
+	core/tcp_client_state.c \
+	core/tcp_server_state.c \
+	core/rand.c
 
 # game modules
 SOURCES+= \

diff --git a/anim.c → core/anim.c b/anim.c → core/anim.c
diff --git a/anim.h → core/anim.h b/anim.h → core/anim.h
diff --git a/array.c → core/array.c b/array.c → core/array.c
diff --git a/array.h → core/array.h b/array.h → core/array.h
diff --git a/blit.c → core/blit.c b/blit.c → core/blit.c
diff --git a/blit.h → core/blit.h b/blit.h → core/blit.h
diff --git a/font.c → core/font.c b/font.c → core/font.c
diff --git a/font.h → core/font.h b/font.h → core/font.h
diff --git a/hashmap.c → core/hashmap.c b/hashmap.c → core/hashmap.c
diff --git a/hashmap.h → core/hashmap.h b/hashmap.h → core/hashmap.h
diff --git a/iso.c → core/iso.c b/iso.c → core/iso.c
diff --git a/iso.h → core/iso.h b/iso.h → core/iso.h
diff --git a/network.h → core/network.h b/network.h → core/network.h
diff --git a/queue.c → core/queue.c b/queue.c → core/queue.c
diff --git a/queue.h → core/queue.h b/queue.h → core/queue.h
diff --git a/rand.c → core/rand.c b/rand.c → core/rand.c
diff --git a/rand.h → core/rand.h b/rand.h → core/rand.h
diff --git a/single_player.c → core/single_player.c b/single_player.c → core/single_player.c
diff --git a/single_player.h → core/single_player.h b/single_player.h → core/single_player.h
diff --git a/socket.c → core/socket.c b/socket.c → core/socket.c
diff --git a/socket.h → core/socket.h b/socket.h → core/socket.h
diff --git a/str.c → core/str.c b/str.c → core/str.c
diff --git a/str.h → core/str.h b/str.h → core/str.h
diff --git a/tcp_client_state.c → core/tcp_client_state.c b/tcp_client_state.c → core/tcp_client_state.c
diff --git a/tcp_network.h → core/tcp_network.h b/tcp_network.h → core/tcp_network.h
diff --git a/tcp_server_state.c → core/tcp_server_state.c b/tcp_server_state.c → core/tcp_server_state.c
diff --git a/texture.c → core/texture.c b/texture.c → core/texture.c
diff --git a/texture.h → core/texture.h b/texture.h → core/texture.h
diff --git a/window.c → core/window.c b/window.c → core/window.c
diff --git a/window.h → core/window.h b/window.h → core/window.h
diff --git a/spells/flare.c b/spells/flare.c
@@ -119,6 +119,7 @@ static void _free(Spell ** s)
 {
 	Flare *spell = (Flare *) * s;
 	if (spell->light) {
+		spell->light->range = 0;
 		free_isolight(&spell->light);
 	}
 	free(*s);
@@ -172,6 +173,11 @@ Spell* create_flare(int gfx, float x, float y, float mx, float my)
 	spell->c.fade = 200;
 	spell->c.exploded = 0;
 
+	if (gfx) {
+		spell->light->x = spell->c.x;
+		spell->light->y = spell->c.y;
+	}
+
 	return (Spell*)spell;
 }