X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fdrives%2Fmotor%2Fclass_Motor.php;h=2f3479edf6db816e44022ecd7fd4d44bb2f0a3af;hp=eb3ac291f22e87a921760801c4717487b2810a52;hb=4f70843ae8428f051d70ccff5bb43fc4c03dda8d;hpb=42b66268af2c7d8872aca3e2fffb76d60954e9f5

diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php
index eb3ac29..2f3479e 100644
--- a/application/ship-simu/main/drives/motor/class_Motor.php
+++ b/application/ship-simu/main/drives/motor/class_Motor.php
@@ -2,11 +2,11 @@
 /**
  * A motorized drive for bigger ships
  *
- * @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
@@ -19,46 +19,21 @@
  * 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 Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart {
+class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart {
 	// Constructor
-	private function __construct() {
+	protected function __construct() {
 		// Call parent constructor
-		parent::constructor(__CLASS__);
-
-		// Debug message
-		if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
-			$this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
-				__CLASS__,
-				__LINE__
-			));
-		}
-
-		// Set description
-		$this->setPartDescr("Namenloser Motor");
-
-		// Generate unique ID number
-		$this->createUniqueID();
-
-		// Clean up a little
-		$this->removeSystemArray();
+		parent::__construct(__CLASS__);
 	}
 
 	// Einen Motor erstellen
-	public final static function createMotor ($descr, $hp, $cams, $w, $h, $l) {
+	public static final function createMotor ($descr, $hp, $cams, $w, $h, $l) {
 		// Get new instance
 		$motorInstance = new Motor();
 
-		// Debug message
-		if ((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) $motorInstance->getDebugInstance()->output(sprintf("[%s:%d] Motor <strong>%s</strong> wird gebaut...<br />\n",
-			__CLASS__,
-			__LINE__,
-			$descr
-		));
-
 		// Beschreibung und Abmasse setzen
-		$motorInstance->setPartDescr($descr);
 		$motorInstance->setWidth($w);
 		$motorInstance->setHeight($h);
 		$motorInstance->setLength($l);
@@ -75,23 +50,6 @@ class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart
 	public function isTradeable () {
 		return true;
 	}
-
-	/**
-	 * Stub!
-	 */
-	public function saveObjectToDatabase () {
-		$this->getDebugInstance()->output(sprintf("[%s:] Stub <strong>%s</strong> erreicht.",
-			$this->__toString(),
-			__FUNCTION__
-		));
-	}
-
-	/**
-	 * Limits this object with an ObjectLimits instance
-	 */
-	public function limitObject (ObjectLimits $limitInstance) {
-		ApplicationEntryPoint::app_die("".__METHOD__." reached! Stub!");
-	}
 }
 
 // [EOF]