Method constructor() removed, several small fixes

[shipsimu.git] / application / ship-simu / main / parts / class_BaseShipPart.php

diff --git a/application/ship-simu/main/parts/class_BaseShipPart.php b/application/ship-simu/main/parts/class_BaseShipPart.php
index 9bb8b6e038572be8bff951f8e708ff0718787fe1..9f2061775b711e92bf1f9fe815fd052a918647b3 100644 (file)
--- a/application/ship-simu/main/parts/class_BaseShipPart.php
+++ b/application/ship-simu/main/parts/class_BaseShipPart.php
@@ -19,16 +19,16 @@
  * 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 BaseShipPart extends BaseSimulator {
        // Price of this ship part
        private $price = 0.00;
 
        // Konstruktor
-       private function __construct($class) {
+       protected function __construct($class) {
                // Call parent constructor
-               parent::constructor($class);
+               parent::__construct($class);
 
                // Debug message
                if (((defined('DEBUG_SHIPPART')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
@@ -39,22 +39,12 @@ class BaseShipPart extends BaseSimulator {
                }
 
                // Beschreibung
-               $this->setPartDescr("Schiffsteil");
+               $this->setObjectDescription("Schiffsteil");
 
                // Clean up a little
                $this->removeNumberFormaters();
        }
 
-       /**
-        * Calls the private constructor
-        *
-        * @param       $class  The class' name
-        * @return      void
-        */
-       public function constructor ($class) {
-               $this->__construct($class);
-       }
-
        // Setter for price
        public final function setPrice ($price) {
                $this->price = (float) $price;