X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fships%2Fpassenger%2Fclass_PassengerShip.php;h=5c9ba11a345eb67f6f88080c62aa00f9666796ea;hp=4e0dd198cc1b1207d54e44a0445a12fdcb532163;hb=2b7c3e43b2fe0f3c5ae0455d13fa7743b638049f;hpb=11c0ba60cb6c044928f41e93cc98d214b1d8ad7c;ds=sidebyside

diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
index 4e0dd19..5c9ba11 100644
--- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php
+++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
@@ -5,9 +5,9 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.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.ship-simu.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
@@ -22,20 +22,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class PassengerShip extends BaseShip implements ConstructableShip, LimitableObject {
+class PassengerShip extends BaseShip implements ConstructableShip {
 	// Konstruktor
 	protected function __construct () {
 		// Eltern-Kontruktor aufrufen
 		parent::__construct(__CLASS__);
 
-		// Set description
-		$this->setObjectDescription("Passagier-Schiff");
-
-		// Generate unique ID number
-		$this->createUniqueID();
-
 		// Clean up a little
 		$this->removeSystemArray();
+		$this->removeNumberFormaters();
 	}
 
 	// Passagier-Schiff erstellen
@@ -43,15 +38,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
 		// Get new instance
 		$passInstance = new PassengerShip();
 
-		// Debug message
-		if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) {
-			$passInstance->getDebugInstance()->output(sprintf("[%s:%d] Ein Passagier-Schiff wird erstellt.<br />\n",
-				__CLASS__,
-				__LINE__
-			));
-		}
-
-		// Set ship's name
+		// Set ship name
 		$passInstance->setShipName($shipName);
 
 		// Instanz zurueckgeben
@@ -59,14 +46,14 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
 	}
 
 	// Anzahl Betten ermitteln
-	final function calcTotalBeds () {
+	public final function calcTotalBeds () {
 		// Struktur-Array holen
 		$struct = $this->getStructuresArray();
 
 		if (is_null($struct)) {
 			// Empty structures list!
 			throw new EmptyStructuresListException($this, self::EXCEPTION_EMPTY_STRUCTURES_ARRAY);
-		}
+		} // END - if
 
 		// Anzahl Betten auf 0 setzen
 		$numBeds = 0;
@@ -90,51 +77,14 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
 					if (!is_null($cab)) {
 						// Kabinenbeschreibung holen
 						$cabType = $cab->getObjectDescription();
-					}
-
-					// Debug-Meldung ausgeben
-					$this->getDebugInstance()->output(sprintf("[%s:%d] Es stehen <strong>%d</strong> Betten vom Kabinen-Typ <strong>%s</strong> bereit.<br />\n",
-						__CLASS__,
-						__LINE__,
-						$total,
-						$cabType
-					));
-				}
-			} else {
-				// Keine Kabine!
-				if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> ist keine Kabine.<br />\n",
-					__CLASS__,
-					__LINE__,
-					$el->getObjectDescription()
-				));
-			}
-		}
-
-		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->getObjectDescription(),
-			$this->getShipName(),
-			$numBeds
-		));
+					} // END - if
+				} // END - if
+			} // END - if
+		} // END - for
 
 		// Anzahl zurueckliefern
 		return $numBeds;
 	}
-
-	/**
-	 * Reduces the volume of a processed object.
-	 *
-	 * @param		$limitInstance		An instance to ObjectLimits which holds
-	 *				attribute names that we want to include in the processing
-	 *				phase. Other attributes except $uniqueID and $realClass will
-	 *				be ignored and keept out.
-	 * @return	void
-	 */
-	function limitObject (ObjectLimits $limitInstance) {
-		// Work in progress
-		$this->partialStub("Unfinished method called.");
-	}
 }
 
 // [EOF]