All pastes #1802435 Raw Edit

Miscellany

public diff v1 · immutable
#1802435 ·published 2010-02-19 07:41 UTC
rendered paste body
Index: src/droid.c===================================================================--- src/droid.c	(revision 9861)+++ src/droid.c	(working copy)@@ -3743,7 +3743,7 @@ 	    && psDroid->droidType != DROID_TRANSPORTER; } -// returns true if the droid has lift propulsion and is moving+/* returns true if the droid has lift propulsion and is moving */ BOOL isFlying(const DROID* psDroid) { 	return (asPropulsionStats + psDroid->asBits[COMP_PROPULSION].nStat)->propulsionType == PROPULSION_TYPE_LIFTIndex: src/component.c===================================================================--- src/component.c	(revision 9861)+++ src/component.c	(working copy)@@ -794,23 +794,17 @@ 		} 	} -	/* render vtol jet if flying - horrible hack - GJ */-	if (((psPropStats->propulsionType == PROPULSION_TYPE_LIFT) &&-		//(psDroid->droidType != DROID_CYBORG)) && (!bButton))-		(!cyborgDroid(psDroid))) && (!bButton))+	/* render vtol jet if flying */+	if ( isVtolDroid( psDroid) && isFlying( psDroid) && (!bButton)) 	{-		/* show flame if above ground */-		if ( psDroid->sMove.Status != MOVEINACTIVE )-		{-			/* draw flame if found  */+		/* draw flame if found  */ -			/* GJ TODO: add flame-finding code here */-			psJet = asBodyStats[psDroid->asBits[COMP_BODY].nStat].pFlameIMD;+		/* GJ TODO: add flame-finding code here */+		psJet = asBodyStats[psDroid->asBits[COMP_BODY].nStat].pFlameIMD; -			if ( psJet != NULL )-			{-				pie_Draw3DShape(psJet, getModularScaledGraphicsTime(100, psJet->numFrames), colour, brightness, specular, pie_ADDITIVE, 200);-			}+		if ( psJet != NULL )+		{+			pie_Draw3DShape(psJet, getModularScaledGraphicsTime(100, psJet->numFrames), colour, brightness, specular, pie_ADDITIVE, 200); 		} 	} Index: src/droid.h===================================================================--- src/droid.h	(revision 9861)+++ src/droid.h	(working copy)@@ -311,7 +311,7 @@  //access function extern BOOL isVtolDroid(const DROID* psDroid);-/*returns true if the droid has lift propulsion and is above the ground level*/+/* returns true if the droid has lift propulsion and is moving */ extern BOOL isFlying(const DROID* psDroid); /*returns true if a VTOL weapon droid which has completed all runs*/ extern BOOL vtolEmpty(DROID *psDroid);