X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fsandbox%2Fsv_sandbox.qc;h=9458189fd0ed20a448b9da906b3f654c12632452;hp=d121cf1094685ac9263f55143b59da831cf37610;hb=16e64ff58cf65d7b3e0815aadb530580a6aa251b;hpb=678127044857fb9b89f06faf7a3313bdeb43205c diff --git a/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc b/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc index d121cf109..9458189fd 100644 --- a/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc +++ b/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc @@ -212,11 +212,11 @@ void sandbox_ObjectRemove(entity e) // if the object being removed has been selected for attachment by a player, unset it FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it) && it.object_attach == e, { it.object_attach = NULL; }); - if(e.material) { strunzone(e.material); e.material = string_null; } - if(e.crypto_idfp) { strunzone(e.crypto_idfp); e.crypto_idfp = string_null; } - if(e.netname) { strunzone(e.netname); e.netname = string_null; } - if(e.message) { strunzone(e.message); e.message = string_null; } - if(e.message2) { strunzone(e.message2); e.message2 = string_null; } + strfree(e.material); + strfree(e.crypto_idfp); + strfree(e.netname); + strfree(e.message); + strfree(e.message2); delete(e); e = NULL; @@ -312,8 +312,9 @@ string sandbox_ObjectPort_Save(entity e, bool database) entity sandbox_ObjectPort_Load(entity this, string s, float database) { // load object properties, and spawn a new object with them - float n, i; + int n, i; entity e = NULL, parent = NULL; + string arg = string_null; // separate objects between the ; symbols n = tokenizebyseparator(s, "; "); @@ -323,9 +324,10 @@ entity sandbox_ObjectPort_Load(entity this, string s, float database) // now separate and apply the properties of each object for(i = 0; i < n; ++i) { - float argv_num; + #define SANDBOX_GETARG arg = argv(++argv_num); + int argv_num = -1; // starts at -1 so I don't need postincrement + string tagname = string_null; - argv_num = 0; tokenize_console(port_string[i]); e = sandbox_ObjectSpawn(this, database); @@ -333,38 +335,40 @@ entity sandbox_ObjectPort_Load(entity this, string s, float database) if(i) { // properties stored only for child objects - if(argv(argv_num) != "") tagname = argv(argv_num); else tagname = string_null; ++argv_num; + SANDBOX_GETARG; tagname = (arg != "") ? arg : string_null; } else { // properties stored only for parent objects if(database) { - setorigin(e, stov(argv(argv_num))); ++argv_num; - e.angles = stov(argv(argv_num)); ++argv_num; + SANDBOX_GETARG; setorigin(e, stov(arg)); + SANDBOX_GETARG; e.angles = stov(arg); } parent = e; // mark parent objects as such } // properties stored for all objects - _setmodel(e, argv(argv_num)); ++argv_num; - e.skin = stof(argv(argv_num)); ++argv_num; - e.alpha = stof(argv(argv_num)); ++argv_num; - e.colormod = stov(argv(argv_num)); ++argv_num; - e.glowmod = stov(argv(argv_num)); ++argv_num; - e.frame = stof(argv(argv_num)); ++argv_num; - sandbox_ObjectEdit_Scale(e, stof(argv(argv_num))); ++argv_num; - e.solid = e.old_solid = stof(argv(argv_num)); ++argv_num; - e.old_movetype = stof(argv(argv_num)); ++argv_num; + SANDBOX_GETARG; _setmodel(e, arg); + SANDBOX_GETARG; e.skin = stof(arg); + SANDBOX_GETARG; e.alpha = stof(arg); + SANDBOX_GETARG; e.colormod = stov(arg); + SANDBOX_GETARG; e.glowmod = stov(arg); + SANDBOX_GETARG; e.frame = stof(arg); + SANDBOX_GETARG; sandbox_ObjectEdit_Scale(e, stof(arg)); + SANDBOX_GETARG; e.solid = e.old_solid = stof(arg); + SANDBOX_GETARG; e.old_movetype = stof(arg); set_movetype(e, e.old_movetype); - e.damageforcescale = stof(argv(argv_num)); ++argv_num; - if(e.material) strunzone(e.material); if(argv(argv_num) != "") e.material = strzone(argv(argv_num)); else e.material = string_null; ++argv_num; + SANDBOX_GETARG; e.damageforcescale = stof(arg); + strfree(e.material); + SANDBOX_GETARG; e.material = (arg != "") ? strzone(arg) : string_null; if(database) { // properties stored only for the database - if(e.crypto_idfp) strunzone(e.crypto_idfp); if(argv(argv_num) != "") e.crypto_idfp = strzone(argv(argv_num)); else e.crypto_idfp = string_null; ++argv_num; - if(e.netname) strunzone(e.netname); e.netname = strzone(argv(argv_num)); ++argv_num; - if(e.message) strunzone(e.message); e.message = strzone(argv(argv_num)); ++argv_num; - if(e.message2) strunzone(e.message2); e.message2 = strzone(argv(argv_num)); ++argv_num; + strfree(e.crypto_idfp); + SANDBOX_GETARG; e.crypto_idfp = (arg != "") ? strzone(arg) : string_null; + SANDBOX_GETARG; strcpy(e.netname, arg); + SANDBOX_GETARG; strcpy(e.message, arg); + SANDBOX_GETARG; strcpy(e.message2, arg); } // attach last @@ -702,7 +706,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) e.damageforcescale = stof(argv(3)); break; case "material": - if(e.material) strunzone(e.material); + strfree(e.material); if(argv(3)) { for (j = 1; j <= 5; j++) // precache material sounds, 5 in total @@ -718,8 +722,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) } // update last editing time - if(e.message2) strunzone(e.message2); - e.message2 = strzone(strftime(true, "%d-%m-%Y %H:%M:%S")); + strcpy(e.message2, strftime(true, "%d-%m-%Y %H:%M:%S")); if(autocvar_g_sandbox_info > 1) LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " edited property ^3", argv(2), " ^7of an object at origin ^3", vtos(e.origin)); @@ -745,8 +748,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) // also update the player's nickname if he changed it (but has the same player UID) if(e.netname != player.netname) { - if(e.netname) strunzone(e.netname); - e.netname = strzone(player.netname); + strcpy(e.netname, player.netname); print_to(player, "^2SANDBOX - INFO: ^7Object owner name updated"); } @@ -756,8 +758,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) return true; } - if(e.crypto_idfp) strunzone(e.crypto_idfp); - e.crypto_idfp = strzone(player.crypto_idfp); + strcpy(e.crypto_idfp, player.crypto_idfp); print_to(player, "^2SANDBOX - INFO: ^7Object claimed successfully"); }