r3154 - in trunk/data: . gfx/menu/default gfx/menu/xaw qcsrc/menu-div0test qcsrc/menu-div0test/nexuiz qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Jan 16 15:24:54 EST 2008
Author: div0
Date: 2008-01-16 15:24:53 -0500 (Wed, 16 Jan 2008)
New Revision: 3154
Added:
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c
Modified:
trunk/data/default.cfg
trunk/data/gfx/menu/default/skinvalues.txt
trunk/data/gfx/menu/xaw/skinvalues.txt
trunk/data/qcsrc/menu-div0test/classes.c
trunk/data/qcsrc/menu-div0test/menu.qc
trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
trunk/data/qcsrc/menu-div0test/progs.src
trunk/data/qcsrc/menu-div0test/skin-customizables.inc
trunk/data/qcsrc/server/campaign.qc
Log:
campaign
Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/default.cfg 2008-01-16 20:24:53 UTC (rev 3154)
@@ -497,7 +497,10 @@
sv_clmovement_waitforinput 4
// disable joysticks
+// set them to "" first so this won't override the default value to 0 to make sure the menu can detect whether joystick is supported
+set joystick ""
set joystick 0
+set joy_enable ""
set joy_enable 0
// startmap_dm is used when running with the -listen or -dedicated commandline options
Modified: trunk/data/gfx/menu/default/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/default/skinvalues.txt 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/gfx/menu/default/skinvalues.txt 2008-01-16 20:24:53 UTC (rev 3154)
@@ -16,6 +16,7 @@
COLOR_DIALOG_SETTINGS '0.7 0.7 1'
COLOR_DIALOG_TEAMSELECT '1 1 1'
COLOR_DIALOG_USERBIND '0.7 0.7 1'
+COLOR_DIALOG_SINGLEPLAYER '1 1 0.7'
COLOR_INPUTBOX_F '1 1 1'
COLOR_INPUTBOX_N '1 1 1'
COLOR_MAPLIST_AUTHOR '0.4 0.4 0.7'
Modified: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt 2008-01-16 20:24:53 UTC (rev 3154)
@@ -16,6 +16,7 @@
COLOR_DIALOG_SETTINGS '1 1 1'
COLOR_DIALOG_TEAMSELECT '1 1 1'
COLOR_DIALOG_USERBIND '1 1 1'
+COLOR_DIALOG_SINGLEPLAYER '1 1 1'
COLOR_INPUTBOX_F '1 1 1'
COLOR_INPUTBOX_N '1 1 1'
COLOR_MAPLIST_AUTHOR '0.5 0.5 0.5'
Modified: trunk/data/qcsrc/menu-div0test/classes.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/classes.c 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/qcsrc/menu-div0test/classes.c 2008-01-16 20:24:53 UTC (rev 3154)
@@ -58,3 +58,5 @@
#include "nexuiz/dialog_settings_input.c"
#include "nexuiz/dialog_settings_input_userbind.c"
#include "nexuiz/slider_decibels.c"
+#include "nexuiz/dialog_singleplayer.c"
+#include "nexuiz/campaign.c"
Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-16 20:24:53 UTC (rev 3154)
@@ -24,8 +24,9 @@
void UpdateConWidthHeight()
{
- var float conwidth_s = conwidth;
- var float conheight_s = conheight;
+ float conwidth_s, conheight_s;
+ conwidth_s = conwidth;
+ conheight_s = conheight;
conwidth = cvar("vid_conwidth");
conheight = cvar("vid_conheight");
if(conwidth < 800)
Added: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c (rev 0)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_singleplayer.c 2008-01-16 20:24:53 UTC (rev 3154)
@@ -0,0 +1,34 @@
+#ifdef INTERFACE
+CLASS(NexuizSingleplayerDialog) EXTENDS(NexuizDialog)
+ METHOD(NexuizSingleplayerDialog, fill, void(entity))
+ ATTRIB(NexuizSingleplayerDialog, title, string, "Singleplayer")
+ ATTRIB(NexuizSingleplayerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER)
+ ATTRIB(NexuizSingleplayerDialog, intendedWidth, float, 0.80)
+ ATTRIB(NexuizSingleplayerDialog, rows, float, 24)
+ ATTRIB(NexuizSingleplayerDialog, columns, float, 5)
+ ATTRIB(NexuizSingleplayerDialog, campaignBox, entity, NULL)
+ENDCLASS(NexuizSingleplayerDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void fillNexuizSingleplayerDialog(entity me)
+{
+ entity e, e0;
+ float n;
+
+ 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.TR(me);
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, me.rows - 5, me.columns, me.campaignBox = makeNexuizCampaignList());
+
+ me.gotoXY(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;
+}
+#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2008-01-16 20:24:53 UTC (rev 3154)
@@ -39,6 +39,7 @@
me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
n = spawnNexuizNexposee();
+ /*
if(checkextension("DP_GECKO_SUPPORT"))
{
i = spawnNexuizNewsDialog();
@@ -46,6 +47,11 @@
n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
n.setNexposee(n, i, '0.1 0.1 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
}
+ */
+ i = spawnNexuizSingleplayerDialog();
+ i.configureDialog(i);
+ n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ n.setNexposee(n, i, '0.1 0.1 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
i = spawnNexuizSettingsDialog();
i.configureDialog(i);
Modified: trunk/data/qcsrc/menu-div0test/progs.src
===================================================================
--- trunk/data/qcsrc/menu-div0test/progs.src 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/qcsrc/menu-div0test/progs.src 2008-01-16 20:24:53 UTC (rev 3154)
@@ -7,8 +7,8 @@
oo/base.h
../common/util.qh
-
../common/mapinfo.qh
+../common/campaign_common.qh
gamecommand.qh
menu.qh
@@ -31,4 +31,6 @@
draw.qc
nexuiz/util.qc
+../common/campaign_file.qc
+../common/campaign_setup.qc
../common/mapinfo.qc
Modified: trunk/data/qcsrc/menu-div0test/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin-customizables.inc 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/qcsrc/menu-div0test/skin-customizables.inc 2008-01-16 20:24:53 UTC (rev 3154)
@@ -32,6 +32,7 @@
SKINVECTOR(COLOR_DIALOG_MUTATORS, '0.7 0.7 1');
SKINVECTOR(COLOR_DIALOG_MAPINFO, '0.7 0.7 1');
SKINVECTOR(COLOR_DIALOG_USERBIND, '0.7 0.7 1');
+ SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
SKINSTRING(GFX_SLIDER, "slider");
SKINVECTOR(COLOR_SLIDER_N, '1 1 1');
Modified: trunk/data/qcsrc/server/campaign.qc
===================================================================
--- trunk/data/qcsrc/server/campaign.qc 2008-01-16 18:14:47 UTC (rev 3153)
+++ trunk/data/qcsrc/server/campaign.qc 2008-01-16 20:24:53 UTC (rev 3154)
@@ -145,6 +145,8 @@
// I have won
savevar = strcat("g_campaign", campaign_name, "_won");
CampaignSaveCvar(savevar, 1);
+ // advance level (for menu to show it right)
+ CampaignSaveCvar(campaign_index_var, campaign_level + 1);
}
else if(campaign_level == cvar(campaign_index_var))
{
More information about the nexuiz-commits
mailing list