r3252 - in trunk/data/qcsrc/menu: item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Jan 23 17:24:11 EST 2008
Author: div0
Date: 2008-01-23 17:24:11 -0500 (Wed, 23 Jan 2008)
New Revision: 3252
Modified:
trunk/data/qcsrc/menu/item/dialog.c
trunk/data/qcsrc/menu/nexuiz/dialog_credits.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c
Log:
gotoXY -> gotoRC (misnaming)
Modified: trunk/data/qcsrc/menu/item/dialog.c
===================================================================
--- trunk/data/qcsrc/menu/item/dialog.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/item/dialog.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -26,7 +26,7 @@
METHOD(Dialog, TDempty, void(entity, float))
METHOD(Dialog, setFirstColumn, void(entity, float))
METHOD(Dialog, TR, void(entity))
- METHOD(Dialog, gotoXY, void(entity, float, float))
+ METHOD(Dialog, gotoRC, void(entity, float, float))
ATTRIB(Dialog, isTabRoot, float, 1)
ATTRIB(Dialog, closeButton, entity, NULL)
@@ -88,7 +88,7 @@
me.addItem(me, e, o, s, 1);
}
-void gotoXYDialog(entity me, float row, float col)
+void gotoRCDialog(entity me, float row, float col)
{
me.currentRow = row;
me.currentColumn = col;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_credits.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_credits.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_credits.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -17,7 +17,7 @@
entity e;
me.TR(me);
me.TD(me, me.rows - 1, me.columns, me.creditsList = makeNexuizCreditsList());
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
e.onClick = Dialog_Close;
e.onClickEntity = me;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -67,7 +67,7 @@
me.TR(me);
me.TD(me, me.rows - 7, 3, e = makeNexuizMapList());
me.mapListBox = e;
- me.gotoXY(me, me.rows - 3, 0);
+ me.gotoRC(me, me.rows - 3, 0);
me.TDempty(me, 0.5);
me.TD(me, 1, 1, e = makeNexuizButton("All", '0 0 0'));
e.onClick = MapList_All;
@@ -77,7 +77,7 @@
e.onClickEntity = me.mapListBox;
me.TDempty(me, 0.5);
- me.gotoXY(me, 3, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 3, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Settings:"));
me.TR(me);
me.sliderTimelimit = makeNexuizSlider(1.0, 60.0, 0.5, "timelimit_override");
@@ -155,7 +155,7 @@
e0.textEntity = main.mutatorsDialog;
e0.allowCut = 1;
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("Start!", '0 0 0'));
e.onClick = MapList_LoadMap;
e.onClickEntity = me.mapListBox;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mapinfo.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -84,7 +84,7 @@
me.TR(me);
me.TD(me, me.rows - 2, 3, e = makeNexuizImage(string_null, 4.0/3.0));
me.previewImage = e;
- me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
w = me.columns - me.currentColumn;
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Title:"));
me.TD(me, 1, w-1, e = makeNexuizTextLabel(0, ""));
@@ -132,12 +132,12 @@
me.typeOnslaughtLabel = e;
}
- me.gotoXY(me, me.rows - 2, 0);
+ me.gotoRC(me, me.rows - 2, 0);
me.TD(me, 1, me.columns, e = makeNexuizTextLabel(0.5, ""));
e.allowCut = 1;
me.descriptionLabel = e;
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
e.onClick = Dialog_Close;
e.onClickEntity = me;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -67,7 +67,7 @@
me.TR(me);
me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_vampire", "Vampire"));
- me.gotoXY(me, 0, 2); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 0, 2); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 2, makeNexuizTextLabel(0, "Arena mutators:"));
me.TR(me);
me.TD(me, 1, 2, e = makeNexuizRadioButton(1, string_null, string_null, "Regular"));
@@ -84,7 +84,7 @@
me.TR(me);
me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "g_rocketarena", string_null, "Rocket launcher arena"));
- me.gotoXY(me, me.rows - 2, 0);
+ me.gotoRC(me, me.rows - 2, 0);
s = makeNexuizSlider(80, 400, 8, "sv_gravity");
s.valueDigits = 0;
s.valueDisplayMultiplier = 0.125; // show gravity in percent
@@ -92,7 +92,7 @@
e.savedValue = 200; // good on silvercity
me.TD(me, 1, 3, s);
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
e.onClick = Dialog_Close;
e.onClickEntity = me;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -51,7 +51,7 @@
me.TR(me);
me.TD(me, me.rows - 3, me.columns, slist);
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("Join!", '0 0 0'));
e.onClick = ServerList_Connect_Click;
e.onClickEntity = slist;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -52,7 +52,7 @@
e.onClick = PlayerModelSelector_Next_Click;
e.onClickEntity = pms;
- me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Field of View:"));
me.TD(me, 1, 2, e = makeNexuizSlider(60, 130, 1, "fov"));
me.TR(me);
@@ -126,7 +126,7 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Client UDP port:"));
me.TD(me, 1, 0.5, e = makeNexuizInputBox(0, "cl_port"));
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name $_cl_name;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;rate $_cl_rate", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -119,7 +119,7 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showfps", "Show frames per second"));
- me.gotoXY(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Anisotropy:"));
me.TD(me, 1, 2, e = makeNexuizTextSlider("gl_texture_anisotropy"));
e.addValue(e, "1x", "1");
@@ -181,7 +181,7 @@
if(cvar("developer"))
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_showsurfaces", "Show surfaces"));
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "sendcvar cl_nogibs; r_restart", COMMANDBUTTON_APPLY));
}
/*
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -26,7 +26,7 @@
me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Key bindings:"));
me.TR(me);
me.TD(me, me.rows - 2, 3, kb = makeNexuizKeyBinder());
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizButton("Change key...", '0 0 0'));
e.onClick = KeyBinder_Bind_Change;
@@ -42,7 +42,7 @@
e.onClick = KeyBinder_Bind_Clear;
e.onClickEntity = kb;
- me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Sensitivity:"));
me.TD(me, 1, 2, e = makeNexuizSlider(1, 32, 0.2, "sensitivity"));
me.TR(me);
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -60,7 +60,7 @@
me.TDempty(me, 0.2);
me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "snd_swapstereo", "Swap Stereo"));
- me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autodemo", "Demo recording"));
me.TR(me);
me.TR(me);
@@ -82,7 +82,7 @@
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "4", "mph"));
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "5", "knots"));
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -65,7 +65,7 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showfps", "Show frames per second"));
- me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Brightness:"));
me.TD(me, 1, 2, e = makeNexuizSlider(0.0, 0.5, 0.02, "v_brightness"));
me.TR(me);
@@ -89,7 +89,7 @@
me.TD(me, 1, 2, e = makeNexuizSlider(1.0, 5.0, 0.1, "r_glsl_contrastboost"));
setDependent(e, "r_glsl", 1, 1);
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -63,7 +63,7 @@
me.TR(me);
me.TD(me, me.rows - 5, me.columns, me.campaignBox = makeNexuizCampaignList());
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("Start!", '0 0 0'));
e.onClick = CampaignList_LoadMap;
e.onClickEntity = me.campaignBox;
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c 2008-01-23 22:15:02 UTC (rev 3251)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer_winner.c 2008-01-23 22:24:11 UTC (rev 3252)
@@ -17,7 +17,7 @@
me.TR(me);
me.TD(me, me.rows - 2, me.columns, e = makeNexuizImage("/gfx/winner", 1.0));
- me.gotoXY(me, me.rows - 1, 0);
+ me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
e.onClick = Dialog_Close;
e.onClickEntity = me;
More information about the nexuiz-commits
mailing list