Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 23, 2011, 12:45:53 AM (13 years ago)
Author:
landauf
Message:

merged output branch back to trunk.

Changes:

  • you have to include util/Output.h instead of util/Debug.h
  • COUT(x) is now called orxout(level)
  • output levels are now defined by an enum instead of numbers. see util/Output.h for the definition
  • it's possible to use output contexts with orxout(level, context). see util/Output.h for some common contexts. you can define more contexts
  • you must use 'endl' at the end of an output message, '\n' does not flush the message

Output levels:

  • instead of COUT(0) use orxout()
  • instead of COUT(1) use orxout(user_error) or orxout(internal_error)
  • instead of COUT(2) use orxout(user_warning) or orxout(internal_warning)
  • instead of COUT(3) use orxout(user_status/user_info) or orxout(internal_status/internal_info)
  • instead of COUT(4) use orxout(verbose)
  • instead of COUT(5) use orxout(verbose_more)
  • instead of COUT(6) use orxout(verbose_ultra)

Guidelines:

  • user_* levels are for the user, visible in the console and the log-file
  • internal_* levels are for developers, visible in the log-file
  • verbose_* levels are for debugging, only visible if the context of the output is activated

Usage in C++:

  • orxout() << "message" << endl;
  • orxout(level) << "message" << endl;
  • orxout(level, context) << "message" << endl;

Usage in Lua:

  • orxout("message")
  • orxout(orxonox.level.levelname, "message")
  • orxout(orxonox.level.levelname, "context", "message")

Usage in Tcl (and in the in-game-console):

  • orxout levelname message
  • orxout_context levelname context message
  • shortcuts: log message, error message, warning message, status message, info message, debug message
Location:
code/trunk
Files:
65 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/modules/designtools/ScreenshotManager.cc

    r8415 r8858  
    153153            finalImage->save(PathConfig::getInstance().getLogPathString() + "screenshot_" + getTimestamp() + this->fileExtension_);
    154154            delete finalImage;
    155             COUT(3) << "Finished taking " << this->gridSize_*this->windowWidth_ << "x" << this->gridSize_*this->windowHeight_ << " pixel HD screenshot. Storing in log/." << endl;
     155            orxout(user_info) << "Finished taking " << this->gridSize_*this->windowWidth_ << "x" << this->gridSize_*this->windowHeight_ << " pixel HD screenshot. Storing in log/." << endl;
    156156        }
    157157        else
    158             COUT(1) << "There needs to be an active camera to make screenshots." << endl;
     158            orxout(user_error) << "There needs to be an active camera to make screenshots." << endl;
    159159
    160160        this->cleanup();
    … …  
    257257                this->buffer_->blitToMemory(this->finalPicturePB_->getSubVolume(subBox));
    258258               
    259                 COUT(4) << "Created screenshot number " << nbScreenshots << " for multi grid HD screenshot." << endl;
     259                orxout(internal_info) << "Created screenshot number " << nbScreenshots << " for multi grid HD screenshot." << endl;
    260260               
    261261            }

  • code/trunk/src/modules/designtools/SkyboxGenerator.cc

    r8413 r8858  
    149149            else
    150150            {
    151                 COUT(1) << "You must be in a level to generate a skybox." << endl;
     151                orxout(user_error) << "You must be in a level to generate a skybox." << endl;
    152152                this->bGenerateSkybox_ = false;
    153153                return;
    … …  
    175175                Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getInstance().getLogPathString(), "FileSystem", Resource::getDefaultResourceGroup());
    176176               
    177                 COUT(4) << "Setting up SkyboxGenerator..." << endl;
     177                orxout(internal_status) << "Setting up SkyboxGenerator..." << endl;
    178178               
    179179                this->bSetup_ = false;
    … …  
    194194                    entity->pitch(Degree((float)rotate.second));
    195195               
    196                 COUT(4) << "Created face number " << this->faceCounter_ << "." << endl;
     196                orxout(internal_info) << "Created face number " << this->faceCounter_ << "." << endl;
    197197                // Check whether we've generated all 6 faces.
    198198                if(++this->faceCounter_ >= 6)
    … …  
    225225                CommandExecutor::execute("pause");
    226226               
    227                 COUT(3) << "Skybox with face size " << this->size_ << "x" << this->size_ << " pixels created. Storing in log/." << endl;
     227                orxout(user_info) << "Skybox with face size " << this->size_ << "x" << this->size_ << " pixels created. Storing in log/." << endl;
    228228            }
    229229        }

  • code/trunk/src/modules/docking/Dock.cc

    r8729 r8858  
    8787        {
    8888            if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
    89                 COUT(4) << "Docking:execute PlayerTrigger was not triggered by a player.." << std::endl;
     89                orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
    9090                return false;
    9191            }
    … …  
    9494        else
    9595        {
    96             COUT(4) << "Docking::execute Not a player trigger, can't extract pawn from it.." << std::endl;
     96            orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
    9797            return false;
    9898        }
    9999        if(player == NULL)
    100100        {
    101             COUT(4) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
     101            orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
    102102            return false;
    103103        }
    … …  
    168168        if(candidates_.find(player) == candidates_.end())
    169169        {
    170             COUT(2) << "Dock::dock Player is not a candidate!" << std::endl;
     170            orxout(internal_warning, context::docking) << "Dock::dock Player is not a candidate!" << endl;
    171171            return false;
    172172        }
    … …  
    187187        if(docked_.find(player) == docked_.end())
    188188        {
    189             COUT(2) << "Dock::dockingAnimationFinished Player is not currently docked." << std::endl;
     189            orxout(internal_warning, context::docking) << "Dock::dockingAnimationFinished Player is not currently docked." << endl;
    190190            return false;
    191191        }
    … …  
    200200        if(docked_.find(player) == docked_.end())
    201201        {
    202             COUT(2) << "Dock::undock Player is not docked to this Dock." << std::endl;
     202            orxout(internal_warning, context::docking) << "Dock::undock Player is not docked to this Dock." << endl;
    203203            return false;
    204204        }
    … …  
    218218
    219219    bool Dock::undockingAnimationFinished(PlayerInfo* player) {
    220         COUT(4) << "Dock::undockingAnimationFinished executed" << std::endl;
     220        orxout(verbose, context::docking) << "Dock::undockingAnimationFinished executed" << endl;
    221221        return true;
    222222    }

  • code/trunk/src/modules/docking/DockToShip.cc

    r8706 r8858  
    4343    {
    4444        RegisterObject(DockToShip);
    45         COUT(4) << "DockToShip instance created.." << endl;
     45        orxout(verbose, context::docking) << "DockToShip instance created.." << endl;
    4646    }
    4747
    … …  
    6969    bool DockToShip::docking(PlayerInfo* player)
    7070    {
    71         COUT(4) << "DockToShip::attach" << endl;
     71        orxout(verbose, context::docking) << "DockToShip::attach" << endl;
    7272
    7373        DockingTarget *target = DockingEffect::findTarget(this->target_);
    7474        if (target == NULL) {
    75             COUT(0) << "Can't retrieve target for '" << this->target_ << "'.." << std::endl;
     75            orxout(internal_warning, context::docking) << "Can't retrieve target for '" << this->target_ << "'.." << endl;
    7676            return false;
    7777        }
    … …  
    7979        ControllableEntity *dockTo = (ControllableEntity*) target->getParent();
    8080        if (dockTo == NULL) {
    81             COUT(2) << "Parent is not a ControllableEntity.." << std::endl;
     81            orxout(internal_warning, context::docking) << "Parent is not a ControllableEntity.." << endl;
    8282            return false;
    8383        }
    … …  
    9292    bool DockToShip::release(PlayerInfo* player)
    9393    {
    94         COUT(4) << "DockToShip::release" << endl;
     94        orxout(verbose, context::docking) << "DockToShip::release" << endl;
    9595
    9696        player->stopTemporaryControl();

  • code/trunk/src/modules/docking/DockingController.cc

    r8706 r8858  
    9797        if (docking)
    9898        {
    99             COUT(4) << "DockingController::takeControl Taking over control." << std::endl;
     99            orxout(verbose, context::docking) << "DockingController::takeControl Taking over control." << endl;
    100100
    101101            this->entity_->setDestroyWhenPlayerLeft(false);
    … …  
    108108    void DockingController::positionReached()
    109109    {
    110         COUT(4) << "DockingController::positionReached() called." << std::endl;
     110        orxout(verbose, context::docking) << "DockingController::positionReached() called." << endl;
    111111
    112112        assert(this->player_);

  • code/trunk/src/modules/docking/DockingTarget.cc

    r8706 r8858  
    5353        SUPER(DockingTarget, XMLPort, xmlelement, mode);
    5454
    55         COUT(4) << "DockingTarget with name '" << this->getName() << "' created.." << std::endl;
     55        orxout(verbose, context::docking) << "DockingTarget with name '" << this->getName() << "' created.." << endl;
    5656    }
    5757

  • code/trunk/src/modules/gametypes/RaceCheckPoint.cc

    r8767 r8858  
    2929#include "RaceCheckPoint.h"
    3030
     31#include "util/Convert.h"
    3132#include "core/CoreIncludes.h"
    3233#include "core/XMLPort.h"
    33 #include "util/Convert.h"
     34#include "chat/ChatManager.h"
    3435
    3536#include "SpaceRace.h"
    … …  
    110111            {
    111112                const std::string& message =  "You have " + multi_cast<std::string>(this->bTimeLimit_)
    112                             + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1) + "\n";
    113                 COUT(3) << message;
     113                            + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1);
    114114                const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage(message);
     115                ChatManager::message(message);
    115116            }
    116117        }

  • code/trunk/src/modules/gametypes/SpaceRace.cc

    r8767 r8858  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "network/Host.h"
     32#include "chat/ChatManager.h"
    3333#include "util/Convert.h"
    3434#include "util/Math.h"
    … …  
    5454            this->clock_.capture();
    5555            int s = this->clock_.getSeconds();
    56             int ms = this->clock_.getMilliseconds()-1000*s;
     56            int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
    5757            const std::string& message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
    5858                        + "You didn't reach the check point " + multi_cast<std::string>(this->checkpointsReached_+1)
    5959                        + " before the time limit. You lose!";
    60             COUT(3) << message;
    6160            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
     61            ChatManager::message(message);
    6262        }
    6363        else
    … …  
    6565            this->clock_.capture();
    6666            int s = this->clock_.getSeconds();
    67             int ms = this->clock_.getMilliseconds()-1000*s;
     67            int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
    6868            const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
    6969                        + "." + multi_cast<std::string>(ms) + " seconds.";
    70             COUT(3) << message << std::endl;
    7170            const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
     71            ChatManager::message(message);
     72/*
    7273            float time = this->clock_.getSecondsPrecise();
    7374            this->scores_.insert(time);
    7475            std::set<float>::iterator it;
    7576            for (it=this->scores_.begin(); it!=this->scores_.end(); it++)
    76             COUT(3) <<  multi_cast<std::string>(*it) << std::endl;
     77                orxout(level::message) << multi_cast<std::string>(*it) << endl;
     78*/
    7779        }
    7880    }
    … …  
    8385
    8486        std::string message("The match has started! Reach the check points as quickly as possible!");
    85         COUT(3) << message << std::endl;
    8687        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
     88        ChatManager::message(message);
    8789    }
    8890
    … …  
    9294        this->clock_.capture();
    9395        int s = this->clock_.getSeconds();
    94         int ms = this->clock_.getMilliseconds()-1000*s;
     96        int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
    9597        const std::string& message = "Checkpoint " + multi_cast<std::string>(this->getCheckpointsReached())
    9698                        + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
    97                         + " seconds.\n";
    98         COUT(3) << message;
     99                        + " seconds.";
    99100        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
     101        ChatManager::message(message);
    100102    }
    101103

  • code/trunk/src/modules/notifications/NotificationDispatcher.cc

    r8706 r8858  
    137137            return false;
    138138
    139         COUT(4) << "NotificationDispatcher (&" << this << ") triggered." << std::endl;
     139        orxout(verbose, context::notifications) << "NotificationDispatcher (&" << this << ") triggered." << endl;
    140140
    141141        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
    … …  
    155155        if(player == NULL)
    156156        {
    157             COUT(4) << "The NotificationDispatcher was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
     157            orxout(verbose, context::notifications) << "The NotificationDispatcher was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
    158158            return false;
    159159        }

  • code/trunk/src/modules/notifications/NotificationManager.cc

    r8706 r8858  
    5757        RegisterRootObject(NotificationManager);
    5858
    59         COUT(3) << "NotificatioManager created." << std::endl;
     59        orxout(internal_info, context::notifications) << "NotificatioManager created." << endl;
    6060    }
    6161
    … …  
    7171        this->allNotificationsList_.clear();
    7272
    73         COUT(3) << "NotificationManager destroyed." << std::endl;
     73        orxout(internal_info, context::notifications) << "NotificationManager destroyed." << endl;
    7474    }
    7575
    … …  
    132132
    133133        if(commandExecuted)
    134             COUT(3) << "Notification command \"" << NotificationListener::command2Str(command) << "\" executed." << endl;
     134            orxout(internal_info, context::notifications) << "Notification command \"" << NotificationListener::command2Str(command) << "\" executed." << endl;
    135135
    136136        return commandExecuted;
    … …  
    198198        }
    199199
    200         COUT(4) << "Notification (&" << notification << ") registered with the NotificationManager." << std::endl;
     200        orxout(verbose, context::notifications) << "Notification (&" << notification << ") registered with the NotificationManager." << endl;
    201201
    202202        return true;
    … …  
    219219        this->removeNotification(notification, *(this->notificationLists_.find(queue->getName())->second));
    220220
    221         COUT(4) << "Notification (&" << notification << ") unregistered with the NotificationManager from NotificationQueue " << queue->getName() << "." << std::endl;
     221        orxout(verbose, context::notifications) << "Notification (&" << notification << ") unregistered with the NotificationManager from NotificationQueue " << queue->getName() << "." << endl;
    222222    }
    223223
    … …  
    351351        queue->update(); // Update the queue.
    352352       
    353         COUT(4) << "NotificationQueue '" << queue->getName() << "' registered with the NotificationManager." << std::endl;
     353        orxout(verbose, context::notifications) << "NotificationQueue '" << queue->getName() << "' registered with the NotificationManager." << endl;
    354354        return true;
    355355    }
    … …  
    384384        this->notificationLists_.erase(queue->getName());
    385385       
    386         COUT(4) << "NotificationQueue '" << queue->getName() << "' unregistered with the NotificationManager." << std::endl;
     386        orxout(verbose, context::notifications) << "NotificationQueue '" << queue->getName() << "' unregistered with the NotificationManager." << endl;
    387387    }
    388388

  • code/trunk/src/modules/notifications/NotificationQueue.cc

    r8706 r8858  
    131131        {
    132132            this->registered_ = false;
    133             COUT(1) << "Error: NotificationQueue '" << this->getName() << "' could not be registered." << std::endl;
     133            orxout(internal_error, context::notifications) << "NotificationQueue '" << this->getName() << "' could not be registered." << endl;
    134134            return;
    135135        }
    136136
    137         COUT(3) << "NotificationQueue '" << this->getName() << "' created." << std::endl;
     137        orxout(internal_info, context::notifications) << "NotificationQueue '" << this->getName() << "' created." << endl;
    138138    }
    139139
    … …  
    215215        delete notifications;
    216216
    217         COUT(4) << "NotificationQueue '" << this->getName() << "' updated." << std::endl;
     217        orxout(verbose, context::notifications) << "NotificationQueue '" << this->getName() << "' updated." << endl;
    218218    }
    219219
    … …  
    232232        this->push(notification, time);
    233233
    234         COUT(4) << "NotificationQueue '" << this->getName() << "' updated. A new Notification has been added." << std::endl;
     234        orxout(verbose, context::notifications) << "NotificationQueue '" << this->getName() << "' updated. A new Notification has been added." << endl;
    235235    }
    236236
    … …  
    265265        this->notificationPushed(notification);
    266266
    267         COUT(5) << "Notification \"" << notification->getMessage() << "\" pushed to NotificationQueue '" << this->getName() << "'" << endl;
    268         COUT(3) << "NotificationQueue \"" << this->getName() << "\": " << notification->getMessage() << endl;
     267        orxout(verbose_more, context::notifications) << "Notification \"" << notification->getMessage() << "\" pushed to NotificationQueue '" << this->getName() << "'" << endl;
     268        orxout(internal_info, context::notifications) << "NotificationQueue \"" << this->getName() << "\": " << notification->getMessage() << endl;
    269269    }
    270270
    … …  
    284284            if(container == *it)
    285285            {
    286                 COUT(5) << "Notification \"" << (*it)->notification->getMessage() << "\" popped from NotificationQueue '" << this->getName() << "'" << endl;
     286                orxout(verbose_more, context::notifications) << "Notification \"" << (*it)->notification->getMessage() << "\" popped from NotificationQueue '" << this->getName() << "'" << endl;
    287287                this->ordering_.erase(it);
    288288                break;
    … …  
    311311        std::vector<NotificationContainer*>::difference_type index = it - this->notifications_.begin ();
    312312
    313         COUT(5) << "Notification \"" << (*it)->notification->getMessage() << "\" removed from NotificationQueue '" << this->getName() << "'" << endl;
     313        orxout(verbose_more, context::notifications) << "Notification \"" << (*it)->notification->getMessage() << "\" removed from NotificationQueue '" << this->getName() << "'" << endl;
    314314
    315315        this->ordering_.erase(containerIterator);
    … …  
    333333    void NotificationQueue::clear(bool noGraphics)
    334334    {
    335         COUT(4) << "Clearing NotificationQueue " << this->getName() << "." << endl;
     335        orxout(verbose, context::notifications) << "Clearing NotificationQueue " << this->getName() << "." << endl;
    336336        this->ordering_.clear();
    337337        // Delete all NotificationContainers in the list.
    … …  
    367367        if(size == 0)
    368368        {
    369             COUT(2) << "Trying to set maximal size of NotificationQueue '" << this->getName() << "' to 0. Ignoring..." << endl;
     369            orxout(internal_warning, context::notifications) << "Trying to set maximal size of NotificationQueue '" << this->getName() << "' to 0. Ignoring..." << endl;
    370370            return;
    371371        }
    … …  
    398398        if(time != NotificationQueue::INF && time <= 0)
    399399        {
    400             COUT(2) << "Trying to set display time of NotificationQueue '" << this->getName() << "' to non-positive value. Ignoring..." << endl;
     400            orxout(internal_warning, context::notifications) << "Trying to set display time of NotificationQueue '" << this->getName() << "' to non-positive value. Ignoring..." << endl;
    401401        }
    402402           

  • code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc

    r8729 r8858  
    143143        if(size.x < 0.0 || size.x > 1.0 || size.z < 0.0 || size.z > 1.0)
    144144        {
    145             COUT(2) << "The display size of the NotificationQueueCEGUI " << this->getName() << " was trying to be set, but the relative size was not in [0,1]. Aborting..." << endl;
     145            orxout(internal_warning, context::notifications) << "The display size of the NotificationQueueCEGUI " << this->getName() << " was trying to be set, but the relative size was not in [0,1]. Aborting..." << endl;
    146146            return;
    147147        }
    … …  
    183183        if(position.x < 0.0 || position.x > 1.0 || position.z < 0.0 || position.z > 1.0)
    184184        {
    185             COUT(2) << "The position the NotificationQueueCEGUI " << this->getName() << " was trying to be set, but the relative position was not in [0,1]. Aborting..." << endl;
     185            orxout(internal_warning, context::notifications) << "The position the NotificationQueueCEGUI " << this->getName() << " was trying to be set, but the relative position was not in [0,1]. Aborting..." << endl;
    186186            return;
    187187        }

  • code/trunk/src/modules/objects/ForceField.cc

    r8397 r8858  
    216216        else
    217217        {
    218             COUT(2) << "Wrong mode '" << mode << "' in ForceField. Setting to 'tube'." << std::endl;
     218            orxout(internal_warning) << "Wrong mode '" << mode << "' in ForceField. Setting to 'tube'." << endl;
    219219            this->mode_ = forceFieldMode::tube;
    220220        }

  • code/trunk/src/modules/objects/Planet.cc

    r7401 r8858  
    7373            {
    7474                float distance = this->getPosition().distance( activeCamera->getWorldPosition() );
    75                 //             COUT(2) << distance << std::endl;
     75                //             orxout(internal_warning) << distance << endl;
    7676                float planetRadius = this->getScale();
    7777

  • code/trunk/src/modules/objects/Script.cc

    r8706 r8858  
    137137            return false;
    138138
    139         COUT(4) << "Script (&" << this << ") triggered." << std::endl;
     139        orxout(verbose, context::misc::script) << "Script (&" << this << ") triggered." << endl;
    140140
    141141        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
    … …  
    155155        if(player == NULL)  //TODO: Will this ever happen? If not, change in NotificationDispatcher as well.
    156156        {
    157             COUT(4) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
     157            orxout(internal_warning) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
    158158            return false;
    159159        }
    … …  
    272272        else
    273273        {
    274             COUT(2) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << std::endl;
     274            orxout(internal_warning) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << endl;
    275275            this->setMode(ScriptMode::normal);
    276276            this->modeStr_ = Script::NORMAL;
    … …  
    323323        else
    324324        {
    325             COUT(2) << "Invalid times '" << times << "' in Script. Setting to infinity." << std::endl;
     325            orxout(internal_warning) << "Invalid times '" << times << "' in Script. Setting to infinity." << endl;
    326326            this->times_ = Script::INF;
    327327            this->remainingExecutions_ = Script::INF;

  • code/trunk/src/modules/objects/SpaceBoundaries.cc

    r8767 r8858  
    215215                distance = this->computeDistance(currentPawn);
    216216                humanItem = this->isHumanPlayer(currentPawn);
    217                 COUT(5) << "Distance:" << distance << std::endl; // message for debugging
     217//                orxout() << "Distance:" << distance << endl; // message for debugging
    218218                if(distance > this->warnDistance_ && distance < this->maxDistance_) // Display warning
    219219                {
    … …  
    231231                    if( humanItem )
    232232                    {
    233                         COUT(5) << "Health should be decreasing!" << std::endl;
     233//                        orxout() << "Health should be decreasing!" << endl;
    234234                        this->displayWarning("You are out of the area now!");
    235235                    }

  • code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc

    r8706 r8858  
    9393        if(!this->hasUniformScaling())
    9494        {
    95             CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
     95            orxout(internal_error) << "BoxCollisionShape: Non-uniform scaling is not yet supported." << endl;
    9696            return;
    9797        }

  • code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc

    r8706 r8858  
    9292        if(!this->hasUniformScaling())
    9393        {
    94             CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
     94            orxout(internal_error) << "ConeCollisionShape: Non-uniform scaling is not yet supported." << endl;
    9595            return;
    9696        }

  • code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

    r8706 r8858  
    9292        if(!this->hasUniformScaling())
    9393        {
    94             CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
     94            orxout(internal_error) << "PlaneCollisionShape: Non-uniform scaling is not yet supported." << endl;
    9595            return;
    9696        }

  • code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc

    r8706 r8858  
    8989        if(!this->hasUniformScaling())
    9090        {
    91             CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
     91            orxout(internal_error) << "SphereCollisionShape: Non-uniform scaling is not yet supported." << endl;
    9292            return;
    9393        }

  • code/trunk/src/modules/objects/eventsystem/EventFilter.cc

    r8729 r8858  
    6363        if (this->bActive_)
    6464        {
    65             COUT(2) << "Warning: Detected Event loop in EventFilter \"" << this->getName() << '"' << std::endl;
     65            orxout(internal_warning, context::events) << "Detected Event loop in EventFilter \"" << this->getName() << '"' << endl;
    6666            return;
    6767        }

  • code/trunk/src/modules/objects/eventsystem/EventListener.cc

    r8729 r8858  
    5959        if (this->bActive_)
    6060        {
    61             COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << '"' << std::endl;
     61            orxout(internal_warning, context::events) << "Detected Event loop in EventListener \"" << this->getName() << '"' << endl;
    6262            return;
    6363        }
    6464
    65         COUT(4) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl;
     65        orxout(verbose, context::events) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << endl;
    6666
    6767        this->bActive_ = true;

  • code/trunk/src/modules/objects/eventsystem/EventTarget.cc

    r6417 r8858  
    6060        if (this->bActive_)
    6161        {
    62             COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << '"' << std::endl;
     62            orxout(internal_warning, context::events) << "Detected Event loop in EventTarget \"" << this->getName() << '"' << endl;
    6363            return;
    6464        }

  • code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc

    r8706 r8858  
    247247            this->setBeaconModeDirect(distanceMultiTriggerBeaconMode::exclude);
    248248        else
    249             COUT(1) << "Invalid beacon mode in DistanceMultiTrigger." << endl;
     249            orxout(internal_error, context::triggers) << "Invalid beacon mode in DistanceMultiTrigger." << endl;
    250250    }
    251251

  • code/trunk/src/modules/objects/triggers/DistanceTrigger.cc

    r8706 r8858  
    108108        if (targetId == NULL)
    109109        {
    110             COUT(1) << "Error: \"" << targetStr << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << std::endl;
     110            orxout(internal_error, context::triggers) << "\"" << targetStr << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << endl;
    111111            return;
    112112        }
    … …  
    209209                        this->setTriggeringPawn(pawn);
    210210                    else
    211                         CCOUT(2) << "Pawn was NULL." << endl;
     211                        orxout(internal_warning, context::triggers) << "Pawn was NULL." << endl;
    212212                }
    213213               
    … …  
    270270            this->setBeaconModeDirect(distanceTriggerBeaconMode::exclude);
    271271        else
    272             COUT(1) << "Invalid beacon mode in DistanceTrigger." << endl;
     272            orxout(internal_error, context::triggers) << "Invalid beacon mode in DistanceTrigger." << endl;
    273273    }
    274274

  • code/trunk/src/modules/objects/triggers/MultiTrigger.cc

    r8706 r8858  
    7272    MultiTrigger::~MultiTrigger()
    7373    {
    74         COUT(4) << "Destroying MultiTrigger &" << this << ". " << this->stateQueue_.size() << " states still in queue. Deleting." << std::endl;
     74        orxout(verbose, context::triggers) << "Destroying MultiTrigger &" << this << ". " << this->stateQueue_.size() << " states still in queue. Deleting." << endl;
    7575        while(this->stateQueue_.size() > 0)
    7676        {
    … …  
    9494        XMLPortParamLoadOnly(MultiTrigger, "target", addTarget, xmlelement, mode).defaultValues("Pawn"); //TODO: Remove load only
    9595
    96         COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << std::endl;
     96        orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << endl;
    9797    }
    9898
    … …  
    132132                if(state == NULL)
    133133                {
    134                     COUT(1) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was NULL. State ignored." << std::endl;
     134                    orxout(internal_error, context::triggers) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was NULL. State ignored." << endl;
    135135                    queue->pop();
    136136                    continue;
    … …  
    241241                            // Print some debug output if the state has changed.
    242242                            if(state->originator != NULL)
    243                                 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: " << state->originator->getIdentifier()->getName() << " (&" << state->originator << "), active: " << bActive << ", triggered: " << state->bTriggered << "." << std::endl;
     243                                orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: " << state->originator->getIdentifier()->getName() << " (&" << state->originator << "), active: " << bActive << ", triggered: " << state->bTriggered << "." << endl;
    244244                            else
    245                                 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << std::endl;
     245                                orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << endl;
    246246
    247247                            // If the MultiTrigger has a parent trigger, that is itself a MultiTrigger, it needs to call a method to notify him, that its activity has changed.
    … …  
    254254                        {
    255255                            this->BaseObject::setActive(false);
    256                             COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") ran out of activations. Setting it to inactive." << std::endl;
     256                            orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") ran out of activations. Setting it to inactive." << endl;
    257257                        }
    258258                    }
    … …  
    301301        if (target == NULL)
    302302        {
    303             COUT(1) << "Error: '" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;
     303            orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl;
    304304            return;
    305305        }
    … …  
    329329        if (target == NULL)
    330330        {
    331             COUT(1) << "Error: '" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;
     331            orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl;
    332332            return;
    333333        }
    … …  
    447447        {
    448448            this->fireEvent(status);
    449             COUT(4) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. status: " << status << "." << std::endl;
     449            orxout(verbose, context::triggers) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. status: " << status << "." << endl;
    450450            return;
    451451        }
    … …  
    453453        MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator);
    454454        this->fireEvent(status, container);
    455         COUT(4) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << std::endl;
     455        orxout(verbose, context::triggers) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl;
    456456        delete container;
    457457    }

  • code/trunk/src/modules/objects/triggers/TriggerBase.cc

    r8706 r8858  
    128128            this->setMode(TriggerMode::EventTriggerXOR);
    129129        else
    130             COUT(2) << "Invalid mode '" << modeName << "' in TriggerBase " << this->getName() << " &(" << this << "). Leaving mode at '" << this->getModeString() << "'." << std::endl;
     130            orxout(internal_warning, context::triggers) << "Invalid mode '" << modeName << "' in TriggerBase " << this->getName() << " &(" << this << "). Leaving mode at '" << this->getModeString() << "'." << endl;
    131131    }
    132132

  • code/trunk/src/modules/overlays/GUIOverlay.cc

    r7401 r8858  
    7676            GUIManager::getInstance().showGUIExtra(this->guiName_, str);
    7777
    78             COUT(4) << "Showing GUI " << this->guiName_ << std::endl;
     78            orxout(verbose, context::misc::gui) << "Showing GUI " << this->guiName_ << endl;
    7979        }
    8080        else
    8181        {
    8282            GUIManager::hideGUI(this->guiName_);
    83             COUT(4) << "Hiding GUI " << this->guiName_ << std::endl;
     83            orxout(verbose, context::misc::gui) << "Hiding GUI " << this->guiName_ << endl;
    8484        }
    8585    }

  • code/trunk/src/modules/overlays/hud/ChatOverlay.cc

    r8327 r8858  
    6767    }
    6868
    69     void ChatOverlay::incomingChat(const std::string& message, unsigned int senderID)
     69    void ChatOverlay::incomingChat(const std::string& message, const std::string& /*name*/)
    7070    {
    71         std::string text;
    72 
    73         if (senderID != NETWORK_PEER_ID_UNKNOWN)
    74         {
    75             std::string name = "unknown";
    76 
    77             PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
    78             if (player)
    79                 name = player->getName();
    80 
    81             text = name + ": " + message;
    82         }
    83         else
    84         {
    85             text = message;
    86         }
    87 
    88         this->messages_.push_back(multi_cast<Ogre::DisplayString>(text));
    89         COUT(0) << "Chat: " << text << std::endl;
     71        this->messages_.push_back(multi_cast<Ogre::DisplayString>(message));
    9072
    9173        Timer* timer = new Timer();
    … …  
    11092        this->text_->setCaption("");
    11193
    112         for (std::list<Ogre::DisplayString>::reverse_iterator it = this->messages_.rbegin(); it != this->messages_.rend(); ++it)
     94        for (std::list<Ogre::DisplayString>::iterator it = this->messages_.begin(); it != this->messages_.end(); ++it)
    11395        {
    11496            this->text_->setCaption(this->text_->getCaption() + "\n" + (*it));

  • code/trunk/src/modules/overlays/hud/ChatOverlay.h

    r6417 r8858  
    3535#include <OgreOverlayElement.h>
    3636
    37 #include "network/ChatListener.h"
     37#include "chat/ChatListener.h"
    3838#include "overlays/OverlayText.h"
    3939
    … …  
    4949
    5050        protected:
    51             virtual void incomingChat(const std::string& message, unsigned int senderID);
     51            virtual void incomingChat(const std::string& message, const std::string& name);
    5252
    5353            std::list<Ogre::DisplayString> messages_;

  • code/trunk/src/modules/overlays/hud/HUDNavigation.cc

    r8706 r8858  
    105105    if ( fontPtr.isNull() )
    106106    {
    107         COUT ( 2 ) << "Warning: HUDNavigation: Font '" << font << "' not found" << std::endl;
     107        orxout(internal_warning) << "HUDNavigation: Font '" << font << "' not found" << endl;
    108108        return;
    109109    }
    … …  
    125125    if ( size <= 0.0f )
    126126    {
    127         COUT ( 2 ) << "Warning: HUDNavigation: Negative font size not allowed" << std::endl;
     127        orxout(internal_warning) << "HUDNavigation: Negative font size not allowed" << endl;
    128128        return;
    129129    }

  • code/trunk/src/modules/overlays/hud/HUDRadar.cc

    r8738 r8858  
    160160            if( !wePointer )
    161161            {
    162                 CCOUT(0) << "Cannot display a non-WorldEntitiy on the radar" << std::endl;
     162                orxout(internal_error) << "Cannot display a non-WorldEntitiy on the radar" << endl;
    163163                assert(0);
    164164            }

  • code/trunk/src/modules/pickup/Pickup.cc

    r7547 r8858  
    169169        else
    170170        {
    171             COUT(1) << "Invalid activationType '" << type << "' in pickup." << std::endl;
     171            orxout(internal_error, context::pickups) << "Invalid activationType '" << type << "' in pickup." << endl;
    172172        }
    173173    }
    … …  
    191191        else
    192192        {
    193             COUT(1) << "Invalid durationType '" << type << "' in pickup." << std::endl;
     193            orxout(internal_error, context::pickups) << "Invalid durationType '" << type << "' in pickup." << endl;
    194194        }
    195195    }

  • code/trunk/src/modules/pickup/PickupManager.cc

    r8729 r8858  
    7272        this->defaultRepresentation_ = new PickupRepresentation();
    7373
    74         COUT(3) << "PickupManager created." << std::endl;
     74        orxout(internal_info, context::pickups) << "PickupManager created." << endl;
    7575    }
    7676
    … …  
    101101        this->indexes_.clear();
    102102
    103         COUT(3) << "PickupManager destroyed." << std::endl;
     103        orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl;
    104104    }
    105105
    … …  
    126126        this->representations_[identifier] = representation;
    127127
    128         COUT(4) << "PickupRepresentation &" << representation << " registered with the PickupManager." << std::endl;
     128        orxout(verbose, context::pickups) << "PickupRepresentation &" << representation << " registered with the PickupManager." << endl;
    129129        return true;
    130130    }
    … …  
    151151        this->representations_.erase(it);
    152152
    153         COUT(4) << "PickupRepresentation &" << representation << " unregistered with the PickupManager." << std::endl;
     153        orxout(verbose, context::pickups) << "PickupRepresentation &" << representation << " unregistered with the PickupManager." << endl;
    154154        return true;
    155155    }
    … …  
    208208        if(it == this->representations_.end()) // If there is no PickupRepresentation associated with the input PickupIdentifier.
    209209        {
    210             COUT(4) << "PickupManager::getRepresentation() returned default representation." << std::endl;
     210            orxout(verbose, context::pickups) << "PickupManager::getRepresentation() returned default representation." << endl;
    211211            return this->defaultRepresentation_;
    212212        }
    … …  
    284284        if(manager.pickupInventoryContainers_.find(pickup) == manager.pickupInventoryContainers_.end())
    285285        {
    286             COUT(1) << "Error: Pickupable &(" << pickup << ") was not registered with PickupManager for the PickupInventory, when it changed used." << std::endl;
     286            orxout(internal_error, context::pickups) << "Pickupable &(" << pickup << ") was not registered with PickupManager for the PickupInventory, when it changed used." << endl;
    287287            return;
    288288        }

  • code/trunk/src/modules/pickup/PickupRepresentation.cc

    r8713 r8858  
    140140            this->spawnerRepresentation_->setVisible(false);
    141141
    142         COUT(4) << "PickupRepresentation created: name: '" << this->name_ << "', description: '" << this->description_ << "', spawnerTemplate: '" << this->spawnerTemplate_ << "'." << std::endl;
     142        orxout(verbose, context::pickups) << "PickupRepresentation created: name: '" << this->name_ << "', description: '" << this->description_ << "', spawnerTemplate: '" << this->spawnerTemplate_ << "'." << endl;
    143143    }
    144144
    … …  
    155155        if(this->spawnerRepresentation_ == NULL)
    156156        {
    157             COUT(4) << "PickupRepresentation: No spawner representation found." << std::endl;
     157            orxout(verbose, context::pickups) << "PickupRepresentation: No spawner representation found." << endl;
    158158            if(this->spawnerTemplate_ == "")
    159159            {
    160                 COUT(4) << "PickupRepresentation: Spawner template is empty." << std::endl;
     160                orxout(verbose, context::pickups) << "PickupRepresentation: Spawner template is empty." << endl;
    161161                // If neither spawnerRepresentation nor spawnerTemplate was specified
    162162                return this->getDefaultSpawnerRepresentation(spawner);

  • code/trunk/src/modules/pickup/PickupSpawner.cc

    r7801 r8858  
    9090        if(this->pickup_ == NULL)
    9191        {
    92             COUT(2) << "A PickupSpawner was created without a valid Pickupable. This won't work." << std::endl;
     92            orxout(internal_warning, context::pickups) << "A PickupSpawner was created without a valid Pickupable. This won't work." << endl;
    9393            this->setActive(false);
    9494        }
    … …  
    144144        if(this->pickup_ == NULL)
    145145        {
    146             COUT(2) << "A PickupSpawner was created without a valid Pickupable. This won't work." << std::endl;
     146            orxout(internal_warning, context::pickups) << "A PickupSpawner was created without a valid Pickupable. This won't work." << endl;
    147147            this->setActive(false);
    148148        }
    … …  
    239239        else
    240240        {
    241             COUT(4) << "PickupSpawner (&" << this << ") empty, selfdestruct initialized." << std::endl;
     241            orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") empty, selfdestruct initialized." << endl;
    242242            this->setActive(false);
    243243            this->destroy();
    … …  
    264264        if(this->pickup_ != NULL)
    265265        {
    266             COUT(1) << "In PickupSpawner (&" << this << "): setPickupable called, with this->pickup_ already set." << std::endl;
     266            orxout(internal_error, context::pickups) << "In PickupSpawner (&" << this << "): setPickupable called, with this->pickup_ already set." << endl;
    267267            return;
    268268        }
    269269        if(pickup == NULL)
    270270        {
    271             COUT(1) << "In PickupSpawner (&" << this << "): Argument of setPickupable is NULL." << std::endl;
     271            orxout(internal_error, context::pickups) << "In PickupSpawner (&" << this << "): Argument of setPickupable is NULL." << endl;
    272272            return;
    273273        }
    … …  
    298298        if(this->isActive()) // Checks whether PickupSpawner is active.
    299299        {
    300             COUT(4) << "PickupSpawner (&" << this << ") triggered and active." << std::endl;
     300            orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") triggered and active." << endl;
    301301
    302302            PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
    … …  
    306306            if(!carrier->isTarget(this->pickup_))
    307307            {
    308                 COUT(4) << "PickupSpawner (&" << this << ") triggered but Pawn wasn't a target of the Pickupable." << std::endl;
     308                orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") triggered but Pawn wasn't a target of the Pickupable." << endl;
    309309                return;
    310310            }
    … …  
    335335        if(this->spawnsRemaining_ == 0)
    336336        {
    337             COUT(1) << "Massive Error: PickupSpawner still alive until having spawned last item." << std::endl;
     337            orxout(internal_error, context::pickups) << "Massive Error: PickupSpawner still alive until having spawned last item." << endl;
    338338            return NULL;
    339339        }
    … …  
    349349    void PickupSpawner::respawnTimerCallback()
    350350    {
    351         COUT(4) << "PickupSpawner (&" << this << ") reactivated." << std::endl;
     351        orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") reactivated." << endl;
    352352
    353353        this->setActive(true);

  • code/trunk/src/modules/pickup/items/DronePickup.cc

    r7548 r8858  
    179179        if(pawn == NULL)
    180180        {
    181             COUT(1) << "Invalid PickupCarrier in DronePickup." << std::endl;
     181            orxout(internal_error, context::pickups) << "Invalid PickupCarrier in DronePickup." << endl;
    182182        }
    183183

  • code/trunk/src/modules/pickup/items/HealthPickup.cc

    r7548 r8858  
    169169                    break;
    170170                default:
    171                     COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
     171                    orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
    172172            }
    173173
    … …  
    218218                        break;
    219219                    default:
    220                         COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
     220                        orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
    221221                }
    222222
    … …  
    234234                if(pawn == NULL)
    235235                {
    236                     COUT(1) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << std::endl;
     236                    orxout(internal_error, context::pickups) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << endl;
    237237                    this->Pickupable::destroy();
    238238                    return;
    … …  
    268268        if(pawn == NULL)
    269269        {
    270             COUT(1) << "Invalid PickupCarrier in HealthPickup." << std::endl;
     270            orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl;
    271271        }
    272272
    … …  
    312312                return HealthPickup::healthTypePermanent_s;
    313313            default:
    314                 COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
     314                orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
    315315                return BLANKSTRING;
    316316        }
    … …  
    331331        else
    332332        {
    333             COUT(1) << "Invalid health in HealthPickup." << std::endl;
     333            orxout(internal_error, context::pickups) << "Invalid health in HealthPickup." << endl;
    334334            this->health_ = 0.0;
    335335        }
    … …  
    350350        else
    351351        {
    352             COUT(1) << "Invalid healthSpeed in HealthPickup." << std::endl;
     352            orxout(internal_error, context::pickups) << "Invalid healthSpeed in HealthPickup." << endl;
    353353        }
    354354    }
    … …  
    376376        else
    377377        {
    378             COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
     378            orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
    379379        }
    380380    }

  • code/trunk/src/modules/pickup/items/InvisiblePickup.cc

    r8220 r8858  
    206206        if(pawn == NULL)
    207207        {
    208             COUT(1) << "Invalid PickupCarrier in InvisiblePickup." << std::endl;
     208            orxout(internal_error, context::pickups) << "Invalid PickupCarrier in InvisiblePickup." << endl;
    209209        }
    210210        return pawn;
    … …  
    225225        else
    226226        {
    227             COUT(1) << "Invalid duration in InvisiblePickup." << std::endl;
     227            orxout(internal_error, context::pickups) << "Invalid duration in InvisiblePickup." << endl;
    228228            this->duration_ = 0.0f;
    229229        }

  • code/trunk/src/modules/pickup/items/MetaPickup.cc

    r7548 r8858  
    232232        }
    233233        else
    234             COUT(2) << "Invalid metaType '" << type << "' in MetaPickup." << std::endl;
     234            orxout(internal_warning, context::pickups) << "Invalid metaType '" << type << "' in MetaPickup." << endl;
    235235    }
    236236

  • code/trunk/src/modules/pickup/items/ShieldPickup.cc

    r7548 r8858  
    181181        if(pawn == NULL)
    182182        {
    183             COUT(1) << "Invalid PickupCarrier in ShieldPickup." << std::endl;
     183            orxout(internal_error, context::pickups) << "Invalid PickupCarrier in ShieldPickup." << endl;
    184184        }
    185185        return pawn;
    … …  
    220220        else
    221221        {
    222             COUT(1) << "Invalid duration in ShieldPickup." << std::endl;
     222            orxout(internal_error, context::pickups) << "Invalid duration in ShieldPickup." << endl;
    223223            this->duration_ = 0.0f;
    224224        }
    … …  
    239239        else
    240240        {
    241             COUT(1) << "Invalid Shieldhealth in ShieldPickup." << std::endl;
     241            orxout(internal_error, context::pickups) << "Invalid Shieldhealth in ShieldPickup." << endl;
    242242            this->shieldHealth_=0;
    243243        }
    … …  
    258258        else
    259259        {
    260             COUT(1) << "Invalid Absorption in ShieldPickup." << std::endl;
     260            orxout(internal_error, context::pickups) << "Invalid Absorption in ShieldPickup." << endl;
    261261            this->shieldAbsorption_=0;
    262262        }

  • code/trunk/src/modules/pickup/items/ShrinkPickup.h

    r8713 r8858  
    9393            */
    9494            inline void setShrinkFactor(float factor)
    95                 { if(factor <= 1.0f) { COUT(2) << "Invalid shrinking factor in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkFactor_ = factor; }
     95                { if(factor <= 1.0f) { orxout(internal_warning, context::pickups) << "Invalid shrinking factor in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkFactor_ = factor; }
    9696            /**
    9797            @brief Get the duration for which the ship remains shrunken.
    … …  
    105105            */
    106106            inline void setDuration(float duration)
    107                 { if(duration < 0.0f) { COUT(2) << "Invalid duration in ShrinkPickup. Ignoring.." << endl; return; } this->duration_ = duration; }
     107                { if(duration < 0.0f) { orxout(internal_warning, context::pickups) << "Invalid duration in ShrinkPickup. Ignoring.." << endl; return; } this->duration_ = duration; }
    108108            /**
    109109            @brief Get the shrink speed.
    … …  
    117117            */
    118118            inline void setShrinkDuration(float speed)
    119                 { if(speed <= 0.0f) { COUT(2) << "Invalid shrink duration in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkDuration_ = speed; }
     119                { if(speed <= 0.0f) { orxout(internal_warning, context::pickups) << "Invalid shrink duration in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkDuration_ = speed; }
    120120
    121121        protected:

  • code/trunk/src/modules/pickup/items/SpeedPickup.cc

    r8727 r8858  
    180180        if(ship == NULL)
    181181        {
    182             COUT(1) << "Invalid PickupCarrier in SpeedPickup." << std::endl;
     182            orxout(internal_error, context::pickups) << "Invalid PickupCarrier in SpeedPickup." << endl;
    183183        }
    184184
    … …  
    221221        else
    222222        {
    223             COUT(1) << "Invalid duration in SpeedPickup." << std::endl;
     223            orxout(internal_error, context::pickups) << "Invalid duration in SpeedPickup." << endl;
    224224            this->duration_ = 0.0f;
    225225        }
    … …  
    240240        else
    241241        {
    242             COUT(1) << "Invalid speedAdd in SpeedPickup." << std::endl;
     242            orxout(internal_error, context::pickups) << "Invalid speedAdd in SpeedPickup." << endl;
    243243            this->speedAdd_ = 0.0f;
    244244        }
    … …  
    259259        else
    260260        {
    261             COUT(1) << "Invalid speedMultiply in SpeedPickup." << std::endl;
     261            orxout(internal_error, context::pickups) << "Invalid speedMultiply in SpeedPickup." << endl;
    262262            this->speedMultiply_ = 1.0f;
    263263        }

  • code/trunk/src/modules/pong/Pong.cc

    r8108 r8858  
    162162        else // If no centerpoint was specified, an error is thrown and the level is exited.
    163163        {
    164             COUT(1) << "Error: No Centerpoint specified." << std::endl;
     164            orxout(internal_error) << "Pong: No Centerpoint specified." << endl;
    165165            GSLevel::startMainMenu();
    166166            return;

  • code/trunk/src/modules/questsystem/GlobalQuest.cc

    r7552 r8858  
    7171        XMLPortObject(GlobalQuest, QuestEffect, "reward-effects", addRewardEffect, getRewardEffects, xmlelement, mode);
    7272
    73         COUT(4) << "New GlobalQuest {" << this->getId() << "} created." << std::endl;
     73        orxout(verbose, context::quests) << "New GlobalQuest {" << this->getId() << "} created." << endl;
    7474    }
    7575
    … …  
    8787        if(!this->isFailable(player)) // Check whether the Quest can be failed.
    8888        {
    89             COUT(4) << "A non-completable quest was trying to be failed." << std::endl;
     89            orxout(verbose, context::quests) << "A non-completable quest was trying to be failed." << endl;
    9090            return false;
    9191        }
    … …  
    114114        if(!this->isCompletable(player)) // Check whether the Quest can be completed.
    115115        {
    116             COUT(4) << "A non-completable quest was trying to be completed." << std::endl;
     116            orxout(verbose, context::quests) << "A non-completable quest was trying to be completed." << endl;
    117117            return false;
    118118        }
    … …  
    227227        this->rewards_.push_back(effect); // Add the QuestEffect to the list.
    228228
    229         COUT(4) << "Reward effect was added to Quest {" << this->getId() << "}." << std::endl;
     229        orxout(verbose, context::quests) << "Reward effect was added to Quest {" << this->getId() << "}." << endl;
    230230        return true;
    231231    }

  • code/trunk/src/modules/questsystem/LocalQuest.cc

    r7552 r8858  
    6969        SUPER(LocalQuest, XMLPort, xmlelement, mode);
    7070
    71         COUT(4) << "New LocalQuest {" << this->getId() << "} created." << std::endl;
     71        orxout(verbose, context::quests) << "New LocalQuest {" << this->getId() << "} created." << endl;
    7272    }
    7373
    … …  
    8585        if(!this->isFailable(player)) // Checks whether the quest can be failed.
    8686        {
    87             COUT(4) << "A non-failable quest was trying to be failed." << std::endl;
     87            orxout(verbose, context::quests) << "A non-failable quest was trying to be failed." << endl;
    8888            return false;
    8989        }
    … …  
    108108        if(!this->isCompletable(player)) // Checks whether the Quest can be completed.
    109109        {
    110             COUT(4) << "A non-completable quest was trying to be completed." << std::endl;
     110            orxout(verbose, context::quests) << "A non-completable quest was trying to be completed." << endl;
    111111            return false;
    112112        }

  • code/trunk/src/modules/questsystem/Quest.cc

    r7552 r8858  
    9696        this->parentQuest_ = quest;
    9797
    98         COUT(4) << "Parent Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
     98        orxout(verbose, context::quests) << "Parent Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << endl;
    9999        return true;
    100100    }
    … …  
    115115        this->subQuests_.push_back(quest); // Adds the Quest to the end of the list of sub-quests.
    116116
    117         COUT(4) << "Sub Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
     117        orxout(verbose, context::quests) << "Sub Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << endl;
    118118        return true;
    119119    }
    … …  
    135135        this->hints_.push_back(hint); // Adds the QuestHint to the end of the list of QuestHints.
    136136
    137         COUT(4) << "QuestHint {" << hint->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
     137        orxout(verbose, context::quests) << "QuestHint {" << hint->getId() << "} was added to Quest {" << this->getId() << "}." << endl;
    138138        return true;
    139139    }
    … …  
    153153        this->failEffects_.push_back(effect); // Adds the QuestEffect to the end of the list of fail QuestEffects.
    154154
    155         COUT(4) << "A FailEffect was added to Quest {" << this->getId() << "}." << std::endl;
     155        orxout(verbose, context::quests) << "A FailEffect was added to Quest {" << this->getId() << "}." << endl;
    156156        return true;
    157157    }
    … …  
    171171        this->completeEffects_.push_back(effect); // Adds the QuestEffect to the end of the list of complete QuestEffects.
    172172
    173         COUT(4) << "A CompleteEffect was added to Quest {" << this->getId() << "}." << std::endl;
     173        orxout(verbose, context::quests) << "A CompleteEffect was added to Quest {" << this->getId() << "}." << endl;
    174174        return true;
    175175    }
    … …  
    341341        this->setStatus(player, QuestStatus::Failed);
    342342
    343         COUT(4) << "Quest {" << this->getId() << "} is failed for player: " << player << " ." <<std::endl;
     343        orxout(verbose, context::quests) << "Quest {" << this->getId() << "} is failed for player: " << player << " ." << endl;
    344344
    345345        this->getDescription()->sendFailQuestNotification(player);
    … …  
    360360        this->setStatus(player, QuestStatus::Completed);
    361361
    362         COUT(4) << "Quest {" << this->getId() << "} is completed for player: " << player << " ." <<std::endl;
     362        orxout(verbose, context::quests) << "Quest {" << this->getId() << "} is completed for player: " << player << " ." << endl;
    363363
    364364        this->getDescription()->sendCompleteQuestNotification(player);
    … …  
    378378        if(!this->isStartable(player)) // Checks whether the quest can be started.
    379379        {
    380             COUT(4) << "A non-startable quest was trying to be started." << std::endl;
     380            orxout(verbose, context::quests) << "A non-startable quest was trying to be started." << endl;
    381381            return false;
    382382        }
    383383
    384         COUT(4) << "Quest {" << this->getId() << "} is started for player: " << player << " ." <<std::endl;
     384        orxout(verbose, context::quests) << "Quest {" << this->getId() << "} is started for player: " << player << " ." << endl;
    385385
    386386        QuestListener::advertiseStatusChange(this->listeners_, "start"); // Tells the QuestListeners, that the status has changed to active.

  • code/trunk/src/modules/questsystem/QuestDescription.cc

    r8706 r8858  
    7979        XMLPortParam(QuestDescription, "completeMessage", setCompleteMessage, getCompleteMessage, xmlelement, mode);
    8080
    81         COUT(4) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
     81        orxout(verbose, context::quests) << "New QuestDescription with title '" << this->getTitle() << "' created." << endl;
    8282    }
    8383
    … …  
    109109            else
    110110            {
    111                 COUT(2) << "Bad input in notificationHelper, this should not be happening!" << std::endl;
     111                orxout(internal_warning, context::quests) << "Bad input in notificationHelper, this should not be happening!" << endl;
    112112                return false;
    113113            }
    … …  
    115115        else
    116116        {
    117             COUT(2) << "Bad input in notificationHelper, this should not be happening!" << std::endl;
     117            orxout(internal_warning, context::quests) << "Bad input in notificationHelper, this should not be happening!" << endl;
    118118            return false;
    119119        }

  • code/trunk/src/modules/questsystem/QuestEffect.cc

    r8351 r8858  
    7070        bool temp = true;
    7171
    72         COUT(4) << "Invoking QuestEffects on player: " << player << " ."  << std::endl;
     72        orxout(verbose, context::quests) << "Invoking QuestEffects on player: " << player << " ."  << endl;
    7373
    7474        for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)

  • code/trunk/src/modules/questsystem/QuestEffectBeacon.cc

    r8706 r8858  
    7979        XMLPortEventSink(QuestEffectBeacon, BaseObject, "execute", execute, xmlelement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
    8080
    81         COUT(4) << "New QuestEffectBeacon created." << std::endl;
     81        orxout(verbose, context::quests) << "New QuestEffectBeacon created." << endl;
    8282    }
    8383
    … …  
    108108        if(!(this->isActive())) // If the QuestEffectBeacon is inactive it cannot be executed.
    109109        {
    110             COUT(4) << "The QuestEffectBeacon is inactive." << std::endl;
     110            orxout(verbose, context::quests) << "The QuestEffectBeacon is inactive." << endl;
    111111            return false;
    112112        }
    … …  
    128128        if(player == NULL)
    129129        {
    130             COUT(4) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
    131             return false;
    132         }
    133 
    134         COUT(4) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;
     130            orxout(verbose, context::quests) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
     131            return false;
     132        }
     133
     134        orxout(verbose, context::quests) << "QuestEffectBeacon executed on player: " << player << " ." << endl;
    135135
    136136        bool temp = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
    … …  
    221221        this->effects_.push_back(effect);
    222222
    223         COUT(4) << "A QuestEffect was added to a QuestEffectBeacon." << std::endl;
     223        orxout(verbose, context::quests) << "A QuestEffect was added to a QuestEffectBeacon." << endl;
    224224        return true;
    225225    }

  • code/trunk/src/modules/questsystem/QuestHint.cc

    r7552 r8858  
    7474        QuestManager::getInstance().registerHint(this); // Registers the QuestHint with the QuestManager.
    7575
    76         COUT(4) << "New QuestHint {" << this->getId() << "} created." << std::endl;
     76        orxout(verbose, context::quests) << "New QuestHint {" << this->getId() << "} created." << endl;
    7777    }
    7878
    … …  
    120120            else
    121121            {
    122                 COUT(4) << "An already active questHint was trying to get activated." << std::endl;
     122                orxout(verbose, context::quests) << "An already active questHint was trying to get activated." << endl;
    123123                return false;
    124124            }
    125125        }
    126126
    127         COUT(4) << "A hint of a non-active quest was trying to get activated." << std::endl;
     127        orxout(verbose, context::quests) << "A hint of a non-active quest was trying to get activated." << endl;
    128128        return false;
    129129    }

  • code/trunk/src/modules/questsystem/QuestItem.cc

    r8079 r8858  
    8989        if(id == "") // Checks whether the id is a valid id.
    9090        {
    91             COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
     91            orxout(internal_warning, context::quests) << "Invalid id. QuestItem id {" << id << "} could not be set." << endl;
    9292            return;
    9393        }

  • code/trunk/src/modules/questsystem/QuestListener.cc

    r7462 r8858  
    8484            this->quest_->addListener(this); // Adds the QuestListener to the Quests list of listeners.
    8585
    86         COUT(4) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << std::endl;
     86        orxout(verbose, context::quests) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << endl;
    8787    }
    8888
    … …  
    146146        else
    147147        {
    148             COUT(2) << "QuestListener with invalid mode '" << mode << "' created. Mode set to 'all'." << std::endl;
     148            orxout(internal_warning, context::quests) << "QuestListener with invalid mode '" << mode << "' created. Mode set to 'all'." << endl;
    149149            this->mode_ = QuestListenerMode::All;
    150150            return false;

  • code/trunk/src/modules/questsystem/QuestManager.cc

    r8729 r8858  
    6161        RegisterRootObject(QuestManager);
    6262
    63         COUT(3) << "QuestManager created." << std::endl;
     63        orxout(internal_info, context::quests) << "QuestManager created." << endl;
    6464    }
    6565
    … …  
    7070    QuestManager::~QuestManager()
    7171    {
    72         COUT(3) << "QuestManager destroyed." << std::endl;
     72        orxout(internal_info, context::quests) << "QuestManager destroyed." << endl;
    7373    }
    7474
    … …  
    103103        {
    104104            quest->setRegistered();
    105             COUT(4) << "Quest with questId {" << quest->getId() << "} successfully inserted." << std::endl;
     105            orxout(verbose, context::quests) << "Quest with questId {" << quest->getId() << "} successfully inserted." << endl;
    106106            return true;
    107107        }
    108108        else
    109109        {
    110            COUT(2) << "Quest with the same id was already present." << std::endl;
     110           orxout(internal_warning, context::quests) << "Quest with the same id was already present." << endl;
    111111           return false;
    112112        }
    … …  
    141141        {
    142142            hint->setRegistered();
    143             COUT(4) << "QuestHint with hintId {" << hint->getId() << "} successfully inserted." << std::endl;
     143            orxout(verbose, context::quests) << "QuestHint with hintId {" << hint->getId() << "} successfully inserted." << endl;
    144144            return true;
    145145        }
    146146        else
    147147        {
    148            COUT(2) << "QuestHint with the same id was already present." << std::endl;
     148           orxout(internal_warning, context::quests) << "QuestHint with the same id was already present." << endl;
    149149           return false;
    150150        }
    … …  
    183183        {
    184184           quest = NULL;
    185            COUT(2) << "The quest with id {" << questId << "} is nowhere to be found." << std::endl;
     185           orxout(internal_warning, context::quests) << "The quest with id {" << questId << "} is nowhere to be found." << endl;
    186186        }
    187187
    … …  
    212212        {
    213213           hint = NULL;
    214            COUT(2) << "The hint with id {" << hintId << "} is nowhere to be found." << std::endl;
     214           orxout(internal_warning, context::quests) << "The hint with id {" << hintId << "} is nowhere to be found." << endl;
    215215        }
    216216
    … …  
    431431        if(player == NULL)
    432432        {
    433             COUT(1) << "Error: GUIOverlay with name '" << guiName << "' has no player." << std::endl;
     433            orxout(internal_error, context::quests) << "GUIOverlay with name '" << guiName << "' has no player." << endl;
    434434            return NULL;
    435435        }

  • code/trunk/src/modules/questsystem/effects/AddQuest.cc

    r7552 r8858  
    7070        SUPER(AddQuest, XMLPort, xmlelement, mode);
    7171
    72         COUT(4) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     72        orxout(verbose, context::quests) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << endl;
    7373    }
    7474
    … …  
    8585        assert(player);
    8686
    87         COUT(5) << "AddQuest on player: " << player << " ." << std::endl;
     87        orxout(verbose_more, context::quests) << "AddQuest on player: " << player << " ." << endl;
    8888
    8989        try
    … …  
    9595        catch(const orxonox::Exception& ex)
    9696        {
    97             COUT(2) << ex.getFullDescription() << std::endl;
     97            orxout(internal_warning, context::quests) << ex.getFullDescription() << endl;
    9898            return false;
    9999        }
    100100
    101         COUT(4) << "Quest {" << this->getQuestId() << "} successfully added to player: " << player << " ." << std::endl;
     101        orxout(verbose, context::quests) << "Quest {" << this->getQuestId() << "} successfully added to player: " << player << " ." << endl;
    102102        return true;
    103103    }

  • code/trunk/src/modules/questsystem/effects/AddQuestHint.cc

    r8079 r8858  
    7373        XMLPortParam(AddQuestHint, "hintId", setHintId, getHintId, xmlelement, mode);
    7474
    75         COUT(4) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << std::endl;
     75        orxout(verbose, context::quests) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << endl;
    7676    }
    7777
    … …  
    8888        if(id == "")
    8989        {
    90             COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
     90            orxout(internal_warning, context::quests) << "Invalid id. QuestItem id {" << id << "} could not be set." << endl;
    9191            return false;
    9292        }
    … …  
    108108        assert(player);
    109109
    110         COUT(5) << "AddQuestHint on player: " << player << " ." << std::endl;
     110        orxout(verbose_more, context::quests) << "AddQuestHint on player: " << player << " ." << endl;
    111111
    112112        try
    … …  
    118118        catch(const Exception& e)
    119119        {
    120            COUT(2) << e.getFullDescription() << std::endl;
     120           orxout(internal_warning, context::quests) << e.getFullDescription() << endl;
    121121           return false;
    122122        }
    123123
    124         COUT(4) << "QuestHint {" << this->getHintId() << "} successfully added to player: " << player << " ." << std::endl;
     124        orxout(verbose, context::quests) << "QuestHint {" << this->getHintId() << "} successfully added to player: " << player << " ." << endl;
    125125        return true;
    126126

  • code/trunk/src/modules/questsystem/effects/AddReward.cc

    r8351 r8858  
    7070        XMLPortObject(AddReward, Rewardable, "", addRewardable, getRewardables, xmlelement, mode);
    7171
    72         COUT(4) << "New AddReward, with " << this->rewards_.size() << " Rewardables created." << std::endl;
     72        orxout(verbose, context::quests) << "New AddReward, with " << this->rewards_.size() << " Rewardables created." << endl;
    7373    }
    7474
    … …  
    103103    bool AddReward::invoke(PlayerInfo* player)
    104104    {
    105         COUT(5) << "AddReward on player: " << player << " ." << std::endl;
     105        orxout(verbose_more, context::quests) << "AddReward on player: " << player << " ." << endl;
    106106
    107107        bool temp = true;
    … …  
    109109            temp = temp && (*reward)->reward(player);
    110110
    111         COUT(4) << "Rewardable successfully added to player." << player << " ." << std::endl;
     111        orxout(verbose, context::quests) << "Rewardable successfully added to player." << player << " ." << endl;
    112112
    113113        return temp;

  • code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc

    r8079 r8858  
    8383        if(id == "")
    8484        {
    85             COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
     85            orxout(internal_warning, context::quests) << "Invalid id. QuestItem id {" << id << "} could not be set." << endl;
    8686            return false;
    8787        }

  • code/trunk/src/modules/questsystem/effects/CompleteQuest.cc

    r7552 r8858  
    7070        SUPER(CompleteQuest, XMLPort, xmlelement, mode);
    7171
    72         COUT(4) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     72        orxout(verbose, context::quests) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << endl;
    7373    }
    7474
    … …  
    8585        assert(player);
    8686
    87         COUT(5) << "CompleteQuest on player: " << player << " ." << std::endl;
     87        orxout(verbose_more, context::quests) << "CompleteQuest on player: " << player << " ." << endl;
    8888
    8989        Quest* quest;
    … …  
    9797        catch(const Exception& e)
    9898        {
    99             COUT(2) << e.getFullDescription() << std::endl;
     99            orxout(internal_warning, context::quests) << e.getFullDescription() << endl;
    100100            return false;
    101101        }
    102102
    103         COUT(4) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << std::endl;
     103        orxout(verbose, context::quests) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << endl;
    104104        return true;
    105105    }

  • code/trunk/src/modules/questsystem/effects/FailQuest.cc

    r7552 r8858  
    7070        SUPER(FailQuest, XMLPort, xmlelement, mode);
    7171
    72         COUT(4) << "New FailQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     72        orxout(verbose, context::quests) << "New FailQuest, with target Quest {" << this->getQuestId() << "}, created." << endl;
    7373    }
    7474
    … …  
    8585        assert(player);
    8686
    87         COUT(4) << "FailQuest on player: " << player << " ." << std::endl;
     87        orxout(verbose, context::quests) << "FailQuest on player: " << player << " ." << endl;
    8888
    8989        Quest* quest;
    … …  
    9696        catch(const Exception& e)
    9797        {
    98             COUT(2) << e.getFullDescription() << std::endl;
     98            orxout(internal_warning, context::quests) << e.getFullDescription() << endl;
    9999            return false;
    100100        }
    101101
    102         COUT(4) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << std::endl;
     102        orxout(verbose, context::quests) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << endl;
    103103        return true;
    104104    }

  • code/trunk/src/modules/tetris/Tetris.cc

    r8706 r8858  
    165165        else // If no centerpoint was specified, an error is thrown and the level is exited.
    166166        {
    167             COUT(1) << "Error: No Centerpoint specified." << std::endl;
     167            orxout(internal_error) << "Tetris: No Centerpoint specified." << endl;
    168168            GSLevel::startMainMenu();
    169169            return;

  • code/trunk/src/modules/weapons/RocketController.cc

    r8855 r8858  
    4848    {
    4949        RegisterObject(RocketController);
    50         COUT(5)<< "RocketController constructed\n";
     50//        orxout() << "RocketController constructed" << endl;
    5151
    5252        // Create a rocket for the controller.
    … …  
    7373    RocketController::~RocketController()
    7474    {
    75         COUT(5)<< "RocketController destroyed\n";
     75//        orxout() << "RocketController destroyed" << endl;
    7676    }
    7777

  • code/trunk/src/modules/weapons/projectiles/BasicProjectile.h

    r8855 r8858  
    6464            */
    6565            inline void setDamage(float damage)
    66                 { if(damage >= 0.0f)  { this->damage_ = damage; return; } COUT(1) << "The input projectile damage must be non-negative. Ignoring..." << endl; }
     66                { if(damage >= 0.0f)  { this->damage_ = damage; return; } orxout(internal_warning) << "The input projectile damage must be non-negative. Ignoring..." << endl; }
    6767            /**
    6868            @brief Get the normal damage done by this projectile.
    … …  
    7979            */
    8080            inline void setHealthDamage(float healthdamage)
    81                 { if(healthdamage >= 0.0f)  { this->healthdamage_ = healthdamage; return; } COUT(1) << "The input projectile health-damage must be non-negative. Ignoring..." << endl; }
     81                { if(healthdamage >= 0.0f)  { this->healthdamage_ = healthdamage; return; } orxout(internal_warning) << "The input projectile health-damage must be non-negative. Ignoring..." << endl; }
    8282            /**
    8383            @brief Get the health-damage done by this projectile.
    … …  
    9494            */
    9595            inline void setShieldDamage(float shielddamage)
    96                 { if(shielddamage >= 0.0f)  { this->shielddamage_ = shielddamage; return; } COUT(1) << "The input projectile shield-damage must be non-negative. Ignoring..." << endl; }
     96                { if(shielddamage >= 0.0f)  { this->shielddamage_ = shielddamage; return; } orxout(internal_warning) << "The input projectile shield-damage must be non-negative. Ignoring..." << endl; }
    9797            /**
    9898            @brief Get the shield-damage done by this projectile.

  • code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc

    r8855 r8858  
    3939#include "core/CoreIncludes.h"
    4040#include "core/XMLPort.h"
    41 #include "util/Debug.h"
    4241
    4342#include "controllers/Controller.h"
Note: See TracChangeset for help on using the changeset viewer.