diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/client/client.c | 1 | ||||
| -rw-r--r-- | src/engine/config_variables.h | 1 | ||||
| -rw-r--r-- | src/engine/server/server.c | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/client/client.c b/src/engine/client/client.c index d1ab4cdb..b862e65a 100644 --- a/src/engine/client/client.c +++ b/src/engine/client/client.c @@ -1038,6 +1038,7 @@ static void client_run() /* render */ if(editor_active) { + client_update(); editor_update_and_render(); gfx_swap(); } diff --git a/src/engine/config_variables.h b/src/engine/config_variables.h index 075731c4..d62529ec 100644 --- a/src/engine/config_variables.h +++ b/src/engine/config_variables.h @@ -49,6 +49,7 @@ MACRO_CONFIG_STR(sv_bindaddr, 128, "") MACRO_CONFIG_INT(sv_port, 8303, 0, 0) MACRO_CONFIG_INT(sv_sendheartbeats, 1, 0, 1) MACRO_CONFIG_STR(sv_map, 128, "dm1") +MACRO_CONFIG_INT(sv_map_reload, 0, 0, 1) MACRO_CONFIG_INT(sv_max_clients, 8, 1, 16) diff --git a/src/engine/server/server.c b/src/engine/server/server.c index 3135f418..e8bc544f 100644 --- a/src/engine/server/server.c +++ b/src/engine/server/server.c @@ -720,8 +720,10 @@ static int server_run() { int64 t = time_get(); /* load new map TODO: don't poll this */ - if(strcmp(config.sv_map, current_map) != 0) + if(strcmp(config.sv_map, current_map) != 0 || config.sv_map_reload) { + config.sv_map_reload = 0; + /* load map */ if(server_load_map(config.sv_map)) { |