unknownworlds/ns
0
0
Fork 0
mirror of https://github.com/unknownworlds/NS.git synced 2024-11-26 14:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

o A new approach to fades and ladders.

Browse source 
- The fade will never stick to a ladder when blink is active
- The fade can only climb ladders when its vertical speed is low ( between -175 and 175)


git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@520 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2006-06-04 09:44:23 +00:00
parent 8b13748023
commit 10a8b3897c
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
releases/3.2.0/source/pm_shared/pm_shared.cpp
View file

@ -4849,12 +4849,13 @@ void PM_LadderMove( physent_t *pLadder )
if ( pmove->cmd.buttons & IN_MOVERIGHT ) if ( pmove->cmd.buttons & IN_MOVERIGHT )
right += MAX_CLIMB_SPEED; right += MAX_CLIMB_SPEED;
if ( PM_GetIsBlinking() ) // if ( PM_GetIsBlinking() )
{ //{
pmove->movetype = MOVETYPE_WALK; //pmove->movetype = MOVETYPE_WALK;
VectorScale( trace.plane.normal, 270, pmove->velocity ); //VectorScale( trace.plane.normal, 270, pmove->velocity );
} //}
else if ( pmove->cmd.buttons & IN_JUMP ) //else
if ( pmove->cmd.buttons & IN_JUMP )
{ {
pmove->movetype = MOVETYPE_WALK; pmove->movetype = MOVETYPE_WALK;
VectorScale( trace.plane.normal, 270, pmove->velocity ); VectorScale( trace.plane.normal, 270, pmove->velocity );
@ -6502,6 +6503,11 @@ void PM_PlayerMove ( qboolean server )
bool theIsFlyingAlien = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3) && (pmove->onground == -1); bool theIsFlyingAlien = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER3) && (pmove->onground == -1);
bool theIsSkulk = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER1); bool theIsSkulk = (pmove->iuser3 == AVH_USER3_ALIEN_PLAYER1);
// if ( PM_GetIsBlinking() ) {
if ( pmove->iuser3 == AVH_USER3_ALIEN_PLAYER4 && ( PM_GetIsBlinking() || pmove->velocity[2] > 175 || pmove->velocity[2] < -175 )) {
g_onladder[pmove->player_index] = 0;
}
else {
if ( !pmove->dead && !(pmove->flags & FL_ONTRAIN) && !gIsJetpacking[pmove->player_index] && !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && !theIsFlyingAlien && !theIsSkulk) if ( !pmove->dead && !(pmove->flags & FL_ONTRAIN) && !gIsJetpacking[pmove->player_index] && !GetHasUpgrade(pmove->iuser4, MASK_WALLSTICKING) && !theIsFlyingAlien && !theIsSkulk)
{ {
pLadder = PM_Ladder(); pLadder = PM_Ladder();
@ -6510,6 +6516,7 @@ void PM_PlayerMove ( qboolean server )
g_onladder[pmove->player_index] = 1; g_onladder[pmove->player_index] = 1;
} }
} }
}
//pmove->Con_DPrintf("g_onladder: %d\n", g_onladder); //pmove->Con_DPrintf("g_onladder: %d\n", g_onladder);