moved out e_system, e_detect, vmath and math to a little base library

default.bam

@@ -295,7 +295,7 @@ function build(settings)
 		end
 	end
 
-	engine = Compile(engine_settings, Collect("src/engine/*.c"))
+	engine = Compile(engine_settings, Collect("src/engine/*.c", "src/base/*.c"))
 	client = Compile(client_settings, Collect("src/engine/client/*.c"))
 	server = Compile(server_settings, Collect("src/engine/server/*.c"))
 	

src/base/system.c

@@ -6,9 +6,9 @@
 #include <ctype.h>
 #include <time.h>
 
-#include "e_detect.h"
-#include "e_system.h"
-#include "e_console.h"
+/*#include "detect.h"*/
+#include "system.h"
+/*#include "e_console.h"*/
 
 #if defined(CONF_FAMILY_UNIX)
 	#include <sys/time.h>

src/base/system.h

@@ -7,7 +7,7 @@
 #ifndef BASE_SYSTEM_H
 #define BASE_SYSTEM_H
 
-#include "e_detect.h"
+#include "detect.h"
 
 #ifdef __cplusplus
 extern "C" {

src/base/vmath.hpp

@@ -2,8 +2,6 @@
 #ifndef BASE_VMATH_H
 #define BASE_VMATH_H
 
-//#include <engine/system.h>
-
 // ------------------------------------
 
 template<typename T>

src/engine/client/ec_client.c

@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <engine/e_system.h>
+#include <base/system.h>
 #include <engine/e_engine.h>
 #include <engine/e_client_interface.h>
 

src/engine/client/ec_font.c

@@ -2,7 +2,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <engine/e_system.h>
+#include <base/system.h>
 #include <engine/e_client_interface.h>
 #include "ec_font.h"
 

src/engine/client/ec_gfx.c

@@ -2,7 +2,7 @@
 #include <GL/glfw.h>
 #include <engine/external/pnglite/pnglite.h>
 
-#include <engine/e_system.h>
+#include <base/system.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
 #include <engine/e_config.h>

src/engine/client/ec_inp.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <GL/glfw.h>
 
-#include <engine/e_system.h>
+#include <base/system.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 

src/engine/client/ec_snd.c

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/e_system.h>
+#include <base/system.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 

src/engine/client/ec_srvbrowse.c

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/e_system.h>
+#include <base/system.h>
 #include <engine/e_network.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>

src/engine/e_compression.c

@@ -1,6 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "e_system.h"
-#include <string.h>
+#include <base/system.h>
 
 /* Format: ESDDDDDD EDDDDDDD EDD...  Extended, Data, Sign */
 unsigned char *vint_pack(unsigned char *dst, int i) 

src/engine/e_config.c

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "e_system.h"
+#include <base/system.h>
 #include "e_config.h"
 #include "e_linereader.h"
 #include "e_engine.h"

src/engine/e_console.c

@@ -1,4 +1,4 @@
-#include "e_system.h"
+#include <base/system.h>
 #include "e_console.h"
 #include "e_config.h"
 #include "e_linereader.h"

src/engine/e_datafile.c

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "e_system.h"
+#include <base/system.h>
 #include "e_datafile.h"
 #include <zlib.h>
 

src/engine/e_engine.c

@@ -3,7 +3,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <engine/e_system.h>
+#include <base/system.h>
+
 #include <engine/e_server_interface.h>
 /*#include <engine/e_client_interface.h>*/
 #include <engine/e_config.h>

src/engine/e_huffman.c

@@ -1,11 +1,11 @@
+#include <base/system.h>
 #include <stdlib.h>
 #include <string.h>
-#include <engine/e_system.h>
 #include <engine/e_huffman.h>
 
 void huffman_init(HUFFSTATE *huff)
 {
-	mem_zero(huff, sizeof(huff));
+	mem_zero(huff, sizeof(HUFFSTATE));
 	huff->nodes[0].frequency = 1;
 	huff->nodes[0].symbol_size = -1;
 	huff->num_symbols++;
@@ -160,6 +160,9 @@ static void bitio_init(HUFFBITIO *bitio, unsigned char *data)
 
 static void bitio_flush(HUFFBITIO *bitio)
 {
+	if(bitio->num == 8)
+		*bitio->data = bitio->current_bits << (8-bitio->num);
+	else
 		*bitio->data = bitio->current_bits;
 	bitio->data++;
 	bitio->num = 0;

src/engine/e_if_other.h

@@ -6,8 +6,8 @@
 	Title: Engine Interface
 */
 
+#include <base/system.h>
 #include "e_keys.h"
-#include "e_system.h"
 
 enum 
 {

src/engine/e_linereader.h

@@ -1,4 +1,4 @@
-#include "e_system.h"
+#include <base/system.h>
 
 /* buffered stream for reading lines, should perhaps be something smaller */
 typedef struct

src/engine/e_map.c

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "e_system.h"
+#include <base/system.h>
 #include "e_datafile.h"
 
 static DATAFILE *map = 0;

src/engine/e_memheap.c

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "e_system.h"
+#include <base/system.h>
 
 typedef struct CHUNK_t
 {

src/engine/e_network.c

@@ -1,8 +1,8 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <string.h>
-#include <stdio.h>
+#include <base/system.h>
+
+#include <string.h> /* strlen */
 
-#include "e_system.h"
 #include "e_config.h"
 #include "e_network.h"
 #include "e_huffman.h"
@@ -134,9 +134,9 @@ static void rb_pop_first(RINGBUFFER *rb)
 		mem_free(rb->first);
 		rb->first = next;
 		if(rb->first)
-			rb->first->prev = NULL;
+			rb->first->prev = (void*)0;
 		else
-			rb->last = NULL;
+			rb->last = (void*)0;
 	}
 }
 

src/engine/e_packer.c

@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <stdlib.h>
+#include <stdlib.h> /* rand() */
+#include <base/system.h>
 
-#include "e_system.h"
 #include "e_packer.h"
 #include "e_compression.h"
 #include "e_engine.h"

src/engine/e_protocol.h

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "e_system.h"
+#include <base/system.h>
 
 /*
 	Connection diagram - How the initilization works.

src/engine/e_ringbuffer.c

@@ -1,4 +1,4 @@
-#include <engine/e_system.h>
+#include <base/system.h>
 
 enum
 {

src/engine/e_snapshot.h

@@ -2,7 +2,7 @@
 #ifndef ENGINE_SNAPSHOT_H
 #define ENGINE_SNAPSHOT_H
 
-#include "e_system.h"
+#include <base/system.h>
 
 /* SNAPSHOT */
 

src/engine/external/glfw/lib/x11/x11_window.c

@@ -1521,7 +1521,7 @@ void _glfwPlatformPollEvents( void )
     // or without XSync, but when the GL window is rendered over a slow
     // network I have noticed bad event syncronisation problems when XSync
     // is not used, so I decided to use it.
-    XSync( _glfwLibrary.Dpy, False );
+    //XSync( _glfwLibrary.Dpy, False );
 
     // Empty the window event queue
     while( XPending( _glfwLibrary.Dpy ) )

src/engine/server/es_register.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include <engine/e_system.h>
+#include <base/system.h>
 #include <engine/e_network.h>
 #include <engine/e_config.h>
 #include <engine/e_engine.h>

src/engine/server/es_server.c

@@ -3,7 +3,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <engine/e_system.h>
+#include <base/system.h>
+
 #include <engine/e_config.h>
 #include <engine/e_engine.h>
 #include <engine/e_server_interface.h>

src/game/client/gc_client.cpp

@@ -1,5 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <game/g_math.hpp>
+#include <base/math.hpp>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -13,7 +14,6 @@ extern "C" {
 #include "../g_game.hpp"
 #include "../g_version.hpp"
 #include "../g_layers.hpp"
-#include "../g_math.hpp"
 #include "gc_map_image.hpp"
 #include "../generated/gc_data.hpp"
 #include "gc_menu.hpp"

src/game/client/gc_client.hpp

@@ -1,4 +1,5 @@
-#include <game/g_vmath.hpp>
+#include <base/vmath.hpp>
+
 #include <game/generated/g_protocol.hpp>
 #include <game/g_game.hpp>
 

src/game/client/gc_console.cpp

@@ -1,8 +1,9 @@
 #include "gc_console.hpp"
 #include "../generated/gc_data.hpp"
 
+#include <base/system.h>
+
 extern "C" {
-	#include <engine/e_system.h>
 	#include <engine/e_client_interface.h>
 	#include <engine/e_config.h>
 	#include <engine/e_console.h>

src/game/client/gc_map_image.cpp

@@ -1,6 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include <base/system.h>
+
 #include <stdio.h>
-#include <engine/e_system.h>
 #include <engine/e_client_interface.h>
 #include <game/g_mapitems.hpp>
 #include "gc_map_image.hpp"

src/game/client/gc_menu.cpp

@@ -4,11 +4,12 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <game/g_math.hpp>
-#include <game/g_vmath.hpp>
+#include <base/system.h>
+#include <base/math.hpp>
+#include <base/vmath.hpp>
+
 
 extern "C" {
-	#include <engine/e_system.h>
 	#include <engine/e_client_interface.h>
 	#include <engine/e_config.h>
 	#include <engine/client/ec_font.h>

src/game/client/gc_render.cpp

@@ -1,10 +1,12 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <math.h>
+
+#include <base/math.hpp>
+
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 #include <game/generated/gc_data.hpp>
 #include <game/generated/g_protocol.hpp>
-#include <game/g_math.hpp>
 #include <game/g_layers.hpp>
 #include "gc_render.hpp"
 #include "gc_anim.hpp"

src/game/client/gc_render.hpp

@@ -2,7 +2,8 @@
 #ifndef GAME_CLIENT_RENDER_H
 #define GAME_CLIENT_RENDER_H
 
-#include "../g_vmath.hpp"
+#include <base/vmath.hpp>
+
 #include "../g_mapitems.hpp"
 #include "gc_ui.hpp"
 

src/game/client/gc_render_map.cpp

@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include <base/math.hpp>
 #include <engine/e_client_interface.h>
-#include "../g_math.hpp"
 #include "gc_client.hpp"
 
 void render_eval_envelope(ENVPOINT *points, int num_points, int channels, float time, float *result)

src/game/client/gc_render_obj.cpp

@@ -1,11 +1,13 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <math.h>
 #include <stdio.h>
+
+#include <base/math.hpp>
+
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 #include <game/generated/gc_data.hpp>
 #include <game/generated/g_protocol.hpp>
-#include "../g_math.hpp"
 #include "gc_render.hpp"
 #include "gc_anim.hpp"
 #include "gc_client.hpp"

src/game/client/gc_skin.cpp

@@ -2,10 +2,12 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
-#include <engine/e_system.h>
+
+#include <base/system.h>
+#include <base/math.hpp>
+
 #include <engine/e_client_interface.h>
 #include "gc_skin.hpp"
-#include "../g_math.hpp"
 
 enum
 {

src/game/client/gc_skin.hpp

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../g_vmath.hpp"
+#include <base/vmath.hpp>
 
 // do this better and nicer
 typedef struct 

src/game/client/gc_ui.cpp

@@ -1,5 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/e_system.h>
+#include <base/system.h>
+
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 #include "gc_ui.hpp"

src/game/editor/ed_editor.cpp

@@ -1,11 +1,12 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
+#include <base/system.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 extern "C" {
-	#include <engine/e_system.h>
 	#include <engine/e_common_interface.h>
 	#include <engine/e_datafile.h>
 	#include <engine/e_config.h>

src/game/editor/ed_editor.hpp

@@ -1,14 +1,15 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
+#include <base/system.h>
+#include <base/math.hpp>
+
 #include <stdlib.h>
 #include <math.h>
 #include "array.hpp"
 #include "../g_mapitems.hpp"
-#include "../g_math.hpp"
 #include "../client/gc_render.hpp"
 
 extern "C" {
-	#include <engine/e_system.h>
 	#include <engine/e_client_interface.h>
 	#include <engine/e_datafile.h>
 	#include <engine/e_config.h>

src/game/editor/ed_layer_quads.cpp

@@ -1,5 +1,6 @@
+#include <base/math.hpp>
+
 #include "ed_editor.hpp"
-#include <game/g_math.hpp>
 #include <game/generated/gc_data.hpp>
 #include <game/client/gc_render.hpp>
 

src/game/editor/ed_layer_tiles.cpp

@@ -1,4 +1,5 @@
-#include <game/g_math.hpp>
+#include <base/math.hpp>
+
 #include <game/generated/gc_data.hpp>
 #include <game/client/gc_render.hpp>
 #include "ed_editor.hpp"

src/game/g_collision.cpp

@@ -1,9 +1,10 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/e_system.h>
-#include <game/g_vmath.hpp>
+#include <base/system.h>
+#include <base/math.hpp>
+#include <base/vmath.hpp>
+
 #include <math.h>
 #include <engine/e_common_interface.h>
-#include <game/g_math.hpp>
 #include <game/g_mapitems.hpp>
 #include <game/g_layers.hpp>
 

src/game/g_collision.hpp

@@ -2,8 +2,7 @@
 #ifndef GAME_MAPRES_COL_H
 #define GAME_MAPRES_COL_H
 
-
-#include <game/g_vmath.hpp>
+#include <base/vmath.hpp>
 
 int col_init();
 int col_is_solid(int x, int y);

src/game/g_game.hpp

@@ -2,10 +2,11 @@
 #ifndef GAME_GAME_H
 #define GAME_GAME_H
 
-#include <engine/e_system.h>
+#include <base/system.h>
+#include <base/math.hpp>
+
 #include <engine/e_common_interface.h>
 #include <math.h>
-#include "g_math.hpp"
 #include "g_collision.hpp"
 #include <game/generated/g_protocol.hpp>
 

src/game/server/gs_server.cpp

@@ -2,12 +2,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
+#include <base/math.hpp>
+
 #include <engine/e_config.h>
 #include <engine/e_server_interface.h>
 #include <game/g_version.hpp>
 #include <game/g_collision.hpp>
 #include <game/g_layers.hpp>
-#include <game/g_math.hpp>
 #include "gs_common.hpp"
 #include "gs_game_ctf.hpp"
 #include "gs_game_tdm.hpp"

src/mastersrv/mastersrv.cpp

@@ -1,8 +1,8 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <string.h>
+#include <base/system.h>
 
 extern "C" {
-	#include <engine/e_system.h>
 	#include <engine/e_network.h>
 }
 

src/tools/crapnet.cpp

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/e_system.h>
+#include <base/system.h>
 
 #include <cstdlib>
 

src/tools/fake_server.c

@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include <base/system.h>
 #include <engine/e_config.h>
-#include <engine/e_system.h>
 #include <engine/e_network.h>
 #include <mastersrv/mastersrv.h>
 #include <stdlib.h>

src/tools/packetgen.c

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/e_system.h>
+#include <base/system.h>
 
 enum { NUM_SOCKETS = 64 };