kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reversed jump physics while crouching in editmode

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6340 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2011-04-25 20:09:33 +00:00
parent 8df06fa6f6
commit b930b59438
4 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot/bot_names.txt
+27 -27
View File
@@ -7,28 +7,28 @@ Coolbot
stefanhendriks
Dude
Dumb
Rabid Newb
Rabid_Newb
Eek
w00t
Pwned
Indoor Terrain
Indoor_Terrain
Dumbstruck
[prrt]brainfart
Santa Far
Santa_Far
TinCan-Sam
Aristotles
MuHaHaHa
0x0DEFACED
James Bonk
Rotaredom Murof
James_Bonk
Rotaredom_Murof
zaiBan
YHWH
gruiiik gruiiik
Lady Die
!!!BUY NOW!!!
gruiiik_gruiiik
Lady_Die
!!!BUY_NOW!!!
where_am_i
PMB
Leagle Eagle
Leagle_Eagle
Maleficus
Grolsch
Gambrinius
@@ -43,7 +43,7 @@ Hell
Koff
Orval
Zlatopramen
Lapin Kulta
Lapin_Kulta
Kaltenberg
Zeunerts
Bluesman
@@ -90,28 +90,28 @@ L33t_kR3W
Bones
MrJoe
Shrike
Captain Shrimps
Count Draculol
Harun Al-RushIt
Honey Bunny
Joe Blow
Z00per N00b
Corporal Clegg
Rushing Russian
Johnny Crash
Private Parts
Major Headache
General Surgery
Captain_Shrimps
Count_Draculol
Harun_Al-RushIt
Honey_Bunny
Joe_Blow
Z00per_N00b
Corporal_Clegg
Rushing_Russian
Johnny_Crash
Private_Parts
Major_Headache
General_Surgery
luggable
fried circuits
Byte my ASCII!
fried_circuits
Byte_my_ASCII!
CPLD
FPGA
THE_STORM
Die Hard
Bad boy
Die_Hard
Bad_boy
Beast
Dead man
Dead_man
chibby
teh_ownerer
teh_masterer
config/menus_bot.cfg
+1 -1
View File
@@ -117,7 +117,7 @@ menuitemslider "# of bots to spawn at checkpoints: " 1 5 "$survBotsToAdd" 1 []
menuitemslider "# of milliseconds between checkpoints: " 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1 ]
menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1 ]
menuitem [] -1
menuitem " Back" [ closemenu "Survival Mode - Customize" ]
menuitem " Back" [ closemenu "Survival Mode - Customize" ]
newmenu "Creating bot waypoints"
config/survival.cfg
+1 -1
View File
@@ -93,7 +93,7 @@ isInZone = [
checkzone = [
if (! $survIsFinished) [
if (|| $editing (|| (> $gamespeed 100) (< $gamespeed 100))) [ endSurvival (concatword (c 3) "Error: " (c 1) editmode (c 5) " and " (c 1) gamespeed (c 5) " are not allowed in Survival Mode.") ]
if (|| $editing (! (= $gamespeed 100))) [ endSurvival (concatword (c 3) "Error: " (c 1) editmode (c 5) " and " (c 1) gamespeed (c 5) " are not allowed in Survival Mode.") ]
if (&& (isInZone) (! $startedSurvival)) [ startSurvival ]
if (&& (&& $startedSurvival $gotCheckPoint) (>= (- (millis) $lastCheckPoint) $timeBetChkPts)) [ increaseDifficulty ]
if (&& (&& (! (isInZone)) $startedSurvival) (! $startedOBCount)) [ startOBCount ]
source/src/physics.cpp
+5 -4
View File
@@ -402,9 +402,10 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
pl->o.add(d);
if(pl->jumpnext)
{
pl->jumpnext = false;
pl->vel.z = 2;
pl->jumpnext = true; // fly directly upwards while holding jump keybinds
pl->vel.z = 0.5f;
}
else if (pl->crouching) pl->vel.z = -0.5f; // fly directly down while holding crouch keybinds
}
else if(specfly)
{
@@ -458,7 +459,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
else
{
pl->timeinair += curtime;
if (pl->trycrouch && !pl->crouching && !pl->crouchedinair) {
if (pl->trycrouch && !pl->crouching && !pl->crouchedinair && pl->state!=CS_EDITING) {
pl->vel.z += 0.3f;
pl->crouchedinair = true;
}
@@ -750,7 +751,7 @@ void updatecrouch(playerent *p, bool on)
const float crouchspeed = 0.6f;
p->crouching = on;
p->eyeheightvel = on ? -crouchspeed : crouchspeed;
if(p==player1) audiomgr.playsoundc(on ? S_CROUCH : S_UNCROUCH);
if(p==player1 && p->state!=CS_EDITING) audiomgr.playsoundc(on ? S_CROUCH : S_UNCROUCH);
}
void crouch(bool on)