Changeset 7222 for code/branches/consolecommands3/src/libraries

Timestamp:

Aug 26, 2010, 2:27:14 AM (14 years ago)

Author:

landauf

Message:

added access level checking

Location:

code/branches/consolecommands3/src/libraries/core/command

Files:

• ConsoleCommand.cc (modified) (2 diffs)
• ConsoleCommand.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc

@@ -31 +31 @@
 #include "util/Convert.h"
 #include "core/Language.h"
-#include "core/BaseObject.h" // remove this
+#include "core/GameMode.h"
 
 namespace orxonox
 {
-    _SetConsoleCommand("BaseObject", "setName", &BaseObject::setName, (BaseObject*)0);
-    _ConsoleCommand::_ConsoleCommandManipulator test(_ModifyConsoleCommand("BaseObject", "setName").setFunction(&BaseObject::setActive));
-
     _ConsoleCommand::_ConsoleCommand(const std::string& group, const std::string& name, const ExecutorPtr& executor, bool bInitialized)
     {
@@ -94 +91 @@
     {
         return (this->bActive_ && this->executor_ && this->executor_->getFunctor() && (this->executor_->getFunctor()->getType() == Functor::Type::Static || this->executor_->getFunctor()->getRawObjectPointer()));
+    }
+
+    bool _ConsoleCommand::hasAccess() const
+    {
+        switch (this->accessLevel_)
+        {
+            case AccessLevel::All:        return true;
+            case AccessLevel::Standalone: return GameMode::isStandalone();
+            case AccessLevel::Master:     return GameMode::isMaster();
+            case AccessLevel::Server:     return GameMode::hasServer();
+            case AccessLevel::Client:     return GameMode::isClient();
+            case AccessLevel::Online:     return (GameMode::hasServer() || GameMode::isClient());
+            case AccessLevel::Offline:    return GameMode::isStandalone();
+            case AccessLevel::None:       return false;
+            default:                      return false;
+        }
     }
 

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.h

@@ -242 +242 @@
             bool isActive() const;
             bool hasAccess() const;
-            bool isHidden() const;
+            inline bool isHidden() const
+                { return this->bHidden_; }
 
             _ConsoleCommand& description(const std::string& description);