Merge pull request #1098 from NHOrus/warning-fix

cmath/fmath include fix

src/Basescape/BaseView.cpp

@@ -30,7 +30,7 @@
 #include "../Interface/Text.h"
 #include "../Engine/Timer.h"
 #include "../Engine/Options.h"
-#include <limits>
+#include <climits>
 
 namespace OpenXcom
 {
@@ -260,7 +260,7 @@ void BaseView::reCalcQueuedBuildings()
 		if ((*i)->getBuildTime() > 0)
 		{
 			// Set all queued buildings to infinite.
-			if ((*i)->getBuildTime() > (*i)->getRules()->getBuildTime()) (*i)->setBuildTime(std::numeric_limits<int>::max());
+			if ((*i)->getBuildTime() > (*i)->getRules()->getBuildTime()) (*i)->setBuildTime(INT_MAX);
 			facilities.push_back(*i);
 		}
 

src/Basescape/ManufactureInfoState.cpp

@@ -36,7 +36,7 @@
 #include "../Engine/Timer.h"
 #include "../Menu/ErrorMessageState.h"
 #include "../Mod/RuleInterface.h"
-#include <limits>
+#include <climits>
 
 namespace OpenXcom
 {
@@ -365,7 +365,7 @@ void ManufactureInfoState::moreEngineerRelease(Action *action)
  */
 void ManufactureInfoState::moreEngineerClick(Action *action)
 {
-	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT) moreEngineer(std::numeric_limits<int>::max());
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT) moreEngineer(INT_MAX);
 	if (action->getDetails()->button.button == SDL_BUTTON_LEFT) moreEngineer(1);
 }
 
@@ -414,7 +414,7 @@ void ManufactureInfoState::lessEngineerRelease(Action *action)
  */
 void ManufactureInfoState::lessEngineerClick(Action *action)
 {
-	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT) lessEngineer(std::numeric_limits<int>::max());
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT) lessEngineer(INT_MAX);
 	if (action->getDetails()->button.button == SDL_BUTTON_LEFT) lessEngineer(1);
 }
 
@@ -433,7 +433,7 @@ void ManufactureInfoState::moreUnit(int change)
 	else
 	{
 		int units = _production->getAmountTotal();
-		change = std::min(std::numeric_limits<int>::max()-units, change);
+		change = std::min(INT_MAX - units, change);
 		if (_production->getRules()->getCategory() == "STR_CRAFT")
 			change = std::min(_base->getAvailableHangars() - _base->getUsedHangars(), change);
 		_production->setAmountTotal(units+change);
@@ -447,7 +447,7 @@ void ManufactureInfoState::moreUnit(int change)
  */
 void ManufactureInfoState::moreUnitPress(Action *action)
 {
-	if (action->getDetails()->button.button == SDL_BUTTON_LEFT && _production->getAmountTotal() < std::numeric_limits<int>::max())
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT && _production->getAmountTotal() < INT_MAX)
 		_timerMoreUnit->start();
 }
 
@@ -475,7 +475,7 @@ void ManufactureInfoState::moreUnitClick(Action *action)
 	{
 		if (_production->getRules()->getCategory() == "STR_CRAFT")
 		{
-			moreUnit(std::numeric_limits<int>::max());
+			moreUnit(INT_MAX);
 		}
 		else
 		{

src/Basescape/PlaceFacilityState.cpp

@@ -31,7 +31,7 @@
 #include "../Menu/ErrorMessageState.h"
 #include "../Engine/Options.h"
 #include "../Mod/RuleInterface.h"
-#include <limits>
+#include <climits>
 
 namespace OpenXcom
 {
@@ -145,7 +145,7 @@ void PlaceFacilityState::viewClick(Action *)
 		_base->getFacilities()->push_back(fac);
 		if (Options::allowBuildingQueue)
 		{
-			if (_view->isQueuedBuilding(_rule)) fac->setBuildTime(std::numeric_limits<int>::max());
+			if (_view->isQueuedBuilding(_rule)) fac->setBuildTime(INT_MAX);
 			_view->reCalcQueuedBuildings();
 		}
 		_game->getSavedGame()->setFunds(_game->getSavedGame()->getFunds() - _rule->getBuildCost());

src/Basescape/PurchaseState.cpp

@@ -21,7 +21,6 @@
 #include <sstream>
 #include <climits>
 #include <cfloat>
-#include <cmath>
 #include <iomanip>
 #include "../fmath.h"
 #include "../Engine/Game.h"

src/Basescape/ResearchInfoState.cpp

@@ -32,7 +32,7 @@
 #include "../Interface/ArrowButton.h"
 #include "../Engine/Timer.h"
 #include "../Engine/RNG.h"
-#include <limits>
+#include <climits>
 
 namespace OpenXcom
 {
@@ -242,7 +242,7 @@ void ResearchInfoState::moreRelease(Action *action)
 void ResearchInfoState::moreClick(Action *action)
 {
 	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
-		moreByValue(std::numeric_limits<int>::max());
+		moreByValue(INT_MAX);
 	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)
 		moreByValue(1);
 }
@@ -277,7 +277,7 @@ void ResearchInfoState::lessRelease(Action *action)
 void ResearchInfoState::lessClick(Action *action)
 {
 	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
-		lessByValue(std::numeric_limits<int>::max());
+		lessByValue(INT_MAX);
 	if (action->getDetails()->button.button == SDL_BUTTON_LEFT)
 		lessByValue(1);
 }

src/Basescape/TransferItemsState.cpp

@@ -21,7 +21,6 @@
 #include <sstream>
 #include <climits>
 #include <cfloat>
-#include <cmath>
 #include "../Engine/Action.h"
 #include "../Engine/Game.h"
 #include "../Mod/Mod.h"

src/Battlescape/AlienBAIState.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include <climits>
 #include <algorithm>
 #include "AlienBAIState.h"
@@ -37,6 +35,7 @@
 #include "../Mod/Armor.h"
 #include "../Mod/Mod.h"
 #include "../Mod/RuleItem.h"
+#include "../fmath.h"
 
 namespace OpenXcom
 {

src/Battlescape/BattlescapeGame.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include <sstream>
 #include "BattlescapeGame.h"
 #include "BattlescapeState.h"
@@ -59,6 +57,7 @@
 #include "UnitFallBState.h"
 #include "../Engine/Logger.h"
 #include "../Savegame/BattleUnitStatistics.h"
+#include "../fmath.h"
 
 namespace OpenXcom
 {

src/Battlescape/BattlescapeState.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include <algorithm>
 #include <sstream>
 #include <iomanip>

src/Battlescape/Camera.cpp

@@ -16,14 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include <fstream>
 #include "Camera.h"
 #include "Map.h"
 #include "../Engine/Action.h"
 #include "../Engine/Options.h"
 #include "../Engine/Timer.h"
+#include "../fmath.h"
 
 namespace OpenXcom
 {

src/Battlescape/CivilianBAIState.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include "CivilianBAIState.h"
 #include "TileEngine.h"
 #include "Pathfinding.h"
@@ -28,6 +26,7 @@
 #include "../Engine/Logger.h"
 #include "../Engine/Options.h"
 #include "../Savegame/Tile.h"
+#include "../fmath.h"
 
 namespace OpenXcom
 {

src/Battlescape/Map.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include <fstream>
 #include "Map.h"
 #include "Camera.h"
@@ -49,6 +47,7 @@
 #include "../Savegame/SavedGame.h"
 #include "../Interface/NumberText.h"
 #include "../Interface/Text.h"
+#include "../fmath.h"
 
 
 /*

src/Battlescape/MiniMapView.cpp

@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <cmath>
 #include <algorithm>
 #include "../fmath.h"
 #include "MiniMapView.h"

src/Battlescape/Particle.cpp

@@ -71,4 +71,4 @@ bool Particle::animate()
 	return true;
 }
 
-}
+}

src/Battlescape/PathfindingNode.cpp

@@ -17,7 +17,7 @@
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "PathfindingNode.h"
-#include <math.h>
+#include <cmath>
 
 namespace OpenXcom
 {

src/Battlescape/Projectile.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include "Projectile.h"
 #include "TileEngine.h"
 #include "Map.h"
@@ -34,6 +32,7 @@
 #include "../Savegame/Tile.h"
 #include "../Engine/RNG.h"
 #include "../Engine/Options.h"
+#include "../fmath.h"
 
 namespace OpenXcom
 {

src/Battlescape/ProjectileFlyBState.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include <algorithm>
 #include "ProjectileFlyBState.h"
 #include "ExplosionBState.h"
@@ -38,6 +36,7 @@
 #include "Explosion.h"
 #include "BattlescapeState.h"
 #include "../Savegame/BattleUnitStatistics.h"
+#include "../fmath.h"
 
 namespace OpenXcom
 {

src/Battlescape/TileEngine.cpp

@@ -16,9 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
 #include <assert.h>
-#include <cmath>
 #include <climits>
 #include <set>
 #include "TileEngine.h"

src/Battlescape/UnitSprite.cpp

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include "UnitSprite.h"
 #include "../Engine/SurfaceSet.h"
 #include "../Mod/RuleItem.h"
@@ -29,6 +27,7 @@
 #include "../Engine/ShaderDraw.h"
 #include "../Engine/ShaderMove.h"
 #include "../Engine/Options.h"
+#include "../fmath.h"
 
 namespace OpenXcom
 {

src/Engine/Adlib/adlplayer.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <stdint.h>
-#include <math.h>
+#include <cmath>
 #include <memory.h>
 #include "fmopl.h"
 

src/Engine/Adlib/fmopl.cpp

@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
+#include <cmath>
 //#include "driver.h"		/* use M.A.M.E. */
 #include "fmopl.h"
 

src/Engine/FlcPlayer.cpp

@@ -25,7 +25,7 @@
 #include <algorithm>
 #include <cassert>
 #include <string.h>
-#include <math.h>
+#include <cmath>
 #include <SDL_mixer.h>
 #include <fstream>
 

src/Engine/Language.cpp

@@ -20,7 +20,7 @@
 #include <fstream>
 #include <cassert>
 #include <set>
-#include <limits.h>
+#include <climits>
 #include "CrossPlatform.h"
 #include "Logger.h"
 #include "Options.h"

src/Engine/RNG.cpp

@@ -17,7 +17,7 @@
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "RNG.h"
-#include <math.h>
+#include <cmath>
 #include <time.h>
 #include <stdlib.h>
 #ifndef UINT64_MAX

src/Engine/Scalers/config.h

@@ -37,4 +37,4 @@ struct ScalerCfg
 };
 }
 
-#endif
+#endif

src/Engine/Scalers/xbrz.h

@@ -18,7 +18,7 @@
 
 #include <cstddef> //size_t
 #include <stdint.h> //uint32_t
-#include <limits>
+#include <climits>
 #include "config.h"
 
 namespace xbrz
@@ -52,7 +52,7 @@ THREAD-SAFETY: - parts of the same image may be scaled by multiple threads as lo
 void scale(size_t factor, //valid range: 2 - 5
            const uint32_t* src, uint32_t* trg, int srcWidth, int srcHeight,
            const ScalerCfg& cfg = ScalerCfg(),
-           int yFirst = 0, int yLast = std::numeric_limits<int>::max()); //slice of source image
+           int yFirst = 0, int yLast = INT_MAX); //slice of source image
 
 void nearestNeighborScale(const uint32_t* src, int srcWidth, int srcHeight,
                           uint32_t* trg, int trgWidth, int trgHeight);

src/Engine/Screen.cpp

@@ -21,7 +21,7 @@
 #include <sstream>
 #include <cmath>
 #include <iomanip>
-#include <limits.h>
+#include <climits>
 #include "../lodepng.h"
 #include "Exception.h"
 #include "Surface.h"

src/Geoscape/BuildNewBaseState.cpp

@@ -17,7 +17,6 @@
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "BuildNewBaseState.h"
-#include <cmath>
 #include "../fmath.h"
 #include "../Engine/Game.h"
 #include "../Engine/Action.h"