The console part of the game will become a daemon that is taking care of all

[city.git] / application / city / main / city / class_BaseCity.php

diff --git a/application/city/main/city/class_BaseCity.php b/application/city/main/city/class_BaseCity.php
index add017eed8af66b6ec6cf82a98e83f0df864e673..812d4263fc615badca4400bb89b42081a60da634 100644 (file)
--- a/application/city/main/city/class_BaseCity.php
+++ b/application/city/main/city/class_BaseCity.php
@@ -80,7 +80,7 @@ class BaseCity extends BaseCitySystem implements Updateable, AddableCriteria {
 
                // Output all lines
                self::createDebugInstance(__CLASS__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . $this->getRequestInstance()->getRequestElement('mode') . ' mode active');
+               self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . $this->getRequestInstance()->getRequestElement('mode') . ' daemon starting');
                self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2015 City Developer Team');
                self::createDebugInstance(__CLASS__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
@@ -218,13 +218,13 @@ class BaseCity extends BaseCitySystem implements Updateable, AddableCriteria {
         * @param       $CityData                       An array with valid City data
         * @return      void
         */
-       public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $CityData) {
+       public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $cityData) {
                // Add all data the array provides
-               foreach (CityDistributedHashTableDatabaseWrapper::getAllElements() as $element) {
+               foreach (CityInformationDatabaseWrapper::getAllElements() as $element) {
                        // Is the element there?
-                       if (isset($CityData[$element])) {
+                       if (isset($cityData[$element])) {
                                // Add it
-                               $dataSetInstance->addCriteria($element, $CityData[$element]);
+                               $dataSetInstance->addCriteria($element, $cityData[$element]);
                        } else {
                                // Output warning message
                                /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('City[' . __METHOD__ . ':' . __LINE__ . ']: addArrayToDataSet(): Element ' . $element . ' not found in CityData array.');