summaryrefslogtreecommitdiff
path: root/src/cgame/cg_tutorial.c
diff options
context:
space:
mode:
authorMichael Levin <risujin@fastmail.fm>2009-10-03 11:30:33 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:03 +0000
commitca3ade0361afe2b5d87c7a46543e6937b04b89bf (patch)
tree1bd831b9fe1d0ffbc8f57f6b5029aafff79aa386 /src/cgame/cg_tutorial.c
parent4249be79aaab686a2df532ab6e18ead135aff5c6 (diff)
* Buildable health accuracy increased to 8 bits, flags moved to eFlags (EF_B_*)
* Fixed Tesla Generator not firing over turrets or missing small aliens entirely -- it now shoots from the top of its bounding box to the top of its target's bounding box * Dying, evolving, or changing teams properly resets the weapon Flame thrower changes: * Reverted flame thrower missile radius to 15 * Muzzle is offset for flame thrower to shoot from the hand
Diffstat (limited to 'src/cgame/cg_tutorial.c')
-rw-r--r--src/cgame/cg_tutorial.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c
index 9bd258fb..0375b3e0 100644
--- a/src/cgame/cg_tutorial.c
+++ b/src/cgame/cg_tutorial.c
@@ -201,7 +201,7 @@ static void CG_AlienBuilderText( char *text, playerState_t *ps )
{
if( cgs.markDeconstruct )
{
- if( es->generic1 & B_MARKED_TOGGLEBIT )
+ if( es->eFlags & EF_B_MARKED )
{
Q_strcat( text, MAX_TUTORIAL_TEXT,
va( "Press %s to unmark this structure\n",
@@ -388,7 +388,7 @@ static void CG_HumanCkitText( char *text, playerState_t *ps )
{
if( cgs.markDeconstruct )
{
- if( es->generic1 & B_MARKED_TOGGLEBIT )
+ if( es->eFlags & EF_B_MARKED )
{
Q_strcat( text, MAX_TUTORIAL_TEXT,
va( "Press %s to unmark this structure\n",
@@ -670,7 +670,7 @@ const char *CG_TutorialText( void )
CG_KeyNameForCommand( "+button7" ) ) );
}
else if( es && es->modelindex == BA_A_HOVEL &&
- es->generic1 & B_SPAWNED_TOGGLEBIT &&
+ ( es->eFlags & EF_B_SPAWNED ) &&
( ps->stats[ STAT_PCLASS ] == PCL_ALIEN_BUILDER0 ||
ps->stats[ STAT_PCLASS ] == PCL_ALIEN_BUILDER0_UPG ) )
{