added map backwards support

Robosturm · Jun 29, 2024 · bba2cdd · bba2cdd
1 parent 264e71c
commit bba2cdd
Show file tree

Hide file tree

Showing 28 changed files with 310 additions and 296 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -212,13 +212,13 @@ endif()
 ###################################################################################
 add_definitions(
     -DVERSION_MAJOR=0
-    -DVERSION_MINOR=36
-    -DVERSION_REVISION=5
+    -DVERSION_MINOR=37
+    -DVERSION_REVISION=0
     -DVERSION_SUFFIX="main"
     -DCOW_BUILD_TAG="${COW_BUILD_TAG}"
     )
 
-set(COW_ANDROID_VERSION_NAME "0.36.5-main")
+set(COW_ANDROID_VERSION_NAME "0.37.0-main")
 set(COW_ANDROID_VERSION_CODE "58")
 
 ###################################################################################

diff --git a/ai/coreai.cpp b/ai/coreai.cpp
@@ -787,7 +787,7 @@ QRectF CoreAI::calcUnitDamage(spGameAction & pAction, const QPoint & target) con
 {
     Interpreter* pInterpreter = Interpreter::getInstance();
     QString function1 = "calcBattleDamage";
-    QJSValueList args({JsThis::getJsThis(m_pMap),
+    QJSValueList args({GameMap::getMapJsThis(m_pMap),
                        JsThis::getJsThis(pAction.get()),
                        QJSValue(target.x()),
                        QJSValue(target.y()),
@@ -803,7 +803,7 @@ QRectF CoreAI::calcVirtuelUnitDamage(GameMap* pMap,
 {
     Interpreter* pInterpreter = Interpreter::getInstance();
     QString function1 = "calcBattleDamage3";
-    QJSValueList args({JsThis::getJsThis(pMap),
+    QJSValueList args({GameMap::getMapJsThis(pMap),
                        JsThis::getJsThis(nullptr),
                        JsThis::getJsThis(pAttacker),
                        QJSValue(attackerTakenDamage),
@@ -2458,7 +2458,7 @@ bool CoreAI::getBuildingTargetPointFromScript(spGameAction & pAction, const spMa
                        pInterpreter->toScriptValue(points),
                        QJSValue(pData->getAllFields()),
                        JsThis::getJsThis(m_pPlayer),
-                       JsThis::getJsThis(m_pMap)});
+                       GameMap::getMapJsThis(m_pMap)});
     if (pInterpreter->exists(GameScript::m_scriptName, function1))
     {
         erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);
@@ -2512,7 +2512,7 @@ bool CoreAI::getBuildingMenuItemFromScript(spGameAction & pAction, spQmlVectorUn
                        JsThis::getJsThis(pUnits.get()),
                        JsThis::getJsThis(pBuildings.get()),
                        JsThis::getJsThis(m_pPlayer),
-                       JsThis::getJsThis(m_pMap)});
+                       GameMap::getMapJsThis(m_pMap)});
     if (pInterpreter->exists(GameScript::m_scriptName, function1))
     {
         erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);

diff --git a/ai/coreai_predefinedai.cpp b/ai/coreai_predefinedai.cpp
@@ -376,7 +376,7 @@ bool CoreAI::processPredefinedGenericScripted(Unit* pUnit, spQmlVectorUnit & pEn
                            JsThis::getJsThis(pUnit),
                            JsThis::getJsThis(pEnemyUnits.get()),
                            JsThis::getJsThis(pEnemyBuildings.get()),
-                           JsThis::getJsThis(m_pMap)});
+                           GameMap::getMapJsThis(m_pMap)});
         QJSValue erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);
         if (erg.isBool() && erg.toBool())
         {
@@ -396,7 +396,7 @@ bool CoreAI::processPredefinedGenericScripted(Unit* pUnit, spQmlVectorUnit & pEn
                            JsThis::getJsThis(pUnit),
                            JsThis::getJsThis(pEnemyUnits.get()),
                            JsThis::getJsThis(pEnemyBuildings.get()),
-                           JsThis::getJsThis(m_pMap)});
+                           GameMap::getMapJsThis(m_pMap)});
         QJSValue erg = pInterpreter->doFunction(m_aiName, function1, args);
         if (erg.isBool() && erg.toBool())
         {
@@ -425,7 +425,7 @@ bool CoreAI::processPredefinedMapScripted(Unit* pUnit, spQmlVectorUnit & pEnemyU
                            JsThis::getJsThis(pUnit),
                            JsThis::getJsThis(pEnemyUnits.get()),
                            JsThis::getJsThis(pEnemyBuildings.get()),
-                           JsThis::getJsThis(m_pMap)});
+                           GameMap::getMapJsThis(m_pMap)});
         QJSValue erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);
         if (erg.isBool() && erg.toBool())
         {

diff --git a/ai/productionSystem/simpleproductionsystem.cpp b/ai/productionSystem/simpleproductionsystem.cpp
@@ -23,7 +23,7 @@ void SimpleProductionSystem::initialize()
         Interpreter* pInterpreter = Interpreter::getInstance();
         QJSValueList args({m_jsThis,
                            JsThis::getJsThis(m_owner),
-                           JsThis::getJsThis(m_owner->getMap())});
+                           GameMap::getMapJsThis(m_owner->getMap())});
         QString function1 = "initializeSimpleProductionSystem";
         QJSValue erg(false);
         if (pInterpreter->exists(GameScript::m_scriptName, function1))
@@ -70,7 +70,7 @@ bool SimpleProductionSystem::buildUnit(QmlVectorBuilding* pBuildings, QmlVectorU
                            JsThis::getJsThis(pUnits),
                            JsThis::getJsThis(pEnemyUnits),
                            JsThis::getJsThis(pEnemyBuildings),
-                           JsThis::getJsThis(m_owner->getMap())});
+                           GameMap::getMapJsThis(m_owner->getMap())});
         QJSValue erg(false);
         if (pInterpreter->exists(GameScript::m_scriptName, function1))
         {
@@ -102,7 +102,7 @@ void SimpleProductionSystem::onNewBuildQueue(QmlVectorBuilding* pBuildings, QmlV
                        JsThis::getJsThis(pUnits),
                        JsThis::getJsThis(pEnemyUnits.get()),
                        JsThis::getJsThis(pEnemyBuildings),
-                       JsThis::getJsThis(m_owner->getMap())});
+                       GameMap::getMapJsThis(m_owner->getMap())});
     QJSValue erg(false);
     if (pInterpreter->exists(GameScript::m_scriptName, function1))
     {

diff --git a/ai/transporterselector.cpp b/ai/transporterselector.cpp
@@ -51,7 +51,7 @@ std::vector<QList<QVariant>> TransporterSelector::getUnloadFields(spGameAction &
         QJSValueList args({
             JsThis::getJsThis(pAction.get()),
             unitIDx[i],
-            JsThis::getJsThis(m_owner.getMap()),
+            GameMap::getMapJsThis(m_owner.getMap()),
         });
         QJSValue ret = pInterpreter->doFunction(CoreAI::ACTION_UNLOAD, function1, args);
         unloadFields.push_back(ret.toVariant().toList());

diff --git a/game/actionperformer.cpp b/game/actionperformer.cpp
@@ -652,7 +652,7 @@ bool ActionPerformer::isTrap(const QString & function, spGameAction pAction, Uni
                        previousPoint.x(),
                        previousPoint.y(),
                        moveCost,
-                       JsThis::getJsThis(m_pMap),
+                       GameMap::getMapJsThis(m_pMap),
                       });
     const QString obj = "ACTION_TRAP";
     QJSValue erg = pInterpreter->doFunction(obj, function, args);