[colobot] 58/377: Moving CBOT enumerated in a separate file called CBotEnum.h

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 573e1152e339f5d018464a473340980a3d8dbb8b
Author: Grunaka <dev at romainbreton.fr>
Date:   Sun Nov 8 18:11:42 2015 +0100

    Moving CBOT enumerated in a separate file called CBotEnum.h
---
 src/CBot/CBotDll.h   | 33 +----------------------------
 src/CBot/CBotEnums.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/src/CBot/CBotDll.h b/src/CBot/CBotDll.h
index dbeaf8f..deec62c 100644
--- a/src/CBot/CBotDll.h
+++ b/src/CBot/CBotDll.h
@@ -28,6 +28,7 @@
 
 // Modules inlcude
 #include "resource.h"
+#include "CBotEnums.h"
 
 // Local include
 
@@ -59,29 +60,6 @@ class CBotCStack;       // stack
 ////////////////////////////////////////////////////////////////////////
 // Variables management
 ////////////////////////////////////////////////////////////////////////
-
-/** \brief CBotType Defines known types. This types are modeled on Java types. Do not change the order of elements */
-enum CBotType
-{
-    CBotTypVoid         = 0,
-    CBotTypByte         = 1,                //n
-    CBotTypShort        = 2,                //n
-    CBotTypChar         = 3,                //n
-    CBotTypInt          = 4,
-    CBotTypLong         = 5,                //n
-    CBotTypFloat        = 6,
-    CBotTypDouble       = 7,                //n
-    CBotTypBoolean      = 8,
-    CBotTypString       = 9,
-
-    CBotTypArrayPointer = 10,                // array of variables
-    CBotTypArrayBody    = 11,                // same but creates an instance
-
-    CBotTypPointer      = 12,                // pointer to an instance
-    CBotTypNullPointer  = 13,                // null pointer is special
-    CBotTypClass        = 15,
-    CBotTypIntrinsic    = 16                // instance of a class intrinsic
-};
 //n = not implemented yet
 
 // for SetUserPtr when deleting an object
@@ -462,15 +440,6 @@ public:
     CBotString&        ElementAt(int nIndex);
 };
 
-// different modes for GetPosition
-enum CBotGet
-{
-    GetPosExtern    = 1,
-    GetPosNom        = 2,
-    GetPosParam        = 3,
-    GetPosBloc        = 4
-};
-
 ////////////////////////////////////////////////////////////////////
 // main class managing CBot program
 //
diff --git a/src/CBot/CBotEnums.h b/src/CBot/CBotEnums.h
new file mode 100644
index 0000000..524f00c
--- /dev/null
+++ b/src/CBot/CBotEnums.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the Colobot: Gold Edition source code
+ * Copyright (C) 2001-2015, Daniel Roux, EPSITEC SA & TerranovaTeam
+ * http://epsitec.ch; http://colobot.info; http://github.com/colobot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://gnu.org/licenses
+ */
+
+#pragma once
+
+// Modules inlcude
+
+// Local include
+
+// Global include
+
+/*! \brief CBotType Defines known types. This types are modeled on Java types.
+ * Do not change the order of elements
+ */
+enum CBotType
+{
+    CBotTypVoid         = 0,
+    CBotTypByte         = 1,                //n
+    CBotTypShort        = 2,                //n
+    CBotTypChar         = 3,                //n
+    CBotTypInt          = 4,
+    CBotTypLong         = 5,                //n
+    CBotTypFloat        = 6,
+    CBotTypDouble       = 7,                //n
+    CBotTypBoolean      = 8,
+    CBotTypString       = 9,
+
+    CBotTypArrayPointer = 10,                // array of variables
+    CBotTypArrayBody    = 11,                // same but creates an instance
+
+    CBotTypPointer      = 12,                // pointer to an instance
+    CBotTypNullPointer  = 13,                // null pointer is special
+    CBotTypClass        = 15,
+    CBotTypIntrinsic    = 16                // instance of a class intrinsic
+};
+
+//! \brief CBotGet Different modes for GetPosition.
+enum CBotGet
+{
+    GetPosExtern = 1,
+    GetPosNom    = 2,
+    GetPosParam  = 3,
+    GetPosBloc   = 4
+};

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git