diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-02-04 07:36:54 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-02-04 07:36:54 +0000 |
| commit | dd1e7adc00b8020fd163a051a6fc6109eeca332b (patch) | |
| tree | ebd96a60c2d55de1dab1d80e9863cab170bf7eb6 /src/engine | |
| parent | d76661b3be30a78203438d53bd91657006d930a9 (diff) | |
| download | zcatch-dd1e7adc00b8020fd163a051a6fc6109eeca332b.tar.gz zcatch-dd1e7adc00b8020fd163a051a6fc6109eeca332b.zip | |
fixed sound positioning bug, tweaked laser effect, fixed memory dumping
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/ec_client.c | 1 | ||||
| -rw-r--r-- | src/engine/e_engine.c | 11 | ||||
| -rw-r--r-- | src/engine/e_ringbuffer.c | 10 | ||||
| -rw-r--r-- | src/engine/e_system.c | 2 |
4 files changed, 19 insertions, 5 deletions
diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c index 27dce4cf..627791bb 100644 --- a/src/engine/client/ec_client.c +++ b/src/engine/client/ec_client.c @@ -19,6 +19,7 @@ #include <engine/e_memheap.h> #include <engine/e_datafile.h> #include <engine/e_console.h> +#include <engine/e_ringbuffer.h> #include <mastersrv/mastersrv.h> diff --git a/src/engine/e_engine.c b/src/engine/e_engine.c index 3168020d..9af77f84 100644 --- a/src/engine/e_engine.c +++ b/src/engine/e_engine.c @@ -8,6 +8,13 @@ #include <engine/e_config.h> #include <engine/e_console.h> + +static void con_dbg_dumpmem(void *result, void *user_data) +{ + mem_debug_dump(); +} + + static char application_save_path[512] = {0}; const char *engine_savepath(const char *filename, char *buffer, int max) @@ -16,6 +23,7 @@ const char *engine_savepath(const char *filename, char *buffer, int max) return buffer; } + void engine_init(const char *appname, int argc, char **argv) { dbg_msg("engine", "running on %s-%s-%s", CONF_FAMILY_STRING, CONF_PLATFORM_STRING, CONF_ARCH_STRING); @@ -44,6 +52,9 @@ void engine_init(const char *appname, int argc, char **argv) /* init console */ console_init(); + + MACRO_REGISTER_COMMAND("dbg_dumpmem", "", con_dbg_dumpmem, 0x0); + /* reset the config */ config_reset(); diff --git a/src/engine/e_ringbuffer.c b/src/engine/e_ringbuffer.c index 9ece9b98..02350140 100644 --- a/src/engine/e_ringbuffer.c +++ b/src/engine/e_ringbuffer.c @@ -206,11 +206,11 @@ void *ringbuf_item_ptr(void *p) return ((RBITEM *)p) - 1; } -void *ringbuf_first(RINGBUFFER *rb) -{ - if(rb->last_alloc && rb->last_alloc->next) - return ringbuf_next(rb, rb->last_alloc->next+1); - return 0x0; +void *ringbuf_first(RINGBUFFER *rb) +{ + if(rb->last_alloc && rb->last_alloc->next) + return ringbuf_next(rb, rb->last_alloc->next+1); + return 0x0; } void *ringbuf_last(RINGBUFFER *rb) diff --git a/src/engine/e_system.c b/src/engine/e_system.c index e9c96fa3..1472b3d6 100644 --- a/src/engine/e_system.c +++ b/src/engine/e_system.c @@ -184,6 +184,8 @@ void mem_debug_dump() io_write(f, buf, strlen(buf)); header = header->next; } + + io_close(f); } |