From: Mario Date: Sat, 25 Apr 2015 15:49:26 +0000 (+1000) Subject: Fix some leftovers from merge X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c8174a93e1357a26f506fe5e7a5c7ccb48348ca9;p=xonotic%2Fxonotic-data.pk3dir.git Fix some leftovers from merge --- diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index b63b829e2..3398066e8 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -222,8 +222,6 @@ void CSQC_Init(void) initialize_minigames(); - initialize_minigames(); - WaypointSprite_Load(); // precaches diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 31547fa69..389f3036e 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -30,8 +30,6 @@ #include "../common/minigames/sv_minigames.qh" -#include "../common/minigames/sv_minigames.qh" - #include "../common/monsters/sv_monsters.qh" #include "../common/vehicles/sv_vehicles.qh" diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index c6a5a0ae9..d8d1d0a8a 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -637,8 +637,6 @@ void spawnfunc_worldspawn (void) initialize_minigames(); - initialize_minigames(); - ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid)); TemporaryDB = db_create();