Method constructor() removed, several small fixes

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

diff --git a/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php b/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php
index c930fee06c9cb37d8f51b88658e94475e9879eab..74eb19b0bcfc3695c57e7b740ac639a6420aef3a 100644 (file)
--- a/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php
+++ b/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php
@@ -19,15 +19,15 @@
  * 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 BaseUpperStructure extends BaseStructure {
        /**
         * Constructor for all super structures on a ship
         */
-       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'))) {
@@ -38,14 +38,7 @@ class BaseUpperStructure extends BaseStructure {
                }
 
                // Set description
-               $this->setPartDescr("Aufbauten");
-       }
-
-       /**
-        * Call new constructor
-        */
-       function constructor ($class) {
-               $this->__construct($class);
+               $this->setObjectDescription("Aufbauten");
        }
 }