mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
moved out e_system, e_detect, vmath and math to a little base library
This commit is contained in:
parent
0fceb1cf1a
commit
817f431377
|
@ -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"))
|
||||
|
||||
|
|
|
@ -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>
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef BASE_SYSTEM_H
|
||||
#define BASE_SYSTEM_H
|
||||
|
||||
#include "e_detect.h"
|
||||
#include "detect.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
|
@ -2,8 +2,6 @@
|
|||
#ifndef BASE_VMATH_H
|
||||
#define BASE_VMATH_H
|
||||
|
||||
//#include <engine/system.h>
|
||||
|
||||
// ------------------------------------
|
||||
|
||||
template<typename T>
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "e_system.h"
|
||||
#include <base/system.h>
|
||||
#include "e_console.h"
|
||||
#include "e_config.h"
|
||||
#include "e_linereader.h"
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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,7 +160,10 @@ static void bitio_init(HUFFBITIO *bitio, unsigned char *data)
|
|||
|
||||
static void bitio_flush(HUFFBITIO *bitio)
|
||||
{
|
||||
*bitio->data = bitio->current_bits;
|
||||
if(bitio->num == 8)
|
||||
*bitio->data = bitio->current_bits << (8-bitio->num);
|
||||
else
|
||||
*bitio->data = bitio->current_bits;
|
||||
bitio->data++;
|
||||
bitio->num = 0;
|
||||
bitio->current_bits = 0;
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
Title: Engine Interface
|
||||
*/
|
||||
|
||||
#include <base/system.h>
|
||||
#include "e_keys.h"
|
||||
#include "e_system.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "e_system.h"
|
||||
#include <base/system.h>
|
||||
|
||||
/* buffered stream for reading lines, should perhaps be something smaller */
|
||||
typedef struct
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <engine/e_system.h>
|
||||
#include <base/system.h>
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#ifndef ENGINE_SNAPSHOT_H
|
||||
#define ENGINE_SNAPSHOT_H
|
||||
|
||||
#include "e_system.h"
|
||||
#include <base/system.h>
|
||||
|
||||
/* SNAPSHOT */
|
||||
|
||||
|
|
|
@ -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 ) )
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#include <game/g_vmath.hpp>
|
||||
#include <base/vmath.hpp>
|
||||
|
||||
#include <game/generated/g_protocol.hpp>
|
||||
#include <game/g_game.hpp>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
}
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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 };
|
||||
|
||||
|
|
Loading…
Reference in a new issue