Fix some stuff when trying to compile in Linux, remove applied #include precompile.h thingy

game/Actor.cpp

@@ -35,7 +35,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "WorldSpawn.h"
 
 #include "Actor.h"
-
+#include "Trigger.h"
 
 /***********************************************************************
 

game/Entity.cpp

@@ -44,6 +44,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "WorldSpawn.h"
 #include "SmokeParticles.h"
 
+#include "ai/AI.h"
 #include "Entity.h"
 
 /*
@@ -120,6 +121,21 @@ const idEventDef EV_StartFx( "startFx", "s" );
 const idEventDef EV_HasFunction( "hasFunction", "s", 'd' );
 const idEventDef EV_CallFunction( "callFunction", "s" );
 const idEventDef EV_SetNeverDormant( "setNeverDormant", "d" );
+// HEXEN : Zeroth
+const idEventDef EV_SetGravity( "SetGravity", "v" );
+const idEventDef EV_GetGravity( "GetGravity", NULL, 'v' );
+const idEventDef EV_GetGravityNormal( "GetGravityNormal", NULL, 'v' );
+const idEventDef EV_GetSelfEntity( "GetSelfEntity", NULL, 'e' );
+const idEventDef EV_SpawnProjectiles( "EntityLaunchProjectiles", "dffff" );
+const idEventDef EV_CreateProjectile( "EntityCreateProjectile", NULL, 'e' );
+const idEventDef EV_GetMaster( "GetMaster", NULL, 'e' );
+const idEventDef EV_GetModelDims( "GetModelDims", NULL, 'v' );
+const idEventDef EV_ReplaceMaterial( "ReplaceMaterial", "ss" );
+const idEventDef EV_ResetGravity( "ResetGravity" );
+const idEventDef EV_GetHealth( "GetHealth", NULL, 'f' );
+const idEventDef EV_SetHealth( "SetHealth", "f" );
+const idEventDef EV_HudMessage( "HudMessage", "s" );
+const idEventDef EV_GetType( "GetType", NULL, 'f' );
 
 ABSTRACT_DECLARATION( idClass, idEntity )
 	EVENT( EV_GetName,				idEntity::Event_GetName )
@@ -185,6 +201,21 @@ ABSTRACT_DECLARATION( idClass, idEntity )
 	EVENT( EV_HasFunction,			idEntity::Event_HasFunction )
 	EVENT( EV_CallFunction,			idEntity::Event_CallFunction )
 	EVENT( EV_SetNeverDormant,		idEntity::Event_SetNeverDormant )
+// HEXEN : Zeroth
+	EVENT( EV_SetGravity,			idEntity::Event_SetGravity )
+	EVENT( EV_GetGravity,			idEntity::Event_GetGravity )
+	EVENT( EV_GetGravityNormal,		idEntity::Event_GetGravityNormal )
+	EVENT( EV_GetSelfEntity,		idEntity::Event_GetSelfEntity )
+	EVENT( EV_SpawnProjectiles,		idEntity::Event_SpawnProjectiles )
+	EVENT( EV_CreateProjectile,		idEntity::Event_CreateProjectile )
+	EVENT( EV_GetMaster,			idEntity::Event_GetMaster )
+	EVENT( EV_GetModelDims,			idEntity::Event_GetModelDims )
+	EVENT( EV_ReplaceMaterial,		idEntity::Event_ReplaceMaterial )
+	EVENT( EV_ResetGravity,			idEntity::Event_ResetGravity )
+	EVENT( EV_GetHealth,			idEntity::Event_GetHealth )
+	EVENT( EV_SetHealth,			idEntity::Event_SetHealth )
+	EVENT( EV_HudMessage,			idEntity::Event_HudMessage )
+	EVENT( EV_GetType,				idEntity::Event_GetType )
 END_CLASS
 
 /*
@@ -435,6 +466,14 @@ idEntity::idEntity() {
 	memset( &refSound, 0, sizeof( refSound ) );
 
 	mpGUIState = -1;
+
+	// HEXEN : Zeroth
+	scriptThread = NULL; // initialized by ConstructScriptObject, which is called by idEntity::Spawn
+	state = NULL;
+	idealState = NULL;
+	waitState = "";
+	gravityMod = false;
+	inWater = false;
 }
 
 /*
@@ -465,6 +504,11 @@ void idEntity::Spawn( void ) {
 	const char			*classname;
 	const char			*scriptObjectName;
 
+	// HEXEN : Zeroth
+	onFire = 0;
+	nextFlame = 0;
+	fireJoint = 0;
+
 	gameLocal.RegisterEntity( this );
 
 	spawnArgs.GetString( "classname", NULL, &classname );
@@ -589,6 +633,7 @@ idEntity::~idEntity( void ) {
 		networkSystem->ServerSendReliableMessage( -1, msg );
 	}
 
+	ShutdownThreads();
 	DeconstructScriptObject();
 	scriptObject.Free();
 
@@ -692,6 +737,44 @@ void idEntity::Save( idSaveGame *savefile ) const {
 	}
 
 	savefile->WriteInt( mpGUIState );
+
+	// HEXEN : Zeroth
+	savefile->WriteObject( scriptThread );
+	savefile->WriteString( waitState );
+
+	//FIXME: this is unneccesary
+	idToken token;
+	// HEXEN : Zeroth
+	if ( state ) {
+		idLexer src( state->Name(), idStr::Length( state->Name() ), "idEntity::Save" );
+
+		src.ReadTokenOnLine( &token );
+		src.ExpectTokenString( "::" );
+		src.ReadTokenOnLine( &token );
+
+		savefile->WriteString( token );
+	} else {
+		savefile->WriteString( "" );
+	}
+
+	// HEXEN : Zeroth
+	if ( idealState ) {
+		idLexer src( idealState->Name(), idStr::Length( idealState->Name() ), "idEntity::Save" );
+
+		src.ReadTokenOnLine( &token );
+		src.ExpectTokenString( "::" );
+		src.ReadTokenOnLine( &token );
+
+		savefile->WriteString( token );
+	} else {
+		savefile->WriteString( "" );
+	}
+
+	// HEXEN : Zeroth
+	savefile->WriteObject( projectileEnt );
+	savefile->WriteInt( nextFlame );
+	savefile->WriteInt( fireJoint );
+	savefile->WriteInt( onFire );
 }
 
 /*
@@ -778,6 +861,37 @@ void idEntity::Restore( idRestoreGame *savefile ) {
 	if ( modelDefHandle != -1 ) {
 		modelDefHandle = gameRenderWorld->AddEntityDef( &renderEntity );
 	}
+
+	// HEXEN : Zeroth
+	savefile->ReadObject( reinterpret_cast<idClass *&>( scriptThread ) );
+	savefile->ReadString( waitState );
+	idStr statename;
+
+	// HEXEN : Zeroth
+	savefile->ReadString( statename );
+	if ( statename.Length() > 0 ) {
+		state = GetScriptFunction( statename );
+	}
+
+	// HEXEN : Zeroth
+	savefile->ReadString( statename );
+	if ( statename.Length() > 0 ) {
+		idealState = GetScriptFunction( statename );
+	}
+
+	// HEXEN : Zeroth
+	const idDeclEntityDef *projectileDef = gameLocal.FindEntityDef( spawnArgs.GetString( "def_projectile" ), false );
+	if ( projectileDef ) {
+		projectileDict = projectileDef->dict;
+	} else {
+		projectileDict.Clear();
+	}
+
+	// HEXEN : Zeroth
+	savefile->ReadObject( reinterpret_cast<idClass *&>( projectileEnt ) );
+	savefile->ReadInt( nextFlame );
+	savefile->ReadInt( fireJoint );
+	savefile->ReadInt( onFire );
 }
 
 /*
@@ -2980,7 +3094,7 @@ inflictor, attacker, dir, and point can be NULL for environmental effects
 ============
 */
 void idEntity::Damage( idEntity *inflictor, idEntity *attacker, const idVec3 &dir,
-					  const char *damageDefName, const float damageScale, const int location ) {
+					  const char *damageDefName, const float damageScale, const int location, const idVec3 &iPoint ) {
 	if ( !fl.takedamage ) {
 		return;
 	}
@@ -3108,7 +3222,6 @@ Can be overridden by subclasses when a thread doesn't need to be allocated.
 ================
 */
 idThread *idEntity::ConstructScriptObject( void ) {
-	idThread *thread;
 	const function_t *constructor;
 
 	// init the script object's data
@@ -3118,18 +3231,22 @@ idThread *idEntity::ConstructScriptObject( void ) {
 	constructor = scriptObject.GetConstructor();
 	if ( constructor ) {
 		// start a thread that will initialize after Spawn is done being called
-		thread = new idThread();
-		thread->SetThreadName( name.c_str() );
-		thread->CallFunction( this, constructor, true );
-		thread->DelayedStart( 0 );
+		scriptThread = new idThread();
+		scriptThread->SetThreadName( name.c_str() );
+		scriptThread->CallFunction( this, constructor, true );
+		scriptThread->DelayedStart( 0 );
+
+		// HEXEN : Zeroth
+		scriptThread->ManualDelete();
+		//scriptThread->ManualControl();
 	} else {
-		thread = NULL;
+		scriptThread = NULL;
 	}
 
 	// clear out the object's memory
 	scriptObject.ClearObject();
 
-	return thread;
+	return scriptThread;
 }
 
 /*
@@ -3576,6 +3693,60 @@ void idEntity::ActivateTargets( idEntity *activator ) const {
 	}
 }
 
+/*
+==============================
+Zeroth
+idAnimatedEntity::EmitFlames
+==============================
+*/
+void idAnimatedEntity::EmitFlames( void ) {
+	if ( gameLocal.time < nextFlame ) {
+		return;
+	}
+
+	particleEmitter_t pe;
+	idStr particleName = "firestorm_incinerator";
+	idVec3 origin;
+	idMat3 axis;
+
+	idAnimator *anim = GetAnimator();
+	if ( anim == NULL ) {
+		return;
+	}
+
+	int numjoints = anim->NumJoints();
+	if ( numjoints <= 0 ) {
+		return;
+	}
+
+	nextFlame += gameLocal.random.RandomFloat() * ( ( 50 / numjoints ) );
+
+	fireJoint++;
+
+	if ( fireJoint >= numjoints ) {
+		fireJoint = 0;
+	}
+
+	pe.joint = (jointHandle_t) fireJoint;
+	//idAnimatedEntity *aent=static_cast< idAnimatedEntity * >( ent );
+
+	anim->GetJointTransform( pe.joint, gameLocal.time, origin, axis );
+	origin = renderEntity.origin + origin * renderEntity.axis;
+	//origin = GetJointPos( (jointHandle_t)fireJoint );
+
+	BecomeActive( TH_UPDATEPARTICLES );
+	if ( !gameLocal.time ) {
+		// particles with time of 0 don't show, so set the time differently on the first frame
+		pe.time = 1;
+	} else {
+		pe.time = gameLocal.time;
+	}
+	pe.particle = static_cast<const idDeclParticle *>( declManager->FindType( DECL_PARTICLE, particleName ) );
+	gameLocal.smokeParticles->EmitSmoke( pe.particle, pe.time, gameLocal.random.CRandomFloat(), origin, axis );
+
+	//particles.Append( pe );
+}
+
 /***********************************************************************
 
   Misc.
@@ -3625,8 +3796,10 @@ bool idEntity::TouchTriggers( void ) const {
 
 		ent = cm->GetEntity();
 
-		if ( !ent->RespondsTo( EV_Touch ) && !ent->HasSignal( SIG_TOUCH ) ) {
-			continue;
+		if ( !ent->RespondsTo( EV_Touch ) ) {
+			if ( !ent->HasSignal( SIG_TOUCH ) ) {
+				continue;
+			}
 		}
 
 		if ( !GetPhysics()->ClipContents( cm ) ) {
@@ -4152,8 +4325,18 @@ idEntity::Event_GetAngles
 ================
 */
 void idEntity::Event_GetAngles( void ) {
-	idAngles ang = GetPhysics()->GetAxis().ToAngles();
-	idThread::ReturnVector( idVec3( ang[0], ang[1], ang[2] ) );
+	idAngles ang = GetAngles();
+	idThread::ReturnVector( idVec3( ang.yaw, ang.pitch, ang.roll) );
+}
+
+/*
+================
+HEXEN
+idEntity::GetAngles
+================
+*/
+idAngles idEntity::GetAngles( void ) {
+	return( GetPhysics()->GetAxis().ToAngles() );
 }
 
 /*
@@ -4376,9 +4559,13 @@ void idEntity::Event_GetEntityKey( const char *key ) {
 	}
 
 	ent = gameLocal.FindEntity( entname );
+	
+	// HEXEN : Zeroth - this gets annoying, not necessary. commenting out.
+	/*
 	if ( !ent ) {
 		gameLocal.Warning( "Couldn't find entity '%s' specified in '%s' key in entity '%s'", entname, key, name.c_str() );
 	}
+	*/
 
 	idThread::ReturnEntity( ent );
 }
@@ -4875,6 +5062,8 @@ const idEventDef EV_SetJointPos( "setJointPos", "ddv" );
 const idEventDef EV_SetJointAngle( "setJointAngle", "ddv" );
 const idEventDef EV_GetJointPos( "getJointPos", "d", 'v' );
 const idEventDef EV_GetJointAngle( "getJointAngle", "d", 'v' );
+// HEXEN : Zeroth
+const idEventDef EV_TransitionJointAngle( "transitionJointAngle", "ddvvff" );
 
 CLASS_DECLARATION( idEntity, idAnimatedEntity )
 	EVENT( EV_GetJointHandle,		idAnimatedEntity::Event_GetJointHandle )
@@ -4884,6 +5073,8 @@ CLASS_DECLARATION( idEntity, idAnimatedEntity )
 	EVENT( EV_SetJointAngle,		idAnimatedEntity::Event_SetJointAngle )
 	EVENT( EV_GetJointPos,			idAnimatedEntity::Event_GetJointPos )
 	EVENT( EV_GetJointAngle,		idAnimatedEntity::Event_GetJointAngle )
+// HEXEN : Zeroth
+	EVENT( EV_TransitionJointAngle,	idAnimatedEntity::Event_TransitionJointAngle )
 END_CLASS
 
 /*
@@ -4967,6 +5158,13 @@ void idAnimatedEntity::Think( void ) {
 	UpdateAnimation();
 	Present();
 	UpdateDamageEffects();
+
+	// HEXEN : Zeroth
+	if ( gameLocal.time < onFire ) {
+		if ( gameLocal.time >= nextFlame ) {
+			EmitFlames();
+		}
+	}
 }
 
 /*
@@ -5364,6 +5562,35 @@ void idAnimatedEntity::Event_SetJointAngle( jointHandle_t jointnum, jointModTran
 	animator.SetJointAxis( jointnum, transform_type, mat );
 }
 
+/*
+================
+Zeroth
+idAnimatedEntity::Event_TransitionJointAngle
+================
+*/
+void idAnimatedEntity::Event_TransitionJointAngle( jointHandle_t jointnum, jointModTransform_t transform_type, const idAngles &to, const idAngles &from, float seconds, float transitions ) {
+	TransitionJointAngle( jointnum, transform_type, to, from, seconds, transitions );
+}
+
+/*
+================
+Zeroth
+idAnimatedEntity::TransitionJointAngle
+================
+*/
+void idAnimatedEntity::TransitionJointAngle( jointHandle_t jointnum, jointModTransform_t transform_type, const idAngles &to, const idAngles &from, float seconds, float transitions ) {
+//	idVec3 offset;
+//	idMat3 axis;
+	idAngles aTo = to;
+	idAngles aFrom = from;
+
+//	if ( !GetJointWorldTransform( jointnum, gameLocal.time, offset, axis ) ) {
+//		gameLocal.Warning( "Joint # %d out of range on entity '%s'",  jointnum, name.c_str() );
+//	}
+
+	animator.eoc_TransitionJointAngle( jointnum, transform_type, aTo, aFrom, seconds, transitions );
+}
+
 /*
 ================
 idAnimatedEntity::Event_GetJointPos
@@ -5372,6 +5599,16 @@ returns the position of the joint in worldspace
 ================
 */
 void idAnimatedEntity::Event_GetJointPos( jointHandle_t jointnum ) {
+	idThread::ReturnVector( GetJointPos( jointnum ) );
+}
+
+/*
+================
+Zeroth
+idAnimatedEntity::GetJointPos
+================
+*/
+idVec3 idAnimatedEntity::GetJointPos( jointHandle_t jointnum ) {
 	idVec3 offset;
 	idMat3 axis;
 
@@ -5379,7 +5616,7 @@ void idAnimatedEntity::Event_GetJointPos( jointHandle_t jointnum ) {
 		gameLocal.Warning( "Joint # %d out of range on entity '%s'",  jointnum, name.c_str() );
 	}
 
-	idThread::ReturnVector( offset );
+	return offset;
 }
 
 /*
@@ -5401,3 +5638,562 @@ void idAnimatedEntity::Event_GetJointAngle( jointHandle_t jointnum ) {
 	idVec3 vec( ang[ 0 ], ang[ 1 ], ang[ 2 ] );
 	idThread::ReturnVector( vec );
 }
+
+/*
+=====================
+Zeroth
+idAnimatedEntity::GetJointAngle
+=====================
+*/
+idAngles idAnimatedEntity::GetJointAngle( jointHandle_t jointnum ) {
+	idVec3 offset;
+	idMat3 axis;
+
+	if ( !GetJointWorldTransform( jointnum, gameLocal.time, offset, axis ) ) {
+		gameLocal.Warning( "Joint # %d out of range on entity '%s'",  jointnum, name.c_str() );
+	}
+
+	return( axis.ToAngles() );
+}
+
+/*
+=====================
+Zeroth
+idAnimatedEntity::SetJointAngle
+=====================
+*/
+void idAnimatedEntity::SetJointAngle( jointHandle_t jointnum, jointModTransform_t transform_type, const idAngles &angles ) {
+	idMat3 mat;
+
+	mat = angles.ToMat3();
+	animator.SetJointAxis( jointnum, transform_type, mat );
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_SetGravity
+=====================
+*/
+void idEntity::Event_SetGravity( const idVec3 &grav ) {
+	GetPhysics()->SetGravity(grav);
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_GetGravity
+=====================
+*/
+void idEntity::Event_GetGravity( void ) {
+	idVec3 cur=GetPhysics()->GetGravity();
+
+	idThread::ReturnVector(cur);
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_GetGravityNormal
+=====================
+*/
+void idEntity::Event_GetGravityNormal( void ) {
+	idVec3 cur=GetPhysics()->GetGravityNormal();
+
+	idThread::ReturnVector(cur);
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_GetSelfEntity
+=====================
+*/
+void idEntity::Event_GetSelfEntity( void ) {
+	idThread::ReturnEntity(this);
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_GetHealth
+=====================
+*/
+void idEntity::Event_GetHealth( void ) {
+	idThread::ReturnInt(health);
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_SetHealth
+=====================
+*/
+void idEntity::Event_SetHealth( float newHealth ) {
+	health = newHealth;
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_HudMessage
+=====================
+*/
+void idEntity::Event_HudMessage( const char *message ) {
+	gameLocal.SendLocalUserHudMessage( message );
+}
+
+/*
+=====================
+Zeroth
+idEntity::GetScriptFunction
+=====================
+*/
+const function_t *idEntity::GetScriptFunction( const char *funcname ) {
+	const function_t *func;
+
+	func = scriptObject.GetFunction( funcname );
+	if ( !func ) {
+		scriptThread->Error( "Unknown function '%s' in '%s'", funcname, scriptObject.GetTypeName() );
+	}
+
+	return func;
+}
+
+/*
+=====================
+Zeroth
+idEntity::SetState
+=====================
+*/
+void idEntity::SetState( const function_t *newState ) {
+	if ( !newState ) {
+		gameLocal.Printf("idEntity::SetState(): %s: Null State.\n", name.c_str());
+	}
+
+	state = newState;
+	idealState = state;
+	scriptThread->CallFunction( this, state, true );
+}
+
+/*
+=====================
+Zeroth
+idEntity::SetState
+=====================
+*/
+void idEntity::SetState( const char *statename ) {
+	const function_t *newState;
+
+	newState = GetScriptFunction( statename );
+	SetState( newState );
+}
+
+/*
+=====================
+idEntity::UpdateScript
+=====================
+*/
+void idEntity::UpdateScript( void ) {
+    int    i;
+
+    // a series of state changes can happen in a single frame.
+    // this loop limits them in case we've entered an infinite loop.
+    for( i = 0; i < 20; i++ ) {
+        if ( idealState != state ) {
+            SetState( idealState );
+        }
+
+        // don't call script until it's done waiting
+        if ( scriptThread->IsWaiting() ) {
+            break;
+        }
+
+        scriptThread->Execute();
+        if ( idealState == state ) {
+            break;
+        }
+    }
+
+    if ( i == 20 ) {
+        scriptThread->Warning( "idEntity::UpdateScript: exited loop to prevent lockup" );
+    }
+}
+
+/*
+================
+Zeroth
+idEntity::ShutdownThreads
+================
+*/
+void idEntity::ShutdownThreads( void ) {
+	if ( scriptThread ) {
+		scriptThread->EndThread();
+		scriptThread->PostEventMS( &EV_Remove, 0 );
+		delete scriptThread;
+		scriptThread = NULL;
+	}
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_SetNextState
+=====================
+*/
+void idEntity::Event_SetNextState( const char *name ) {
+	idealState = GetScriptFunction( name );
+	if ( idealState == state ) {
+		state = NULL;
+	}
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_SetState
+=====================
+*/
+void idEntity::Event_SetState( const char *name ) {
+	idealState = GetScriptFunction( name );
+	if ( idealState == state ) {
+		state = NULL;
+	}
+	scriptThread->DoneProcessing();
+}
+
+/*
+=====================
+Zeroth
+idEntity::Event_GetState
+=====================
+*/
+void idEntity::Event_GetState( void ) {
+	if ( state ) {
+		idThread::ReturnString( state->Name() );
+	} else {
+		idThread::ReturnString( "" );
+	}
+}
+
+
+/*
+=====================
+Zeroth
+idEntity::WaitState
+=====================
+*/
+const char *idEntity::WaitState( void ) const {
+	if ( waitState.Length() ) {
+		return waitState;
+	} else {
+		return NULL;
+	}
+}
+
+/*
+=====================
+Zeroth
+idEntity::SetWaitState
+=====================
+*/
+void idEntity::SetWaitState( const char *_waitstate ) {
+	waitState = _waitstate;
+}
+
+#if 0
+/*
+================
+Zeroth
+idEntity::FinishSetup
+================
+*/
+void idEntity::FinishSetup( void ) {
+	const char	*scriptObjectName;
+	// setup script object
+	if ( spawnArgs.GetString( "scriptobject", NULL, &scriptObjectName ) ) {
+		if ( !scriptObject.SetType( scriptObjectName ) ) {
+			gameLocal.Error( "Script object '%s' not found on entity '%s'.", scriptObjectName, name.c_str() );
+		}
+		ConstructScriptObject();
+	}
+}
+#endif
+
+#if 0
+/*
+================
+HEXEN : Zeroth
+idEntity::IsInUse
+================
+*/
+bool IsInUse( void ) {
+	if (scriptThread != NULL) {
+		return (scriptThread->IsBusy());
+	}
+
+	return false;
+}
+#endif
+
+/*
+================
+Zeroth
+idEntity::Event_GetType
+================
+*/
+void idEntity::Event_GetType( void ) {
+	idThread::ReturnFloat( (float)GetType()->typeNum );
+}
+
+/*
+================
+Zeroth
+idEntity::Event_SpawnProjectiles
+================
+*/
+void idEntity::Event_SpawnProjectiles( int num_projectiles, float spread, float fuseOffset, float launchPower, float dmgPower ) {
+	idProjectile		*proj;
+	idEntity		*ent;
+	int			i;
+	idVec3			dir;
+	float			ang;
+	float			spin;
+	float			distance;
+	trace_t			tr;
+	idVec3			start;
+	idVec3			muzzle_pos;
+	idBounds		ownerBounds, projBounds;
+
+	idVec3			playerViewOrigin;
+	idMat3			playerViewAxis;
+	idVec3			zzero;
+	idEntity		*owner = this;
+
+	zzero.Zero();
+
+	playerViewOrigin.Zero();
+	playerViewAxis.Zero();
+
+	playerViewOrigin = physics->GetOrigin();
+	playerViewAxis = physics->GetAxis();
+
+	if ( !projectileDict.GetNumKeyVals() ) {
+		const char *classname =  this->spawnArgs.GetString("inv_name");
+		gameLocal.Warning( "No projectile defined on '%s'", classname );
+		return;
+	}
+
+	if ( gameLocal.isClient ) {
+		// predict instant hit projectiles
+		if ( projectileDict.GetBool( "net_instanthit" ) ) {
+			float spreadRad = DEG2RAD( spread );
+			muzzle_pos = playerViewOrigin + playerViewAxis[ 0 ] * 2.0f;
+			for( i = 0; i < num_projectiles; i++ ) {
+				ang = idMath::Sin( spreadRad * gameLocal.random.RandomFloat() );
+				spin = (float)DEG2RAD( 360.0f ) * gameLocal.random.RandomFloat();
+				dir = playerViewAxis[ 0 ] + playerViewAxis[ 2 ] * ( ang * idMath::Sin( spin ) ) - playerViewAxis[ 1 ] * ( ang * idMath::Cos( spin ) );
+				dir.Normalize();
+				gameLocal.clip.Translation( tr, muzzle_pos, muzzle_pos + dir * 4096.0f, NULL, mat3_identity, MASK_SHOT_RENDERMODEL, owner );
+				if ( tr.fraction < 1.0f ) {
+					idProjectile::ClientPredictionCollide( this, projectileDict, tr, vec3_origin, true );
+				}
+			}
+		}
+
+	} else {
+
+		ownerBounds = owner->GetPhysics()->GetAbsBounds();
+
+//		owner->AddProjectilesFired( num_projectiles );
+
+		float spreadRad = DEG2RAD( spread );
+		for( i = 0; i < num_projectiles; i++ ) {
+			ang = idMath::Sin( spreadRad * gameLocal.random.RandomFloat() );
+			spin = (float)DEG2RAD( 360.0f ) * gameLocal.random.RandomFloat();
+			dir = playerViewAxis[ 0 ] + playerViewAxis[ 2 ] * ( ang * idMath::Sin( spin ) ) - playerViewAxis[ 1 ] * ( ang * idMath::Cos( spin ) );
+			dir.Normalize();
+
+			if ( projectileEnt ) {
+				ent = projectileEnt;
+				ent->Show();
+				ent->Unbind();
+				projectileEnt = NULL;
+			} else {
+				gameLocal.SpawnEntityDef( projectileDict, &ent, false );
+			}
+
+			if ( !ent || !ent->IsType( idProjectile::Type ) ) {
+				const char *projectileName = this->spawnArgs.GetString( "def_projectile" );
+				gameLocal.Error( "'%s' is not an idProjectile", projectileName );
+			}
+
+			if ( projectileDict.GetBool( "net_instanthit" ) ) {
+				// don't synchronize this on top of the already predicted effect
+				ent->fl.networkSync = false;
+			}
+
+			proj = static_cast<idProjectile *>(ent);
+			proj->Create( owner, playerViewOrigin, dir );
+
+			projBounds = proj->GetPhysics()->GetBounds().Rotate( proj->GetPhysics()->GetAxis() );
+
+			// make sure the projectile starts inside the bounding box of the owner
+			if ( i == 0 ) {
+				muzzle_pos = playerViewOrigin + playerViewAxis[ 0 ] * 2.0f;
+				if ( ( ownerBounds - projBounds).RayIntersection( muzzle_pos, playerViewAxis[0], distance ) ) {
+					start = muzzle_pos + distance * playerViewAxis[0];
+				} else {
+					start = ownerBounds.GetCenter();
+				}
+				gameLocal.clip.Translation( tr, start, muzzle_pos, proj->GetPhysics()->GetClipModel(), proj->GetPhysics()->GetClipModel()->GetAxis(), MASK_SHOT_RENDERMODEL, owner );
+				muzzle_pos = tr.endpos;
+			}
+
+			proj->Launch( muzzle_pos, dir, zzero, fuseOffset, launchPower, dmgPower );
+		}
+
+	}
+}
+
+/*
+================
+Zeroth
+idEntity::Event_CreateProjectile
+================
+*/
+void idEntity::Event_CreateProjectile( void ) {
+	idEntity	*owner = this;
+
+	if ( !gameLocal.isClient ) {
+		projectileEnt = NULL;
+		gameLocal.SpawnEntityDef( projectileDict, &projectileEnt, false );
+		if ( projectileEnt ) {
+			projectileEnt->SetOrigin( GetPhysics()->GetOrigin() );
+			projectileEnt->Bind( owner, false );
+			projectileEnt->Hide();
+		}
+		idThread::ReturnEntity( projectileEnt );
+	} else {
+		idThread::ReturnEntity( NULL );
+	}
+}
+
+/*
+================
+Zeroth
+idEntity::Event_GetMaster
+================
+*/
+void idEntity::Event_GetMaster( void ) {
+	idThread::ReturnEntity(bindMaster);
+}
+
+/*
+================
+Zeroth
+idEntity::Event_GetModelDims
+================
+*/
+void idEntity::Event_GetModelDims( void ) {
+	idThread::ReturnVector(GetModelDims());
+}
+
+/*
+================
+Zeroth
+idEntity::GetModelDims
+================
+*/
+idVec3 idEntity::GetModelDims( void ) {
+	idVec3 a;
+	if ( renderEntity.hModel ) {
+		a.x = abs(renderEntity.bounds.GetMaxs().x) + abs(renderEntity.bounds.GetMins().x);
+		a.y = abs(renderEntity.bounds.GetMaxs().y) + abs(renderEntity.bounds.GetMins().y);
+		a.z = abs(renderEntity.bounds.GetMaxs().z) + abs(renderEntity.bounds.GetMins().z);
+	} else {
+		a.Zero();
+	}
+	return a;
+}
+
+/*
+================
+Zeroth
+idEntity::Event_ResetGravity
+================
+*/
+void idEntity::Event_ResetGravity( void ) {
+	physics->SetGravity(gameLocal.GetGravity());
+}
+
+// HEXEN : Zeroth - broken
+/*
+================
+Zeroth
+idEntity::Event_ReplaceMaterial
+================
+*/
+void idEntity::Event_ReplaceMaterial( const char * replacee, const char * replacer ) {
+
+#if 0
+	idStr str = replacer;
+
+	if ( !str.Length() ) {
+		return;
+	}
+	int i, num = renderEntity.hModel->NumSurfaces();
+
+	for (i=0; i<num; i++ ) {
+		renderEntity.hModel->ma
+			this->UpdateRenderEntity(
+		renderEntity.hModel->Surface(i)->shader->FreeData();
+
+		gameLocal.Printf("repmat: %s\n", replacer);
+		gameLocal.Printf("curmat: %s\n", renderEntity.hModel->Surface(i)->shader->GetName());
+
+		const idMaterial * shd;
+		shd = renderEntity.hModel->Surface(i)->shader;
+
+		shd = declManager->FindMaterial( replacer );
+		renderEntity.hModel->Surface(i)->shader = declManager->FindMaterial( replacer );
+
+		gameLocal.Printf("newmat: %s\n", renderEntity.hModel->Surface(i)->shader->GetName());
+		this->renderEntity.hModel->FinishSurfaces();
+	}
+#endif
+}
+
+// HEXEN : Zeroth
+// ****** thanks SnoopJeDi ( http://www.doom3world.org/phpbb2/viewtopic.php?f=56&t=12469&p=214427#p214427 )
+/*
+================
+idEntity::FadeMusic
+================
+*/
+void idEntity::FadeMusic( int channel, float to, float over ) {
+    if ( spawnArgs.GetBool( "s_music" ) ) { 
+       Event_FadeSound( channel, to, over );
+    }
+}
+// ******
+
+/*
+================
+Zeroth
+idEntity::curNorm
+================
+*/
+idVec3 idEntity::curNorm() {
+	return physics->GetGravityNormal();
+}
+
+/*
+================
+Zeroth
+idEntity::curGrav
+================
+*/
+idVec3 idEntity::curGrav() {
+	return physics->GetGravity();
+}

game/Entity.h

@@ -602,7 +602,7 @@ private:
 private:
 	void					Event_TransitionJointAngle( jointHandle_t jointnum, jointModTransform_t transform_type, const idAngles &to, const idAngles &from, float seconds, float transitions );
 public:
-	idVec3					idAnimatedEntity::GetJointPos( jointHandle_t jointnum );
+	idVec3					GetJointPos( jointHandle_t jointnum );
 	void					TransitionJointAngle( jointHandle_t jointnum, jointModTransform_t transform_type, const idAngles &to, const idAngles &from, float seconds, float transitions );
 	void 					SetJointAngle( jointHandle_t jointnum, jointModTransform_t transform_type, const idAngles &angles );
 	idAngles				GetJointAngle( jointHandle_t jointnum );

game/Game_local.cpp

@@ -50,6 +50,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "Trigger.h"
 
 #include "Game_local.h"
+#include "Sound.h"
 
 // HEXEN : Zeroth
 #include "projectiles/Wraithverge.h"

game/Player.cpp

@@ -221,8 +221,8 @@ void idInventory::Clear( void ) {
 	// set to -1 so that the gun knows to have a full clip the first time we get it and at the start of the level
 	// HEXEN : Zeroth. You can't memset floats as -1, else you get -1.#QNAN0 values.
 	// memset( clip, -1, sizeof( clip ) );
-	for (int i=0; i< MAX_WEAPONS; i++) {
-		clip[i]=-1;
+	for ( int i = 0; i < MAX_WEAPONS; i++ ) {
+		clip[i] = -1;
 	}
 
 	items.DeleteContents( true );

game/Player.h

@@ -459,7 +459,7 @@ public:
 	void					ArtifactScrollRight( int startfrom );
 	void					ArtifactScrollLeft( int startfrom );
 	int						Belt2Index(int belt_index); // translate an artitfacts position on the belt to it'sArtifactItem[] index.
-	// HEXEN : Zeroth
+// HEXEN : Zeroth
 	/*virtual*/ bool		StuckToSurface( void );
 	void					SpawnHellions( void );
 	void					UpdateHudAutoMap( void );
@@ -786,7 +786,7 @@ private:
 
 public:
 	idVec3					VecForwardP( void ) const;
-	idVec3					idPlayer::VecFacingP( void ) const;
+	idVec3					VecFacingP( void ) const;
 	void					OpenCustomGui( idStr file );
 };
 

game/PlayerArtifacts.cpp

@@ -1,6 +1,5 @@
 // HEXEN : Zeroth
 
-#include "../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "Game_local.h"

game/PlayerScriptEvents.cpp

@@ -1,6 +1,5 @@
 // HEXEN : Zeroth
 
-#include "../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "Game_local.h"

game/ai/AI_Golem.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/ai/AI_Golem.h

@@ -1,7 +1,6 @@
 #ifndef __AI_GOLEM_
 #define __AI_GOLEM_
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"
@@ -39,7 +38,7 @@ private:
     void		nextBone( void );
 	void		BlowUp( void );
 	void		Event_SawEnemy( void );
-	idMoveable *idAI_Golem::FindGolemRock( void );
+	idMoveable	*FindGolemRock( void );
 };
 
 

game/ai/AI_Shadowspawn.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/ai/AI_Veloxite.cpp

@@ -1,4 +1,4 @@
-#include "../../idlib/precompiled.h"
+
 #pragma hdrstop
 
 #include "../Game_local.h"

game/gamesys/SysCmds.cpp

@@ -42,6 +42,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "Fx.h"
 #include "Misc.h"
 
+#include "GameBase.h"
 #include "SysCmds.h"
 
 /*

game/objects/ChaosDeviceModel.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/objects/Leaf.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/objects/LeafEmitter.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/objects/Tree.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/physics/Physics_Player.h

@@ -48,7 +48,7 @@ typedef enum {
 	PM_DEAD,				// no acceleration or turning, but free falling
 	PM_SPECTATOR,			// flying without gravity but with collision detection
 	PM_FREEZE,				// stuck in place without control
-	PM_NOCLIP				// flying without collision detection nor gravity
+	PM_NOCLIP,				// flying without collision detection nor gravity
 	PM_FLY					// flying without gravity but with collision detection
 } pmtype_t;
 

game/projectiles/FireStorm.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/projectiles/Soul.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"

game/projectiles/Wraithverge.cpp

@@ -1,5 +1,4 @@
 
-#include "../../idlib/precompiled.h"
 #pragma hdrstop
 
 #include "../Game_local.h"