Method constructor() removed, several small fixes

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

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php
index 851c69e491af667b6e88ae31ca630b957f02e109..63574618785e46c40cc24b69d96cb651a06b207a 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.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 EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
+class EconomyCabin 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'))) {
@@ -36,7 +36,7 @@ class EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
                }
 
                // Set description
-               $this->setPartDescr("Economy-Class-Kabine");
+               $this->setObjectDescription("Economy-Class-Kabine");
 
                // Generate unique ID number
                $this->createUniqueID();
@@ -71,36 +71,6 @@ class EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
                return $ecoInstance;
        }
 
-       // 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;