From 1418c7e54656cbf6ed58b25df165aaf226621530 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 28 Oct 2011 18:48:57 +0300 Subject: [PATCH] Add a name cvar for storage. That way, people can select between multiple storages. If * is that cvar, storage files are named sandbox/storage_*_mapname.txt --- defaultXonotic.cfg | 1 + qcsrc/server/autocvars.qh | 1 + qcsrc/server/mutators/sandbox.qc | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 15d89491f..74d2afe7d 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -546,6 +546,7 @@ seta g_balance_cloaked_alpha 0.25 set g_sandbox 0 "allow players to spawn and edit objects around the map" set g_sandbox_info 1 "print object information to the server. 1 prints info about spawned / removed objects, 2 also prints info about edited objects" +set g_sandbox_storage_name default "name of the selected storage to use" set g_sandbox_storage_autosave 10 "storage is automatically saved every specified number of seconds" set g_sandbox_storage_autoload 1 "if a storage file exists for the given map, automatically load it at startup" set g_sandbox_editor_maxobjects 1000 "maximum number of objects that may exist at a time" diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index c33203bdd..ed1dc30f0 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -1200,6 +1200,7 @@ float autocvar_g_trueaim_minrange; float autocvar_g_debug_defaultsounds; float autocvar_g_loituma; float autocvar_g_sandbox_info; +string autocvar_g_sandbox_storage_name; float autocvar_g_sandbox_storage_autosave; float autocvar_g_sandbox_storage_autoload; float autocvar_g_sandbox_editor_maxobjects; diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index e22f917c8..8a7521ba3 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -204,7 +204,7 @@ void sandbox_Database_Save() string file_name; float file_get; - file_name = strcat("sandbox/storage_", GetMapname(), ".txt"); + file_name = strcat("sandbox/storage_", autocvar_g_sandbox_storage_name, "_", GetMapname(), ".txt"); file_get = fopen(file_name, FILE_WRITE); fputs(file_get, strcat("// sandbox storage for map ", GetMapname(), ", containing a total of ", ftos(object_count), " objects\n")); for(head = world; (head = find(head, classname, "object")); ) @@ -227,7 +227,7 @@ void sandbox_Database_Load() string file_read, file_name; float file_get; - file_name = strcat("sandbox/storage_", GetMapname(), ".txt"); + file_name = strcat("sandbox/storage_", autocvar_g_sandbox_storage_name, "_", GetMapname(), ".txt"); file_get = fopen(file_name, FILE_READ); if(file_get < 0) { -- 2.39.2