r127 - trunk/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: vermeulen
Date: 2008-09-07 18:10:41 -0400 (Sun, 07 Sep 2008)
New Revision: 127

Modified:
   trunk/menu/nexuiz/dialog_infoscreen.c
   trunk/menu/nexuiz/dialog_singleplayer.c
Log:
info screen
took out instant action

Modified: trunk/menu/nexuiz/dialog_infoscreen.c
===================================================================
--- trunk/menu/nexuiz/dialog_infoscreen.c	2008-09-07 22:10:20 UTC (rev 126)
+++ trunk/menu/nexuiz/dialog_infoscreen.c	2008-09-07 22:10:41 UTC (rev 127)
@@ -2,7 +2,7 @@
 CLASS(NexuizInfoScreenDialog) EXTENDS(NexuizRootDialog)
 	METHOD(NexuizInfoScreenDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
 	METHOD(NexuizInfoScreenDialog, showNotify, void(entity))
-	ATTRIB(NexuizInfoScreenDialog, title, string, "MISSION OBJECTIVE:") // ;)
+	ATTRIB(NexuizInfoScreenDialog, title, string, "MISSION OBJECTIVES:") // ;)
 	ATTRIB(NexuizInfoScreenDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
 	ATTRIB(NexuizInfoScreenDialog, intendedWidth, float, 0.4)
 	ATTRIB(NexuizInfoScreenDialog, rows, float, 5)
@@ -22,12 +22,13 @@
 void fillNexuizInfoScreenDialog(entity me)
 {
 	me.TR(me);
-	me.TD(me, 1, 1, me.text1 = makeNexuizTextLabel(0, "Destroy the 5 power stations throughout the level"));
+	me.TD(me, 1, 1, me.text1 = makeNexuizTextLabel(0, "- Pick up Jetpack at the first base"));
 	me.TR(me);
+	me.TD(me, 1, 1, me.text1 = makeNexuizTextLabel(0, "- Capture the 5 enemy bases shown on map"));
 	me.TR(me);
 	me.TR(me);
 	me.TDempty(me, (me.columns - 1) / 2);
-	me.TD(me, 2, 1, me.okay1 = makeNexuizCommandButton("Start", '1 1 1', "",1));
+	me.TD(me, 2, 1, me.okay1 = makeNexuizCommandButton("Start", '1 1 1', "cmd join\n",1));
 }
 #endif
 

Modified: trunk/menu/nexuiz/dialog_singleplayer.c
===================================================================
--- trunk/menu/nexuiz/dialog_singleplayer.c	2008-09-07 22:10:20 UTC (rev 126)
+++ trunk/menu/nexuiz/dialog_singleplayer.c	2008-09-07 22:10:41 UTC (rev 127)
@@ -55,9 +55,9 @@
 
 	me.TR(me);
 		me.TDempty(me, (me.columns - 2) / 2);
-		me.TD(me, 2, 2, e = makeNexuizButton("Instant action!", '0 0 0'));
-			e.onClick = InstantAction_LoadMap;
-			e.onClickEntity = NULL;
+		//me.TD(me, 2, 2, e = makeNexuizButton("Instant action!", '0 0 0'));
+		//	e.onClick = InstantAction_LoadMap;
+		//	e.onClickEntity = NULL;
 	me.TR(me);
 	me.TR(me);
 	me.TR(me);