[Orxonox-commit 1098] r5819 - in code/branches/core5/src: libraries/core modules/gamestates
landauf at orxonox.net
landauf at orxonox.net
Mon Sep 28 01:00:21 CEST 2009
Author: landauf
Date: 2009-09-28 01:00:21 +0200 (Mon, 28 Sep 2009)
New Revision: 5819
Modified:
code/branches/core5/src/libraries/core/GUIManager.cc
code/branches/core5/src/libraries/core/MemoryArchive.cc
code/branches/core5/src/libraries/core/Resource.h
code/branches/core5/src/modules/gamestates/GSMainMenu.h
Log:
removed some tabs
Modified: code/branches/core5/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/core5/src/libraries/core/GUIManager.cc 2009-09-27 20:26:49 UTC (rev 5818)
+++ code/branches/core5/src/libraries/core/GUIManager.cc 2009-09-27 23:00:21 UTC (rev 5819)
@@ -61,7 +61,7 @@
class CEGUILogger : public CEGUI::DefaultLogger
{
public:
- void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
+ void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
{
int orxonoxLevel = CEGUI::Standard;
switch (level)
Modified: code/branches/core5/src/libraries/core/MemoryArchive.cc
===================================================================
--- code/branches/core5/src/libraries/core/MemoryArchive.cc 2009-09-27 20:26:49 UTC (rev 5818)
+++ code/branches/core5/src/libraries/core/MemoryArchive.cc 2009-09-27 23:00:21 UTC (rev 5819)
@@ -118,10 +118,10 @@
}
bool MemoryArchive::exists(const String& filename)
- {
+ {
const FileMap& files = archives_s[this->getName()];
return files.find(filename) != files.end();
- }
+ }
const Ogre::String& MemoryArchiveFactory::getType(void) const
{
Modified: code/branches/core5/src/libraries/core/Resource.h
===================================================================
--- code/branches/core5/src/libraries/core/Resource.h 2009-09-27 20:26:49 UTC (rev 5818)
+++ code/branches/core5/src/libraries/core/Resource.h 2009-09-27 23:00:21 UTC (rev 5819)
@@ -63,7 +63,7 @@
{
// Docs by Ogre::ResourceGroupManager.h
public:
- /**
+ /**
@brief
Open a single resource by name and return a DataStream
pointing at the source of the data.
@@ -80,12 +80,12 @@
@return
Shared pointer to data stream containing the data. Will be
destroyed automatically when no longer referenced.
- */
+ */
static DataStreamPtr open(const std::string& name,
const std::string& group = Resource::DEFAULT_GROUP,
bool bSearchGroupsIfNotFound = false);
- /**
+ /**
@brief
Open all resources matching a given pattern (which can contain
the character '*' as a wildcard), and return a collection of
@@ -100,7 +100,7 @@
@return
Shared pointer to a data stream list , will be
destroyed automatically when no longer referenced
- */
+ */
static DataStreamListPtr openMulti(const std::string& pattern, const std::string& group = Resource::DEFAULT_GROUP);
/**
Modified: code/branches/core5/src/modules/gamestates/GSMainMenu.h
===================================================================
--- code/branches/core5/src/modules/gamestates/GSMainMenu.h 2009-09-27 20:26:49 UTC (rev 5818)
+++ code/branches/core5/src/modules/gamestates/GSMainMenu.h 2009-09-27 23:00:21 UTC (rev 5819)
@@ -50,7 +50,7 @@
void startServer();
void startClient();
void startDedicated();
- void startMainMenu();
+ void startMainMenu();
private:
InputState* inputState_;
More information about the Orxonox-commit
mailing list