Method constructor() removed, several small fixes

[shipsimu.git] / application / ship-simu / main / ships / passenger / class_PassengerShip.php

diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
index 947bba2cfa074ee4a0c339d61197cbd1e11d429f..a581c120713946b36a54c2c7cb148b5c8303cdd4 100644 (file)
--- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php
+++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
@@ -20,13 +20,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class PassengerShip extends BaseShip implements ConstructableShip, LimitableObject {
        // Konstruktor
-       private function __construct () {
+       protected function __construct () {
                // Eltern-Kontruktor aufrufen
-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);
 
                // Debug message
                if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
@@ -37,7 +37,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
                }
 
                // Set description
-               $this->setPartDescr("Passagier-Schiff");
+               $this->setObjectDescription("Passagier-Schiff");
 
                // Generate unique ID number
                $this->createUniqueID();
@@ -97,7 +97,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
                                        $cab = $el->getPartInstance();
                                        if (!is_null($cab)) {
                                                // Kabinenbeschreibung holen
-                                               $cabType = $cab->getPartDescr();
+                                               $cabType = $cab->getObjectDescription();
                                        }
 
                                        // Debug-Meldung ausgeben
@@ -113,7 +113,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
                                if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> ist keine Kabine.<br />\n",
                                        __CLASS__,
                                        __LINE__,
-                                       $el->getPartDescr()
+                                       $el->getObjectDescription()
                                ));
                        }
                }
@@ -121,7 +121,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
                if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das <strong>%s</strong> mit dem Namen <strong>%s</strong> hat <strong>%d</strong> Betten.<br />\n",
                        __CLASS__,
                        __LINE__,
-                       $this->getPartDescr(),
+                       $this->getObjectDescription(),
                        $this->getShipName(),
                        $numBeds
                ));