SyPB Beta 1.44 - Open Source

SyPB Beta 1.44 Available (13/6/2016)
CCNHsK-Dev · Jan 21, 2017 · 2f2a373 · 2f2a373
1 parent 96d0b0e
commit 2f2a373
Show file tree

Hide file tree

Showing 60 changed files with 39 additions and 16 deletions.
diff --git a/sypb_src/include/resource.h b/sypb_src/include/resource.h
@@ -36,7 +36,7 @@
 // Dev Version Date
 #define PV_VERSION_YEAR 2016
 #define PV_VERSION_MON 6
-#define PV_VERSION_DAY 1
+#define PV_VERSION_DAY 20
 #else
 #define PRODUCT_DEV_VERSION_FORTEST ""
 #endif
@@ -50,9 +50,9 @@
 #define SUPPORT_SWNPC_VERSION_F 1.42
 
 // SyPB Version
-#define PRODUCT_VERSION_DWORD 1,43,20160531,640 // yyyy/mm/dd  
-#define PRODUCT_VERSION "Beta 1.43"
-#define PRODUCT_VERSION_F 1.43
+#define PRODUCT_VERSION_DWORD 1,44,20160613,642 // yyyy/mm/dd  
+#define PRODUCT_VERSION "Beta 1.44"
+#define PRODUCT_VERSION_F 1.44
 
 // general product information
 #define PRODUCT_NAME "SyPB"

diff --git a/sypb_src/project/.vs/sypb/v14/.suo b/sypb_src/project/.vs/sypb/v14/.suo
diff --git a/sypb_src/project/.vs/sypb/v15/.suo b/sypb_src/project/.vs/sypb/v15/.suo
diff --git a/sypb_src/project/ipch/SYPB-928c689c/SYPB-75b9b74a.ipch b/sypb_src/project/ipch/SYPB-928c689c/SYPB-75b9b74a.ipch
diff --git a/sypb_src/project/ipch/SYPB-928c689c/SYPB-b4ddbbc5.ipch b/sypb_src/project/ipch/SYPB-928c689c/SYPB-b4ddbbc5.ipch
diff --git a/sypb_src/project/ipch/SYPB-96599d2/SYPB-75b9b74a.ipch b/sypb_src/project/ipch/SYPB-96599d2/SYPB-75b9b74a.ipch
diff --git a/sypb_src/project/sypb.VC.db b/sypb_src/project/sypb.VC.db
diff --git a/sypb_src/project/sypb.suo b/sypb_src/project/sypb.suo
diff --git a/sypb_src/project/sypb.vcxproj b/sypb_src/project/sypb.vcxproj
@@ -28,7 +28,7 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>
     </CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -153,7 +153,7 @@
       <PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>
       </StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>
       </FunctionLevelLinking>
       <RuntimeTypeInfo>
@@ -183,6 +183,7 @@
       <EnableParallelCodeGeneration>
       </EnableParallelCodeGeneration>
       <MinimalRebuild>false</MinimalRebuild>
+      <BrowseInformation>true</BrowseInformation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -217,7 +218,12 @@
       </IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
+      <MinimumRequiredVersion>
+      </MinimumRequiredVersion>
     </Link>
+    <Bscmake>
+      <PreserveSbr>true</PreserveSbr>
+    </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\source\basecode.cpp" />

diff --git a/sypb_src/project/sypb.vcxproj.user b/sypb_src/project/sypb.vcxproj.user
@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SyPB_Release|Win32'">
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SyPB_Debug|Win32'">
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
 </Project>
diff --git a/sypb_src/project/sypb_debug/inf/Experience.sbr b/sypb_src/project/sypb_debug/inf/Experience.sbr
diff --git a/sypb_src/project/sypb_debug/inf/basecode.sbr b/sypb_src/project/sypb_debug/inf/basecode.sbr
diff --git a/sypb_src/project/sypb_debug/inf/callbacks.sbr b/sypb_src/project/sypb_debug/inf/callbacks.sbr
diff --git a/sypb_src/project/sypb_debug/inf/chatlib.sbr b/sypb_src/project/sypb_debug/inf/chatlib.sbr
diff --git a/sypb_src/project/sypb_debug/inf/combat.sbr b/sypb_src/project/sypb_debug/inf/combat.sbr
diff --git a/sypb_src/project/sypb_debug/inf/control.sbr b/sypb_src/project/sypb_debug/inf/control.sbr
diff --git a/sypb_src/project/sypb_debug/inf/engine.sbr b/sypb_src/project/sypb_debug/inf/engine.sbr
diff --git a/sypb_src/project/sypb_debug/inf/globals.sbr b/sypb_src/project/sypb_debug/inf/globals.sbr
diff --git a/sypb_src/project/sypb_debug/inf/interface.sbr b/sypb_src/project/sypb_debug/inf/interface.sbr
diff --git a/sypb_src/project/sypb_debug/inf/navigate.sbr b/sypb_src/project/sypb_debug/inf/navigate.sbr
diff --git a/sypb_src/project/sypb_debug/inf/netmsg.sbr b/sypb_src/project/sypb_debug/inf/netmsg.sbr
diff --git a/sypb_src/project/sypb_debug/inf/precomp.sbr b/sypb_src/project/sypb_debug/inf/precomp.sbr
diff --git a/sypb_src/project/sypb_debug/inf/support.sbr b/sypb_src/project/sypb_debug/inf/support.sbr
diff --git a/sypb_src/project/sypb_debug/inf/sypb.Build.CppClean.log b/sypb_src/project/sypb_debug/inf/sypb.Build.CppClean.log
@@ -1,7 +1,22 @@
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\sypb.bsc
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.pch
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\vc140.pdb
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\vc140.idb
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\precomp.sbr
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\obj\precomp.obj
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\basecode.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\callbacks.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\chatlib.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\combat.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\control.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\engine.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\experience.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\globals.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\interface.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\navigate.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\netmsg.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\support.sbr
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\waypoint.sbr
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\obj\waypoint.obj
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\obj\support.obj
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\obj\netmsg.obj
@@ -21,6 +36,9 @@ c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.res
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.lib
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.exp
 c:\users\mikeg\desktop\sypb_src\project\.\sypb_debug\sypb.dll
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.tlog\bscmake.command.1.tlog
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.tlog\bscmake.read.1.tlog
+c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.tlog\bscmake.write.1.tlog
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.tlog\cl.command.1.tlog
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.tlog\cl.read.1.tlog
 c:\users\mikeg\desktop\sypb_src\project\sypb_debug\inf\sypb.tlog\cl.write.1.tlog

diff --git a/sypb_src/project/sypb_debug/inf/sypb.exp b/sypb_src/project/sypb_debug/inf/sypb.exp
diff --git a/sypb_src/project/sypb_debug/inf/sypb.lib b/sypb_src/project/sypb_debug/inf/sypb.lib
diff --git a/sypb_src/project/sypb_debug/inf/sypb.pch b/sypb_src/project/sypb_debug/inf/sypb.pch
diff --git a/sypb_src/project/sypb_debug/inf/sypb.res b/sypb_src/project/sypb_debug/inf/sypb.res
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/BscMake.command.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/BscMake.command.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/BscMake.write.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/BscMake.write.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/CL.command.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/CL.command.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/CL.read.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/CL.read.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/CL.write.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/CL.write.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/bscmake.read.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/bscmake.read.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/link.command.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/link.command.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/link.read.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/link.read.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/rc.command.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/rc.command.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/rc.read.1.tlog b/sypb_src/project/sypb_debug/inf/sypb.tlog/rc.read.1.tlog
diff --git a/sypb_src/project/sypb_debug/inf/sypb.tlog/sypb.lastbuildstate b/sypb_src/project/sypb_debug/inf/sypb.tlog/sypb.lastbuildstate
@@ -1,2 +1,2 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v140_xp:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
 SyPB_Debug|Win32|C:\Users\mikeg\Desktop\sypb_src\project\|
diff --git a/sypb_src/project/sypb_debug/inf/vc140.idb b/sypb_src/project/sypb_debug/inf/vc140.idb
diff --git a/sypb_src/project/sypb_debug/inf/vc140.pdb b/sypb_src/project/sypb_debug/inf/vc140.pdb
diff --git a/sypb_src/project/sypb_debug/inf/waypoint.sbr b/sypb_src/project/sypb_debug/inf/waypoint.sbr
diff --git a/sypb_src/project/sypb_debug/obj/Experience.obj b/sypb_src/project/sypb_debug/obj/Experience.obj
diff --git a/sypb_src/project/sypb_debug/obj/basecode.obj b/sypb_src/project/sypb_debug/obj/basecode.obj
diff --git a/sypb_src/project/sypb_debug/obj/callbacks.obj b/sypb_src/project/sypb_debug/obj/callbacks.obj
diff --git a/sypb_src/project/sypb_debug/obj/chatlib.obj b/sypb_src/project/sypb_debug/obj/chatlib.obj
diff --git a/sypb_src/project/sypb_debug/obj/combat.obj b/sypb_src/project/sypb_debug/obj/combat.obj
diff --git a/sypb_src/project/sypb_debug/obj/control.obj b/sypb_src/project/sypb_debug/obj/control.obj
diff --git a/sypb_src/project/sypb_debug/obj/engine.obj b/sypb_src/project/sypb_debug/obj/engine.obj
diff --git a/sypb_src/project/sypb_debug/obj/globals.obj b/sypb_src/project/sypb_debug/obj/globals.obj
diff --git a/sypb_src/project/sypb_debug/obj/interface.obj b/sypb_src/project/sypb_debug/obj/interface.obj
diff --git a/sypb_src/project/sypb_debug/obj/navigate.obj b/sypb_src/project/sypb_debug/obj/navigate.obj
diff --git a/sypb_src/project/sypb_debug/obj/netmsg.obj b/sypb_src/project/sypb_debug/obj/netmsg.obj
diff --git a/sypb_src/project/sypb_debug/obj/precomp.obj b/sypb_src/project/sypb_debug/obj/precomp.obj
diff --git a/sypb_src/project/sypb_debug/obj/support.obj b/sypb_src/project/sypb_debug/obj/support.obj
diff --git a/sypb_src/project/sypb_debug/obj/waypoint.obj b/sypb_src/project/sypb_debug/obj/waypoint.obj
diff --git a/sypb_src/project/sypb_debug/sypb.bsc b/sypb_src/project/sypb_debug/sypb.bsc
diff --git a/sypb_src/project/sypb_debug/sypb.dll b/sypb_src/project/sypb_debug/sypb.dll
diff --git a/sypb_src/project/sypb_debug/sypb.pdb b/sypb_src/project/sypb_debug/sypb.pdb
diff --git a/sypb_src/source/basecode.cpp b/sypb_src/source/basecode.cpp
@@ -2951,13 +2951,17 @@ bool Bot::ReactOnEnemy(void)
 			}
 			else
 			{
-				// SyPB Pro P.43 - Knife Ai improve TESTTEST
+				// SyPB Pro P.43 - Knife Ai improve
 				if (m_currentWeapon == WEAPON_KNIFE)
 				{
 					m_isEnemyReachable = false;
 
 					if (i == enemyIndex)
 						m_isEnemyReachable = true;
+					// SyPB Pro P.44 - Knife Ai improve TESTTEST
+					else if (m_navNode != null && m_navNode->index == enemyIndex)
+						m_isEnemyReachable = true;
+					/*
 					else
 					{
 						for (int j = 0; j < Const_MaxPathIndex; j++)
@@ -2968,7 +2972,7 @@ bool Bot::ReactOnEnemy(void)
 								break;
 							}
 						}
-					}
+					} */
 
 					if (!m_isEnemyReachable)
 						SetMoveTarget(m_enemy);