summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_pmove.c12
-rw-r--r--src/game/bg_public.h2
-rw-r--r--src/game/bg_slidemove.c8
-rw-r--r--src/game/g_active.c2
-rw-r--r--src/game/g_buildable.c6
-rw-r--r--src/game/tremulous.h16
6 files changed, 28 insertions, 18 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index bfc47a22..26a95255 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2036,6 +2036,12 @@ static void PM_GroundTrace( void )
point[ 2 ] = pm->ps->origin[ 2 ] - 0.25f;
pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
+/* if( trace.fraction < 1.0f && VectorCompare( trace.plane.normal, vec3_origin ) )
+ {
+ Com_Printf( "\n%v %d\n", trace.plane.normal, trace.entityNum );
+ Com_Printf( "%v %v\n", pm->ps->origin, point );
+ Com_Printf( "%d %d\n", trace.allsolid, trace.startsolid );
+ }*/
pml.groundTrace = trace;
@@ -3306,11 +3312,11 @@ void PmoveSingle( pmove_t *pmove )
}
else if( pm->ps->pm_flags & PMF_TIME_WATERJUMP )
PM_WaterJumpMove( );
- else if ( pm->waterlevel > 1 )
+ else if( pm->waterlevel > 1 )
PM_WaterMove( );
- else if ( pml.ladder )
+ else if( pml.ladder )
PM_LadderMove( );
- else if ( pml.walking )
+ else if( pml.walking )
{
if( BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_WALLCLIMBER ) &&
( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING ) )
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index a516c36e..b477bcf1 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -571,7 +571,6 @@ typedef enum
MN_A_INFEST,
MN_A_HOVEL_OCCUPIED,
MN_A_HOVEL_BLOCKED,
- MN_A_NOFUNDS,
MN_A_NOEROOM,
//alien build
@@ -595,6 +594,7 @@ typedef enum
//human build
MN_H_REPEATER,
MN_H_NOPOWER,
+ MN_H_NOTPOWERED,
MN_H_NODCC,
MN_H_REACTOR,
MN_H_NOROOM,
diff --git a/src/game/bg_slidemove.c b/src/game/bg_slidemove.c
index 4abd5ddf..e4f7f6c5 100644
--- a/src/game/bg_slidemove.c
+++ b/src/game/bg_slidemove.c
@@ -307,7 +307,7 @@ qboolean PM_StepSlideMove( qboolean gravity, qboolean predictive )
{
if( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING )
{
- VectorCopy(start_o, down);
+ VectorCopy( start_o, down );
VectorMA( down, -STEPSIZE, normal, down );
pm->trace( &trace, start_o, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask );
@@ -328,8 +328,8 @@ qboolean PM_StepSlideMove( qboolean gravity, qboolean predictive )
VectorMA( down, -STEPSIZE, normal, down );
pm->trace( &trace, start_o, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask );
// never step up when you still have up velocity
- if( DotProduct( trace.plane.normal, pm->ps->velocity ) > 0 &&
- ( trace.fraction == 1.0 || DotProduct( trace.plane.normal, normal ) < 0.7 ) )
+ if( DotProduct( trace.plane.normal, pm->ps->velocity ) > 0.0f &&
+ ( trace.fraction == 1.0f || DotProduct( trace.plane.normal, normal ) < 0.7f ) )
{
return stepped;
}
@@ -375,7 +375,7 @@ qboolean PM_StepSlideMove( qboolean gravity, qboolean predictive )
if( !trace.allsolid )
VectorCopy( trace.endpos, pm->ps->origin );
- if( trace.fraction < 1.0 )
+ if( trace.fraction < 1.0f )
PM_ClipVelocity( pm->ps->velocity, trace.plane.normal, pm->ps->velocity, OVERCLIP );
}
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 9feb6721..a8889ef1 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1051,7 +1051,7 @@ void ClientThink_real( gentity_t *ent )
VectorCopy( client->ps.origin, client->oldOrigin );
- Pmove( &pm);
+ Pmove( &pm );
// save results of pmove
if( ent->client->ps.eventSequence != oldEventSequence )
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index e0b59fa5..a525ae9c 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -1434,7 +1434,7 @@ void HArmoury_Activate( gentity_t *self, gentity_t *other, gentity_t *activator
if( self->powered )
G_TriggerMenu( activator->client->ps.clientNum, MN_H_ARMOURY );
else
- G_TriggerMenu( activator->client->ps.clientNum, MN_H_NOPOWER );
+ G_TriggerMenu( activator->client->ps.clientNum, MN_H_NOTPOWERED );
}
}
@@ -2507,6 +2507,10 @@ qboolean G_ValidateBuild( gentity_t *ent, buildable_t buildable )
G_TriggerMenu( ent->client->ps.clientNum, MN_A_NOOVMND );
return qfalse;
+ case IBE_NOCREEP:
+ G_TriggerMenu( ent->client->ps.clientNum, MN_A_NOCREEP );
+ return qfalse;
+
case IBE_OVERMIND:
G_TriggerMenu( ent->client->ps.clientNum, MN_A_OVERMIND );
return qfalse;
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index b8454759..0550f784 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -345,7 +345,7 @@
#define MDRIVER_SPAWNCLIPS 2
#define MDRIVER_MAXCLIPS 3
#define MDRIVER_PRICE 250
-#define MDRIVER_DMG HDM(100)
+#define MDRIVER_DMG HDM(50)
#define MDRIVER_REPEAT 1000
#define MDRIVER_RELOAD 2000
@@ -363,8 +363,8 @@
#define LCANNON_REPEAT 500
#define LCANNON_CHARGEREPEAT 1000
#define LCANNON_RELOAD 2000
-#define LCANNON_DAMAGE HDM(500)
-#define LCANNON_SECONDARY_DAMAGE HDM(50)
+#define LCANNON_DAMAGE HDM(400)
+#define LCANNON_SECONDARY_DAMAGE HDM(30)
#define LCANNON_SPEED 250
#define LCANNON_CHARGE_TIME 1000
@@ -433,7 +433,7 @@
*
*/
-#define HUMAN_BHLTH_MODIFIER 0.5f
+#define HUMAN_BHLTH_MODIFIER 0.6f
#define HBHM(h) ((int)((float)h*HUMAN_BHLTH_MODIFIER))
#define REACTOR_BASESIZE 1000
@@ -449,14 +449,14 @@
#define MEDISTAT_BP 80
#define MEDISTAT_BT 10000
-#define MEDISTAT_HEALTH HBHM(200)
+#define MEDISTAT_HEALTH HBHM(300)
#define MEDISTAT_SPLASHDAMAGE 50
#define MEDISTAT_SPLASHRADIUS 100
#define MAX_MEDISTAT_CLIENTS 1
#define MGTURRET_BP 80
#define MGTURRET_BT 10000
-#define MGTURRET_HEALTH HBHM(100)
+#define MGTURRET_HEALTH HBHM(250)
#define MGTURRET_SPLASHDAMAGE 50
#define MGTURRET_SPLASHRADIUS 100
#define MGTURRET_ANGULARSPEED 5 //degrees/think ~= 200deg/sec
@@ -471,7 +471,7 @@
#define TESLAGEN_BP 100
#define TESLAGEN_BT 15000
-#define TESLAGEN_HEALTH HBHM(200)
+#define TESLAGEN_HEALTH HBHM(350)
#define TESLAGEN_SPLASHDAMAGE 50
#define TESLAGEN_SPLASHRADIUS 100
#define TESLAGEN_REPEAT 500
@@ -486,7 +486,7 @@
#define ARMOURY_BP 100
#define ARMOURY_BT 10000
-#define ARMOURY_HEALTH HBHM(175)
+#define ARMOURY_HEALTH HBHM(200)
#define ARMOURY_SPLASHDAMAGE 50
#define ARMOURY_SPLASHRADIUS 100
generated by cgit (git 2.34.1) at 2025-01-17 15:10:12 +0000