r2079 - in branches/nexuiz-2.0: . data data/menu data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Dec 31 06:17:53 EST 2006
Author: div0
Date: 2006-12-31 06:17:52 -0500 (Sun, 31 Dec 2006)
New Revision: 2079
Modified:
branches/nexuiz-2.0/data/default.cfg
branches/nexuiz-2.0/data/menu/main.menu
branches/nexuiz-2.0/data/qcsrc/server/bots.qc
branches/nexuiz-2.0/nexuiz-linux-glx.sh
branches/nexuiz-2.0/nexuiz-linux-sdl.sh
Log:
nexuiz-linux-* features (vid_x11_display)
menu position fix by Black
bot code fix (will run in current DP again)
Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg 2006-12-31 11:11:54 UTC (rev 2078)
+++ branches/nexuiz-2.0/data/default.cfg 2006-12-31 11:17:52 UTC (rev 2079)
@@ -81,6 +81,13 @@
scr_menuforcewhiledisconnected 1
v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
+// nexuiz-linux-*.sh will use this
+seta vid_x11_display ""
+// This can have three possible settings:
+// "" run as usual
+// ":n" use DISPLAY=:n, create it if needed
+// ":n layout" use DISPLAY=:n, create it if needed with ServerLayout layout
+
// server settings
seta hostname "Nexuiz Server"
seta sv_maxrate 10000
Modified: branches/nexuiz-2.0/data/menu/main.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/main.menu 2006-12-31 11:11:54 UTC (rev 2078)
+++ branches/nexuiz-2.0/data/menu/main.menu 2006-12-31 11:17:52 UTC (rev 2079)
@@ -1,94 +1,91 @@
// Property of Alientrap
//
// Main menu
-Item Layout Main
+Item Arrangement Main
{
- Item Layout MainBar
+ pos '11 17'
+ direction '10 0'
+
+ DeriveTemplate PictureButton MainButton
{
- origin '11 17'
- direction '10 0'
-
- DeriveTemplate PictureButton MainButton
- {
- soundPressed "misc/menu2.wav"
- colorSelected [DefaultPicColor]
- }
-
- Derive MainButton Campaign
- {
- normal "$gfx/b_campaign"
- selected "$gfx/b_campaign_u"
-
- target "Campaign"
- init Nex_Action_SetNormalPanelLink
- }
- Derive MainButton Join
- {
- normal "$gfx/b_join"
- selected "$gfx/b_join_u"
-
- target "JoinGame"
- action Nex_Action_JumpToJoinGame
- }
- Derive MainButton Create
- {
- normal "$gfx/b_create"
- selected "$gfx/b_create_u"
-
- target "CreateGame"
- init Nex_Action_SetNormalPanelLink
- }
- Derive MainButton Options
- {
- normal "$gfx/b_options"
- selected "$gfx/b_options_u"
-
- target "Options"
- init Nex_Action_SetNormalPanelLink
- }
- Derive MainButton Quit
- {
- normal "$gfx/b_quit"
- selected "$gfx/b_quit_u"
-
- action Nex_Quit_Action
- }
+ soundPressed "misc/menu2.wav"
+ colorSelected [DefaultPicColor]
}
- Item Layout MainInsta
+
+ Derive MainButton Campaign
{
- origin '11 715'
- direction '10 0'
+ normal "$gfx/b_campaign"
+ selected "$gfx/b_campaign_u"
- DeriveTemplate PictureButton MainButton
- {
- soundPressed "misc/menu2.wav"
- colorSelected [DefaultPicColor]
- }
-
- Derive MainButton Credits
- {
- size '119 39'
- normal "$gfx/b_instantaction"
- selected "$gfx/b_instantaction_u"
-
- action Nex_Action_Instant_Action
- }
- Derive MainButton InstantAction
- {
- size '119 39'
- normal "$gfx/b_credits"
- selected "$gfx/b_credits_u"
-
- action Nex_Credits_Action
- }
- Derive MainButton Demos
- {
- size '119 39'
- normal "$gfx/b_demos"
- selected "$gfx/b_demos_u"
-
- target "Demos"
- init Nex_Action_SetNormalPanelLink
- }
+ target "Campaign"
+ init Nex_Action_SetNormalPanelLink
}
+ Derive MainButton Join
+ {
+ normal "$gfx/b_join"
+ selected "$gfx/b_join_u"
+
+ target "JoinGame"
+ action Nex_Action_JumpToJoinGame
+ }
+ Derive MainButton Create
+ {
+ normal "$gfx/b_create"
+ selected "$gfx/b_create_u"
+
+ target "CreateGame"
+ init Nex_Action_SetNormalPanelLink
+ }
+ Derive MainButton Options
+ {
+ normal "$gfx/b_options"
+ selected "$gfx/b_options_u"
+
+ target "Options"
+ init Nex_Action_SetNormalPanelLink
+ }
+ Derive MainButton Quit
+ {
+ normal "$gfx/b_quit"
+ selected "$gfx/b_quit_u"
+
+ action Nex_Quit_Action
+ }
}
+Item Arrangement InstantBar
+{
+ pos '11 715'
+ direction '10 0'
+
+ DeriveTemplate PictureButton MainButton
+ {
+ soundPressed "misc/menu2.wav"
+ colorSelected [DefaultPicColor]
+ }
+
+ Derive MainButton Credits
+ {
+ size '119 39'
+ normal "$gfx/b_instantaction"
+ selected "$gfx/b_instantaction_u"
+
+ action Nex_Action_Instant_Action
+ }
+ Derive MainButton InstantAction
+ {
+ size '119 39'
+ normal "$gfx/b_credits"
+ selected "$gfx/b_credits_u"
+
+ action Nex_Credits_Action
+ }
+ Derive MainButton Demos
+ {
+ size '119 39'
+ normal "$gfx/b_demos"
+ selected "$gfx/b_demos_u"
+
+ target "Demos"
+ init Nex_Action_SetNormalPanelLink
+ }
+}
Modified: branches/nexuiz-2.0/data/qcsrc/server/bots.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2006-12-31 11:11:54 UTC (rev 2078)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2006-12-31 11:17:52 UTC (rev 2079)
@@ -93,7 +93,7 @@
if (trace_dpstartcontents & DPCONTENTS_LIQUIDSMASK)
{
move = normalize(end - org);
- tracebox(org, m1, m2, org + move * stepdist, FALSE, e);
+ tracebox(org, m1, m2, org + move * stepdist, MOVE_WORLDONLY, e);
if (trace_fraction < 1)
{
if (navigation_testtracewalk)
@@ -111,10 +111,10 @@
else
{
move = dir * stepdist + org;
- tracebox(org, m1, m2, move, FALSE, e);
+ tracebox(org, m1, m2, move, MOVE_WORLDONLY, e);
if (trace_fraction < 1)
{
- tracebox(org + stepheightvec, m1, m2, move + stepheightvec, FALSE, e);
+ tracebox(org + stepheightvec, m1, m2, move + stepheightvec, MOVE_WORLDONLY, e);
if (trace_fraction < 1 || trace_startsolid)
{
if (navigation_testtracewalk)
@@ -933,7 +933,7 @@
local entity waylist, w, best;
local float dist, bestdist;
local vector v, org;
- org = player.origin + (self.mins_z - PL_MIN_z) * '0 0 1';
+ org = player.origin + (player.mins_z - PL_MIN_z) * '0 0 1';
if (navigation_testtracewalk)
te_plasmaburn(org);
best = world;
@@ -1912,6 +1912,12 @@
while (currentbots > bots)
bot_removenewest();
+ if(botframe_spawnedwaypoints)
+ {
+ if(cvar("waypoint_benchmark"))
+ localcmd("quit\n");
+ }
+
if (bots > 0 || cvar("g_waypointeditor"))
if (!botframe_spawnedwaypoints)
{
Modified: branches/nexuiz-2.0/nexuiz-linux-glx.sh
===================================================================
--- branches/nexuiz-2.0/nexuiz-linux-glx.sh 2006-12-31 11:11:54 UTC (rev 2078)
+++ branches/nexuiz-2.0/nexuiz-linux-glx.sh 2006-12-31 11:17:52 UTC (rev 2079)
@@ -11,4 +11,80 @@
*) nexuiz="nexuiz-linux-686-glx" ;;
esac
-exec ./${nexuiz} "${@}"
+set -- ./${nexuiz} "${@}"
+
+xserver=
+xlayout=
+
+# now how do we execute it?
+if [ -r ~/.nexuiz/data/config.cfg ]; then
+ while read -r CMD KEY VALUE; do
+ VALUE=${VALUE#\"}
+ VALUE=${VALUE%\"}
+ case "$CMD:$KEY" in
+ seta:vid_x11_display)
+ case "$VALUE" in
+ :*)
+ ;;
+ *)
+ VALUE=:$VALUE
+ ;;
+ esac
+ VALUE="$VALUE "
+ xserver="${VALUE%% *}"
+ xserver=${xserver#:}
+ xlayout=${VALUE#* }
+ xlayout=${xlayout% }
+ ;;
+ esac
+ done < ~/.nexuiz/data/config.cfg
+fi
+
+case "$xserver" in
+ '')
+ ;;
+ *[!0-9]*)
+ echo "Not using display ':$xserver': evil characters"
+ ;;
+ *)
+ msg=
+ lf='
+'
+ prefix=
+
+ # check for a listening X server on that socket
+ if netstat -nl | grep -F " /tmp/.X11-unix/X$xserver" >/dev/null; then
+ # X server already exists
+ export DISPLAY=:$xserver
+ prefix="DISPLAY=:$xserver "
+ msg=$msg$lf"- Running Nexuiz on already existing display :$xserver"
+ else
+ set -- startx "$@" -fullscreen -- ":$xserver"
+ msg=$msg$lf"- Running Nexuiz on a newly created X server :$xserver."
+ case "$xlayout" in
+ '')
+ ;;
+ *[!A-Za-z0-9]*)
+ echo >&2 "Not using layout '$xlayout': evil characters"
+ xlayout=
+ ;;
+ *)
+ set -- "$@" -layout "$xlayout"
+ msg=$msg$lf"- Using the ServerLayout section named $xlayout."
+ ;;
+ esac
+ fi
+
+ echo "X SERVER OVERRIDES IN EFFECT:$msg"
+ echo
+ echo "Resulting command line:"
+ echo " $prefix$*"
+ echo
+ echo "To undo these overrides, edit ~/.nexuiz/data/config.cfg and remove the line"
+ echo "starting with 'seta vid_x11_display'."
+ echo
+ echo
+ ;;
+esac
+
+exec "$@"
Modified: branches/nexuiz-2.0/nexuiz-linux-sdl.sh
===================================================================
--- branches/nexuiz-2.0/nexuiz-linux-sdl.sh 2006-12-31 11:11:54 UTC (rev 2078)
+++ branches/nexuiz-2.0/nexuiz-linux-sdl.sh 2006-12-31 11:17:52 UTC (rev 2079)
@@ -11,4 +11,80 @@
*) nexuiz="nexuiz-linux-686-sdl" ;;
esac
-exec ./${nexuiz} "${@}"
+set -- ./${nexuiz} "${@}"
+
+xserver=
+xlayout=
+
+# now how do we execute it?
+if [ -r ~/.nexuiz/data/config.cfg ]; then
+ while read -r CMD KEY VALUE; do
+ VALUE=${VALUE#\"}
+ VALUE=${VALUE%\"}
+ case "$CMD:$KEY" in
+ seta:vid_x11_display)
+ case "$VALUE" in
+ :*)
+ ;;
+ *)
+ VALUE=:$VALUE
+ ;;
+ esac
+ VALUE="$VALUE "
+ xserver="${VALUE%% *}"
+ xserver=${xserver#:}
+ xlayout=${VALUE#* }
+ xlayout=${xlayout% }
+ ;;
+ esac
+ done < ~/.nexuiz/data/config.cfg
+fi
+
+case "$xserver" in
+ '')
+ ;;
+ *[!0-9]*)
+ echo "Not using display ':$xserver': evil characters"
+ ;;
+ *)
+ msg=
+ lf='
+'
+ prefix=
+
+ # check for a listening X server on that socket
+ if netstat -nl | grep -F " /tmp/.X11-unix/X$xserver" >/dev/null; then
+ # X server already exists
+ export DISPLAY=:$xserver
+ prefix="DISPLAY=:$xserver "
+ msg=$msg$lf"- Running Nexuiz on already existing display :$xserver"
+ else
+ set -- startx "$@" -fullscreen -- ":$xserver"
+ msg=$msg$lf"- Running Nexuiz on a newly created X server :$xserver."
+ case "$xlayout" in
+ '')
+ ;;
+ *[!A-Za-z0-9]*)
+ echo >&2 "Not using layout '$xlayout': evil characters"
+ xlayout=
+ ;;
+ *)
+ set -- "$@" -layout "$xlayout"
+ msg=$msg$lf"- Using the ServerLayout section named $xlayout."
+ ;;
+ esac
+ fi
+
+ echo "X SERVER OVERRIDES IN EFFECT:$msg"
+ echo
+ echo "Resulting command line:"
+ echo " $prefix$*"
+ echo
+ echo "To undo these overrides, edit ~/.nexuiz/data/config.cfg and remove the line"
+ echo "starting with 'seta vid_x11_display'."
+ echo
+ echo
+ ;;
+esac
+
+exec "$@"
More information about the nexuiz-commits
mailing list