Minor code improvements:

[shipsimu.git] / application / ship-simu / main / ships / passenger / class_PassengerShip.php

diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
index af742b3450c3ac5d18a994ce9ad1b9d952cfa543..39f50db78d00aadf707f3b685d5ce79d5bfcb1d7 100644 (file)
--- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php
+++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
@@ -43,15 +43,7 @@ class PassengerShip extends BaseShip implements ConstructableShip {
                // Get new instance
                $passInstance = new PassengerShip();
 
-               // Debug message
-               if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) {
-                       $passInstance->getDebugInstance()->output(sprintf("[%s:%d] Ein Passagier-Schiff wird erstellt.",
-                               __CLASS__,
-                               __LINE__
-                       ));
-               } // END - if
-
-               // Set ship's name
+               // Set ship name
                $passInstance->setShipName($shipName);
 
                // Instanz zurueckgeben
@@ -59,7 +51,7 @@ class PassengerShip extends BaseShip implements ConstructableShip {
        }
 
        // Anzahl Betten ermitteln
-       final function calcTotalBeds () {
+       public final function calcTotalBeds () {
                // Struktur-Array holen
                $struct = $this->getStructuresArray();
 
@@ -90,34 +82,11 @@ class PassengerShip extends BaseShip implements ConstructableShip {
                                        if (!is_null($cab)) {
                                                // Kabinenbeschreibung holen
                                                $cabType = $cab->getObjectDescription();
-                                       }
-
-                                       // Debug-Meldung ausgeben
-                                       $this->getDebugInstance()->output(sprintf("[%s:%d] Es stehen <strong>%d</strong> Betten vom Kabinen-Typ <strong>%s</strong> bereit.",
-                                               __CLASS__,
-                                               __LINE__,
-                                               $total,
-                                               $cabType
-                                       ));
-                               }
-                       } else {
-                               // Keine Kabine!
-                               if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> ist keine Kabine.",
-                                       __CLASS__,
-                                       __LINE__,
-                                       $el->getObjectDescription()
-                               ));
-                       }
+                                       } // END - if
+                               } // END - if
+                       } // END - if
                } // END - for
 
-               if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das <strong>%s</strong> mit dem Namen <strong>%s</strong> hat <strong>%d</strong> Betten.",
-                       __CLASS__,
-                       __LINE__,
-                       $this->getObjectDescription(),
-                       $this->getShipName(),
-                       $numBeds
-               ));
-
                // Anzahl zurueckliefern
                return $numBeds;
        }