#1840

Robosturm · Jan 2, 2025 · ee80d6d · ee80d6d
1 parent 5193a8a
commit ee80d6d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/ai/veryeasyai.cpp b/ai/veryeasyai.cpp
@@ -254,7 +254,7 @@ bool VeryEasyAI::fireWithIndirectUnits(spQmlVectorUnit & pUnits)
         pInterpreter->threadProcessEvents();
         // can we use the unit?
         if (!pUnit->getHasMoved() && pUnit->getBaseMaxRange() > 1 &&
-            (pUnit->getAmmo1() > 0 || pUnit->getAmmo2() > 0) &&
+            (pUnit->hasAmmo1() || pUnit->hasAmmo2()) &&
             pUnit->getAiMode() == GameEnums::GameAi_Normal)
         {
             if (attack(pUnit.get()))
@@ -275,7 +275,7 @@ bool VeryEasyAI::fireWithDirectUnits(spQmlVectorUnit & pUnits)
         pInterpreter->threadProcessEvents();
         // can we use the unit?
         if (!pUnit->getHasMoved() && pUnit->getBaseMaxRange() == 1 &&
-            (pUnit->getAmmo1() > 0 || pUnit->getAmmo2() > 0) &&
+            (pUnit->hasAmmo1() || pUnit->hasAmmo2()) &&
             pUnit->getAiMode() == GameEnums::GameAi_Normal)
         {
             if (attack(pUnit.get()))

diff --git a/coreengine/mainapp.cpp b/coreengine/mainapp.cpp
@@ -266,7 +266,6 @@ void Mainapp::nextStartUpStep(StartupPhase step)
         }
         case UpdateManager:
         {
-            changeScreenMode(getScreenMode());
 #ifdef UPDATESUPPORT
             GameUpdater::cleanUpOldArtifacts();
             QString updateStep = Settings::getInstance()->getUpdateStep();

diff --git a/main.cpp b/main.cpp
@@ -56,8 +56,11 @@ int main(qint32 argc, char* argv[])
         // force a resolution reset
         window.changeScreenMode(Settings::ScreenModes::FullScreen);
     }
-    // show as normal borderless
-    window.changeScreenMode(window.getScreenMode());
+    else
+    {
+        // show as normal borderless
+        window.changeScreenMode(window.getScreenMode());
+    }
     window.setBrightness(Settings::getInstance()->getBrightness());
     window.setGamma(Settings::getInstance()->getGamma());
     if (window.getScreenMode() != Settings::ScreenModes::Window)