Method constructor() removed, several small fixes

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

diff --git a/application/ship-simu/main/structures/class_BaseStructure.php b/application/ship-simu/main/structures/class_BaseStructure.php
index 5259ca29e3778df4b59ee356544188a6f3b3744e..8620ce95d71d7544a0c26607d9ad19a32fccfdb2 100644 (file)
--- a/application/ship-simu/main/structures/class_BaseStructure.php
+++ b/application/ship-simu/main/structures/class_BaseStructure.php
@@ -19,16 +19,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 BaseStructure extends BaseSimulator {
        // Price of this structure
        private $price = 0.00;
 
        // Konstruktor (hier keine Exceptions aendern!)
  */
 class BaseStructure extends BaseSimulator {
        // Price of this structure
        private $price = 0.00;
 
        // Konstruktor (hier keine Exceptions aendern!)

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -39,22 +39,12 @@ class BaseStructure extends BaseSimulator {
                }
 
                // Set description
                }
 
                // Set description

-               $this->setPartDescr("Schiffsstrukturen");
+               $this->setObjectDescription("Schiffsstrukturen");

 
                // Clean up a little
                $this->removeNumberFormaters();
        }
 
 
                // 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;
        // Setter for price
        public final function setPrice ($price) {
                $this->price = (float) $price;