Merge pull request #1 from Robosturm/master

Merge

Author: TheMasterCreed

CMakeLists.txt

@@ -109,8 +109,8 @@ if(PRECOMPILEDOPENSSL AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
 elseif(PRECOMPILEDOPENSSL AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
     message("Using local pre-compiled openssl version from path: ${OPENSSL_LIB_PATH} for windows")
     set(OPENSSL_LIBS
-        ${OPENSSL_LIB_PATH}/libcrypto-3-x64.dll
-        ${OPENSSL_LIB_PATH}/libssl-3-x64.dll
+        ${OPENSSL_LIB_PATH}/libcrypto-4-x64.dll
+        ${OPENSSL_LIB_PATH}/libssl-4-x64.dll
     CACHE INTERNAL "")
     include_directories(${OPENSSL_INCLUDE_DIR})
     message ("OpenSsL Include directories:" ${OPENSSL_INCLUDE_DIR})
@@ -215,15 +215,15 @@ endif()
 add_definitions(
     -DVERSION_MAJOR=0
     -DVERSION_MINOR=38
-    -DVERSION_REVISION=6
+    -DVERSION_REVISION=7
     -DVERSION_SUFFIX="main"
     -DCOW_BUILD_TAG="${COW_BUILD_TAG}"
     -DCOW_BUILD_NAME="${COW_BUILD_NAME}"
     -DUPDATE_FILE="${UPDATE_FILE}"
 )
 
-set(COW_ANDROID_VERSION_NAME "0.38.6-main")
-set(COW_ANDROID_VERSION_CODE "67")
+set(COW_ANDROID_VERSION_NAME "0.38.7-main")
+set(COW_ANDROID_VERSION_CODE "68")
 
 ###################################################################################
 # Set up some compiler and linking options

ai/productionSystem/simpleproductionsystem.cpp

@@ -573,7 +573,7 @@ void SimpleProductionSystem::getBuildDistribution(std::vector<CurrentBuildDistri
         while(i < item.distribution.unitIds.size())
         {
             qint32 cost = item.distribution.units[i]->getUnitCosts();
-            if (cost >= minBaseCost ||
+            if (cost >= minBaseCost &&
                 cost <= maxBaseCost)
             {
                 ++i;

game/unit.cpp

@@ -3675,7 +3675,7 @@ void Unit::serializeObject(QDataStream& pStream, bool forHash) const
     pStream << units;
     for (qint32 i = 0; i < units; i++)
     {
-        m_TransportUnits[i]->serializeObject(pStream);
+        m_TransportUnits[i]->serializeObject(pStream, forHash);
     }
     pStream << m_capturePoints;
     pStream << m_Hidden;

menue/shopmenu.cpp

@@ -138,6 +138,7 @@ void Shopmenu::onEnter()
 
 void Shopmenu::exitMenue()
 {
+    Userdata::getInstance()->storeUser();
     CONSOLE_PRINT("Leaving Shop Menue", GameConsole::eDEBUG);
     m_onEnterTimer.stop();
     auto window = MemoryManagement::create<Mainwindow>("ui/menu/playermenu.xml");

network/networkInterface.cpp

@@ -47,8 +47,8 @@ void NetworkInterface::attachKeys(QSslConfiguration &sslConfiguration)
             X509_gmtime_adj(X509_get_notAfter(x509.get()), 3600L * 24L * 365L * 10L);
             X509_set_pubkey(x509.get(), pkey);
             auto * nameField = X509_get_subject_name(x509.get());
-            X509_NAME_add_entry_by_txt(nameField, "C",  MBSTRING_ASC, reinterpret_cast<const unsigned char *>("DE"),        -1, -1, 0);
-            X509_NAME_add_entry_by_txt(nameField, "O",  MBSTRING_ASC, reinterpret_cast<const unsigned char *>("CommanderWars"), -1, -1, 0);
+            X509_NAME_add_entry_by_txt(nameField, "C",  MBSTRING_ASC, const_cast<unsigned char*>(reinterpret_cast<const unsigned char *>("DE")),        -1, -1, 0);
+            X509_NAME_add_entry_by_txt(nameField, "O",  MBSTRING_ASC, const_cast<unsigned char*>(reinterpret_cast<const unsigned char *>("CommanderWars")), -1, -1, 0);
             // X509_NAME_add_entry_by_txt(nameField, "CN", MBSTRING_ASC, reinterpret_cast<const unsigned char *>("localhost"), -1, -1, 0);
             X509_set_issuer_name(x509.get(), nameField);
             if (X509_sign(x509.get(), pkey, EVP_sha1()))