const float MAX_STORAGE_ATTACHMENTS = 16;
float object_count;
-.string object_clipboard;
.entity object_attach;
.string material;
}
}
+.float old_movetype;
void sandbox_ObjectAttach_Remove(entity e);
void sandbox_ObjectAttach_Set(entity e, entity parent, string s)
{
// we can't attach to an attachment, for obvious reasons
sandbox_ObjectAttach_Remove(e);
+ e.old_movetype = e.movetype; // persist physics
e.movetype = MOVETYPE_FOLLOW;
e.solid = SOLID_NOT;
e.takedamage = DAMAGE_NO;
if(head.owner == e)
{
vector org;
- head.movetype = MOVETYPE_TOSS; // default
+ head.movetype = head.old_movetype; // restore persisted physics
head.solid = SOLID_BBOX;
head.takedamage = DAMAGE_AIM;
e.skin = 0;
e.material = string_null;
e.touch = sandbox_ObjectFunction_Touch;
+ //e.effects |= EF_SELECTABLE;
if(!database)
{
for(head = world; (head = find(head, classname, "object")); )
{
// the main object needs to be first in the array [0] with attached objects following
- float slot;
- string tagindex;
+ float slot, physics;
if(head == e) // this is the main object, place it first
{
slot = 0;
- tagindex = string_null; // the main object is not attached to anything
+ physics = head.movetype; // applied physics are normal physics for parents
}
else if(head.owner == e) // child object, list them in order
{
i += 1; // children start from 1
slot = i;
-
- // get the name of the tag our object is attached to
- gettaginfo(head.owner, head.tag_index);
- tagindex = gettaginfo_name;
+ physics = head.old_movetype; // persisted physics are normal physics for children
+ gettaginfo(head.owner, head.tag_index); // get the name of the tag our object is attached to, used further below
}
else
continue;
if(slot)
{
// properties stored only for child objects
- if(tagindex) port_string[slot] = strcat(port_string[slot], "\"", tagindex, "\" "); else port_string[slot] = strcat(port_string[slot], "- "); // none
+ if(gettaginfo_name) port_string[slot] = strcat(port_string[slot], "\"", gettaginfo_name, "\" "); else port_string[slot] = strcat(port_string[slot], "- "); // none
}
else
{
port_string[slot] = strcat(port_string[slot], sprintf("\"%.9v\"", head.glowmod), " ");
port_string[slot] = strcat(port_string[slot], ftos(head.frame), " ");
port_string[slot] = strcat(port_string[slot], ftos(head.scale), " ");
- port_string[slot] = strcat(port_string[slot], ftos(head.movetype), " ");
+ port_string[slot] = strcat(port_string[slot], ftos(physics), " ");
port_string[slot] = strcat(port_string[slot], ftos(head.damageforcescale), " ");
if(head.material) port_string[slot] = strcat(port_string[slot], "\"", head.material, "\" "); else port_string[slot] = strcat(port_string[slot], "- "); // none
if(database)
for(i = 0; i < n; ++i)
{
float argv_num;
+ string tagname;
argv_num = 0;
tokenize_console(port_string[i]);
e = sandbox_ObjectSpawn(database);
if(i)
{
// properties stored only for child objects
- if(argv(argv_num) != "-") sandbox_ObjectAttach_Set(e, parent, argv(argv_num)); else sandbox_ObjectAttach_Set(e, parent, ""); ++argv_num;
+ if(argv(argv_num) != "-") tagname = argv(argv_num); else tagname = string_null; ++argv_num;
}
else
{
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.movetype = stof(argv(argv_num)); ++argv_num;
+ e.movetype = e.old_movetype = stof(argv(argv_num)); ++argv_num;
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;
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;
}
+
+ // attach last
+ if(i)
+ sandbox_ObjectAttach_Set(e, parent, tagname);
}
for(i = 0; i <= MAX_STORAGE_ATTACHMENTS; ++i)
{
entity e;
float i;
+ string s;
// ---------------- COMMAND: HELP ----------------
case "help":
print_to(self, "You can use the following sandbox commands:");
print_to(self, "^7\"^2object_spawn ^3models/foo/bar.md3^7\" spawns a new object in front of the player, and gives it the specified model");
print_to(self, "^7\"^2object_remove^7\" removes the object the player is looking at. Players can only remove their own objects");
- print_to(self, "^7\"^2object_duplicate ^3value^7\" duplicates the object. 'copy' copies the object, 'paste' puts it in front of the player");
+ print_to(self, "^7\"^2object_duplicate ^3value^7\" duplicates the object, if the player has copying rights over the original");
+ print_to(self, "^Properties for ^2object_duplicate^7:");
+ print_to(self, "^3copy value ^7- copies the properties of the object to the specified client cvar");
+ print_to(self, "^3paste value ^7- spawns an object with the given properties. Properties or cvars must be specified as follows; eg1: \"0 1 2 ...\", eg2: \"$cl_cvar\"");
print_to(self, "^7\"^2object_attach ^3property value^7\" attaches one object to another. Players can only attach their own objects");
- print_to(self, "^7Attachment properties for ^2object_attach^7:");
+ print_to(self, "^7Properties for ^2object_attach^7:");
print_to(self, "^3get ^7- selects the object you are facing as the object to be attached");
print_to(self, "^3set value ^7- attaches the previously selected object to the object you are facing, on the specified bone");
print_to(self, "^3remove ^7- detaches all objects from the object you are facing");
print_to(self, "^7\"^2object_edit ^3property value^7\" edits the given property of the object. Players can only edit their own objects");
- print_to(self, "^7Object properties for ^2object_edit^7:");
+ print_to(self, "^7Properties for ^2object_edit^7:");
print_to(self, "^3skin value ^7- changes the skin of the object");
print_to(self, "^3alpha value ^7- sets object transparency");
print_to(self, "^3colormod \"value_x value_y value_z\" ^7- main object color");
switch(argv(2))
{
case "copy":
- // copies customizable properties of the selected object to the clipboard
+ // copies customizable properties of the selected object to the clipboard cvar
e = sandbox_ObjectEdit_Get(autocvar_g_sandbox_editor_free); // can we copy objects we can't edit?
if(e != world)
{
- if(self.object_clipboard)
- strunzone(self.object_clipboard);
- self.object_clipboard = strzone(sandbox_ObjectPort_Save(e, FALSE));
+ s = sandbox_ObjectPort_Save(e, FALSE);
+ s = strreplace("\"", "\\\"", s);
+ stuffcmd(self, strcat("set ", argv(3), " \"", s, "\""));
print_to(self, "^2SANDBOX - INFO: ^7Object copied to clipboard");
return TRUE;
return TRUE;
case "paste":
- // spawns a new object using the properties in the player's clipboard
- if(!self.object_clipboard) // no object in clipboard
+ // spawns a new object using the properties in the player's clipboard cvar
+ if(!argv(3)) // no object in clipboard
{
print_to(self, "^1SANDBOX - WARNING: ^7No object in clipboard. You must copy an object before you can paste it");
return TRUE;
print_to(self, strcat("^1SANDBOX - WARNING: ^7Cannot spawn any more objects. Up to ^3", ftos(autocvar_g_sandbox_editor_maxobjects), " ^7objects may exist at a time"));
return TRUE;
}
-
- e = sandbox_ObjectPort_Load(self.object_clipboard, FALSE);
+ e = sandbox_ObjectPort_Load(argv(3), FALSE);
print_to(self, "^2SANDBOX - INFO: ^7Object pasted successfully");
if(autocvar_g_sandbox_info > 0)
return FALSE;
}
-MUTATOR_HOOKFUNCTION(sandbox_ClientDisconnect)
-{
- // unzone the player's clipboard if it's not empty
- if(self.object_clipboard)
- {
- strunzone(self.object_clipboard);
- self.object_clipboard = string_null;
- }
-
- return FALSE;
-}
-
float autosave_time;
MUTATOR_HOOKFUNCTION(sandbox_StartFrame)
{
MUTATOR_HOOK(SV_ParseClientCommand, sandbox_PlayerCommand, CBC_ORDER_ANY);
MUTATOR_HOOK(SV_StartFrame, sandbox_StartFrame, CBC_ORDER_ANY);
MUTATOR_HOOK(PlayerPreThink, sandbox_PlayerPreThink, CBC_ORDER_ANY);
- MUTATOR_HOOK(ClientDisconnect, sandbox_ClientDisconnect, CBC_ORDER_ANY);
MUTATOR_ONADD
{
projects / xonotic / xonotic-data.pk3dir.git / blobdiff