even more fly updates

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6352 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2011-04-26 00:36:04 +00:00
parent f9a2e7c52d
commit 0c48eb7998
5 changed files with 6 additions and 2 deletions
+1
View File
@@ -26,6 +26,7 @@ poniesmodeon = 0 // Reduced violence mode.
__gibsgore = 1 // Default value for gibs slider.
dyngamma = 0
old_editbinds = 1
flystyle = 0
nickhighlight = 0
survMap = (rnd (listlen $defaultmaps))
survDifficulty = 0
+1
View File
@@ -400,6 +400,7 @@ menuitemslider "Screenshot type: " -1 4 "$__screenshottype" 1 [ "JPEG (Terrible
menuitemslider "Console size: " 0 20 "$consize" 1 "" [ consize $arg1 ]
menuitemslider "Font type: " 0 2 "$__fontsetting" 1 [ "Default" "v104" "Mono" ] [ if (= $arg1 1) [ setfont v104; __fontsetting = 1 ] [ if (= $arg1 2) [ setfont mono; __fontsetting = 2 ] [ setfont default; __fontsetting = 0 ] ] ]
menuitemslider "Mini-map background style: " 0 2 "$showmapbackdrop" 1 [ "Fully Transparent" "Black" "White/Transparent" ] [ showmapbackdrop $arg1 ]
menuitemslider "Fly style: " 0 1 "$flystyle" 1 [ "fly fast, toggle slow" "fly slow, toggle fast" ] [ flystyle = $arg1 ]
menuitemcheckbox "Enable per-official map dynamic gamma: " "$dyngamma" [ dyngamma = $arg1 ]
menuitemtextinput "Set default gamma for this map: " "(at $ofc_gamma_list (findlist $defaultmaps (curmap 1)))" [ setgamma $arg1 ]
+1 -1
View File
@@ -4,7 +4,7 @@
// Do not modify.
bind MOUSE1 "attack"
bind MOUSE2 [ if $old_editbinds [ if $editing [ showmenu editing ] [ altaction ] ] [ if $editing [ slowmove 1; onrelease [ slowmove 0 ] ] [ altaction ] ] ]
bind MOUSE2 [ if $old_editbinds [ if $editing [ showmenu editing ] [ altaction ] ] [ if (&& (alive) (! $editing)) [ altaction ] [ slowtoggle $flystyle ] ] ]
bind MOUSE3 "weapon"
bind MOUSE4 "universaldelta 1"
bind MOUSE5 "universaldelta -1"
+2
View File
@@ -430,6 +430,8 @@ cleanshot = [
sleep 90 [ loop ros (listlen $cs_sets) [ (at $cs_sets $ros) (at $tmp_old_sets $ros) ] ]
]
slowtoggle = [ if (! (= $arg1 0)) [ slowmove 0; onrelease [ slowmove 1 ] ] [ slowmove 1; onrelease [ slowmove 0 ] ] ]
// Simple claim-admin script for one single-server.
// Fill in the 3 aliases below, and uncomment the below line to activate.
// bind F3 "customclaimadminscript"
+1 -1
View File
@@ -328,7 +328,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
bool water = false;
const bool editfly = pl->state==CS_EDITING;
const bool specfly = pl->type==ENT_PLAYER && ((playerent *)pl)->spectatemode==SM_FLY;
const bool isfly = editfly || specfly;
const bool isfly = editfly || specfly || player1->spectatemode==SM_FLY;
vec d; // vector of direction we ideally want to move in