Method constructor() removed, several small fixes

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

diff --git a/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php b/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php
index cf50ce16a54ed5b0fbe6f902229b12ff0ac2e628..31253aef2942264559b8ad3e13d45a2eed416189 100644 (file)
--- a/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php
+++ b/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php
@@ -19,7 +19,7 @@
  * 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 BaseCabinStructure extends BaseStructure {
        // --- Besondere Eigenschaften dazufuegen: ---
@@ -33,9 +33,9 @@ class BaseCabinStructure extends BaseStructure {
        private $numBeds = 0;
 
        // Konstruktor
-       private function __construct ($class) {
+       protected function __construct ($class) {
                // Call parent constructor
-               parent::constructor($class);
+               parent::__construct($class);
 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
@@ -46,17 +46,7 @@ class BaseCabinStructure extends BaseStructure {
                }
 
                // Set description
-               $this->setPartDescr("Kabinenstruktur");
-       }
-
-       /**
-        * Calls the private constructor
-        *
-        * @param       $class  The class' name
-        * @return      void
-        */
-       public function constructor ($class) {
-               $this->__construct($class);
+               $this->setObjectDescription("Kabinenstruktur");
        }
 
        // Kabine hinzufuegen
@@ -64,7 +54,7 @@ class BaseCabinStructure extends BaseStructure {
                if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Kabine <strong>%s</strong> wird f&uuml;r das Schiff <strong>%s</strong> konstruiert.<br />\n",
                        __CLASS__,
                        __LINE__,
-                       $cabinInstance->getPartDescr(),
+                       $cabinInstance->getObjectDescription(),
                        $shipInstance->getShipName()
                ));
 
@@ -88,7 +78,7 @@ class BaseCabinStructure extends BaseStructure {
                if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Kabine <strong>%s</strong> wurde in das Schiff eingebaut.<br />\n",
                        __CLASS__,
                        __LINE__,
-                       $cabinInstance->getPartDescr(),
+                       $cabinInstance->getObjectDescription(),
                        $shipInstance->getShipName()
                ));
        }