r2861 - in trunk/data/qcsrc/menu-div0test: . nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-10-28 06:50:04 -0400 (Sun, 28 Oct 2007)
New Revision: 2861

Modified:
   trunk/data/qcsrc/menu-div0test/basebutton_d.tga
   trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c
Log:
renamed Nexuiz specific classes to get a Nexuiz prefix (NexuizCommandButton, NexuizTeamSelectDialog)


Modified: trunk/data/qcsrc/menu-div0test/basebutton_d.tga
===================================================================
(Binary files differ)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c	2007-10-28 10:20:41 UTC (rev 2860)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/commandbutton.c	2007-10-28 10:50:04 UTC (rev 2861)
@@ -1,22 +1,22 @@
 #ifdef INTERFACE
-CLASS(CommandButton) EXTENDS(NexuizButton)
-	METHOD(CommandButton, configureCommandButton, void(entity, string, vector, string, float))
-	ATTRIB(CommandButton, onClickCommand, string, "")
-	ATTRIB(CommandButton, closes, float, 0)
-ENDCLASS(CommandButton)
-entity makeCommandButton(string theText, vector theColor, string theCommand, float closesMenu);
+CLASS(NexuizCommandButton) EXTENDS(NexuizButton)
+	METHOD(NexuizCommandButton, configureNexuizCommandButton, void(entity, string, vector, string, float))
+	ATTRIB(NexuizCommandButton, onClickCommand, string, "")
+	ATTRIB(NexuizCommandButton, closes, float, 0)
+ENDCLASS(NexuizCommandButton)
+entity makeNexuizCommandButton(string theText, vector theColor, string theCommand, float closesMenu);
 #endif
 
 #ifdef IMPLEMENTATION
-entity makeCommandButton(string theText, vector theColor, string theCommand, float closesMenu)
+entity makeNexuizCommandButton(string theText, vector theColor, string theCommand, float closesMenu)
 {
 	entity me;
-	me = spawnCommandButton();
-	me.configureCommandButton(me, theText, theColor, theCommand, closesMenu);
+	me = spawnNexuizCommandButton();
+	me.configureNexuizCommandButton(me, theText, theColor, theCommand, closesMenu);
 	return me;
 }
 
-void CommandButton_Click(entity me, entity other)
+void NexuizCommandButton_Click(entity me, entity other)
 {
 	cmd("\n", me.onClickCommand, "\n");
 	if(me.closes)
@@ -25,12 +25,12 @@
 	}
 }
 
-void configureCommandButtonCommandButton(entity me, string theText, vector theColor, string theCommand, float closesMenu)
+void configureNexuizCommandButtonNexuizCommandButton(entity me, string theText, vector theColor, string theCommand, float closesMenu)
 {
 	me.configureNexuizButton(me, theText, theColor);
 	me.onClickCommand = theCommand;
 	me.closes = closesMenu;
-	me.onClick = CommandButton_Click;
+	me.onClick = NexuizCommandButton_Click;
 	me.onClickEntity = me;
 }
 #endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c	2007-10-28 10:20:41 UTC (rev 2860)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c	2007-10-28 10:50:04 UTC (rev 2861)
@@ -1,18 +1,18 @@
 #ifdef INTERFACE
-CLASS(TeamSelectDialog) EXTENDS(NexuizDialog)
-	METHOD(TeamSelectDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
-	METHOD(TeamSelectDialog, open, void(entity))
-	ATTRIB(TeamSelectDialog, title, string, "Team Selection") // ;)
-	ATTRIB(TeamSelectDialog, color, vector, '1 1 1')
-	ATTRIB(TeamSelectDialog, intendedWidth, float, 0.4)
-	ATTRIB(TeamSelectDialog, rows, float, 5)
-	ATTRIB(TeamSelectDialog, columns, float, 4)
-	ATTRIB(TeamSelectDialog, name, string, "TeamSelect")
-	ATTRIB(TeamSelectDialog, team1, entity, NULL)
-	ATTRIB(TeamSelectDialog, team2, entity, NULL)
-	ATTRIB(TeamSelectDialog, team3, entity, NULL)
-	ATTRIB(TeamSelectDialog, team4, entity, NULL)
-ENDCLASS(TeamSelectDialog)
+CLASS(NexuizTeamSelectDialog) EXTENDS(NexuizDialog)
+	METHOD(NexuizTeamSelectDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
+	METHOD(NexuizTeamSelectDialog, open, void(entity))
+	ATTRIB(NexuizTeamSelectDialog, title, string, "Team Selection") // ;)
+	ATTRIB(NexuizTeamSelectDialog, color, vector, '1 1 1')
+	ATTRIB(NexuizTeamSelectDialog, intendedWidth, float, 0.4)
+	ATTRIB(NexuizTeamSelectDialog, rows, float, 5)
+	ATTRIB(NexuizTeamSelectDialog, columns, float, 4)
+	ATTRIB(NexuizTeamSelectDialog, name, string, "TeamSelect")
+	ATTRIB(NexuizTeamSelectDialog, team1, entity, NULL)
+	ATTRIB(NexuizTeamSelectDialog, team2, entity, NULL)
+	ATTRIB(NexuizTeamSelectDialog, team3, entity, NULL)
+	ATTRIB(NexuizTeamSelectDialog, team4, entity, NULL)
+ENDCLASS(NexuizTeamSelectDialog)
 #endif
 
 #ifdef IMPLEMENTATION
@@ -23,7 +23,7 @@
 	return b;
 }
 
-void openTeamSelectDialog(entity me)
+void openNexuizTeamSelectDialog(entity me)
 {
 	float teams, nTeams;
 	teams = cvar("_teams_available");
@@ -34,7 +34,7 @@
 	me.team4.disabled = !(teams & 8); nTeams += !!(teams & 8);
 }
 
-void fillTeamSelectDialog(entity me)
+void fillNexuizTeamSelectDialog(entity me)
 {
 	me.TR(me);
 		me.TD(me, 2, 4, makeTeamButton("auto", '0 0 0', "cmd selectteam auto; cmd join"));