Rip out unused, broken drive mode.

Warzone2100 · Oct 15, 2016 · 8f620fc · 8f620fc
1 parent 825ff51
commit 8f620fc
Show file tree

Hide file tree

Showing 21 changed files with 131 additions and 1,215 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -71,7 +71,6 @@ noinst_HEADERS = \
 	display3d.h \
 	displaydef.h \
 	display.h \
-	drive.h \
 	droiddef.h \
 	droid.h \
 	edit3d.h \
@@ -198,7 +197,6 @@ COMMONSOURCES = \
 	difficulty.cpp \
 	display3d.cpp \
 	display.cpp \
-	drive.cpp \
 	droid.cpp \
 	edit3d.cpp \
 	effects.cpp \

diff --git a/src/Warzone2100.vcxproj b/src/Warzone2100.vcxproj
@@ -321,7 +321,6 @@ call $(ProjectDir)..\build_tools\autorevision.bat $(ProjectDir)</Command>
     <ClCompile Include="difficulty.cpp" />
     <ClCompile Include="display.cpp" />
     <ClCompile Include="display3d.cpp" />
-    <ClCompile Include="drive.cpp" />
     <ClCompile Include="droid.cpp" />
     <ClCompile Include="edit3d.cpp" />
     <ClCompile Include="effects.cpp" />
@@ -438,7 +437,6 @@ call $(ProjectDir)..\build_tools\autorevision.bat $(ProjectDir)</Command>
     <ClInclude Include="display3d.h" />
     <ClInclude Include="display3ddef.h" />
     <ClInclude Include="displaydef.h" />
-    <ClInclude Include="drive.h" />
     <ClInclude Include="droid.h" />
     <ClInclude Include="droiddef.h" />
     <ClInclude Include="edit3d.h" />

diff --git a/src/Warzone2100.vcxproj.filters b/src/Warzone2100.vcxproj.filters
@@ -81,9 +81,6 @@
     <ClCompile Include="display3d.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="drive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="droid.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -425,9 +422,6 @@
     <ClInclude Include="displaydef.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="drive.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="droid.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/src/ai.cpp b/src/ai.cpp
@@ -29,7 +29,6 @@
 #include "action.h"
 #include "cmddroid.h"
 #include "combat.h"
-#include "drive.h"
 #include "mapgrid.h"
 #include "map.h"
 #include "projectile.h"
@@ -653,7 +652,7 @@ int aiBestNearestTarget(DROID *psDroid, BASE_OBJECT **ppsObj, int weapon_slot, i
 					psTarget = targetInQuestion;
 				}
 				else if ((psStruct->pStructureType->type != REF_WALL && psStruct->pStructureType->type != REF_WALLCORNER)
-				         || driveModeActive() || (bMultiPlayer && !isHumanPlayer(psDroid->player)))
+				         || (bMultiPlayer && !isHumanPlayer(psDroid->player)))
 				{
 					psTarget = targetInQuestion;
 				}
@@ -1153,13 +1152,6 @@ void aiUpdateDroid(DROID *psDroid)
 		updateTarget = false;
 	}
 
-	// do not look for a target if droid is currently under direct control.
-	if (driveModeActive() && (psDroid == driveGetDriven()))
-	{
-		lookForTarget = false;
-		updateTarget = false;
-	}
-
 	// CB and VTOL CB droids can't autotarget.
 	if (psDroid->droidType == DROID_SENSOR && !standardSensorDroid(psDroid))
 	{