From 08d799e38e3003b3441ce7e819ef9a4fd1acf582 Mon Sep 17 00:00:00 2001
From: makke <makke@users.sourceforge.net>
Date: Fri, 15 Sep 2006 12:43:50 +0000
Subject: [PATCH] config

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@383 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 actioncube.bat              |  5 +++--
 config/autoexec.cfg         | 41 +++++++++++++++++++++++++++++--------
 config/autoexec.cfg.default |  8 +++-----
 config/servers.cfg          |  3 +++
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/actioncube.bat b/actioncube.bat
index 2456cb63..0a79b6ac 100755
--- a/actioncube.bat
+++ b/actioncube.bat
@@ -1,2 +1,3 @@
-bin_win32\ac_client.exe -w1280 -h1024 &*
-pause
\ No newline at end of file
+bin_win32\ac_client.exe -w1024 -h768 %1 %2 %3 %4 %5
+
+
diff --git a/config/autoexec.cfg b/config/autoexec.cfg
index ca820402..85e85188 100755
--- a/config/autoexec.cfg
+++ b/config/autoexec.cfg
@@ -23,6 +23,8 @@ dynlight 16        // set 0 if it slows you down
 
 gamma 100          // set to your liking, 100 = default
 
+hidestats 1
+
 bind F6 showmip
 bind F5 toggleocull
 
@@ -39,12 +41,6 @@ bind D right
 hudgun 1
 maxroll 0
 lighterror 4 //change to 8 if you experience low fps
-particlesize 45
-
-//alias sp    [ mode -2; map $arg1 ]
-//alias dmsp  [ mode -1; map $arg1 ]
-//alias ffa   [ mode  0; map $arg1 ]
-//alias insta [ mode  4; map $arg1 ]
 
 
 // below is a fun new way of editing, with all using the mousewheel
@@ -77,9 +73,13 @@ bind 3 melee
 bind 4 grenade
 
 bind R reload
-// bind MOUSE2 [ altattack ]
-bind MOUSE2 [ altattack; onrelease [ altattack ] ] // click and hold = Scope ON, release button = Scope OFF
 
+
+//bind MOUSE2 [ altattack ]
+bind mouse2 [ altattack;onrelease [ altattack ] ] 
+
+=======
+>>>>>>> 1.15
 alias delta_edit_0 [ editheight $flrceil $arg1 ]
 alias delta_edit_1 [ if $flrceil [ vdelta $arg1 ] [ vdelta (- 0 $arg1) ] ]
 alias delta_edit_2 [ edittex $flrceil $arg1 ]
@@ -91,6 +91,29 @@ alias delta_game_0 [ if (= $arg1 1) [ shiftweapon 1 ] [ shiftweapon -1 ] ]
 
 
 
+if (only_menu_music) [ musicvol 1; music $menu_music ]
+
+// change
+hudgun 1
+
+alias delta_game_0 [ if (= $arg1 1) [ primary ] [ secondary ] ]
+bind lshift "grenade"
+bind lalt "melee"
+
+
+bind f12 screenshot
+
+alias tdm   [ mode 0; map $arg1 ]
+alias ts    [ mode 4; map $arg1 ]
+alias ctf   [ mode 5; map $arg1 ]
+alias dm    [ mode 2; map $arg1 ]
+alias ffa   [ mode 2; map $arg1 ]
+alias lms   [ mode 3; map $arg1 ]
+
+
+
+=======
+
 music ac.ogg
 musicvol $maxmusicvol
 
@@ -111,4 +134,4 @@ alias start_intermission [
 ]
 
 // play once (1:40)
-sleep 100000 [ fade 1 ]
\ No newline at end of file
+sleep 100000 [ fade 1 ]>>>>>>> 1.15
diff --git a/config/autoexec.cfg.default b/config/autoexec.cfg.default
index 0db9a3fb..9f7a0e70 100644
--- a/config/autoexec.cfg.default
+++ b/config/autoexec.cfg.default
@@ -52,8 +52,8 @@ bind R reload
 
 // SCOPE FUNCTION - choose your preferred mode. 
 
-bind MOUSE2 [ altattack ]  //one click = scope on, next click = scope off
-//bind mouse2 [ altattack;onrelease [ altattack ] ] // click and hold = Scope ON, release button = Scope OFF
+//bind MOUSE2 [ altattack ]  //one click = scope on, next click = scope off
+bind mouse2 [ altattack;onrelease [ altattack ] ] // click and hold = Scope ON, release button = Scope OFF
 
 hudgun 1
 maxroll 0
@@ -119,11 +119,9 @@ if (only_menu_music) [ musicvol 1; music $menu_music ]
 bind KP_MINUS "conskip 1"
 bind KP_PLUS "conskip -1"
 
-//------ALTERTNATIVE WEAPON SWITCHING------ no more 1-2-3-4 /wheel cycling, quick nade ( highly recommended),
+//------ALTERTNATIVE WEAPON SWITCHING------ no more 1-2-3-4 /wheel cycling no finger ever leaving WASD
 //uncomment lines (remove the //) below to activate
 
 //alias delta_game_0 [ if (= $arg1 1) [ primary ] [ secondary ] ]
 //bind lshift "grenade"
 //bind lalt "melee"
-//bind e "grenade;attack"
-//bind lctrl "edittoggle"  
diff --git a/config/servers.cfg b/config/servers.cfg
index 08bbd490..219eb0a4 100755
--- a/config/servers.cfg
+++ b/config/servers.cfg
@@ -1,3 +1,6 @@
 // servers connected to are added here automatically
 
+addserver 84.227.72.17
+addserver 84.227.72.17
+addserver 84.226.155.46
 addserver localhost