OpenBW · Bytekeeper · Jul 16, 2015 · Jul 19, 2015 · Jul 19, 2015 · Jul 19, 2015
diff --git a/.gitignore b/.gitignore
@@ -2,13 +2,16 @@
 *.sdf
 *.opensdf
 */svnrev.h
+*/include/svnrev.h
 *.suo
 *.log
 *.ncb
 Debug
 Release
 Release_Pipeline
 Debug_Pipeline
+Release_NoCopy
+Debug_NoCopy
 *.swp
 *.bak
 cppcheck.xml
@@ -39,3 +42,5 @@ apps/cygwin/
 apps/http*
 BWAPI.7z
 
+
+build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(BWAPI)
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

diff --git a/Documentation/Doxyfile b/Documentation/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = BWAPI
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.2.0
+PROJECT_NUMBER         = 4.4.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/Documentation/post-processing/htmlcompressor-1.5.3.jar b/Documentation/post-processing/htmlcompressor-1.5.3.jar
diff --git a/Documentation/post-processing/phantomjs/LICENSE.BSD b/Documentation/post-processing/phantomjs/LICENSE.BSD
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  * Neither the name of the <organization> nor the
+    names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Documentation/post-processing/phantomjs/phantomjs.exe b/Documentation/post-processing/phantomjs/phantomjs.exe
diff --git a/Documentation/post-processing/phantomjs/third-party.txt b/Documentation/post-processing/phantomjs/third-party.txt
@@ -0,0 +1,40 @@
+This document contains the list of Third Party Software included with
+PhantomJS, along with the license information.
+
+Third Party Software may impose additional restrictions and it is the
+user's responsibility to ensure that they have met the licensing
+requirements of PhantomJS and the relevant license of the Third Party
+Software they are using.
+
+Qt - http://qt-project.org/
+License: GNU Lesser General Public License (LGPL) version 2.1.
+Reference: http://qt-project.org/doc/qt-4.8/lgpl.html.
+
+WebKit - http://www.webkit.org/
+License: GNU Lesser General Public License (LGPL) version 2.1 and BSD.
+Reference: http://www.webkit.org/coding/lgpl-license.html and
+http://www.webkit.org/coding/bsd-license.html.
+
+Mongoose - https://github.com/cesanta/mongoose
+License: MIT
+Reference: https://github.com/cesanta/mongoose/commit/abbf27338ef554cce0281ac157aa71a9c1b82a55
+
+Breakpad - http://code.google.com/p/google-breakpad/
+License: BSD.
+Reference: http://code.google.com/p/google-breakpad/source/browse/trunk/COPYING.
+
+OpenSSL - http://www.openssl.org/
+License: OpenSSL License, SSLeay License.
+Reference: http://www.openssl.org/source/license.html.
+
+Linenoise - https://github.com/tadmarshall/linenoise
+License: BSD.
+Reference: https://github.com/tadmarshall/linenoise/blob/master/linenoise.h.
+
+QCommandLine - http://xf.iksaif.net/dev/qcommandline.html
+License: GNU Lesser General Public License (LGPL) version 2.1.
+Reference: http://dev.iksaif.net/projects/qcommandline/repository/revisions/master/entry/COPYING
+
+wkhtmlpdf - http://code.google.com/p/wkhtmltopdf/
+License: GNU Lesser General Public License (LGPL)
+Reference: http://code.google.com/p/wkhtmltopdf/
diff --git a/Documentation/post-processing/yuicompressor-2.4.8.jar b/Documentation/post-processing/yuicompressor-2.4.8.jar
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # BWAPI for OpenBW
 
 This is a fork of BWAPI which allows the use of OpenBW as a backend for BWAPI.
-The BWAPI version is 4.2.0.
+The BWAPI version is 4.4.0.
 
 This fork has significant changes and it no longer works with regular StarCraft: Brood War. Support for OpenBW should eventually be merged into the official BWAPI, but this fork will exist until then.
 
@@ -43,6 +43,7 @@ If you installed, BWAPI.h (and the rest) will be in the include folder, otherwis
 On Windows, you should link to BWAPILIB.lib (not BWAPI.lib, this is different from regular BWAPI).
 
 On Linux, you don't really need to link to anything, but you can -lBWAPILIB if you want.
+* **SSCAIT Discord:**        https://discord.gg/DqvHsq9
 
 ### Running
 

diff --git a/bwapi/AIModuleLoader/AIModuleLoader.vcxproj b/bwapi/AIModuleLoader/AIModuleLoader.vcxproj
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -45,29 +45,29 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;WIN32;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <PreLinkEvent />
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>../lib/BWAPId.lib;../lib/BWAPIClientd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;WIN32;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -79,6 +79,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <PreLinkEvent />
     <Link>
@@ -87,12 +88,19 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>../lib/BWAPI.lib;../lib/BWAPIClient.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Source\AIModuleLoader.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BWAPIClient\BWAPIClient.vcxproj">
+      <Project>{c99abf61-6716-4fc0-aa77-9a136ea61680}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\BWAPILIB\BWAPILIB.vcxproj">
+      <Project>{843656fd-9bfd-47bf-8460-7bfe9710ea2c}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/bwapi/Archive/Archive.vcxproj b/bwapi/Archive/Archive.vcxproj
@@ -15,13 +15,12 @@
     <ProjectGuid>{7C035A16-F016-4F21-88EB-8DD3B9539219}</ProjectGuid>
     <Keyword>MakeFileProj</Keyword>
     <ProjectName>InstallerArchive</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -42,7 +41,7 @@ IF %ERRORLEVEL% NEQ 0 (
 )
 
 cd $(SolutionDir)/../
-7z a -r -mx=9 -myx=9 BWAPI.7z Release_Binary
+7z a -r BWAPI.7z Release_Binary
 cd $(SolutionDir)
 </NMakeBuildCommandLine>
   </PropertyGroup>

diff --git a/bwapi/BWAPI/Source/BW/OrderTypes.cpp b/bwapi/BWAPI/Source/BW/OrderTypes.cpp
@@ -5,7 +5,7 @@
 #include <BWAPI/Order.h>
 #include <BWAPI/Race.h>
 
-#include "../../../Debug.h"
+#include <Debug.h>
 namespace BW
 {
   namespace Orders

diff --git a/bwapi/BWAPI/Source/BW/PositionUnitTarget.cpp b/bwapi/BWAPI/Source/BW/PositionUnitTarget.cpp
@@ -1,6 +1,6 @@
 #include "PositionUnitTarget.h"
 
-#include "../../../Debug.h"
+#include <Debug.h>
 
 #include <BWAPI/GameImpl.h>
 

diff --git a/bwapi/BWAPI/Source/BW/UnitTarget.cpp b/bwapi/BWAPI/Source/BW/UnitTarget.cpp
@@ -3,7 +3,7 @@
 #include <BWAPI/UnitImpl.h>
 #include <BWAPI/GameImpl.h>
 
-#include "../../../Debug.h"
+#include <Debug.h>
 
 namespace BW
 {

diff --git a/bwapi/BWAPI/Source/BWAPI/AutoMenuManager.cpp b/bwapi/BWAPI/Source/BWAPI/AutoMenuManager.cpp
@@ -3,6 +3,7 @@
 //#include "../DLLMain.h"
 
 #include <algorithm>
+#include <random>
 #include <sstream>
 //#include <Util/Path.h>
 #include <Util/StringUtil.h>
@@ -14,6 +15,11 @@
 
 using namespace BWAPI;
 
+namespace
+{
+  std::mt19937 mt{static_cast<unsigned>(std::chrono::system_clock::now().time_since_epoch().count())};
+}
+
 AutoMenuManager::AutoMenuManager(BW::Game bwgame) : bwgame(bwgame)
 {
   this->reloadConfig();
@@ -149,19 +155,18 @@ void AutoMenuManager::chooseNewRandomMap()
 {
   if (!this->autoMapPool.empty())
   {
-    int chosenEntry = 0;
+    std::string chosen;
     if (this->autoMapIteration == "RANDOM")
     {
       // Obtain a random map file
-      chosenEntry = rand() % this->autoMapPool.size();
+      std::sample(autoMapPool.begin(), autoMapPool.end(), &chosen, 1, mt);
     }
     else if (this->autoMapIteration == "SEQUENCE")
     {
       if (this->lastAutoMapEntry >= this->autoMapPool.size())
         this->lastAutoMapEntry = 0;
-      chosenEntry = this->lastAutoMapEntry++;
+      chosen = this->autoMapPool[this->lastAutoMapEntry++];
     }
-    std::string chosen = this->autoMapPool[chosenEntry];
     this->lastMapGen = this->autoMenuMapPath + chosen;
   }
 }

diff --git a/bwapi/BWAPI/Source/BWAPI/AutoMenuManager.h b/bwapi/BWAPI/Source/BWAPI/AutoMenuManager.h
@@ -46,7 +46,7 @@ namespace BWAPI
     std::string lastMapGen;
     std::vector<std::string> autoMapPool;
     std::string autoMenuMapPath;
-    std::string autoMapIteration;
+    std::string autoMapIteration = "RANDOM";
 
     std::string autoMenuRace;
     std::array<std::string, BW::PLAYABLE_PLAYER_COUNT> autoMenuEnemyRace;

diff --git a/bwapi/BWAPI/Source/BWAPI/BWtoBWAPI.cpp b/bwapi/BWAPI/Source/BWAPI/BWtoBWAPI.cpp
@@ -1,6 +1,6 @@
 #include "BWtoBWAPI.h"
 
-#include "../../../Debug.h"
+#include <Debug.h>
 
 namespace BWAPI
 {

diff --git a/bwapi/BWAPI/Source/BWAPI/BulletImpl.cpp b/bwapi/BWAPI/Source/BWAPI/BulletImpl.cpp
@@ -8,7 +8,7 @@
 #include "PlayerImpl.h"
 #include "UnitImpl.h"
 
-#include "../../../Debug.h"
+#include <Debug.h>
 
 namespace BWAPI
 {

diff --git a/bwapi/BWAPI/Source/BWAPI/Command.h b/bwapi/BWAPI/Source/BWAPI/Command.h
@@ -1,13 +1,10 @@
 #pragma once
-#include "CommandTemp.h"
+class Command;
+#include <BWAPI/Client/CommandTemp.h>
 #include "UnitImpl.h"
 #include "PlayerImpl.h"
 
 namespace BWAPI
 {
-  class Command : public CommandTemp<BWAPI::UnitImpl,BWAPI::PlayerImpl>
-  {
-    public:
-      Command(const UnitCommand& command) : CommandTemp<BWAPI::UnitImpl,BWAPI::PlayerImpl>(command) {}
-  };
+  using Command = CommandTemp<UnitImpl, PlayerImpl>;
 }