From: Mircea Kitsune Date: Tue, 25 Oct 2011 12:55:39 +0000 (+0300) Subject: First functionality for the sandbox menu. Allows specifying the model in an input... X-Git-Tag: xonotic-v0.6.0~35^2~18^2~173 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19f327de06effd70c90012cd1ae99efabd3a6e71;p=xonotic%2Fxonotic-data.pk3dir.git First functionality for the sandbox menu. Allows specifying the model in an input field, and spawning the object by button. --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 7ae4c6678..2fd8df062 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -546,6 +546,8 @@ set g_sandbox_info 1 "print non-critical information to the server" set g_sandbox_editor_distance_spawn 200 "distance at which objects spawn in front of the player" set g_sandbox_editor_distance_edit 350 "distance at which players can edit or remove objects they are looking at" +set menu_sandbox_spawn_model "" // used to store the model in the input field + alias menu_showsandboxtools "menu_cmd directmenu SandboxTools" bind f7 menu_showsandboxtools diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.c b/qcsrc/menu/xonotic/dialog_sandboxtools.c index 86e32ad5c..bf5581437 100644 --- a/qcsrc/menu/xonotic/dialog_sandboxtools.c +++ b/qcsrc/menu/xonotic/dialog_sandboxtools.c @@ -3,8 +3,8 @@ CLASS(XonoticSandboxToolsDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticSandboxToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls ATTRIB(XonoticSandboxToolsDialog, title, string, _("Sandbox Tools")) // ;) ATTRIB(XonoticSandboxToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS) - ATTRIB(XonoticSandboxToolsDialog, intendedWidth, float, 0.4) - ATTRIB(XonoticSandboxToolsDialog, rows, float, 5) + ATTRIB(XonoticSandboxToolsDialog, intendedWidth, float, 0.8) + ATTRIB(XonoticSandboxToolsDialog, rows, float, 20) ATTRIB(XonoticSandboxToolsDialog, columns, float, 4) ATTRIB(XonoticSandboxToolsDialog, name, string, "SandboxTools") ENDCLASS(XonoticSandboxToolsDialog) @@ -13,7 +13,16 @@ ENDCLASS(XonoticSandboxToolsDialog) #ifdef IMPLEMENTATION void XonoticSandboxToolsDialog_fill(entity me) { - entity e; + entity e, box; + + me.TR(me); + me.TD(me, 1, 0.25, e = makeXonoticTextLabel(0, _("Model:"))); + me.TD(me, 1, 2.0, box = makeXonoticInputBox(1, "menu_sandbox_spawn_model")); + box.forbiddenCharacters = "\r\n\\\"$"; // don't care, isn't getting saved + box.maxLength = -127; // negative means encoded length in bytes + box.saveImmediately = 1; + me.TDempty(me, 0.2); + me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Spawn"), '0 0 0', "sandbox spawn_object $menu_sandbox_spawn_model", 0)); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));