From 70a1b16a70163cc15c906f11583ac7b7097aa2c0 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 28 Jan 2008 19:30:51 +0000
Subject: [PATCH] remove "port"; add sv_vote_simple_majority

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3296 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/default.cfg                                   | 1 -
 data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/data/default.cfg b/data/default.cfg
index 5895ef724..5181a3d5e 100644
--- a/data/default.cfg
+++ b/data/default.cfg
@@ -884,7 +884,6 @@ set con_completion_timedemo *.dem
 set con_completion_exec     *.cfg
 
 // these non-saved engine cvars shall be savedG
-seta port $port
 seta cl_port $cl_port
 seta joy_enable $joy_enable
 seta r_showsurfaces $r_showsurfaces
diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
index 9a410b86b..50a4261ee 100644
--- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
+++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
@@ -95,9 +95,6 @@ void fillNexuizServerCreateTab(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2.8, e = makeNexuizSliderCheckBox(-1, 0, me.sliderFraglimit, "Use map specified default"));
 	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Server UDP port:"));
-		me.TD(me, 1, 0.5, e = makeNexuizInputBox(0, "port"));
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "g_antilag", "AntiLag"));
 	me.TR(me);
@@ -112,6 +109,8 @@ void fillNexuizServerCreateTab(entity me)
 			e.addValue(e, "6 choices", "6");
 			e.addValue(e, "7 choices", "7");
 			e.configureNexuizTextSliderValues(e);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "sv_vote_simple_majority", "Simple majority wins vcall"));
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Number of players:"));
-- 
2.39.2