Skip to content

Commit bba2cdd

Browse files
RobosturmRobosturm
committed
added map backwards support
1 parent 264e71c commit bba2cdd

28 files changed

+310
-296
lines changed

‎CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ endif()
212212
###################################################################################
213213
add_definitions(
214214
-DVERSION_MAJOR=0
215-
-DVERSION_MINOR=36
216-
-DVERSION_REVISION=5
215+
-DVERSION_MINOR=37
216+
-DVERSION_REVISION=0
217217
-DVERSION_SUFFIX="main"
218218
-DCOW_BUILD_TAG="${COW_BUILD_TAG}"
219219
)
220220

221-
set(COW_ANDROID_VERSION_NAME "0.36.5-main")
221+
set(COW_ANDROID_VERSION_NAME "0.37.0-main")
222222
set(COW_ANDROID_VERSION_CODE "58")
223223

224224
###################################################################################

‎ai/coreai.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ QRectF CoreAI::calcUnitDamage(spGameAction & pAction, const QPoint & target) con
787787
{
788788
Interpreter* pInterpreter = Interpreter::getInstance();
789789
QString function1 = "calcBattleDamage";
790-
QJSValueList args({JsThis::getJsThis(m_pMap),
790+
QJSValueList args({GameMap::getMapJsThis(m_pMap),
791791
JsThis::getJsThis(pAction.get()),
792792
QJSValue(target.x()),
793793
QJSValue(target.y()),
@@ -803,7 +803,7 @@ QRectF CoreAI::calcVirtuelUnitDamage(GameMap* pMap,
803803
{
804804
Interpreter* pInterpreter = Interpreter::getInstance();
805805
QString function1 = "calcBattleDamage3";
806-
QJSValueList args({JsThis::getJsThis(pMap),
806+
QJSValueList args({GameMap::getMapJsThis(pMap),
807807
JsThis::getJsThis(nullptr),
808808
JsThis::getJsThis(pAttacker),
809809
QJSValue(attackerTakenDamage),
@@ -2458,7 +2458,7 @@ bool CoreAI::getBuildingTargetPointFromScript(spGameAction & pAction, const spMa
24582458
pInterpreter->toScriptValue(points),
24592459
QJSValue(pData->getAllFields()),
24602460
JsThis::getJsThis(m_pPlayer),
2461-
JsThis::getJsThis(m_pMap)});
2461+
GameMap::getMapJsThis(m_pMap)});
24622462
if (pInterpreter->exists(GameScript::m_scriptName, function1))
24632463
{
24642464
erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);
@@ -2512,7 +2512,7 @@ bool CoreAI::getBuildingMenuItemFromScript(spGameAction & pAction, spQmlVectorUn
25122512
JsThis::getJsThis(pUnits.get()),
25132513
JsThis::getJsThis(pBuildings.get()),
25142514
JsThis::getJsThis(m_pPlayer),
2515-
JsThis::getJsThis(m_pMap)});
2515+
GameMap::getMapJsThis(m_pMap)});
25162516
if (pInterpreter->exists(GameScript::m_scriptName, function1))
25172517
{
25182518
erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);

‎ai/coreai_predefinedai.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ bool CoreAI::processPredefinedGenericScripted(Unit* pUnit, spQmlVectorUnit & pEn
376376
JsThis::getJsThis(pUnit),
377377
JsThis::getJsThis(pEnemyUnits.get()),
378378
JsThis::getJsThis(pEnemyBuildings.get()),
379-
JsThis::getJsThis(m_pMap)});
379+
GameMap::getMapJsThis(m_pMap)});
380380
QJSValue erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);
381381
if (erg.isBool() && erg.toBool())
382382
{
@@ -396,7 +396,7 @@ bool CoreAI::processPredefinedGenericScripted(Unit* pUnit, spQmlVectorUnit & pEn
396396
JsThis::getJsThis(pUnit),
397397
JsThis::getJsThis(pEnemyUnits.get()),
398398
JsThis::getJsThis(pEnemyBuildings.get()),
399-
JsThis::getJsThis(m_pMap)});
399+
GameMap::getMapJsThis(m_pMap)});
400400
QJSValue erg = pInterpreter->doFunction(m_aiName, function1, args);
401401
if (erg.isBool() && erg.toBool())
402402
{
@@ -425,7 +425,7 @@ bool CoreAI::processPredefinedMapScripted(Unit* pUnit, spQmlVectorUnit & pEnemyU
425425
JsThis::getJsThis(pUnit),
426426
JsThis::getJsThis(pEnemyUnits.get()),
427427
JsThis::getJsThis(pEnemyBuildings.get()),
428-
JsThis::getJsThis(m_pMap)});
428+
GameMap::getMapJsThis(m_pMap)});
429429
QJSValue erg = pInterpreter->doFunction(GameScript::m_scriptName, function1, args);
430430
if (erg.isBool() && erg.toBool())
431431
{

‎ai/productionSystem/simpleproductionsystem.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void SimpleProductionSystem::initialize()
2323
Interpreter* pInterpreter = Interpreter::getInstance();
2424
QJSValueList args({m_jsThis,
2525
JsThis::getJsThis(m_owner),
26-
JsThis::getJsThis(m_owner->getMap())});
26+
GameMap::getMapJsThis(m_owner->getMap())});
2727
QString function1 = "initializeSimpleProductionSystem";
2828
QJSValue erg(false);
2929
if (pInterpreter->exists(GameScript::m_scriptName, function1))
@@ -70,7 +70,7 @@ bool SimpleProductionSystem::buildUnit(QmlVectorBuilding* pBuildings, QmlVectorU
7070
JsThis::getJsThis(pUnits),
7171
JsThis::getJsThis(pEnemyUnits),
7272
JsThis::getJsThis(pEnemyBuildings),
73-
JsThis::getJsThis(m_owner->getMap())});
73+
GameMap::getMapJsThis(m_owner->getMap())});
7474
QJSValue erg(false);
7575
if (pInterpreter->exists(GameScript::m_scriptName, function1))
7676
{
@@ -102,7 +102,7 @@ void SimpleProductionSystem::onNewBuildQueue(QmlVectorBuilding* pBuildings, QmlV
102102
JsThis::getJsThis(pUnits),
103103
JsThis::getJsThis(pEnemyUnits.get()),
104104
JsThis::getJsThis(pEnemyBuildings),
105-
JsThis::getJsThis(m_owner->getMap())});
105+
GameMap::getMapJsThis(m_owner->getMap())});
106106
QJSValue erg(false);
107107
if (pInterpreter->exists(GameScript::m_scriptName, function1))
108108
{

‎ai/transporterselector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ std::vector<QList<QVariant>> TransporterSelector::getUnloadFields(spGameAction &
5151
QJSValueList args({
5252
JsThis::getJsThis(pAction.get()),
5353
unitIDx[i],
54-
JsThis::getJsThis(m_owner.getMap()),
54+
GameMap::getMapJsThis(m_owner.getMap()),
5555
});
5656
QJSValue ret = pInterpreter->doFunction(CoreAI::ACTION_UNLOAD, function1, args);
5757
unloadFields.push_back(ret.toVariant().toList());

‎game/actionperformer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ bool ActionPerformer::isTrap(const QString & function, spGameAction pAction, Uni
652652
previousPoint.x(),
653653
previousPoint.y(),
654654
moveCost,
655-
JsThis::getJsThis(m_pMap),
655+
GameMap::getMapJsThis(m_pMap),
656656
});
657657
const QString obj = "ACTION_TRAP";
658658
QJSValue erg = pInterpreter->doFunction(obj, function, args);

0 commit comments

Comments
 (0)