'public static final' is correct

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

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
index 8dd7574fcc6f502cb182cd95d8d4cf399d19d83b..f6d12aec4d04c3b662b14e4c037c6b8eb129c3c6 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @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
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -26,28 +26,13 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);

-
-               // Set description
-               $this->setObjectDescription("Luxuskabine");
-
-               // Generate unique ID number
-               $this->generateUniqueId();
-
-               // Clean up a little
-               $this->removeSystemArray();

        }
 
        // Eine Luxuskabine erstellen
        }
 
        // Eine Luxuskabine erstellen

-       public final static function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) {
+       public static final function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) {

                // Get new instance
                $luxuryInstance = new LuxuryCabin();
 
                // Get new instance
                $luxuryInstance = new LuxuryCabin();
 

-               // Debug message
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $luxuryInstance->getDebugInstance()->output(sprintf("[%s:%d] Eine Luxuskabine wird konstruiert...<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-

                // Abmasse extrahieren
                $luxuryInstance->extractDimensions($dim);
 
                // Abmasse extrahieren
                $luxuryInstance->extractDimensions($dim);
 


@@ -67,13 +52,6 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP
        public function isTradeable () {
                return true;
        }
        public function isTradeable () {
                return true;
        }

-
-       /**
-        * Limits this object with an ObjectLimits instance
-        */
-       public function limitObject (ObjectLimits $limitInstance) {
-               ApplicationEntryPoint::app_die("".__METHOD__." reached! Stub!");
-       }

 }
 
 // [EOF]
 }
 
 // [EOF]