[Orxonox-commit 4140] r8811 - in code/branches/output/src: libraries/util/output modules/designtools modules/docking modules/gametypes modules/notifications modules/objects modules/objects/collisionshapes modules/objects/eventsystem modules/objects/triggers modules/overlays modules/overlays/hud modules/pickup modules/pickup/items modules/pong modules/questsystem modules/questsystem/effects modules/tetris modules/weapons modules/weapons/projectiles
landauf at orxonox.net
landauf at orxonox.net
Mon Aug 1 19:09:29 CEST 2011
Author: landauf
Date: 2011-08-01 19:09:29 +0200 (Mon, 01 Aug 2011)
New Revision: 8811
Modified:
code/branches/output/src/libraries/util/output/OutputDefinitions.h
code/branches/output/src/modules/designtools/ScreenshotManager.cc
code/branches/output/src/modules/designtools/SkyboxGenerator.cc
code/branches/output/src/modules/docking/Dock.cc
code/branches/output/src/modules/docking/DockToShip.cc
code/branches/output/src/modules/docking/DockingController.cc
code/branches/output/src/modules/docking/DockingTarget.cc
code/branches/output/src/modules/gametypes/RaceCheckPoint.cc
code/branches/output/src/modules/gametypes/SpaceRace.cc
code/branches/output/src/modules/notifications/NotificationDispatcher.cc
code/branches/output/src/modules/notifications/NotificationManager.cc
code/branches/output/src/modules/notifications/NotificationQueue.cc
code/branches/output/src/modules/notifications/NotificationQueueCEGUI.cc
code/branches/output/src/modules/objects/ForceField.cc
code/branches/output/src/modules/objects/Planet.cc
code/branches/output/src/modules/objects/Script.cc
code/branches/output/src/modules/objects/SpaceBoundaries.cc
code/branches/output/src/modules/objects/collisionshapes/BoxCollisionShape.cc
code/branches/output/src/modules/objects/collisionshapes/ConeCollisionShape.cc
code/branches/output/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
code/branches/output/src/modules/objects/collisionshapes/SphereCollisionShape.cc
code/branches/output/src/modules/objects/eventsystem/EventFilter.cc
code/branches/output/src/modules/objects/eventsystem/EventListener.cc
code/branches/output/src/modules/objects/eventsystem/EventTarget.cc
code/branches/output/src/modules/objects/triggers/DistanceMultiTrigger.cc
code/branches/output/src/modules/objects/triggers/DistanceTrigger.cc
code/branches/output/src/modules/objects/triggers/MultiTrigger.cc
code/branches/output/src/modules/objects/triggers/TriggerBase.cc
code/branches/output/src/modules/overlays/GUIOverlay.cc
code/branches/output/src/modules/overlays/hud/ChatOverlay.cc
code/branches/output/src/modules/overlays/hud/HUDNavigation.cc
code/branches/output/src/modules/overlays/hud/HUDRadar.cc
code/branches/output/src/modules/pickup/Pickup.cc
code/branches/output/src/modules/pickup/PickupManager.cc
code/branches/output/src/modules/pickup/PickupRepresentation.cc
code/branches/output/src/modules/pickup/PickupSpawner.cc
code/branches/output/src/modules/pickup/items/DronePickup.cc
code/branches/output/src/modules/pickup/items/HealthPickup.cc
code/branches/output/src/modules/pickup/items/InvisiblePickup.cc
code/branches/output/src/modules/pickup/items/MetaPickup.cc
code/branches/output/src/modules/pickup/items/ShieldPickup.cc
code/branches/output/src/modules/pickup/items/ShrinkPickup.h
code/branches/output/src/modules/pickup/items/SpeedPickup.cc
code/branches/output/src/modules/pong/Pong.cc
code/branches/output/src/modules/questsystem/GlobalQuest.cc
code/branches/output/src/modules/questsystem/LocalQuest.cc
code/branches/output/src/modules/questsystem/Quest.cc
code/branches/output/src/modules/questsystem/QuestDescription.cc
code/branches/output/src/modules/questsystem/QuestEffect.cc
code/branches/output/src/modules/questsystem/QuestEffectBeacon.cc
code/branches/output/src/modules/questsystem/QuestHint.cc
code/branches/output/src/modules/questsystem/QuestItem.cc
code/branches/output/src/modules/questsystem/QuestListener.cc
code/branches/output/src/modules/questsystem/QuestManager.cc
code/branches/output/src/modules/questsystem/effects/AddQuest.cc
code/branches/output/src/modules/questsystem/effects/AddQuestHint.cc
code/branches/output/src/modules/questsystem/effects/AddReward.cc
code/branches/output/src/modules/questsystem/effects/ChangeQuestStatus.cc
code/branches/output/src/modules/questsystem/effects/CompleteQuest.cc
code/branches/output/src/modules/questsystem/effects/FailQuest.cc
code/branches/output/src/modules/tetris/Tetris.cc
code/branches/output/src/modules/weapons/RocketController.cc
code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc
Log:
Replaced COUT() with orxout() in all modules. phew.
Modified: code/branches/output/src/libraries/util/output/OutputDefinitions.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputDefinitions.h 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/libraries/util/output/OutputDefinitions.h 2011-08-01 17:09:29 UTC (rev 8811)
@@ -101,7 +101,7 @@
REGISTER_OUTPUT_CONTEXT(pickups);
REGISTER_OUTPUT_CONTEXT(quests);
REGISTER_OUTPUT_CONTEXT(notifications);
- REGISTER_OUTPUT_CONTEXT(trigger);
+ REGISTER_OUTPUT_CONTEXT(triggers);
REGISTER_OUTPUT_CONTEXT(docking);
}
}
Modified: code/branches/output/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/output/src/modules/designtools/ScreenshotManager.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/designtools/ScreenshotManager.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -152,10 +152,10 @@
// Save it.
finalImage->save(PathConfig::getInstance().getLogPathString() + "screenshot_" + getTimestamp() + this->fileExtension_);
delete finalImage;
- COUT(3) << "Finished taking " << this->gridSize_*this->windowWidth_ << "x" << this->gridSize_*this->windowHeight_ << " pixel HD screenshot. Storing in log/." << endl;
+ orxout(user_info) << "Finished taking " << this->gridSize_*this->windowWidth_ << "x" << this->gridSize_*this->windowHeight_ << " pixel HD screenshot. Storing in log/." << endl;
}
else
- COUT(1) << "There needs to be an active camera to make screenshots." << endl;
+ orxout(user_error) << "There needs to be an active camera to make screenshots." << endl;
this->cleanup();
}
@@ -256,7 +256,7 @@
// Place the tempBuffer content at the right position
this->buffer_->blitToMemory(this->finalPicturePB_->getSubVolume(subBox));
- COUT(4) << "Created screenshot number " << nbScreenshots << " for multi grid HD screenshot." << endl;
+ orxout(internal_info) << "Created screenshot number " << nbScreenshots << " for multi grid HD screenshot." << endl;
}
Modified: code/branches/output/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/output/src/modules/designtools/SkyboxGenerator.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/designtools/SkyboxGenerator.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -148,7 +148,7 @@
entity = HumanController::getLocalControllerSingleton()->getControllableEntity();
else
{
- COUT(1) << "You must be in a level to generate a skybox." << endl;
+ orxout(user_error) << "You must be in a level to generate a skybox." << endl;
this->bGenerateSkybox_ = false;
return;
}
@@ -174,7 +174,7 @@
// Add the log path to the standard resource group.
Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getInstance().getLogPathString(), "FileSystem", Resource::getDefaultResourceGroup());
- COUT(4) << "Setting up SkyboxGenerator..." << endl;
+ orxout(internal_status) << "Setting up SkyboxGenerator..." << endl;
this->bSetup_ = false;
this->bWait_ = true;
@@ -193,7 +193,7 @@
if(rotate.second != 0)
entity->pitch(Degree((float)rotate.second));
- COUT(4) << "Created face number " << this->faceCounter_ << "." << endl;
+ orxout(internal_info) << "Created face number " << this->faceCounter_ << "." << endl;
// Check whether we've generated all 6 faces.
if(++this->faceCounter_ >= 6)
this->bCreateFace_ = false;
@@ -224,7 +224,7 @@
// Unpause.
CommandExecutor::execute("pause");
- COUT(3) << "Skybox with face size " << this->size_ << "x" << this->size_ << " pixels created. Storing in log/." << endl;
+ orxout(user_info) << "Skybox with face size " << this->size_ << "x" << this->size_ << " pixels created. Storing in log/." << endl;
}
}
}
Modified: code/branches/output/src/modules/docking/Dock.cc
===================================================================
--- code/branches/output/src/modules/docking/Dock.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/docking/Dock.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -86,19 +86,19 @@
if(pTrigger != NULL)
{
if(!pTrigger->isForPlayer()) { // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
- COUT(4) << "Docking:execute PlayerTrigger was not triggered by a player.." << std::endl;
+ orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
return false;
}
player = pTrigger->getTriggeringPlayer();
}
else
{
- COUT(4) << "Docking::execute Not a player trigger, can't extract pawn from it.." << std::endl;
+ orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
return false;
}
if(player == NULL)
{
- COUT(4) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
+ orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
return false;
}
@@ -167,7 +167,7 @@
// Check if player is a candidate
if(candidates_.find(player) == candidates_.end())
{
- COUT(2) << "Dock::dock Player is not a candidate!" << std::endl;
+ orxout(internal_warning, context::docking) << "Dock::dock Player is not a candidate!" << endl;
return false;
}
@@ -186,7 +186,7 @@
{
if(docked_.find(player) == docked_.end())
{
- COUT(2) << "Dock::dockingAnimationFinished Player is not currently docked." << std::endl;
+ orxout(internal_warning, context::docking) << "Dock::dockingAnimationFinished Player is not currently docked." << endl;
return false;
}
@@ -199,7 +199,7 @@
// Check if player is docked to this Dock
if(docked_.find(player) == docked_.end())
{
- COUT(2) << "Dock::undock Player is not docked to this Dock." << std::endl;
+ orxout(internal_warning, context::docking) << "Dock::undock Player is not docked to this Dock." << endl;
return false;
}
@@ -217,7 +217,7 @@
}
bool Dock::undockingAnimationFinished(PlayerInfo* player) {
- COUT(4) << "Dock::undockingAnimationFinished executed" << std::endl;
+ orxout(verbose, context::docking) << "Dock::undockingAnimationFinished executed" << endl;
return true;
}
Modified: code/branches/output/src/modules/docking/DockToShip.cc
===================================================================
--- code/branches/output/src/modules/docking/DockToShip.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/docking/DockToShip.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -42,7 +42,7 @@
DockToShip::DockToShip(BaseObject* creator) : DockingEffect(creator)
{
RegisterObject(DockToShip);
- COUT(4) << "DockToShip instance created.." << endl;
+ orxout(verbose, context::docking) << "DockToShip instance created.." << endl;
}
DockToShip::~DockToShip()
@@ -68,17 +68,17 @@
bool DockToShip::docking(PlayerInfo* player)
{
- COUT(4) << "DockToShip::attach" << endl;
+ orxout(verbose, context::docking) << "DockToShip::attach" << endl;
DockingTarget *target = DockingEffect::findTarget(this->target_);
if (target == NULL) {
- COUT(0) << "Can't retrieve target for '" << this->target_ << "'.." << std::endl;
+ orxout(internal_warning, context::docking) << "Can't retrieve target for '" << this->target_ << "'.." << endl;
return false;
}
ControllableEntity *dockTo = (ControllableEntity*) target->getParent();
if (dockTo == NULL) {
- COUT(2) << "Parent is not a ControllableEntity.." << std::endl;
+ orxout(internal_warning, context::docking) << "Parent is not a ControllableEntity.." << endl;
return false;
}
@@ -91,7 +91,7 @@
bool DockToShip::release(PlayerInfo* player)
{
- COUT(4) << "DockToShip::release" << endl;
+ orxout(verbose, context::docking) << "DockToShip::release" << endl;
player->stopTemporaryControl();
Modified: code/branches/output/src/modules/docking/DockingController.cc
===================================================================
--- code/branches/output/src/modules/docking/DockingController.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/docking/DockingController.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -96,7 +96,7 @@
if (docking)
{
- COUT(4) << "DockingController::takeControl Taking over control." << std::endl;
+ orxout(verbose, context::docking) << "DockingController::takeControl Taking over control." << endl;
this->entity_->setDestroyWhenPlayerLeft(false);
this->player_->pauseControl();
@@ -107,7 +107,7 @@
void DockingController::positionReached()
{
- COUT(4) << "DockingController::positionReached() called." << std::endl;
+ orxout(verbose, context::docking) << "DockingController::positionReached() called." << endl;
assert(this->player_);
assert(this->dock_);
Modified: code/branches/output/src/modules/docking/DockingTarget.cc
===================================================================
--- code/branches/output/src/modules/docking/DockingTarget.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/docking/DockingTarget.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -52,7 +52,7 @@
{
SUPER(DockingTarget, XMLPort, xmlelement, mode);
- COUT(4) << "DockingTarget with name '" << this->getName() << "' created.." << std::endl;
+ orxout(verbose, context::docking) << "DockingTarget with name '" << this->getName() << "' created.." << endl;
}
}
Modified: code/branches/output/src/modules/gametypes/RaceCheckPoint.cc
===================================================================
--- code/branches/output/src/modules/gametypes/RaceCheckPoint.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/gametypes/RaceCheckPoint.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -108,8 +108,8 @@
if (gametype)
{
const std::string& message = "You have " + multi_cast<std::string>(this->bTimeLimit_)
- + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1) + "\n";
- COUT(3) << message;
+ + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1);
+ orxout(level::message) << message << endl;
const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage(message);
}
}
Modified: code/branches/output/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/output/src/modules/gametypes/SpaceRace.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/gametypes/SpaceRace.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -58,7 +58,7 @@
const std::string& message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
+ "You didn't reach the check point " + multi_cast<std::string>(this->bCheckpointsReached_+1)
+ " before the time limit. You lose!";
- COUT(3) << message;
+ orxout(level::message) << message << endl;
const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
Host::Broadcast(message);
}
@@ -69,14 +69,14 @@
int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
+ "." + multi_cast<std::string>(ms) + " seconds.";
- COUT(3) << message << std::endl;
+ orxout(level::message) << message << endl;
const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
Host::Broadcast(message);
float time = this->clock_.getSecondsPrecise();
this->scores_.insert(time);
std::set<float>::iterator it;
for (it=this->scores_.begin(); it!=this->scores_.end(); it++)
- COUT(3) << multi_cast<std::string>(*it) << std::endl;
+ orxout(level::message) << multi_cast<std::string>(*it) << endl;
}
}
@@ -85,7 +85,7 @@
Gametype::start();
std::string message("The match has started! Reach the check points as quickly as possible!");
- COUT(3) << message << std::endl;
+ orxout(level::message) << message << endl;
Host::Broadcast(message);
}
@@ -97,10 +97,10 @@
int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
const std::string& message = "Checkpoint " + multi_cast<std::string>(this->getCheckpointsReached())
+ " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
- + " seconds.\n";
- COUT(3) << message;
+ + " seconds.";
+ orxout(level::message) << message << endl;
const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
Host::Broadcast(message);
}
-}
\ No newline at end of file
+}
Modified: code/branches/output/src/modules/notifications/NotificationDispatcher.cc
===================================================================
--- code/branches/output/src/modules/notifications/NotificationDispatcher.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/notifications/NotificationDispatcher.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -136,7 +136,7 @@
if(!triggered || !this->isActive()) // If the NotificationDispatcher is inactive it cannot be executed.
return false;
- COUT(4) << "NotificationDispatcher (&" << this << ") triggered." << std::endl;
+ orxout(verbose, context::notifications) << "NotificationDispatcher (&" << this << ") triggered." << endl;
PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
PlayerInfo* player = NULL;
@@ -154,7 +154,7 @@
if(player == NULL)
{
- COUT(4) << "The NotificationDispatcher was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
+ orxout(verbose, context::notifications) << "The NotificationDispatcher was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
return false;
}
Modified: code/branches/output/src/modules/notifications/NotificationManager.cc
===================================================================
--- code/branches/output/src/modules/notifications/NotificationManager.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/notifications/NotificationManager.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -56,7 +56,7 @@
{
RegisterRootObject(NotificationManager);
- COUT(3) << "NotificatioManager created." << std::endl;
+ orxout(internal_info, context::notifications) << "NotificatioManager created." << endl;
}
/**
@@ -70,7 +70,7 @@
it->second->destroy();
this->allNotificationsList_.clear();
- COUT(3) << "NotificationManager destroyed." << std::endl;
+ orxout(internal_info, context::notifications) << "NotificationManager destroyed." << endl;
}
/**
@@ -131,7 +131,7 @@
}
if(commandExecuted)
- COUT(3) << "Notification command \"" << NotificationListener::command2Str(command) << "\" executed." << endl;
+ orxout(internal_info, context::notifications) << "Notification command \"" << NotificationListener::command2Str(command) << "\" executed." << endl;
return commandExecuted;
}
@@ -197,7 +197,7 @@
}
}
- COUT(4) << "Notification (&" << notification << ") registered with the NotificationManager." << std::endl;
+ orxout(verbose, context::notifications) << "Notification (&" << notification << ") registered with the NotificationManager." << endl;
return true;
}
@@ -218,7 +218,7 @@
// Remove the Notification from the list of Notifications of the input NotificationQueue.
this->removeNotification(notification, *(this->notificationLists_.find(queue->getName())->second));
- COUT(4) << "Notification (&" << notification << ") unregistered with the NotificationManager from NotificationQueue " << queue->getName() << "." << std::endl;
+ orxout(verbose, context::notifications) << "Notification (&" << notification << ") unregistered with the NotificationManager from NotificationQueue " << queue->getName() << "." << endl;
}
/**
@@ -350,7 +350,7 @@
queue->update(); // Update the queue.
- COUT(4) << "NotificationQueue '" << queue->getName() << "' registered with the NotificationManager." << std::endl;
+ orxout(verbose, context::notifications) << "NotificationQueue '" << queue->getName() << "' registered with the NotificationManager." << endl;
return true;
}
@@ -383,7 +383,7 @@
// Remove the Notifications list that was associated with the input NotificationQueue.
this->notificationLists_.erase(queue->getName());
- COUT(4) << "NotificationQueue '" << queue->getName() << "' unregistered with the NotificationManager." << std::endl;
+ orxout(verbose, context::notifications) << "NotificationQueue '" << queue->getName() << "' unregistered with the NotificationManager." << endl;
}
/**
Modified: code/branches/output/src/modules/notifications/NotificationQueue.cc
===================================================================
--- code/branches/output/src/modules/notifications/NotificationQueue.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/notifications/NotificationQueue.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -130,11 +130,11 @@
if(!queueRegistered) // If the registration has failed.
{
this->registered_ = false;
- COUT(1) << "Error: NotificationQueue '" << this->getName() << "' could not be registered." << std::endl;
+ orxout(internal_error, context::notifications) << "NotificationQueue '" << this->getName() << "' could not be registered." << endl;
return;
}
- COUT(3) << "NotificationQueue '" << this->getName() << "' created." << std::endl;
+ orxout(internal_info, context::notifications) << "NotificationQueue '" << this->getName() << "' created." << endl;
}
/**
@@ -214,7 +214,7 @@
delete notifications;
- COUT(4) << "NotificationQueue '" << this->getName() << "' updated." << std::endl;
+ orxout(verbose, context::notifications) << "NotificationQueue '" << this->getName() << "' updated." << endl;
}
/**
@@ -231,7 +231,7 @@
this->push(notification, time);
- COUT(4) << "NotificationQueue '" << this->getName() << "' updated. A new Notification has been added." << std::endl;
+ orxout(verbose, context::notifications) << "NotificationQueue '" << this->getName() << "' updated. A new Notification has been added." << endl;
}
/**
@@ -264,8 +264,8 @@
// Inform that a Notification was pushed.
this->notificationPushed(notification);
- COUT(5) << "Notification \"" << notification->getMessage() << "\" pushed to NotificationQueue '" << this->getName() << "'" << endl;
- COUT(3) << "NotificationQueue \"" << this->getName() << "\": " << notification->getMessage() << endl;
+ orxout(verbose_more, context::notifications) << "Notification \"" << notification->getMessage() << "\" pushed to NotificationQueue '" << this->getName() << "'" << endl;
+ orxout(internal_info, context::notifications) << "NotificationQueue \"" << this->getName() << "\": " << notification->getMessage() << endl;
}
/**
@@ -283,7 +283,7 @@
{
if(container == *it)
{
- COUT(5) << "Notification \"" << (*it)->notification->getMessage() << "\" popped from NotificationQueue '" << this->getName() << "'" << endl;
+ orxout(verbose_more, context::notifications) << "Notification \"" << (*it)->notification->getMessage() << "\" popped from NotificationQueue '" << this->getName() << "'" << endl;
this->ordering_.erase(it);
break;
}
@@ -310,7 +310,7 @@
// Get the index at which the Notification is.
std::vector<NotificationContainer*>::difference_type index = it - this->notifications_.begin ();
- COUT(5) << "Notification \"" << (*it)->notification->getMessage() << "\" removed from NotificationQueue '" << this->getName() << "'" << endl;
+ orxout(verbose_more, context::notifications) << "Notification \"" << (*it)->notification->getMessage() << "\" removed from NotificationQueue '" << this->getName() << "'" << endl;
this->ordering_.erase(containerIterator);
this->notifications_.erase(it);
@@ -332,7 +332,7 @@
*/
void NotificationQueue::clear(bool noGraphics)
{
- COUT(4) << "Clearing NotificationQueue " << this->getName() << "." << endl;
+ orxout(verbose, context::notifications) << "Clearing NotificationQueue " << this->getName() << "." << endl;
this->ordering_.clear();
// Delete all NotificationContainers in the list.
for(std::vector<NotificationContainer*>::iterator it = this->notifications_.begin(); it != this->notifications_.end(); it++)
@@ -366,7 +366,7 @@
if(size == 0)
{
- COUT(2) << "Trying to set maximal size of NotificationQueue '" << this->getName() << "' to 0. Ignoring..." << endl;
+ orxout(internal_warning, context::notifications) << "Trying to set maximal size of NotificationQueue '" << this->getName() << "' to 0. Ignoring..." << endl;
return;
}
@@ -397,7 +397,7 @@
if(time != NotificationQueue::INF && time <= 0)
{
- COUT(2) << "Trying to set display time of NotificationQueue '" << this->getName() << "' to non-positive value. Ignoring..." << endl;
+ orxout(internal_warning, context::notifications) << "Trying to set display time of NotificationQueue '" << this->getName() << "' to non-positive value. Ignoring..." << endl;
}
this->displayTime_ = time;
Modified: code/branches/output/src/modules/notifications/NotificationQueueCEGUI.cc
===================================================================
--- code/branches/output/src/modules/notifications/NotificationQueueCEGUI.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/notifications/NotificationQueueCEGUI.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -142,7 +142,7 @@
if(size.x < 0.0 || size.x > 1.0 || size.z < 0.0 || size.z > 1.0)
{
- 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;
+ 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;
return;
}
@@ -182,7 +182,7 @@
if(position.x < 0.0 || position.x > 1.0 || position.z < 0.0 || position.z > 1.0)
{
- COUT(2) << "The position the NotificationQueueCEGUI " << this->getName() << " was trying to be set, but the relative position was not in [0,1]. Aborting..." << endl;
+ 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;
return;
}
Modified: code/branches/output/src/modules/objects/ForceField.cc
===================================================================
--- code/branches/output/src/modules/objects/ForceField.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/ForceField.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -215,7 +215,7 @@
this->mode_ = forceFieldMode::newtonianGravity;
else
{
- COUT(2) << "Wrong mode '" << mode << "' in ForceField. Setting to 'tube'." << std::endl;
+ orxout(internal_warning) << "Wrong mode '" << mode << "' in ForceField. Setting to 'tube'." << endl;
this->mode_ = forceFieldMode::tube;
}
}
Modified: code/branches/output/src/modules/objects/Planet.cc
===================================================================
--- code/branches/output/src/modules/objects/Planet.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/Planet.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -72,7 +72,7 @@
if (activeCamera && this->billboard_.getBillboardSet())
{
float distance = this->getPosition().distance( activeCamera->getWorldPosition() );
- // COUT(2) << distance << std::endl;
+ // orxout(internal_warning) << distance << endl;
float planetRadius = this->getScale();
float newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
Modified: code/branches/output/src/modules/objects/Script.cc
===================================================================
--- code/branches/output/src/modules/objects/Script.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/Script.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -136,7 +136,7 @@
if(!triggered || !this->isActive()) // If the Script is inactive it cannot be executed.
return false;
- COUT(4) << "Script (&" << this << ") triggered." << std::endl;
+ orxout(internal_info) << "Script (&" << this << ") triggered." << endl;
PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
PlayerInfo* player = NULL;
@@ -154,7 +154,7 @@
if(player == NULL) //TODO: Will this ever happen? If not, change in NotificationDispatcher as well.
{
- COUT(4) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
+ orxout(internal_warning) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
return false;
}
@@ -271,7 +271,7 @@
}
else
{
- COUT(2) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << std::endl;
+ orxout(internal_warning) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << endl;
this->setMode(ScriptMode::normal);
this->modeStr_ = Script::NORMAL;
}
@@ -322,7 +322,7 @@
}
else
{
- COUT(2) << "Invalid times '" << times << "' in Script. Setting to infinity." << std::endl;
+ orxout(internal_warning) << "Invalid times '" << times << "' in Script. Setting to infinity." << endl;
this->times_ = Script::INF;
this->remainingExecutions_ = Script::INF;
}
Modified: code/branches/output/src/modules/objects/SpaceBoundaries.cc
===================================================================
--- code/branches/output/src/modules/objects/SpaceBoundaries.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/SpaceBoundaries.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -214,7 +214,7 @@
{
distance = this->computeDistance(currentPawn);
humanItem = this->isHumanPlayer(currentPawn);
- COUT(5) << "Distance:" << distance << std::endl; // message for debugging
+// orxout() << "Distance:" << distance << endl; // message for debugging
if(distance > this->warnDistance_ && distance < this->maxDistance_) // Display warning
{
if(humanItem)
@@ -230,7 +230,7 @@
{
if( humanItem )
{
- COUT(5) << "Health should be decreasing!" << std::endl;
+// orxout() << "Health should be decreasing!" << endl;
this->displayWarning("You are out of the area now!");
}
currentPawn->removeHealth( (distance - this->maxDistance_) * this->healthDecrease_);
Modified: code/branches/output/src/modules/objects/collisionshapes/BoxCollisionShape.cc
===================================================================
--- code/branches/output/src/modules/objects/collisionshapes/BoxCollisionShape.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/collisionshapes/BoxCollisionShape.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -92,7 +92,7 @@
// this->collisionShape_->setLocalScaling(multi_cast<btVector3>(this->getScale3D()));
if(!this->hasUniformScaling())
{
- CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
+ orxout(internal_error) << "BoxCollisionShape: Non-uniform scaling is not yet supported." << endl;
return;
}
Modified: code/branches/output/src/modules/objects/collisionshapes/ConeCollisionShape.cc
===================================================================
--- code/branches/output/src/modules/objects/collisionshapes/ConeCollisionShape.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/collisionshapes/ConeCollisionShape.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -91,7 +91,7 @@
//this->collisionShape_->setLocalScaling(multi_cast<btVector3>(this->getScale3D()));
if(!this->hasUniformScaling())
{
- CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
+ orxout(internal_error) << "ConeCollisionShape: Non-uniform scaling is not yet supported." << endl;
return;
}
Modified: code/branches/output/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
===================================================================
--- code/branches/output/src/modules/objects/collisionshapes/PlaneCollisionShape.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/collisionshapes/PlaneCollisionShape.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -91,7 +91,7 @@
//this->collisionShape_->setLocalScaling(multi_cast<btVector3>(this->getScale3D()));
if(!this->hasUniformScaling())
{
- CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
+ orxout(internal_error) << "PlaneCollisionShape: Non-uniform scaling is not yet supported." << endl;
return;
}
Modified: code/branches/output/src/modules/objects/collisionshapes/SphereCollisionShape.cc
===================================================================
--- code/branches/output/src/modules/objects/collisionshapes/SphereCollisionShape.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/collisionshapes/SphereCollisionShape.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -88,7 +88,7 @@
//this->collisionShape_->setLocalScaling(multi_cast<btVector3>(this->getScale3D()));
if(!this->hasUniformScaling())
{
- CCOUT(1) << "Error: Non-uniform scaling is not yet supported." << endl;
+ orxout(internal_error) << "SphereCollisionShape: Non-uniform scaling is not yet supported." << endl;
return;
}
Modified: code/branches/output/src/modules/objects/eventsystem/EventFilter.cc
===================================================================
--- code/branches/output/src/modules/objects/eventsystem/EventFilter.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/eventsystem/EventFilter.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -62,7 +62,7 @@
{
if (this->bActive_)
{
- COUT(2) << "Warning: Detected Event loop in EventFilter \"" << this->getName() << '"' << std::endl;
+ orxout(internal_warning, context::events) << "Detected Event loop in EventFilter \"" << this->getName() << '"' << endl;
return;
}
Modified: code/branches/output/src/modules/objects/eventsystem/EventListener.cc
===================================================================
--- code/branches/output/src/modules/objects/eventsystem/EventListener.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/eventsystem/EventListener.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -58,11 +58,11 @@
{
if (this->bActive_)
{
- COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << '"' << std::endl;
+ orxout(internal_warning, context::events) << "Detected Event loop in EventListener \"" << this->getName() << '"' << endl;
return;
}
- COUT(4) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl;
+ orxout(verbose, context::events) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << endl;
this->bActive_ = true;
//TODO: Why not this->fireEvent(event)?
Modified: code/branches/output/src/modules/objects/eventsystem/EventTarget.cc
===================================================================
--- code/branches/output/src/modules/objects/eventsystem/EventTarget.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/eventsystem/EventTarget.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -59,7 +59,7 @@
{
if (this->bActive_)
{
- COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << '"' << std::endl;
+ orxout(internal_warning, context::events) << "Detected Event loop in EventTarget \"" << this->getName() << '"' << endl;
return;
}
Modified: code/branches/output/src/modules/objects/triggers/DistanceMultiTrigger.cc
===================================================================
--- code/branches/output/src/modules/objects/triggers/DistanceMultiTrigger.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/triggers/DistanceMultiTrigger.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -246,7 +246,7 @@
else if(mode == DistanceMultiTrigger::beaconModeExlcude_s)
this->setBeaconModeDirect(distanceMultiTriggerBeaconMode::exclude);
else
- COUT(1) << "Invalid beacon mode in DistanceMultiTrigger." << endl;
+ orxout(internal_error, context::triggers) << "Invalid beacon mode in DistanceMultiTrigger." << endl;
}
/**
Modified: code/branches/output/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/output/src/modules/objects/triggers/DistanceTrigger.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/triggers/DistanceTrigger.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -107,7 +107,7 @@
if (targetId == NULL)
{
- COUT(1) << "Error: \"" << targetStr << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << std::endl;
+ orxout(internal_error, context::triggers) << "\"" << targetStr << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << endl;
return;
}
@@ -208,7 +208,7 @@
if(pawn != NULL)
this->setTriggeringPawn(pawn);
else
- CCOUT(2) << "Pawn was NULL." << endl;
+ orxout(internal_warning, context::triggers) << "Pawn was NULL." << endl;
}
// Add the entity to the cache.
@@ -269,7 +269,7 @@
else if(mode == DistanceTrigger::beaconModeExlcude_s)
this->setBeaconModeDirect(distanceTriggerBeaconMode::exclude);
else
- COUT(1) << "Invalid beacon mode in DistanceTrigger." << endl;
+ orxout(internal_error, context::triggers) << "Invalid beacon mode in DistanceTrigger." << endl;
}
/**
Modified: code/branches/output/src/modules/objects/triggers/MultiTrigger.cc
===================================================================
--- code/branches/output/src/modules/objects/triggers/MultiTrigger.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/triggers/MultiTrigger.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -71,7 +71,7 @@
*/
MultiTrigger::~MultiTrigger()
{
- COUT(4) << "Destroying MultiTrigger &" << this << ". " << this->stateQueue_.size() << " states still in queue. Deleting." << std::endl;
+ orxout(verbose, context::triggers) << "Destroying MultiTrigger &" << this << ". " << this->stateQueue_.size() << " states still in queue. Deleting." << endl;
while(this->stateQueue_.size() > 0)
{
MultiTriggerState* state = this->stateQueue_.front().second;
@@ -93,7 +93,7 @@
XMLPortParam(MultiTrigger, "broadcast", setBroadcast, getBroadcast, xmlelement, mode);
XMLPortParamLoadOnly(MultiTrigger, "target", addTarget, xmlelement, mode).defaultValues("Pawn"); //TODO: Remove load only
- COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << std::endl;
+ orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << endl;
}
@@ -131,7 +131,7 @@
// If the state is NULL. (This really shouldn't happen)
if(state == NULL)
{
- COUT(1) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was NULL. State ignored." << std::endl;
+ orxout(internal_error, context::triggers) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was NULL. State ignored." << endl;
queue->pop();
continue;
}
@@ -240,9 +240,9 @@
{
// Print some debug output if the state has changed.
if(state->originator != NULL)
- COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: " << state->originator->getIdentifier()->getName() << " (&" << state->originator << "), active: " << bActive << ", triggered: " << state->bTriggered << "." << std::endl;
+ orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: " << state->originator->getIdentifier()->getName() << " (&" << state->originator << "), active: " << bActive << ", triggered: " << state->bTriggered << "." << endl;
else
- COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << std::endl;
+ orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << endl;
// 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.
if(this->parent_ != NULL && this->parent_->isMultiTrigger())
@@ -253,7 +253,7 @@
if(this->remainingActivations_ == 0 && !bActive)
{
this->BaseObject::setActive(false);
- COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") ran out of activations. Setting it to inactive." << std::endl;
+ orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") ran out of activations. Setting it to inactive." << endl;
}
}
@@ -300,7 +300,7 @@
// If the target is not a valid class name display an error.
if (target == NULL)
{
- COUT(1) << "Error: '" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;
+ orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl;
return;
}
@@ -328,7 +328,7 @@
// If the target is not a valid class name display an error.
if (target == NULL)
{
- COUT(1) << "Error: '" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;
+ orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl;
return;
}
@@ -446,13 +446,13 @@
if(originator == NULL)
{
this->fireEvent(status);
- COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. status: " << status << "." << std::endl;
+ orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. status: " << status << "." << endl;
return;
}
MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator);
this->fireEvent(status, container);
- COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << std::endl;
+ orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl;
delete container;
}
Modified: code/branches/output/src/modules/objects/triggers/TriggerBase.cc
===================================================================
--- code/branches/output/src/modules/objects/triggers/TriggerBase.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/objects/triggers/TriggerBase.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -127,7 +127,7 @@
else if (modeName == TriggerBase::xor_s)
this->setMode(TriggerMode::EventTriggerXOR);
else
- COUT(2) << "Invalid mode '" << modeName << "' in TriggerBase " << this->getName() << " &(" << this << "). Leaving mode at '" << this->getModeString() << "'." << std::endl;
+ orxout(internal_warning, context::triggers) << "Invalid mode '" << modeName << "' in TriggerBase " << this->getName() << " &(" << this << "). Leaving mode at '" << this->getModeString() << "'." << endl;
}
/**
Modified: code/branches/output/src/modules/overlays/GUIOverlay.cc
===================================================================
--- code/branches/output/src/modules/overlays/GUIOverlay.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/overlays/GUIOverlay.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -75,12 +75,12 @@
const std::string& str = multi_cast<std::string>(reinterpret_cast<long>(this));
GUIManager::getInstance().showGUIExtra(this->guiName_, str);
- COUT(4) << "Showing GUI " << this->guiName_ << std::endl;
+ orxout(internal_info) << "Showing GUI " << this->guiName_ << endl;
}
else
{
GUIManager::hideGUI(this->guiName_);
- COUT(4) << "Hiding GUI " << this->guiName_ << std::endl;
+ orxout(internal_info) << "Hiding GUI " << this->guiName_ << endl;
}
}
Modified: code/branches/output/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/branches/output/src/modules/overlays/hud/ChatOverlay.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/overlays/hud/ChatOverlay.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -86,7 +86,7 @@
}
this->messages_.push_back(multi_cast<Ogre::DisplayString>(text));
- COUT(0) << "Chat: " << text << std::endl;
+ orxout(level::message) << "Chat: " << text << endl;
Timer* timer = new Timer();
this->timers_.insert(timer); // store the timer in a set to destroy it in the destructor
Modified: code/branches/output/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/output/src/modules/overlays/hud/HUDNavigation.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/overlays/hud/HUDNavigation.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -104,7 +104,7 @@
const Ogre::ResourcePtr& fontPtr = Ogre::FontManager::getSingleton().getByName ( font );
if ( fontPtr.isNull() )
{
- COUT ( 2 ) << "Warning: HUDNavigation: Font '" << font << "' not found" << std::endl;
+ orxout(internal_warning) << "HUDNavigation: Font '" << font << "' not found" << endl;
return;
}
fontName_ = font;
@@ -124,7 +124,7 @@
{
if ( size <= 0.0f )
{
- COUT ( 2 ) << "Warning: HUDNavigation: Negative font size not allowed" << std::endl;
+ orxout(internal_warning) << "HUDNavigation: Negative font size not allowed" << endl;
return;
}
textSize_ = size;
Modified: code/branches/output/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/output/src/modules/overlays/hud/HUDRadar.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/overlays/hud/HUDRadar.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -159,7 +159,7 @@
const WorldEntity* wePointer = it->first->getWorldEntity();
if( !wePointer )
{
- CCOUT(0) << "Cannot display a non-WorldEntitiy on the radar" << std::endl;
+ orxout(internal_error) << "Cannot display a non-WorldEntitiy on the radar" << endl;
assert(0);
}
bool isFocus = (it->first == focusObject);
Modified: code/branches/output/src/modules/pickup/Pickup.cc
===================================================================
--- code/branches/output/src/modules/pickup/Pickup.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/Pickup.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -168,7 +168,7 @@
}
else
{
- COUT(1) << "Invalid activationType '" << type << "' in pickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid activationType '" << type << "' in pickup." << endl;
}
}
@@ -190,7 +190,7 @@
}
else
{
- COUT(1) << "Invalid durationType '" << type << "' in pickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid durationType '" << type << "' in pickup." << endl;
}
}
Modified: code/branches/output/src/modules/pickup/PickupManager.cc
===================================================================
--- code/branches/output/src/modules/pickup/PickupManager.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/PickupManager.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -71,7 +71,7 @@
this->defaultRepresentation_ = new PickupRepresentation();
- COUT(3) << "PickupManager created." << std::endl;
+ orxout(internal_info, context::pickups) << "PickupManager created." << endl;
}
/**
@@ -100,7 +100,7 @@
this->indexes_.clear();
- COUT(3) << "PickupManager destroyed." << std::endl;
+ orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl;
}
/**
@@ -125,7 +125,7 @@
this->representations_[identifier] = representation;
- COUT(4) << "PickupRepresentation &" << representation << " registered with the PickupManager." << std::endl;
+ orxout(verbose, context::pickups) << "PickupRepresentation &" << representation << " registered with the PickupManager." << endl;
return true;
}
@@ -150,7 +150,7 @@
this->representations_.erase(it);
- COUT(4) << "PickupRepresentation &" << representation << " unregistered with the PickupManager." << std::endl;
+ orxout(verbose, context::pickups) << "PickupRepresentation &" << representation << " unregistered with the PickupManager." << endl;
return true;
}
@@ -207,7 +207,7 @@
std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare>::iterator it = this->representations_.find(identifier);
if(it == this->representations_.end()) // If there is no PickupRepresentation associated with the input PickupIdentifier.
{
- COUT(4) << "PickupManager::getRepresentation() returned default representation." << std::endl;
+ orxout(verbose, context::pickups) << "PickupManager::getRepresentation() returned default representation." << endl;
return this->defaultRepresentation_;
}
@@ -283,7 +283,7 @@
// If the input Pickupable (i.e its identifier) is not present in the list the PickupManager has.
if(manager.pickupInventoryContainers_.find(pickup) == manager.pickupInventoryContainers_.end())
{
- COUT(1) << "Error: Pickupable &(" << pickup << ") was not registered with PickupManager for the PickupInventory, when it changed used." << std::endl;
+ orxout(internal_error, context::pickups) << "Pickupable &(" << pickup << ") was not registered with PickupManager for the PickupInventory, when it changed used." << endl;
return;
}
Modified: code/branches/output/src/modules/pickup/PickupRepresentation.cc
===================================================================
--- code/branches/output/src/modules/pickup/PickupRepresentation.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/PickupRepresentation.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -139,7 +139,7 @@
if(this->spawnerRepresentation_ != NULL)
this->spawnerRepresentation_->setVisible(false);
- COUT(4) << "PickupRepresentation created: name: '" << this->name_ << "', description: '" << this->description_ << "', spawnerTemplate: '" << this->spawnerTemplate_ << "'." << std::endl;
+ orxout(verbose, context::pickups) << "PickupRepresentation created: name: '" << this->name_ << "', description: '" << this->description_ << "', spawnerTemplate: '" << this->spawnerTemplate_ << "'." << endl;
}
/**
@@ -154,10 +154,10 @@
{
if(this->spawnerRepresentation_ == NULL)
{
- COUT(4) << "PickupRepresentation: No spawner representation found." << std::endl;
+ orxout(verbose, context::pickups) << "PickupRepresentation: No spawner representation found." << endl;
if(this->spawnerTemplate_ == "")
{
- COUT(4) << "PickupRepresentation: Spawner template is empty." << std::endl;
+ orxout(verbose, context::pickups) << "PickupRepresentation: Spawner template is empty." << endl;
// If neither spawnerRepresentation nor spawnerTemplate was specified
return this->getDefaultSpawnerRepresentation(spawner);
}
Modified: code/branches/output/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/branches/output/src/modules/pickup/PickupSpawner.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/PickupSpawner.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -89,7 +89,7 @@
if(this->pickup_ == NULL)
{
- COUT(2) << "A PickupSpawner was created without a valid Pickupable. This won't work." << std::endl;
+ orxout(internal_warning, context::pickups) << "A PickupSpawner was created without a valid Pickupable. This won't work." << endl;
this->setActive(false);
}
else
@@ -143,7 +143,7 @@
if(this->pickup_ == NULL)
{
- COUT(2) << "A PickupSpawner was created without a valid Pickupable. This won't work." << std::endl;
+ orxout(internal_warning, context::pickups) << "A PickupSpawner was created without a valid Pickupable. This won't work." << endl;
this->setActive(false);
}
else
@@ -238,7 +238,7 @@
}
else
{
- COUT(4) << "PickupSpawner (&" << this << ") empty, selfdestruct initialized." << std::endl;
+ orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") empty, selfdestruct initialized." << endl;
this->setActive(false);
this->destroy();
}
@@ -263,12 +263,12 @@
{
if(this->pickup_ != NULL)
{
- COUT(1) << "In PickupSpawner (&" << this << "): setPickupable called, with this->pickup_ already set." << std::endl;
+ orxout(internal_error, context::pickups) << "In PickupSpawner (&" << this << "): setPickupable called, with this->pickup_ already set." << endl;
return;
}
if(pickup == NULL)
{
- COUT(1) << "In PickupSpawner (&" << this << "): Argument of setPickupable is NULL." << std::endl;
+ orxout(internal_error, context::pickups) << "In PickupSpawner (&" << this << "): Argument of setPickupable is NULL." << endl;
return;
}
@@ -297,7 +297,7 @@
{
if(this->isActive()) // Checks whether PickupSpawner is active.
{
- COUT(4) << "PickupSpawner (&" << this << ") triggered and active." << std::endl;
+ orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") triggered and active." << endl;
PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
assert(carrier);
@@ -305,7 +305,7 @@
// If the Pawn isn't a target of the Pickupable.
if(!carrier->isTarget(this->pickup_))
{
- COUT(4) << "PickupSpawner (&" << this << ") triggered but Pawn wasn't a target of the Pickupable." << std::endl;
+ orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") triggered but Pawn wasn't a target of the Pickupable." << endl;
return;
}
@@ -334,7 +334,7 @@
{
if(this->spawnsRemaining_ == 0)
{
- COUT(1) << "Massive Error: PickupSpawner still alive until having spawned last item." << std::endl;
+ orxout(internal_error, context::pickups) << "Massive Error: PickupSpawner still alive until having spawned last item." << endl;
return NULL;
}
@@ -348,7 +348,7 @@
*/
void PickupSpawner::respawnTimerCallback()
{
- COUT(4) << "PickupSpawner (&" << this << ") reactivated." << std::endl;
+ orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") reactivated." << endl;
this->setActive(true);
}
Modified: code/branches/output/src/modules/pickup/items/DronePickup.cc
===================================================================
--- code/branches/output/src/modules/pickup/items/DronePickup.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/items/DronePickup.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -178,7 +178,7 @@
if(pawn == NULL)
{
- COUT(1) << "Invalid PickupCarrier in DronePickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid PickupCarrier in DronePickup." << endl;
}
return pawn;
Modified: code/branches/output/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/output/src/modules/pickup/items/HealthPickup.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/items/HealthPickup.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -168,7 +168,7 @@
pawn->addHealth(health);
break;
default:
- COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
}
// If all health has been transferred.
@@ -217,7 +217,7 @@
pawn->addHealth(this->getHealth());
break;
default:
- COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
}
// The pickup has been used up.
@@ -233,7 +233,7 @@
if(pawn == NULL)
{
- COUT(1) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << std::endl;
+ orxout(internal_error, context::pickups) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << endl;
this->Pickupable::destroy();
return;
}
@@ -267,7 +267,7 @@
if(pawn == NULL)
{
- COUT(1) << "Invalid PickupCarrier in HealthPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl;
}
return pawn;
@@ -311,7 +311,7 @@
case pickupHealthType::permanent:
return HealthPickup::healthTypePermanent_s;
default:
- COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
return BLANKSTRING;
}
}
@@ -330,7 +330,7 @@
}
else
{
- COUT(1) << "Invalid health in HealthPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid health in HealthPickup." << endl;
this->health_ = 0.0;
}
}
@@ -349,7 +349,7 @@
}
else
{
- COUT(1) << "Invalid healthSpeed in HealthPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid healthSpeed in HealthPickup." << endl;
}
}
@@ -375,7 +375,7 @@
}
else
{
- COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl;
}
}
Modified: code/branches/output/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/branches/output/src/modules/pickup/items/InvisiblePickup.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/items/InvisiblePickup.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -205,7 +205,7 @@
if(pawn == NULL)
{
- COUT(1) << "Invalid PickupCarrier in InvisiblePickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid PickupCarrier in InvisiblePickup." << endl;
}
return pawn;
}
@@ -224,7 +224,7 @@
}
else
{
- COUT(1) << "Invalid duration in InvisiblePickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid duration in InvisiblePickup." << endl;
this->duration_ = 0.0f;
}
}
Modified: code/branches/output/src/modules/pickup/items/MetaPickup.cc
===================================================================
--- code/branches/output/src/modules/pickup/items/MetaPickup.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/items/MetaPickup.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -231,7 +231,7 @@
this->setMetaTypeDirect(pickupMetaType::destroyCarrier);
}
else
- COUT(2) << "Invalid metaType '" << type << "' in MetaPickup." << std::endl;
+ orxout(internal_warning, context::pickups) << "Invalid metaType '" << type << "' in MetaPickup." << endl;
}
}
Modified: code/branches/output/src/modules/pickup/items/ShieldPickup.cc
===================================================================
--- code/branches/output/src/modules/pickup/items/ShieldPickup.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/items/ShieldPickup.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -180,7 +180,7 @@
if(pawn == NULL)
{
- COUT(1) << "Invalid PickupCarrier in ShieldPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid PickupCarrier in ShieldPickup." << endl;
}
return pawn;
}
@@ -219,7 +219,7 @@
}
else
{
- COUT(1) << "Invalid duration in ShieldPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid duration in ShieldPickup." << endl;
this->duration_ = 0.0f;
}
}
@@ -238,7 +238,7 @@
}
else
{
- COUT(1) << "Invalid Shieldhealth in ShieldPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid Shieldhealth in ShieldPickup." << endl;
this->shieldHealth_=0;
}
}
@@ -257,7 +257,7 @@
}
else
{
- COUT(1) << "Invalid Absorption in ShieldPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid Absorption in ShieldPickup." << endl;
this->shieldAbsorption_=0;
}
}
Modified: code/branches/output/src/modules/pickup/items/ShrinkPickup.h
===================================================================
--- code/branches/output/src/modules/pickup/items/ShrinkPickup.h 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/items/ShrinkPickup.h 2011-08-01 17:09:29 UTC (rev 8811)
@@ -92,7 +92,7 @@
@param factor The factor, needs to greater than 1.
*/
inline void setShrinkFactor(float factor)
- { if(factor <= 1.0f) { COUT(2) << "Invalid shrinking factor in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkFactor_ = factor; }
+ { if(factor <= 1.0f) { orxout(internal_warning, context::pickups) << "Invalid shrinking factor in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkFactor_ = factor; }
/**
@brief Get the duration for which the ship remains shrunken.
@return Returns the duration.
@@ -104,7 +104,7 @@
@param duration The duration, needs to be non-negative.
*/
inline void setDuration(float duration)
- { if(duration < 0.0f) { COUT(2) << "Invalid duration in ShrinkPickup. Ignoring.." << endl; return; } this->duration_ = duration; }
+ { if(duration < 0.0f) { orxout(internal_warning, context::pickups) << "Invalid duration in ShrinkPickup. Ignoring.." << endl; return; } this->duration_ = duration; }
/**
@brief Get the shrink speed.
@return Returns the shrink speed.
@@ -116,7 +116,7 @@
@param speed The shrink duration, needs to be positive.
*/
inline void setShrinkDuration(float speed)
- { if(speed <= 0.0f) { COUT(2) << "Invalid shrink duration in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkDuration_ = speed; }
+ { if(speed <= 0.0f) { orxout(internal_warning, context::pickups) << "Invalid shrink duration in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkDuration_ = speed; }
protected:
void initializeIdentifier(void);
Modified: code/branches/output/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/output/src/modules/pickup/items/SpeedPickup.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pickup/items/SpeedPickup.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -179,7 +179,7 @@
if(ship == NULL)
{
- COUT(1) << "Invalid PickupCarrier in SpeedPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid PickupCarrier in SpeedPickup." << endl;
}
return ship;
@@ -220,7 +220,7 @@
}
else
{
- COUT(1) << "Invalid duration in SpeedPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid duration in SpeedPickup." << endl;
this->duration_ = 0.0f;
}
}
@@ -239,7 +239,7 @@
}
else
{
- COUT(1) << "Invalid speedAdd in SpeedPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid speedAdd in SpeedPickup." << endl;
this->speedAdd_ = 0.0f;
}
}
@@ -258,7 +258,7 @@
}
else
{
- COUT(1) << "Invalid speedMultiply in SpeedPickup." << std::endl;
+ orxout(internal_error, context::pickups) << "Invalid speedMultiply in SpeedPickup." << endl;
this->speedMultiply_ = 1.0f;
}
}
Modified: code/branches/output/src/modules/pong/Pong.cc
===================================================================
--- code/branches/output/src/modules/pong/Pong.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/pong/Pong.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -161,7 +161,7 @@
}
else // If no centerpoint was specified, an error is thrown and the level is exited.
{
- COUT(1) << "Error: No Centerpoint specified." << std::endl;
+ orxout(internal_error) << "Pong: No Centerpoint specified." << endl;
GSLevel::startMainMenu();
return;
}
Modified: code/branches/output/src/modules/questsystem/GlobalQuest.cc
===================================================================
--- code/branches/output/src/modules/questsystem/GlobalQuest.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/GlobalQuest.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -70,7 +70,7 @@
XMLPortObject(GlobalQuest, QuestEffect, "reward-effects", addRewardEffect, getRewardEffects, xmlelement, mode);
- COUT(4) << "New GlobalQuest {" << this->getId() << "} created." << std::endl;
+ orxout(verbose, context::quests) << "New GlobalQuest {" << this->getId() << "} created." << endl;
}
/**
@@ -86,7 +86,7 @@
{
if(!this->isFailable(player)) // Check whether the Quest can be failed.
{
- COUT(4) << "A non-completable quest was trying to be failed." << std::endl;
+ orxout(verbose, context::quests) << "A non-completable quest was trying to be failed." << endl;
return false;
}
@@ -113,7 +113,7 @@
{
if(!this->isCompletable(player)) // Check whether the Quest can be completed.
{
- COUT(4) << "A non-completable quest was trying to be completed." << std::endl;
+ orxout(verbose, context::quests) << "A non-completable quest was trying to be completed." << endl;
return false;
}
@@ -226,7 +226,7 @@
this->rewards_.push_back(effect); // Add the QuestEffect to the list.
- COUT(4) << "Reward effect was added to Quest {" << this->getId() << "}." << std::endl;
+ orxout(verbose, context::quests) << "Reward effect was added to Quest {" << this->getId() << "}." << endl;
return true;
}
Modified: code/branches/output/src/modules/questsystem/LocalQuest.cc
===================================================================
--- code/branches/output/src/modules/questsystem/LocalQuest.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/LocalQuest.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -68,7 +68,7 @@
{
SUPER(LocalQuest, XMLPort, xmlelement, mode);
- COUT(4) << "New LocalQuest {" << this->getId() << "} created." << std::endl;
+ orxout(verbose, context::quests) << "New LocalQuest {" << this->getId() << "} created." << endl;
}
/**
@@ -84,7 +84,7 @@
{
if(!this->isFailable(player)) // Checks whether the quest can be failed.
{
- COUT(4) << "A non-failable quest was trying to be failed." << std::endl;
+ orxout(verbose, context::quests) << "A non-failable quest was trying to be failed." << endl;
return false;
}
@@ -107,7 +107,7 @@
{
if(!this->isCompletable(player)) // Checks whether the Quest can be completed.
{
- COUT(4) << "A non-completable quest was trying to be completed." << std::endl;
+ orxout(verbose, context::quests) << "A non-completable quest was trying to be completed." << endl;
return false;
}
Modified: code/branches/output/src/modules/questsystem/Quest.cc
===================================================================
--- code/branches/output/src/modules/questsystem/Quest.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/Quest.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -95,7 +95,7 @@
this->parentQuest_ = quest;
- COUT(4) << "Parent Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
+ orxout(verbose, context::quests) << "Parent Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << endl;
return true;
}
@@ -114,7 +114,7 @@
quest->setParentQuest(this); // Sets the currentQuest (this) as parent-quest for the added sub-quest.
this->subQuests_.push_back(quest); // Adds the Quest to the end of the list of sub-quests.
- COUT(4) << "Sub Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
+ orxout(verbose, context::quests) << "Sub Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << endl;
return true;
}
@@ -134,7 +134,7 @@
hint->setQuest(this); // Sets the current Quest (this) as Quest for the added QuestHint.
this->hints_.push_back(hint); // Adds the QuestHint to the end of the list of QuestHints.
- COUT(4) << "QuestHint {" << hint->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
+ orxout(verbose, context::quests) << "QuestHint {" << hint->getId() << "} was added to Quest {" << this->getId() << "}." << endl;
return true;
}
@@ -152,7 +152,7 @@
this->failEffects_.push_back(effect); // Adds the QuestEffect to the end of the list of fail QuestEffects.
- COUT(4) << "A FailEffect was added to Quest {" << this->getId() << "}." << std::endl;
+ orxout(verbose, context::quests) << "A FailEffect was added to Quest {" << this->getId() << "}." << endl;
return true;
}
@@ -170,7 +170,7 @@
this->completeEffects_.push_back(effect); // Adds the QuestEffect to the end of the list of complete QuestEffects.
- COUT(4) << "A CompleteEffect was added to Quest {" << this->getId() << "}." << std::endl;
+ orxout(verbose, context::quests) << "A CompleteEffect was added to Quest {" << this->getId() << "}." << endl;
return true;
}
@@ -340,7 +340,7 @@
QuestListener::advertiseStatusChange(this->listeners_, "fail"); // Tells the QuestListeners, that the status has changed to failed.
this->setStatus(player, QuestStatus::Failed);
- COUT(4) << "Quest {" << this->getId() << "} is failed for player: " << player << " ." <<std::endl;
+ orxout(verbose, context::quests) << "Quest {" << this->getId() << "} is failed for player: " << player << " ." << endl;
this->getDescription()->sendFailQuestNotification(player);
return true;
@@ -359,7 +359,7 @@
QuestListener::advertiseStatusChange(this->listeners_, "complete"); // Tells the QuestListeners, that the status has changed to completed.
this->setStatus(player, QuestStatus::Completed);
- COUT(4) << "Quest {" << this->getId() << "} is completed for player: " << player << " ." <<std::endl;
+ orxout(verbose, context::quests) << "Quest {" << this->getId() << "} is completed for player: " << player << " ." << endl;
this->getDescription()->sendCompleteQuestNotification(player);
return true;
@@ -377,11 +377,11 @@
{
if(!this->isStartable(player)) // Checks whether the quest can be started.
{
- COUT(4) << "A non-startable quest was trying to be started." << std::endl;
+ orxout(verbose, context::quests) << "A non-startable quest was trying to be started." << endl;
return false;
}
- COUT(4) << "Quest {" << this->getId() << "} is started for player: " << player << " ." <<std::endl;
+ orxout(verbose, context::quests) << "Quest {" << this->getId() << "} is started for player: " << player << " ." << endl;
QuestListener::advertiseStatusChange(this->listeners_, "start"); // Tells the QuestListeners, that the status has changed to active.
Modified: code/branches/output/src/modules/questsystem/QuestDescription.cc
===================================================================
--- code/branches/output/src/modules/questsystem/QuestDescription.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/QuestDescription.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -78,7 +78,7 @@
XMLPortParam(QuestDescription, "failMessage", setFailMessage, getFailMessage, xmlelement, mode);
XMLPortParam(QuestDescription, "completeMessage", setCompleteMessage, getCompleteMessage, xmlelement, mode);
- COUT(4) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
+ orxout(verbose, context::quests) << "New QuestDescription with title '" << this->getTitle() << "' created." << endl;
}
/**
@@ -108,13 +108,13 @@
message = "You successfully completed the quest: '" + this->title_ + '\'';
else
{
- COUT(2) << "Bad input in notificationHelper, this should not be happening!" << std::endl;
+ orxout(internal_warning, context::quests) << "Bad input in notificationHelper, this should not be happening!" << endl;
return false;
}
}
else
{
- COUT(2) << "Bad input in notificationHelper, this should not be happening!" << std::endl;
+ orxout(internal_warning, context::quests) << "Bad input in notificationHelper, this should not be happening!" << endl;
return false;
}
Modified: code/branches/output/src/modules/questsystem/QuestEffect.cc
===================================================================
--- code/branches/output/src/modules/questsystem/QuestEffect.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/QuestEffect.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -69,7 +69,7 @@
{
bool temp = true;
- COUT(4) << "Invoking QuestEffects on player: " << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "Invoking QuestEffects on player: " << player << " ." << endl;
for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
temp = temp && (*effect)->invoke(player);
Modified: code/branches/output/src/modules/questsystem/QuestEffectBeacon.cc
===================================================================
--- code/branches/output/src/modules/questsystem/QuestEffectBeacon.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/QuestEffectBeacon.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -78,7 +78,7 @@
XMLPortEventSink(QuestEffectBeacon, BaseObject, "execute", execute, xmlelement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
- COUT(4) << "New QuestEffectBeacon created." << std::endl;
+ orxout(verbose, context::quests) << "New QuestEffectBeacon created." << endl;
}
void QuestEffectBeacon::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
@@ -107,7 +107,7 @@
}
if(!(this->isActive())) // If the QuestEffectBeacon is inactive it cannot be executed.
{
- COUT(4) << "The QuestEffectBeacon is inactive." << std::endl;
+ orxout(verbose, context::quests) << "The QuestEffectBeacon is inactive." << endl;
return false;
}
@@ -127,11 +127,11 @@
if(player == NULL)
{
- COUT(4) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
+ orxout(verbose, context::quests) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
return false;
}
- COUT(4) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "QuestEffectBeacon executed on player: " << player << " ." << endl;
bool temp = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo.
if(temp)
@@ -220,7 +220,7 @@
this->effects_.push_back(effect);
- COUT(4) << "A QuestEffect was added to a QuestEffectBeacon." << std::endl;
+ orxout(verbose, context::quests) << "A QuestEffect was added to a QuestEffectBeacon." << endl;
return true;
}
Modified: code/branches/output/src/modules/questsystem/QuestHint.cc
===================================================================
--- code/branches/output/src/modules/questsystem/QuestHint.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/QuestHint.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -73,7 +73,7 @@
QuestManager::getInstance().registerHint(this); // Registers the QuestHint with the QuestManager.
- COUT(4) << "New QuestHint {" << this->getId() << "} created." << std::endl;
+ orxout(verbose, context::quests) << "New QuestHint {" << this->getId() << "} created." << endl;
}
@@ -119,12 +119,12 @@
}
else
{
- COUT(4) << "An already active questHint was trying to get activated." << std::endl;
+ orxout(verbose, context::quests) << "An already active questHint was trying to get activated." << endl;
return false;
}
}
- COUT(4) << "A hint of a non-active quest was trying to get activated." << std::endl;
+ orxout(verbose, context::quests) << "A hint of a non-active quest was trying to get activated." << endl;
return false;
}
Modified: code/branches/output/src/modules/questsystem/QuestItem.cc
===================================================================
--- code/branches/output/src/modules/questsystem/QuestItem.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/QuestItem.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -88,7 +88,7 @@
{
if(id == "") // Checks whether the id is a valid id.
{
- COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
+ orxout(internal_warning, context::quests) << "Invalid id. QuestItem id {" << id << "} could not be set." << endl;
return;
}
Modified: code/branches/output/src/modules/questsystem/QuestListener.cc
===================================================================
--- code/branches/output/src/modules/questsystem/QuestListener.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/QuestListener.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -83,7 +83,7 @@
if(this->quest_ != NULL)
this->quest_->addListener(this); // Adds the QuestListener to the Quests list of listeners.
- COUT(4) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << std::endl;
+ orxout(verbose, context::quests) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << endl;
}
/**
@@ -145,7 +145,7 @@
this->mode_ = QuestListenerMode::Complete;
else
{
- COUT(2) << "QuestListener with invalid mode '" << mode << "' created. Mode set to 'all'." << std::endl;
+ orxout(internal_warning, context::quests) << "QuestListener with invalid mode '" << mode << "' created. Mode set to 'all'." << endl;
this->mode_ = QuestListenerMode::All;
return false;
}
Modified: code/branches/output/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/output/src/modules/questsystem/QuestManager.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/QuestManager.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -60,7 +60,7 @@
{
RegisterRootObject(QuestManager);
- COUT(3) << "QuestManager created." << std::endl;
+ orxout(internal_info, context::quests) << "QuestManager created." << endl;
}
/**
@@ -69,7 +69,7 @@
*/
QuestManager::~QuestManager()
{
- COUT(3) << "QuestManager destroyed." << std::endl;
+ orxout(internal_info, context::quests) << "QuestManager destroyed." << endl;
}
/**
@@ -102,12 +102,12 @@
if(result.second) // If inserting was a success.
{
quest->setRegistered();
- COUT(4) << "Quest with questId {" << quest->getId() << "} successfully inserted." << std::endl;
+ orxout(verbose, context::quests) << "Quest with questId {" << quest->getId() << "} successfully inserted." << endl;
return true;
}
else
{
- COUT(2) << "Quest with the same id was already present." << std::endl;
+ orxout(internal_warning, context::quests) << "Quest with the same id was already present." << endl;
return false;
}
}
@@ -140,12 +140,12 @@
if(result.second) // If inserting was a success.
{
hint->setRegistered();
- COUT(4) << "QuestHint with hintId {" << hint->getId() << "} successfully inserted." << std::endl;
+ orxout(verbose, context::quests) << "QuestHint with hintId {" << hint->getId() << "} successfully inserted." << endl;
return true;
}
else
{
- COUT(2) << "QuestHint with the same id was already present." << std::endl;
+ orxout(internal_warning, context::quests) << "QuestHint with the same id was already present." << endl;
return false;
}
}
@@ -182,7 +182,7 @@
else
{
quest = NULL;
- COUT(2) << "The quest with id {" << questId << "} is nowhere to be found." << std::endl;
+ orxout(internal_warning, context::quests) << "The quest with id {" << questId << "} is nowhere to be found." << endl;
}
return quest;
@@ -211,7 +211,7 @@
else
{
hint = NULL;
- COUT(2) << "The hint with id {" << hintId << "} is nowhere to be found." << std::endl;
+ orxout(internal_warning, context::quests) << "The hint with id {" << hintId << "} is nowhere to be found." << endl;
}
return hint;
@@ -430,7 +430,7 @@
PlayerInfo* player = GUIManager::getInstance().getPlayer(guiName);
if(player == NULL)
{
- COUT(1) << "Error: GUIOverlay with name '" << guiName << "' has no player." << std::endl;
+ orxout(internal_error, context::quests) << "GUIOverlay with name '" << guiName << "' has no player." << endl;
return NULL;
}
Modified: code/branches/output/src/modules/questsystem/effects/AddQuest.cc
===================================================================
--- code/branches/output/src/modules/questsystem/effects/AddQuest.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/effects/AddQuest.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -69,7 +69,7 @@
{
SUPER(AddQuest, XMLPort, xmlelement, mode);
- COUT(4) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
+ orxout(verbose, context::quests) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << endl;
}
/**
@@ -84,7 +84,7 @@
{
assert(player);
- COUT(5) << "AddQuest on player: " << player << " ." << std::endl;
+ orxout(verbose_more, context::quests) << "AddQuest on player: " << player << " ." << endl;
try
{
@@ -94,11 +94,11 @@
}
catch(const orxonox::Exception& ex)
{
- COUT(2) << ex.getFullDescription() << std::endl;
+ orxout(internal_warning, context::quests) << ex.getFullDescription() << endl;
return false;
}
- COUT(4) << "Quest {" << this->getQuestId() << "} successfully added to player: " << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "Quest {" << this->getQuestId() << "} successfully added to player: " << player << " ." << endl;
return true;
}
Modified: code/branches/output/src/modules/questsystem/effects/AddQuestHint.cc
===================================================================
--- code/branches/output/src/modules/questsystem/effects/AddQuestHint.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/effects/AddQuestHint.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -72,7 +72,7 @@
XMLPortParam(AddQuestHint, "hintId", setHintId, getHintId, xmlelement, mode);
- COUT(4) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << std::endl;
+ orxout(verbose, context::quests) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << endl;
}
/**
@@ -87,7 +87,7 @@
{
if(id == "")
{
- COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
+ orxout(internal_warning, context::quests) << "Invalid id. QuestItem id {" << id << "} could not be set." << endl;
return false;
}
@@ -107,7 +107,7 @@
{
assert(player);
- COUT(5) << "AddQuestHint on player: " << player << " ." << std::endl;
+ orxout(verbose_more, context::quests) << "AddQuestHint on player: " << player << " ." << endl;
try
{
@@ -117,11 +117,11 @@
}
catch(const Exception& e)
{
- COUT(2) << e.getFullDescription() << std::endl;
+ orxout(internal_warning, context::quests) << e.getFullDescription() << endl;
return false;
}
- COUT(4) << "QuestHint {" << this->getHintId() << "} successfully added to player: " << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "QuestHint {" << this->getHintId() << "} successfully added to player: " << player << " ." << endl;
return true;
}
Modified: code/branches/output/src/modules/questsystem/effects/AddReward.cc
===================================================================
--- code/branches/output/src/modules/questsystem/effects/AddReward.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/effects/AddReward.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -69,7 +69,7 @@
XMLPortObject(AddReward, Rewardable, "", addRewardable, getRewardables, xmlelement, mode);
- COUT(4) << "New AddReward, with " << this->rewards_.size() << " Rewardables created." << std::endl;
+ orxout(verbose, context::quests) << "New AddReward, with " << this->rewards_.size() << " Rewardables created." << endl;
}
/**
@@ -102,13 +102,13 @@
*/
bool AddReward::invoke(PlayerInfo* player)
{
- COUT(5) << "AddReward on player: " << player << " ." << std::endl;
+ orxout(verbose_more, context::quests) << "AddReward on player: " << player << " ." << endl;
bool temp = true;
for ( std::list<Rewardable*>::iterator reward = this->rewards_.begin(); reward != this->rewards_.end(); ++reward )
temp = temp && (*reward)->reward(player);
- COUT(4) << "Rewardable successfully added to player." << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "Rewardable successfully added to player." << player << " ." << endl;
return temp;
}
Modified: code/branches/output/src/modules/questsystem/effects/ChangeQuestStatus.cc
===================================================================
--- code/branches/output/src/modules/questsystem/effects/ChangeQuestStatus.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/effects/ChangeQuestStatus.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -82,7 +82,7 @@
{
if(id == "")
{
- COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
+ orxout(internal_warning, context::quests) << "Invalid id. QuestItem id {" << id << "} could not be set." << endl;
return false;
}
Modified: code/branches/output/src/modules/questsystem/effects/CompleteQuest.cc
===================================================================
--- code/branches/output/src/modules/questsystem/effects/CompleteQuest.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/effects/CompleteQuest.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -69,7 +69,7 @@
{
SUPER(CompleteQuest, XMLPort, xmlelement, mode);
- COUT(4) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
+ orxout(verbose, context::quests) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << endl;
}
/**
@@ -84,7 +84,7 @@
{
assert(player);
- COUT(5) << "CompleteQuest on player: " << player << " ." << std::endl;
+ orxout(verbose_more, context::quests) << "CompleteQuest on player: " << player << " ." << endl;
Quest* quest;
@@ -96,11 +96,11 @@
}
catch(const Exception& e)
{
- COUT(2) << e.getFullDescription() << std::endl;
+ orxout(internal_warning, context::quests) << e.getFullDescription() << endl;
return false;
}
- COUT(4) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << endl;
return true;
}
Modified: code/branches/output/src/modules/questsystem/effects/FailQuest.cc
===================================================================
--- code/branches/output/src/modules/questsystem/effects/FailQuest.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/questsystem/effects/FailQuest.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -69,7 +69,7 @@
{
SUPER(FailQuest, XMLPort, xmlelement, mode);
- COUT(4) << "New FailQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
+ orxout(verbose, context::quests) << "New FailQuest, with target Quest {" << this->getQuestId() << "}, created." << endl;
}
/**
@@ -84,7 +84,7 @@
{
assert(player);
- COUT(4) << "FailQuest on player: " << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "FailQuest on player: " << player << " ." << endl;
Quest* quest;
try
@@ -95,11 +95,11 @@
}
catch(const Exception& e)
{
- COUT(2) << e.getFullDescription() << std::endl;
+ orxout(internal_warning, context::quests) << e.getFullDescription() << endl;
return false;
}
- COUT(4) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << std::endl;
+ orxout(verbose, context::quests) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << endl;
return true;
}
Modified: code/branches/output/src/modules/tetris/Tetris.cc
===================================================================
--- code/branches/output/src/modules/tetris/Tetris.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/tetris/Tetris.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -164,7 +164,7 @@
}
else // If no centerpoint was specified, an error is thrown and the level is exited.
{
- COUT(1) << "Error: No Centerpoint specified." << std::endl;
+ orxout(internal_error) << "Tetris: No Centerpoint specified." << endl;
GSLevel::startMainMenu();
return;
}
Modified: code/branches/output/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/output/src/modules/weapons/RocketController.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/weapons/RocketController.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -43,7 +43,7 @@
RocketController::RocketController(BaseObject* creator) : Controller(creator)
{
RegisterObject(RocketController);
- COUT(5)<< "RocketController constructed\n";
+// orxout() << "RocketController constructed" << endl;
this->rocket_ = new SimpleRocket(this);
@@ -72,7 +72,7 @@
RocketController::~RocketController()
{
- COUT(5)<< "RocketController destroyed\n";
+// orxout() << "RocketController destroyed" << endl;
}
void RocketController::setTargetPosition()
Modified: code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc 2011-08-01 14:40:20 UTC (rev 8810)
+++ code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc 2011-08-01 17:09:29 UTC (rev 8811)
@@ -58,7 +58,7 @@
this->lifetime_ = 10;
this->setMass(15);
-// COUT(4) << "simplerocket constructed\n";
+// orxout() << "simplerocket constructed" << endl;
if (GameMode::isMaster())
{
More information about the Orxonox-commit
mailing list