Adjust defaults. Also persist all menu settings (seta), which should make it easier...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 21de2f373e580af9a603221bc2155e9196c0f014..d220f7ba404c25c3ecd8c99e0e4c0a2500fe1580 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -549,14 +549,14 @@ set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to"
 set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to"
 
 seta menu_sandbox_spawn_model "" // used to store the model in the input field
 set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to"
 
 seta menu_sandbox_spawn_model "" // used to store the model in the input field

-set menu_sandbox_edit_skin 0
-set menu_sandbox_edit_alpha 1
-set menu_sandbox_edit_color_main "1 1 1"
-set menu_sandbox_edit_color_glow "1 1 1"
-set menu_sandbox_edit_frame 0
-set menu_sandbox_edit_scale 1
-set menu_sandbox_edit_physics 0
-set menu_sandbox_edit_force 0
+seta menu_sandbox_edit_skin 0
+seta menu_sandbox_edit_alpha 1
+seta menu_sandbox_edit_color_main "1 1 1"
+seta menu_sandbox_edit_color_glow "1 1 1"
+seta menu_sandbox_edit_frame 0
+seta menu_sandbox_edit_scale 1
+seta menu_sandbox_edit_physics 1
+seta menu_sandbox_edit_force 1

 
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
 bind f7 menu_showsandboxtools
 
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
 bind f7 menu_showsandboxtools

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 6aa97b6960f9aedb87e63114ec216348f1e0ce8a..30e486895a851903848fa7c2e332c0bdc6b2897f 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -31,7 +31,7 @@ entity sandbox_SpawnObject()
        e.realowner = self;
        e.classname = "object";
        e.takedamage = DAMAGE_AIM;
        e.realowner = self;
        e.classname = "object";
        e.takedamage = DAMAGE_AIM;

-       e.damageforcescale = 0;
+       e.damageforcescale = 1;

        e.solid = SOLID_BBOX; // SOLID_BSP would be best, but can lag the server badly
        e.movetype = MOVETYPE_TOSS;
        e.frame = 0;
        e.solid = SOLID_BBOX; // SOLID_BSP would be best, but can lag the server badly
        e.movetype = MOVETYPE_TOSS;
        e.frame = 0;