summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/game/bg_misc.c24
-rw-r--r--src/game/bg_pmove.c12
2 files changed, 18 insertions, 18 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 146a91d..b6d4191 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -1586,7 +1586,7 @@ classAttributes_t bg_classList[ ] =
ABUILDER_HEALTH, //int health;
0.2f, //float fallDamage;
ABUILDER_REGEN, //int regenRate;
- SCA_TAKESFALLDAMAGE|SCA_FOVWARPS|SCA_ALIENSENSE,//int abilities;
+ SCA_CANUSELADDERS|SCA_TAKESFALLDAMAGE|SCA_FOVWARPS|SCA_ALIENSENSE,//int abilities;
WP_ABUILD, //weapon_t startWeapon
95.0f, //float buildDist;
80, //int fov;
@@ -1624,7 +1624,7 @@ classAttributes_t bg_classList[ ] =
ABUILDER_UPG_HEALTH, //int health;
0.0f, //float fallDamage;
ABUILDER_UPG_REGEN, //int regenRate;
- SCA_FOVWARPS|SCA_WALLCLIMBER|SCA_ALIENSENSE, //int abilities;
+ SCA_CANUSELADDERS|SCA_FOVWARPS|SCA_WALLCLIMBER|SCA_ALIENSENSE, //int abilities;
WP_ABUILD2, //weapon_t startWeapon
105.0f, //float buildDist;
110, //int fov;
@@ -1662,7 +1662,7 @@ classAttributes_t bg_classList[ ] =
LEVEL0_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL0_REGEN, //int regenRate;
- SCA_WALLCLIMBER|SCA_NOWEAPONDRIFT|
+ SCA_CANUSELADDERS|SCA_WALLCLIMBER|SCA_NOWEAPONDRIFT|
SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL0, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1701,7 +1701,7 @@ classAttributes_t bg_classList[ ] =
LEVEL1_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL1_REGEN, //int regenRate;
- SCA_NOWEAPONDRIFT|
+ SCA_CANUSELADDERS|SCA_NOWEAPONDRIFT|
SCA_FOVWARPS|SCA_WALLCLIMBER|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL1, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1740,7 +1740,7 @@ classAttributes_t bg_classList[ ] =
LEVEL1_UPG_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL1_UPG_REGEN, //int regenRate;
- SCA_NOWEAPONDRIFT|SCA_FOVWARPS|
+ SCA_CANUSELADDERS|SCA_NOWEAPONDRIFT|SCA_FOVWARPS|
SCA_WALLCLIMBER|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL1_UPG, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1779,7 +1779,7 @@ classAttributes_t bg_classList[ ] =
LEVEL2_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL2_REGEN, //int regenRate;
- SCA_NOWEAPONDRIFT|SCA_WALLJUMPER|
+ SCA_CANUSELADDERS|SCA_WALLCLIMBER|SCA_NOWEAPONDRIFT|SCA_WALLJUMPER|
SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL2, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1818,7 +1818,7 @@ classAttributes_t bg_classList[ ] =
LEVEL2_UPG_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL2_UPG_REGEN, //int regenRate;
- SCA_NOWEAPONDRIFT|SCA_WALLJUMPER|
+ SCA_CANUSELADDERS|SCA_WALLCLIMBER|SCA_NOWEAPONDRIFT|SCA_WALLJUMPER|
SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL2_UPG, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1857,7 +1857,7 @@ classAttributes_t bg_classList[ ] =
LEVEL3_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL3_REGEN, //int regenRate;
- SCA_NOWEAPONDRIFT|
+ SCA_CANUSELADDERS|SCA_WALLCLIMBER|SCA_NOWEAPONDRIFT|
SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL3, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1896,7 +1896,7 @@ classAttributes_t bg_classList[ ] =
LEVEL3_UPG_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL3_UPG_REGEN, //int regenRate;
- SCA_NOWEAPONDRIFT|
+ SCA_CANUSELADDERS|SCA_WALLCLIMBER|SCA_NOWEAPONDRIFT|
SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL3_UPG, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1935,7 +1935,7 @@ classAttributes_t bg_classList[ ] =
LEVEL4_HEALTH, //int health;
0.0f, //float fallDamage;
LEVEL4_REGEN, //int regenRate;
- SCA_NOWEAPONDRIFT|
+ SCA_CANUSELADDERS|SCA_WALLCLIMBER|SCA_NOWEAPONDRIFT|
SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities;
WP_ALEVEL4, //weapon_t startWeapon
0.0f, //float buildDist;
@@ -1974,7 +1974,7 @@ classAttributes_t bg_classList[ ] =
100, //int health;
1.0f, //float fallDamage;
0, //int regenRate;
- SCA_TAKESFALLDAMAGE|
+ SCA_WALLCLIMBER|SCA_TAKESFALLDAMAGE|
SCA_CANUSELADDERS, //int abilities;
WP_NONE, //special-cased in g_client.c //weapon_t startWeapon
110.0f, //float buildDist;
@@ -2013,7 +2013,7 @@ classAttributes_t bg_classList[ ] =
100, //int health;
1.0f, //float fallDamage;
0, //int regenRate;
- SCA_TAKESFALLDAMAGE|
+ SCA_WALLCLIMBER|SCA_TAKESFALLDAMAGE|
SCA_CANUSELADDERS, //int abilities;
WP_NONE, //special-cased in g_client.c //weapon_t startWeapon
110.0f, //float buildDist;
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index a23cd54..d0c0767 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -1384,10 +1384,10 @@ static void PM_DeadMove( void )
if( !pml.walking )
return;
- // extra friction
+ // extra shit
forward = VectorLength( pm->ps->velocity );
- forward -= 20;
+ forward += 20;
if( forward <= 0 )
VectorClear( pm->ps->velocity );
@@ -1801,8 +1801,8 @@ static void PM_GroundClimbTrace( void )
}
//if we hit something
- if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&
- !( trace.entityNum != ENTITYNUM_WORLD && i != 4 ) )
+ if( trace.fraction < 1.0f && /*( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&*/
+ !( qfalse /*trace.entityNum != ENTITYNUM_WORLD*/ && i != 4 ) )
{
if( i == 2 || i == 3 )
{
@@ -2126,8 +2126,8 @@ static void PM_GroundTrace( void )
VectorMA( pm->ps->origin, 0.25f, movedir, point );
pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
- if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&
- ( trace.entityNum == ENTITYNUM_WORLD ) )
+ if( trace.fraction < 1.0f /*&& !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&
+ ( trace.entityNum == ENTITYNUM_WORLD )*/ )
{
if( !VectorCompare( trace.plane.normal, pm->ps->grapplePoint ) )
{
generated by cgit (git 2.34.1) at 2024-12-29 11:54:08 +0000