make force fire an option

until we make it configurable

Author: Warboy1982

bin/data/Language/en-GB.yml

@@ -1345,3 +1345,6 @@ en-GB:
   STR_PREFERRED_SFX_FORMAT_DESC: "Chooses the preferred sound effects format to use when multiple ones are available."
   STR_PREFERRED_FORMAT_AUTO: "Auto"
   STR_CURRENT_FORMAT: "Current: {0}"
+  STR_MELEE_ACCURACY: "MELEE ACCURACY"
+  STR_FORCE_FIRE: "Alternate Fire Method"
+  STR_FORCE_FIRE_DESC: "Enables forcing your soldiers to take a shot, regardless of line of fire rules, when holding CTRL"

bin/data/Language/en-US.yml

@@ -1345,3 +1345,6 @@ en-US:
   STR_PREFERRED_SFX_FORMAT_DESC: "Chooses the preferred sound effects format to use when multiple ones are available."
   STR_PREFERRED_FORMAT_AUTO: "Auto"
   STR_CURRENT_FORMAT: "Current: {0}"
+  STR_MELEE_ACCURACY: "MELEE ACCURACY"
+  STR_FORCE_FIRE: "Alternate Fire Method"
+  STR_FORCE_FIRE_DESC: "Enables forcing your soldiers to take a shot, regardless of line of fire rules, when holding CTRL"

src/Battlescape/Projectile.cpp

@@ -103,7 +103,7 @@ int Projectile::calculateTrajectory(double accuracy, Position originVoxel)
 		!_trajectory.empty() &&
 		_action.actor->getFaction() == FACTION_PLAYER &&
 		_action.autoShotCounter == 1 &&
-		(SDL_GetModState() & KMOD_CTRL) == 0 &&
+		((SDL_GetModState() & KMOD_CTRL) == 0 || !Options::forceFire) &&
 		_save->getBattleGame()->getPanicHandled() &&
 		_action.type != BA_LAUNCH)
 	{

src/Battlescape/ProjectileFlyBState.cpp

@@ -191,7 +191,7 @@ void ProjectileFlyBState::init()
 		return;
 	}
 
-	if (_action.type == BA_LAUNCH || ((SDL_GetModState() & KMOD_CTRL) != 0 && _parent->getSave()->getSide() == FACTION_PLAYER) || !_parent->getPanicHandled())
+	if (_action.type == BA_LAUNCH || (Options::forceFire && (SDL_GetModState() & KMOD_CTRL) != 0 && _parent->getSave()->getSide() == FACTION_PLAYER) || !_parent->getPanicHandled())
 	{
 		// target nothing, targets the middle of the tile
 		_targetVoxel = Position(_action.target.x*16 + 8, _action.target.y*16 + 8, _action.target.z*24 + 12);

src/Engine/Options.cpp

@@ -163,6 +163,7 @@ void create()
 	_info.push_back(OptionInfo("weaponSelfDestruction", &weaponSelfDestruction, false, "STR_WEAPONSELFDESTRUCTION", "STR_BATTLESCAPE"));
 	_info.push_back(OptionInfo("allowPsionicCapture", &allowPsionicCapture, false, "STR_ALLOWPSIONICCAPTURE", "STR_BATTLESCAPE"));
 	_info.push_back(OptionInfo("strafe", &strafe, false, "STR_STRAFE", "STR_BATTLESCAPE"));
+	_info.push_back(OptionInfo("forceFire", &forceFire, true, "STR_FORCE_FIRE", "STR_BATTLESCAPE"));
 	_info.push_back(OptionInfo("skipNextTurnScreen", &skipNextTurnScreen, false, "STR_SKIPNEXTTURNSCREEN", "STR_BATTLESCAPE"));
 	_info.push_back(OptionInfo("TFTDDamage", &TFTDDamage, false, "STR_TFTDDAMAGE", "STR_BATTLESCAPE"));
 	_info.push_back(OptionInfo("noAlienPanicMessages", &noAlienPanicMessages, false, "STR_NOALIENPANICMESSAGES", "STR_BATTLESCAPE"));

src/Engine/Options.inc.h

@@ -28,7 +28,7 @@ OPT ScrollType battleEdgeScroll;
 OPT PathPreview battleNewPreviewPath;
 OPT int battleScrollSpeed, battleDragScrollButton, battleFireSpeed, battleXcomSpeed, battleAlienSpeed, battleExplosionHeight, battlescapeScale;
 OPT bool traceAI, sneakyAI, battleInstantGrenade, battleNotifyDeath, battleTooltips, battleHairBleach, battleAutoEnd,
-	strafe, showMoreStatsInInventoryView, allowPsionicCapture, skipNextTurnScreen, disableAutoEquip,
+	strafe, forceFire, showMoreStatsInInventoryView, allowPsionicCapture, skipNextTurnScreen, disableAutoEquip,
 	battleUFOExtenderAccuracy, battleConfirmFireMode, battleSmoothCamera, TFTDDamage, noAlienPanicMessages, alienBleeding;
 OPT SDLKey keyBattleLeft, keyBattleRight, keyBattleUp, keyBattleDown, keyBattleLevelUp, keyBattleLevelDown, keyBattleCenterUnit, keyBattlePrevUnit, keyBattleNextUnit, keyBattleDeselectUnit,
 	keyBattleUseLeftHand, keyBattleUseRightHand, keyBattleInventory, keyBattleMap, keyBattleOptions, keyBattleEndTurn, keyBattleAbort, keyBattleStats, keyBattleKneel,