[Orxonox-commit 1027] r5748 - in code/trunk: data/gui/layouts data/gui/scripts src/modules/questsystem src/modules/questsystem/notifications
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat Sep 19 23:57:28 CEST 2009
Author: rgrieder
Date: 2009-09-19 23:57:28 +0200 (Sat, 19 Sep 2009)
New Revision: 5748
Modified:
code/trunk/data/gui/layouts/QuestGUI.layout
code/trunk/data/gui/scripts/QuestGUI.lua
code/trunk/src/modules/questsystem/QuestGUI.cc
code/trunk/src/modules/questsystem/QuestGUI.h
code/trunk/src/modules/questsystem/QuestGUINode.cc
code/trunk/src/modules/questsystem/QuestGUINode.h
code/trunk/src/modules/questsystem/QuestManager.cc
code/trunk/src/modules/questsystem/QuestManager.h
code/trunk/src/modules/questsystem/QuestNotification.cc
code/trunk/src/modules/questsystem/notifications/NotificationManager.cc
code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc
Log:
In quest system:
- Build fix (non-void function must return a value)
- Removed some header files to reduce compile time
- svn:eol-style "native" for the added files
- removed svn:executable property from QuestNotification.cc
Property changes on: code/trunk/data/gui/layouts/QuestGUI.layout
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/gui/scripts/QuestGUI.lua
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/trunk/src/modules/questsystem/QuestGUI.cc
===================================================================
--- code/trunk/src/modules/questsystem/QuestGUI.cc 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/QuestGUI.cc 2009-09-19 21:57:28 UTC (rev 5748)
@@ -29,20 +29,16 @@
#include "QuestGUI.h"
#include <sstream>
+#include <CEGUIWindow.h>
+#include <CEGUIWindowManager.h>
#include "core/CoreIncludes.h"
-#include "core/GUIManager.h"
-#include "infos/PlayerInfo.h"
#include "Quest.h"
#include "QuestHint.h"
-#include "QuestDescription.h" //Debug
#include "QuestItem.h"
#include "QuestGUINode.h"
#include "QuestManager.h"
-#include <CEGUIWindow.h>
-#include <CEGUIWindowManager.h>
-
namespace orxonox {
/**
Property changes on: code/trunk/src/modules/questsystem/QuestGUI.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/trunk/src/modules/questsystem/QuestGUI.h
===================================================================
--- code/trunk/src/modules/questsystem/QuestGUI.h 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/QuestGUI.h 2009-09-19 21:57:28 UTC (rev 5748)
@@ -35,14 +35,14 @@
#define _QuestGUI_H__
#include "questsystem/QuestsystemPrereqs.h"
+
+#include <list>
+#include <map>
+#include <string>
#include <CEGUIForwardRefs.h>
#include "core/OrxonoxClass.h"
-#include <map>
-#include <string>
-#include <list>
-
namespace orxonox {
/**
@@ -94,7 +94,7 @@
void clear(void); //!< Clear the QuestGUI.
PlayerInfo* player_; //!< The player that owns the GUI.
- CEGUI::WindowManager* windowManager_; //!< The CEGUI WindowManager. //TDO: needed?
+ CEGUI::WindowManager* windowManager_; //!< The CEGUI WindowManager. //TODO: needed?
CEGUI::Window* rootWindow_; //!< The root CEGUI Window of the GUI.
QuestGUINode* root_; //!< An empty QuestGUINode being the parent of all otherwise parent-less nodes.
Property changes on: code/trunk/src/modules/questsystem/QuestGUI.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/trunk/src/modules/questsystem/QuestGUINode.cc
===================================================================
--- code/trunk/src/modules/questsystem/QuestGUINode.cc 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/QuestGUINode.cc 2009-09-19 21:57:28 UTC (rev 5748)
@@ -30,19 +30,19 @@
#include <sstream>
+#include <CEGUIWindowManager.h>
+#include <elements/CEGUIFrameWindow.h>
+#include <elements/CEGUIPushButton.h>
+#include <falagard/CEGUIFalWidgetLookFeel.h>
+#include <falagard/CEGUIFalWidgetLookManager.h>
+
#include "core/CoreIncludes.h"
-#include "infos/PlayerInfo.h"
#include "Quest.h"
#include "QuestHint.h"
#include "QuestItem.h"
#include "QuestDescription.h"
#include "QuestGUI.h"
-#include <CEGUIWindow.h>
-#include <CEGUIWindowManager.h>
-#include <CEGUIFont.h>
-#include <CEGUI.h>
-
namespace orxonox {
/**
@@ -116,7 +116,7 @@
this->visible_ = true;
}
- int QuestGUINode::toggleVisibility(void)
+ void QuestGUINode::toggleVisibility(void)
{
}
@@ -233,7 +233,7 @@
QuestGUINode* node = *it;
node->window_->setSize(CEGUI::UVector2(CEGUI::UDim(1.0, -13),CEGUI::UDim(0, 30)));
node->window_->setPosition(CEGUI::UVector2(CEGUI::UDim(0, 0),CEGUI::UDim(0, offset)));
- node->window_->setProperty("HorizontalAlignment", "Left"); // TDO: Get this working.
+ node->window_->setProperty("HorizontalAlignment", "Left"); // TODO: Get this working.
window->addChildWindow(node->window_);
offset += 30;
}
Property changes on: code/trunk/src/modules/questsystem/QuestGUINode.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/trunk/src/modules/questsystem/QuestGUINode.h
===================================================================
--- code/trunk/src/modules/questsystem/QuestGUINode.h 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/QuestGUINode.h 2009-09-19 21:57:28 UTC (rev 5748)
@@ -30,12 +30,11 @@
#define _QuestGUINode_H__
#include "questsystem/QuestsystemPrereqs.h"
-#include <CEGUIForwardRefs.h>
-#include "core/OrxonoxClass.h"
-
#include <list>
#include <string>
+#include <CEGUIForwardRefs.h>
+#include "core/OrxonoxClass.h"
namespace orxonox {
@@ -49,7 +48,7 @@
QuestGUINode(QuestGUI* gui, QuestGUINode* parent, QuestItem* item, int depth, int index);
virtual ~QuestGUINode(void);
- int toggleVisibility(void);
+ void toggleVisibility(void);
void getName(std::string & buffer); //!< Sets the input buffer to the name of the node.
/**
Property changes on: code/trunk/src/modules/questsystem/QuestGUINode.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/trunk/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/trunk/src/modules/questsystem/QuestManager.cc 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/QuestManager.cc 2009-09-19 21:57:28 UTC (rev 5748)
@@ -33,18 +33,18 @@
#include "QuestManager.h"
+#include <CEGUIWindow.h>
+
#include "util/Exception.h"
#include "core/CoreIncludes.h"
#include "core/GUIManager.h"
#include "core/ConsoleCommand.h"
-#include "core/input/InputManager.h" //TDO: Necessary?
-#include <CEGUIWindow.h>
+#include "infos/PlayerInfo.h"
#include "overlays/GUIOverlay.h"
-#include "infos/PlayerInfo.h"
#include "Quest.h"
#include "QuestHint.h"
-#include "QuestItem.h" //TDO: Necessary?
+#include "QuestItem.h"
namespace orxonox
{
Modified: code/trunk/src/modules/questsystem/QuestManager.h
===================================================================
--- code/trunk/src/modules/questsystem/QuestManager.h 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/QuestManager.h 2009-09-19 21:57:28 UTC (rev 5748)
@@ -64,7 +64,7 @@
// tolua_end
friend class ScopedSingleton<QuestManager, ScopeID::GSLevel>;
- friend class QuestGUI; //TDO: better solution.
+ friend class QuestGUI; //TODO: better solution.
//friend std::map<std::string, Quest*> & QuestGUI::getQuests(void);
public:
@@ -93,7 +93,7 @@
std::map<std::string, Quest*> questMap_; //!< All Quests registered by their id's.
std::map<std::string, QuestHint*> hintMap_; //!< All QuestHints registered by their id's.
- //TDO: Call destructor of QuestGUI's on destruction of QuestManager?
+ //TODO: Call destructor of QuestGUI's on destruction of QuestManager?
std::map<PlayerInfo*, QuestGUI*> questGUIs_; //!< All GUI's registered by the players.
}; // tolua_export
Property changes on: code/trunk/src/modules/questsystem/QuestNotification.cc
___________________________________________________________________
Deleted: svn:executable
- *
Modified: code/trunk/src/modules/questsystem/notifications/NotificationManager.cc
===================================================================
--- code/trunk/src/modules/questsystem/notifications/NotificationManager.cc 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/notifications/NotificationManager.cc 2009-09-19 21:57:28 UTC (rev 5748)
@@ -80,7 +80,7 @@
if(notification == NULL) //!< A NULL-Notification cannot be registered.
return false;
- std::time_t time = std::time(0); //TDO: Doesn't this expire? //!< Get current time.
+ std::time_t time = std::time(0); //TODO: Doesn't this expire? //!< Get current time.
this->allNotificationsList_.insert(std::pair<std::time_t,Notification*>(time,notification));
@@ -95,7 +95,7 @@
for(std::map<NotificationListener*,int>::iterator it = this->listenerList_.begin(); it != this->listenerList_.end(); it++) //!< Iterate through all listeners.
{
std::set<std::string> set = it->first->getTargetsSet();
- if(all || set.find(notification->getSender()) != set.end() || set.find(ALL) != set.end()) //TDO: Make sure this works.
+ if(all || set.find(notification->getSender()) != set.end() || set.find(ALL) != set.end()) //TODO: Make sure this works.
{
this->notificationLists_[it->second]->insert(std::pair<std::time_t,Notification*>(time,notification)); //!< Insert the Notification in the Notifications list of the current NotificationListener.
it->first->update(notification, time); //!< Update the listener.
@@ -122,7 +122,7 @@
this->listenerList_[listener] = index; //!< Add the NotificationListener to the list of listeners.
- std::set<std::string> set = listener->getTargetsSet(); //TDO: Works this?
+ std::set<std::string> set = listener->getTargetsSet(); //TODO: Works this?
//! If all senders are the target of the listener, then the list of notification for that specific listener is te same as the list of all Notifications.
if(set.find(ALL) != set.end())
Modified: code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc
===================================================================
--- code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc 2009-09-19 21:17:51 UTC (rev 5747)
+++ code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc 2009-09-19 21:57:28 UTC (rev 5748)
@@ -139,7 +139,7 @@
{
this->removeContainer(*it);
this->scroll(Vector2(0.0,-(1.1*this->getFontSize())));
- it = this->containers_.begin(); //TDO: Needed?
+ it = this->containers_.begin(); //TODO: Needed?
}
this->tickTime_ = 0.0; //!< Reset time counter.
@@ -442,7 +442,7 @@
while(it != this->containers_.end())
{
this->removeContainer(*it);
- it = this->containers_.begin(); //TDO: Needed?
+ it = this->containers_.begin(); //TODO: Needed?
}
}
More information about the Orxonox-commit
mailing list