Add a name cvar for storage. That way, people can select between multiple storages...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 15d89491fec083675db18c178fd4379018bf366d..74d2afe7d3ddc239235b790232404947c6daaaf3 100644 (file)
--- 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 c33203bddc748bbdc15342c7bcb0b68ff00e5d5a..ed1dc30f0e90b79e05435af3a3b53cd2e13e16b2 100644 (file)
--- 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 e22f917c8f296daacae243311d07f715fab9bbbd..8a7521ba32e7da0c168254008fd1e7b0ea21222d 100644 (file)
--- 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)
        {