X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fships%2Fpassenger%2Fclass_PassengerShip.php;h=70fa5ed56b79e7e333d934a8e81f19d2e8bb2c51;hp=4e8b1300e39636314cd1a5d7d4e02db679206436;hb=4f70843ae8428f051d70ccff5bb43fc4c03dda8d;hpb=efba981c9bf18c733dfde945b09111ff4b6007ce

diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
index 4e8b130..70fa5ed 100644
--- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php
+++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
@@ -3,11 +3,11 @@
  * A passenger ship with one or more decks, cabins, bridge (replacement for the
  * captain) and many more
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,31 +27,14 @@ class PassengerShip extends BaseShip implements ConstructableShip {
 	protected function __construct () {
 		// Eltern-Kontruktor aufrufen
 		parent::__construct(__CLASS__);
-
-		// Set description
-		$this->setObjectDescription("Passagier-Schiff");
-
-		// Generate unique ID number
-		$this->generateUniqueId();
-
-		// Clean up a little
-		$this->removeSystemArray();
 	}
 
 	// Passagier-Schiff erstellen
-	public final static function createPassengerShip ($shipName) {
+	public static final function createPassengerShip ($shipName) {
 		// Get new instance
 		$passInstance = new PassengerShip();
 
-		// Debug message
-		if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) {
-			$passInstance->debugOutput(sprintf("[%s:%d] Ein Passagier-Schiff wird erstellt.",
-				__CLASS__,
-				__LINE__
-			));
-		} // END - if
-
-		// Set ship's name
+		// Set ship name
 		$passInstance->setShipName($shipName);
 
 		// Instanz zurueckgeben
@@ -59,7 +42,7 @@ class PassengerShip extends BaseShip implements ConstructableShip {
 	}
 
 	// Anzahl Betten ermitteln
-	final function calcTotalBeds () {
+	public final function calcTotalBeds () {
 		// Struktur-Array holen
 		$struct = $this->getStructuresArray();
 
@@ -90,34 +73,11 @@ class PassengerShip extends BaseShip implements ConstructableShip {
 					if (!is_null($cab)) {
 						// Kabinenbeschreibung holen
 						$cabType = $cab->getObjectDescription();
-					}
-
-					// Debug-Meldung ausgeben
-					$this->debugOutput(sprintf("[%s:%d] Es stehen <strong>%d</strong> Betten vom Kabinen-Typ <strong>%s</strong> bereit.",
-						__CLASS__,
-						__LINE__,
-						$total,
-						$cabType
-					));
-				}
-			} else {
-				// Keine Kabine!
-				if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] <strong>%s</strong> ist keine Kabine.",
-					__CLASS__,
-					__LINE__,
-					$el->getObjectDescription()
-				));
-			}
+					} // END - if
+				} // END - if
+			} // END - if
 		} // END - for
 
-		if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] Das <strong>%s</strong> mit dem Namen <strong>%s</strong> hat <strong>%d</strong> Betten.",
-			__CLASS__,
-			__LINE__,
-			$this->getObjectDescription(),
-			$this->getShipName(),
-			$numBeds
-		));
-
 		// Anzahl zurueckliefern
 		return $numBeds;
 	}