Method constructor() removed, several small fixes

[shipsimu.git] / application / ship-simu / main / drives / motor / class_Motor.php

diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php
index 0af6b97a92e04c0092231657bb2e2f11a10a1e1b..699c7219d5a89037c3cd2a723036ef4aee70f92b 100644 (file)
--- a/application/ship-simu/main/drives/motor/class_Motor.php
+++ b/application/ship-simu/main/drives/motor/class_Motor.php
@@ -1,11 +1,31 @@
 <?php
-
-// Motorisierter Antrieb
-class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart {
+/**
+ * A motorized drive for bigger ships
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @license            GNU GPL 3.0 or any newer version
+ * @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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ */
+class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart {
        // Constructor
-       private function __construct() {
-               // Eltern-Konstruktor aufrufen
-               parent::constructor(__CLASS__);
+       protected function __construct() {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
 
                // Debug message
                if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
@@ -15,10 +35,10 @@ class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart
                        ));
                }
 
-               // Beschreibung setzen
-               $this->setPartDescr("Namenloser Motor");
+               // Set description
+               $this->setObjectDescription("Namenloser Motor");
 
-               // Unique-ID erzeugen
+               // Generate unique ID number
                $this->createUniqueID();
 
                // Clean up a little
@@ -26,8 +46,8 @@ class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart
        }
 
        // Einen Motor erstellen
-       public static function createMotor ($descr, $hp, $cams, $w, $h, $l) {
-               // Instanz holen
+       public final static function createMotor ($descr, $hp, $cams, $w, $h, $l) {
+               // Get new instance
                $motorInstance = new Motor();
 
                // Debug message
@@ -38,7 +58,7 @@ class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart
                ));
 
                // Beschreibung und Abmasse setzen
-               $motorInstance->setPartDescr($descr);
+               $motorInstance->setObjectDescription($descr);
                $motorInstance->setWidth($w);
                $motorInstance->setHeight($h);
                $motorInstance->setLength($l);