Merge remote-tracking branch 'dhewm3/master'

Author: FriskTheFallenHuman

dist/linux/share/applications/org.dhewm3.Dhewm3.d3xp.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=dhewm 3 is a Doom 3 GPL source port
 Categories=Game;Shooter;
-Exec=dhewm3 +set fs_game d3xp "\\$@"
+Exec=dhewm3 +set fs_game d3xp
 Icon=org.dhewm3.Dhewm3
 Name=Dhewm3 XP
 StartupNotify=true

dist/linux/share/applications/org.dhewm3.Dhewm3.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=dhewm 3 is a Doom 3 GPL source port
 Categories=Game;Shooter;
-Exec=dhewm3 "\\$@"
+Exec=dhewm3
 Icon=org.dhewm3.Dhewm3
 Name=Dhewm3
 StartupNotify=true

neo/d3xp/ai/AI_pathing.cpp

@@ -900,7 +900,11 @@ bool FindOptimalPath( const pathNode_t *root, const obstacle_t *obstacles, int n
 	}
 
 	if ( !pathToGoalExists ) {
-		seekPos.ToVec2() = root->children[0]->pos;
+		if ( root->children[0] != NULL ) {
+			seekPos.ToVec2() = root->children[0]->pos;
+		} else {
+			seekPos.ToVec2() = root->pos;
+		}
 	} else if ( !optimizedPathCalculated ) {
 		OptimizePath( root, bestNode, obstacles, numObstacles, optimizedPath );
 		seekPos.ToVec2() = optimizedPath[1];

neo/d3xp/physics/Clip.cpp

@@ -963,27 +963,27 @@ idClip::TestHugeTranslation
 */
 ID_INLINE bool TestHugeTranslation( trace_t &results, const idClipModel *mdl, const idVec3 &start, const idVec3 &end, const idMat3 &trmAxis ) {
 	if ( mdl != NULL && ( end - start ).LengthSqr() > Square( CM_MAX_TRACE_DIST ) ) {
+#ifndef CTF
+		// May be important: This occurs in CTF when a player connects and spawns
+		// in the PVS of a player that has a flag that is spawning the idMoveableItem
+		// "nuggets".  The error seems benign and the assert was getting in the way
+		// of testing.
+		// assert( 0 ); DG: this was annoying and not really necessary, a Warning should suffice.
+#endif
+
 		results.fraction = 0.0f;
 		results.endpos = start;
 		results.endAxis = trmAxis;
 		memset( &results.c, 0, sizeof( results.c ) );
 		results.c.point = start;
 
 		if ( mdl->GetEntity() ) {
-			gameLocal.Printf( "huge translation for clip model %d on entity %d '%s'\n", mdl->GetId(), mdl->GetEntity()->entityNumber, mdl->GetEntity()->GetName() );
+			gameLocal.Warning( "huge translation for clip model %d on entity %d '%s'\n", mdl->GetId(), mdl->GetEntity()->entityNumber, mdl->GetEntity()->GetName() );
 		} else {
-			gameLocal.Printf( "huge translation for clip model %d\n", mdl->GetId() );
+			gameLocal.Warning( "huge translation for clip model %d\n", mdl->GetId() );
 		}
+		gameLocal.Warning( "  from (%.2f %.2f %.2f) to (%.2f %.2f %.2f)\n", start.x, start.y, start.z, end.x, end.y, end.z);
 
-		gameLocal.Printf( "  from (%.2f %.2f %.2f) to (%.2f %.2f %.2f)\n", start.x, start.y, start.z, end.x, end.y, end.z);
-
-#ifndef CTF
-		// May be important: This occurs in CTF when a player connects and spawns
-		// in the PVS of a player that has a flag that is spawning the idMoveableItem
-		// "nuggets".  The error seems benign and the assert was getting in the way
-		// of testing.
-		assert( 0 );
-#endif
 		return true;
 	}
 	return false;

neo/game/ai/AI_pathing.cpp

@@ -900,10 +900,10 @@ bool FindOptimalPath( const pathNode_t *root, const obstacle_t *obstacles, int n
 	}
 
 	if ( !pathToGoalExists ) {
-		if ( !root->children[0] ) {
-			seekPos.ToVec2() = root->pos;
-		} else {
+		if ( root->children[0] != NULL ) {
 			seekPos.ToVec2() = root->children[0]->pos;
+		} else {
+			seekPos.ToVec2() = root->pos;
 		}
 	} else if ( !optimizedPathCalculated ) {
 		OptimizePath( root, bestNode, obstacles, numObstacles, optimizedPath );

neo/game/physics/Clip.cpp

@@ -963,6 +963,8 @@ idClip::TestHugeTranslation
 */
 ID_INLINE bool TestHugeTranslation( trace_t &results, const idClipModel *mdl, const idVec3 &start, const idVec3 &end, const idMat3 &trmAxis ) {
 	if ( mdl != NULL && ( end - start ).LengthSqr() > Square( CM_MAX_TRACE_DIST ) ) {
+		// assert( 0 ); DG: this was annoying and not really necessary, a Warning should suffice.
+
 		results.fraction = 0.0f;
 		results.endpos = start;
 		results.endAxis = trmAxis;
@@ -971,22 +973,13 @@ ID_INLINE bool TestHugeTranslation( trace_t &results, const idClipModel *mdl, co
 		results.c.entityNum = ENTITYNUM_WORLD;
 
 		if ( mdl->GetEntity() ) {
-			gameLocal.Printf( "huge translation for clip model %d on entity %d '%s'\n", mdl->GetId(), mdl->GetEntity()->entityNumber, mdl->GetEntity()->GetName() );
+			gameLocal.Warning( "huge translation for clip model %d on entity %d '%s'\n", mdl->GetId(), mdl->GetEntity()->entityNumber, mdl->GetEntity()->GetName() );
 		} else {
-			gameLocal.Printf( "huge translation for clip model %d\n", mdl->GetId() );
+			gameLocal.Warning( "huge translation for clip model %d\n", mdl->GetId() );
 		}
 
-		gameLocal.Printf( "  from (%.2f %.2f %.2f) to (%.2f %.2f %.2f)\n", start.x, start.y, start.z, end.x, end.y, end.z);
-
-		if ( mdl->GetEntity() != NULL && idStr::Cmp(mdl->GetEntity()->GetName(), "monster_zsec_shotgun_12") == 0
-		     && idStr::Cmp(gameLocal.GetMapName(), "maps/game/alphalabs4.map") == 0 )
-		{
-			// there is a map bug in alpha4 where the ride of death can push a monster far into the void
-			// don't assert there
-			return true;
-		}
+		gameLocal.Warning( "  from (%.2f %.2f %.2f) to (%.2f %.2f %.2f)\n", start.x, start.y, start.z, end.x, end.y, end.z);
 
-		assert( 0 );
 		return true;
 	}
 	return false;