Method constructor() removed, several small fixes

[shipsimu.git] / application / ship-simu / main / structures / extended / cabines / ship / class_PremierCabin.php

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
index 3be9a95b0c4c45367d156d0fd0012c5af66428e8..020fd14869857329c04a06b83a371e9a1cca9a52 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
@@ -19,13 +19,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 PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
+class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor
-       private function __construct () {
+       protected function __construct () {
                // Call parent constructor
-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);
 
                // Debug message
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[PremierCabin:] Konstruktor erreicht.<br />\n",
@@ -34,7 +34,7 @@ class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
                ));
 
                // Set description
-               $this->setPartDescr("Premier-Class-Kabine");
+               $this->setObjectDescription("Premier-Class-Kabine");
 
                // Generate unique ID number
                $this->createUniqueID();
@@ -44,7 +44,7 @@ class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
        }
 
        // Premier-Kabine erstellen
-       public static function createPremierCabin ($numLuxury, $numRooms, $numBeds, $dim) {
+       public final static function createPremierCabin ($numLuxury, $numRooms, $numBeds, $dim) {
                // Get new instance
                $premierInstance = new PremierCabin();
 
@@ -66,36 +66,6 @@ class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
                return $premierInstance;
        }
 
-       // Loesch-Methode fuer Anzahl Betten
-       public function removeNumBeds() {
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Anzahl Betten gel&ouml;scht.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-               unset($this->numBeds);
-               parent::removeNumBeds();
-       }
-
-       // Loesch-Methode fuer Anzahl Kabinen
-       public function removeNumCabin() {
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Anzahl Kabinen gel&ouml;scht.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-               unset($this->numCabin);
-               parent::removeNumCabin();
-       }
-
-       // Loesch-Methode fuer Anzahl Raeume
-       public function removeNumRooms() {
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Anzahl R&auml;ume gel&ouml;scht.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-               unset($this->numRooms);
-               parent::removeNumRooms();
-       }
-
        // Overwritten method for tradeable items
        public function isTradeable () {
                return true;