Instructions Jenkins Doxygen

[added] city maintenance paid on non structure decorations 15/715/1
authorPete <elpete@swgemu.com>
Fri, 30 Aug 2013 22:18:42 +0000 (17:18 -0500)
committerPete <elpete@swgemu.com>
Fri, 30 Aug 2013 22:18:42 +0000 (17:18 -0500)
Change-Id: I0d2f814c1a687773adce063a64e7fe74882af6a1

MMOCoreORB/src/server/zone/managers/city/CityManagerImplementation.cpp

index 21dde83..b4c0a0e 100644 (file)
@@ -830,7 +830,11 @@ void CityManagerImplementation::deductCityMaintenance(CityRegion* city) {
 
        for(int i = city->getDecorationCount() - 1; i >= 0; i--){
                ManagedReference<SceneObject*> decoration = city->getCityDecoration(i);
-               if(decoration != NULL && decoration->isStructureObject()){
+
+               if(decoration == NULL)
+                       continue;
+
+               if( decoration->isStructureObject()){
                        StructureObject* structure = cast<StructureObject*>(decoration.get());
 
                        if(structure != NULL){
@@ -839,6 +843,9 @@ void CityManagerImplementation::deductCityMaintenance(CityRegion* city) {
                                thisCost = maintenanceDiscount * structureTemplate->getCityMaintenanceAtRank(city->getCityRank() - 1);
                                totalPaid += collectCivicStructureMaintenance(structure, city, thisCost);
                        }
+               } else {
+                       thisCost = maintenanceDiscount * 1500;
+                       totalPaid += collectNonStructureMaintenance(decoration, city, thisCost);
                }
        }