[nexuiz-commits] r6369 - in branches/nexuiz-2.0: . data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-30 07:05:04 -0400 (Mon, 30 Mar 2009)
New Revision: 6369

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/modbutton.c
Log:
r6363 | esteel | 2009-03-30 11:25:11 +0200 (Mon, 30 Mar 2009) | 1 line
slightly modified patch by Ronan, make the modbutton go back to the same menu after switching the mod.  Currently thats more userfriendly.  Might need to be changed back when its a real mod menu (Please test)
r6364 | esteel | 2009-03-30 11:28:46 +0200 (Mon, 30 Mar 2009) | 1 line
forgot one file


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-03-30 11:00:10 UTC (rev 6368)
+++ branches/nexuiz-2.0/.patchsets	2009-03-30 11:05:04 UTC (rev 6369)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6039,6044-6357
+revisions_applied = 1-6039,6044-6357,6363-6364

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c	2009-03-30 11:00:10 UTC (rev 6368)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c	2009-03-30 11:05:04 UTC (rev 6369)
@@ -162,7 +162,7 @@
 			e0.allowCut = 1;
 
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, 2, e = makeNexuizModButton());
+		me.TD(me, 1, 2, e = makeNexuizModButton("Multiplayer_Create"));
 		me.TD(me, 1, me.columns - 2, e = makeNexuizButton("Start Multiplayer!", '0 0 0'));
 			e.onClick = MapList_LoadMap;
 			e.onClickEntity = me.mapListBox;

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c	2009-03-30 11:00:10 UTC (rev 6368)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c	2009-03-30 11:05:04 UTC (rev 6369)
@@ -67,7 +67,7 @@
 			e.onClickEntity = slist;
 			slist.infoButton = e;
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeNexuizModButton());
+		me.TD(me, 1, 2, e = makeNexuizModButton("Multiplayer_Join"));
 		me.TD(me, 1, me.columns - 2, e = makeNexuizButton("Join!", '0 0 0'));
 			e.onClick = ServerList_Connect_Click;
 			e.onClickEntity = slist;

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-03-30 11:00:10 UTC (rev 6368)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-03-30 11:05:04 UTC (rev 6369)
@@ -76,7 +76,7 @@
 			me.campaignBox.campaignGo(me.campaignBox, 0);
 
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, 2, e = makeNexuizModButton());
+		me.TD(me, 1, 2, e = makeNexuizModButton("Singleplayer"));
 		me.TD(me, 1, me.columns - 2 , e = makeNexuizButton("Start Singleplayer!", '0 0 0'));
 			e.onClick = CampaignList_LoadMap;
 			e.onClickEntity = me.campaignBox;

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/modbutton.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/modbutton.c	2009-03-30 11:00:10 UTC (rev 6368)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/modbutton.c	2009-03-30 11:05:04 UTC (rev 6369)
@@ -1,33 +1,42 @@
 #ifdef INTERFACE
 CLASS(NexuizModButton) EXTENDS(NexuizButton)
-	METHOD(NexuizModButton, configureNexuizModButton, void(entity))
+	METHOD(NexuizModButton, configureNexuizModButton, void(entity, string))
+	ATTRIB(NexuizModButton, destination, string, string_null)
 ENDCLASS(NexuizModButton)
-entity makeNexuizModButton();
+entity makeNexuizModButton(string menu);
 void NexuizModButton_Click(entity me, entity other);
 #endif
 
 #ifdef IMPLEMENTATION
-entity makeNexuizModButton()
+entity makeNexuizModButton(string menu)
 {
 	entity me;
 	me = spawnNexuizModButton();
-	me.configureNexuizModButton(me);
+	me.configureNexuizModButton(me, menu);
 	return me;
 }
 
 void NexuizModButton_Click(entity me, entity other)
 {
+	string thecmd;
+	thecmd = strcat("\nmenu_restart");
+
+	if (me.destination != "")
+		thecmd = strcat(thecmd, "\ntogglemenu\ndefer 0.1 \"menu_cmd directmenu ", me.destination,"\"\n");
+
 	if (cvar_string("menu_slist_modfilter") == "havoc")
-		cmd("gamedir data; menu_restart");
+		thecmd = strcat("\ngamedir data", thecmd);
 	else
-		cmd("gamedir havoc; menu_restart");
+		thecmd = strcat("\ngamedir havoc", thecmd);
+	cmd(thecmd);
 }
 
-void configureNexuizModButtonNexuizModButton(entity me)
+void configureNexuizModButtonNexuizModButton(entity me, string menu)
 {
 	me.configureNexuizButton(me, "", '0 0 0');
 	me.onClick = NexuizModButton_Click;
 	me.onClickEntity = me;
+	me.destination = menu;
 
 	if (cvar_string("menu_slist_modfilter") == "havoc")
 		me.text = "Switch to Nexuiz mode";