fix compilation on VC

Author: ashdnazg

CDefenseMatrix.cpp

@@ -8,7 +8,6 @@
 #include "CUnitTable.h"
 #include "CThreatMap.h"
 #include "CIntel.h"
-#include "MathUtil.h"
 
 
 CDefenseMatrix::CDefenseMatrix(AIClasses *ai) {

CE323AI.cpp

@@ -40,7 +40,7 @@ void CE323AI::InitAI(IGlobalAICallback* callback, int team) {
 optionDifficulty[] = "difficulty",
 optionLoggingLevel[] = "logging";
 
-CLogger::logLevel loggingLevel = CLogger::VERBOSE;
+CLogger::logLevel loggingLevel = CLogger::LL_VERBOSE;
 
 ai = new AIClasses(callback);
 

CLogger.cpp

@@ -13,18 +13,18 @@ std::map<CLogger::logLevel, std::string> CLogger::logDesc;
 
 CLogger::CLogger(AIClasses *_ai, unsigned int lt, logLevel lf): ai(_ai), logType(lt), logFilter(lf) {
 if (logLevels.empty()) {
-logLevels[ERROR] = "(EE)";
-logLevels[WARNING] = "(WW)";
-logLevels[VERBOSE] = "(II)";
+logLevels[LL_ERROR] = "(EE)";
+logLevels[LL_WARNING] = "(WW)";
+logLevels[LL_VERBOSE] = "(II)";
 }
 
 if (logDesc.empty()) {
-logDesc[ERROR] = logLevels[ERROR] + " error, ";
-logDesc[WARNING] = logLevels[WARNING] + " warning, ";
-logDesc[VERBOSE] = logLevels[VERBOSE] + " informational";
+logDesc[LL_ERROR] = logLevels[LL_ERROR] + " error, ";
+logDesc[LL_WARNING] = logLevels[LL_WARNING] + " warning, ";
+logDesc[LL_VERBOSE] = logLevels[LL_VERBOSE] + " informational";
 }
 
-if (lf == NONE) {
+if (lf == LL_NONE) {
 ai->cb->SendTextMsg("Logging disabled", 0);
 return;
 }
@@ -90,7 +90,7 @@ void CLogger::s(std::string msg) {
 }
 
 void CLogger::log(logLevel level, std::string &msg) {
-if (level == NONE || level > logFilter)
+if (level == LL_NONE || level > logFilter)
 return;
 
 int frame = ai->cb->GetCurrentFrame();
@@ -114,7 +114,7 @@ void CLogger::log(logLevel level, std::string &msg) {
 std::cout << output;
 }
 
-if ((logType & CLogger::LOG_SPRING) && level == ERROR) {
+if ((logType & CLogger::LOG_SPRING) && level == LL_ERROR) {
 ai->cb->SendTextMsg(msg.c_str(), 0);
 }
 }

CLogger.h

@@ -7,24 +7,25 @@
 #include <iostream>
 #include <map>
 
+
 class AIClasses;
 
 class CLogger {
 public:
 enum type { LOG_FILE = (1<<0), LOG_STDOUT = (1<<1), LOG_SPRING = (1<<2) };
-enum logLevel { NONE = 0, ERROR, WARNING, VERBOSE };
+enum logLevel { LL_NONE = 0, LL_ERROR, LL_WARNING, LL_VERBOSE };
 
-CLogger(AIClasses *_ai, unsigned int lt, logLevel lf = VERBOSE);
+CLogger(AIClasses *_ai, unsigned int lt, logLevel lf = LL_VERBOSE);
 ~CLogger() {}
 
 /* Error logging */
-void e(std::string msg) { log(ERROR, msg); }
+void e(std::string msg) { log(LL_ERROR, msg); }
 
 /* Warning logging */
-void w(std::string msg) { log(WARNING, msg); }
+void w(std::string msg) { log(LL_WARNING, msg); }
 
 /* Verbose logging */
-void v(std::string msg) { log(VERBOSE, msg); }
+void v(std::string msg) { log(LL_VERBOSE, msg); }
 
 /* Log to spring */
 void s(std::string msg);

CPathfinder.cpp

@@ -9,7 +9,6 @@
 #include "CUnit.h"
 #include "CUnitTable.h"
 #include "CThreatMap.h"
-#include "MathUtil.h"
 #include "Util.hpp"
 #include "CScopedTimer.h"
 

CThreatMap.cpp

@@ -7,7 +7,6 @@
 #include "CIntel.h"
 #include "CUnit.h"
 #include "CGroup.h"
-#include "MathUtil.h"
 #include "GameMap.hpp"
 
 CThreatMap::CThreatMap(AIClasses *ai) {

GameMap.cpp

@@ -9,7 +9,6 @@
 #include <limits>
 
 #include "CAI.h"
-#include "MathUtil.h"
 
 #include "headers/HEngine.h"