Changeset 7412 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Apr 28, 2006, 12:03:54 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Another CompletionMode is working

File:

• trunk/src/world_entities/playable.cc (modified) (2 diffs)

trunk/src/world_entities/playable.cc

@@ -563 +563 @@
 Playable::Playmode Playable::stringToPlaymode(const std::string& playmode)
 {
-  if (playmode == "Vertical")
+  if (playmode == Playable::playmodeNames[0])
     return Playable::Vertical;
-  if (playmode == "Horizontal")
+  if (playmode == Playable::playmodeNames[1])
     return Playable::Horizontal;
-  if (playmode == "FromBehind")
+  if (playmode == Playable::playmodeNames[2])
     return Playable::FromBehind;
-  if (playmode == "Full3D")
+  if (playmode == Playable::playmodeNames[3])
     return Playable::Full3D;
 
@@ -581 +581 @@
  * @returns the String.
  */
-const char* Playable::playmodeToString(Playable::Playmode playmode)
+const std::string& Playable::playmodeToString(Playable::Playmode playmode)
 {
   switch(playmode)
   {
     case Playable::Vertical:
-      return "Vertical";
+      return Playable::playmodeNames[0];
     case Playable::Horizontal:
-      return "Horizontal";
+      return Playable::playmodeNames[1];
     case Playable::FromBehind:
-      return "FromBehind";
+      return Playable::playmodeNames[2];
     case Playable::Full3D:
-      return "Full3D";
+      return Playable::playmodeNames[3];
 
     default:
-      return "Full3D";
-  }
-
-}
+      return Playable::playmodeNames[3];
+  }
+}
+
+/**
+ * @brief PlaymodeNames
+ */
+const std::string Playable::playmodeNames[] =
+{
+  "Vertical",
+  "Horizontal",
+  "FromBehind",
+  "Full3D"
+};