Add getProvinceID to CyCity (#25)

VDuchauffour · May 6, 2024 · be253bd · be253bd
1 parent 1c136d0
commit be253bd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/Assets/CvGameCoreDLL.dll b/Assets/CvGameCoreDLL.dll
diff --git a/CvGameCoreDLL/CvCity.cpp b/CvGameCoreDLL/CvCity.cpp
@@ -14582,6 +14582,11 @@ int CvCity::getProvince()
   return provinceMap[getY_INLINE() * EARTH_X + getX_INLINE()];
 };
 
+int CvCity::getProvinceID() const
+{
+  return plot()->getProvinceID();
+};
+
 int CvCity::getNumForeignReligions()
 {
   int iLoopReligion, iCount = 0, iStateReligion;

diff --git a/CvGameCoreDLL/CvCity.h b/CvGameCoreDLL/CvCity.h
@@ -990,7 +990,7 @@ class CvCity : public CvDLLEntity
 
   // 3MiroProvinces
   int getProvince();
-
+  int getProvinceID() const;
   // 3MiroBuildings: StarFort bombard immune defense
   int getBombImmuneDefense() const;
   void chnageBombImmuneDefense(int iChange);

diff --git a/CvGameCoreDLL/CyCity.cpp b/CvGameCoreDLL/CyCity.cpp
@@ -2349,6 +2349,12 @@ int CyCity::getProvince()
 {
   return m_pCity->getProvince();
 };
+
+int CyCity::getProvinceID()
+{
+  return m_pCity ? m_pCity->getProvinceID() : -1;
+};
+
 int CyCity::getNumForeignReligions()
 {
   return m_pCity->getNumForeignReligions();

diff --git a/CvGameCoreDLL/CyCity.h b/CvGameCoreDLL/CyCity.h
@@ -511,6 +511,7 @@ class CyCity
 
   // 3MiroProvinces
   int getProvince();
+  int getProvinceID();
 
   // 3Miro: some tests for stability
   int getNumForeignReligions();

diff --git a/CvGameCoreDLL/CyCityInterface1.cpp b/CvGameCoreDLL/CyCityInterface1.cpp
@@ -607,9 +607,10 @@ void CyCityPythonInterface1(python::class_<CyCity> &x)
       // 3Miro: New functions
       // Absinthe: with the new persecution code added from SoI, these functions are currently unused
       /*.def("canPurgeReligion", &CyCity::canPurgeReligion, "bool ()")
-		.def("doPurgeReligions", &CyCity::doPurgeReligions, "void ()")*/
+      .def("doPurgeReligions", &CyCity::doPurgeReligions, "void ()")*/
       // Absinthe: end
       .def("getProvince", &CyCity::getProvince, "int ()")
+      .def("getProvinceID", &CyCity::getProvinceID, "int ()")
 
       .def("getNumForeignReligions", &CyCity::getNumForeignReligions, "int ()");
 }