This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot.
commit 922082b360add4944a92e0860fc40d77ccaf318f Author: Grunaka <d...@romainbreton.fr> Date: Sun Nov 22 18:33:55 2015 +0100 Move define from resource.h to CBotDefines.h. --- src/CBot/CBotDefines.h | 64 ++++++++++++++++++++++++++++++++++-- src/CBot/CBotInstr/CBotBlock.cpp | 2 ++ src/CBot/CBotInstr/CBotBoolExpr.cpp | 2 ++ src/CBot/CBotInstr/CBotCondition.cpp | 2 ++ src/CBot/resource.h | 61 ---------------------------------- 5 files changed, 68 insertions(+), 63 deletions(-) diff --git a/src/CBot/CBotDefines.h b/src/CBot/CBotDefines.h index 9cb70ab..b1c73b3 100644 --- a/src/CBot/CBotDefines.h +++ b/src/CBot/CBotDefines.h @@ -21,8 +21,6 @@ // Modules inlcude -#include "CBotInstr.h" - // Local include // Global include @@ -119,3 +117,65 @@ #define CBotErrNotOpen 6013 // channel not open #define CBotErrRead 6014 // error while reading #define CBotErrWrite 6015 // writing error + + +// TODO: refactor & change to enum! + +// Compile errors +#define TX_OPENPAR 5000 +#define TX_CLOSEPAR 5001 +#define TX_NOTBOOL 5002 +#define TX_UNDEFVAR 5003 +#define TX_BADLEFT 5004 +#define TX_ENDOF 5005 +#define TX_OUTCASE 5006 +#define TX_CLOSEBLK 5008 +#define TX_ELSEWITHOUTIF 5009 +#define TX_OPENBLK 5010 +#define TX_BADTYPE 5011 +#define TX_REDEFVAR 5012 +#define TX_BAD2TYPE 5013 +#define TX_UNDEFCALL 5014 +#define TX_MISDOTS 5015 +#define TX_WHILE 5016 +#define TX_BREAK 5017 +#define TX_LABEL 5018 +#define TX_NOLABEL 5019 +#define TX_NOCASE 5020 +#define TX_BADNUM 5021 +#define TX_VOID 5022 +#define TX_NOTYP 5023 +#define TX_NOVAR 5024 +#define TX_NOFONC 5025 +#define TX_OVERPARAM 5026 +#define TX_REDEF 5027 +#define TX_LOWPARAM 5028 +#define TX_BADPARAM 5029 +#define TX_NUMPARAM 5030 +#define TX_NOITEM 5031 +#define TX_DOT 5032 +#define TX_NOCONST 5033 +#define TX_REDEFCLASS 5034 +#define TX_CLBRK 5035 +#define TX_RESERVED 5036 +#define TX_BADNEW 5037 +#define TX_BADSTRING 5039 +#define TX_BADINDEX 5040 +#define TX_PRIVATE 5041 +#define TX_NOPUBLIC 5042 + +// Runtime errors +#define TX_DIVZERO 6000 +#define TX_NOTINIT 6001 +#define TX_BADTHROW 6002 +#define TX_NORUN 6004 +#define TX_NOCALL 6005 +#define TX_NOCLASS 6006 +#define TX_NULLPT 6007 +#define TX_OPNAN 6008 +#define TX_OUTARRAY 6009 +#define TX_STACKOVER 6010 +#define TX_DELETEDPT 6011 + +// Max errors +#define TX_MAX 6012 diff --git a/src/CBot/CBotInstr/CBotBlock.cpp b/src/CBot/CBotInstr/CBotBlock.cpp index ba2b5ce..648c5ac 100644 --- a/src/CBot/CBotInstr/CBotBlock.cpp +++ b/src/CBot/CBotInstr/CBotBlock.cpp @@ -23,6 +23,8 @@ #include "CBotCStack.h" #include "CBotListInstr.h" +#include "CBotDefines.h" + // Local include // Global include diff --git a/src/CBot/CBotInstr/CBotBoolExpr.cpp b/src/CBot/CBotInstr/CBotBoolExpr.cpp index db6b36b..873a1a6 100644 --- a/src/CBot/CBotInstr/CBotBoolExpr.cpp +++ b/src/CBot/CBotInstr/CBotBoolExpr.cpp @@ -23,6 +23,8 @@ #include "CBotCStack.h" +#include "CBotDefines.h" + // Local include // Global include diff --git a/src/CBot/CBotInstr/CBotCondition.cpp b/src/CBot/CBotInstr/CBotCondition.cpp index 453e26c..6c5e53d 100644 --- a/src/CBot/CBotInstr/CBotCondition.cpp +++ b/src/CBot/CBotInstr/CBotCondition.cpp @@ -23,6 +23,8 @@ #include "CBotCStack.h" +#include "CBotDefines.h" + // Local include // Global include diff --git a/src/CBot/resource.h b/src/CBot/resource.h index 5c204f8..60d2c77 100644 --- a/src/CBot/resource.h +++ b/src/CBot/resource.h @@ -112,64 +112,3 @@ enum EID TX_UNDEF = 4000, TX_NAN }; - -// TODO: refactor & change to enum! - -// Compile errors -#define TX_OPENPAR 5000 -#define TX_CLOSEPAR 5001 -#define TX_NOTBOOL 5002 -#define TX_UNDEFVAR 5003 -#define TX_BADLEFT 5004 -#define TX_ENDOF 5005 -#define TX_OUTCASE 5006 -#define TX_CLOSEBLK 5008 -#define TX_ELSEWITHOUTIF 5009 -#define TX_OPENBLK 5010 -#define TX_BADTYPE 5011 -#define TX_REDEFVAR 5012 -#define TX_BAD2TYPE 5013 -#define TX_UNDEFCALL 5014 -#define TX_MISDOTS 5015 -#define TX_WHILE 5016 -#define TX_BREAK 5017 -#define TX_LABEL 5018 -#define TX_NOLABEL 5019 -#define TX_NOCASE 5020 -#define TX_BADNUM 5021 -#define TX_VOID 5022 -#define TX_NOTYP 5023 -#define TX_NOVAR 5024 -#define TX_NOFONC 5025 -#define TX_OVERPARAM 5026 -#define TX_REDEF 5027 -#define TX_LOWPARAM 5028 -#define TX_BADPARAM 5029 -#define TX_NUMPARAM 5030 -#define TX_NOITEM 5031 -#define TX_DOT 5032 -#define TX_NOCONST 5033 -#define TX_REDEFCLASS 5034 -#define TX_CLBRK 5035 -#define TX_RESERVED 5036 -#define TX_BADNEW 5037 -#define TX_BADSTRING 5039 -#define TX_BADINDEX 5040 -#define TX_PRIVATE 5041 -#define TX_NOPUBLIC 5042 - -// Runtime errors -#define TX_DIVZERO 6000 -#define TX_NOTINIT 6001 -#define TX_BADTHROW 6002 -#define TX_NORUN 6004 -#define TX_NOCALL 6005 -#define TX_NOCLASS 6006 -#define TX_NULLPT 6007 -#define TX_OPNAN 6008 -#define TX_OUTARRAY 6009 -#define TX_STACKOVER 6010 -#define TX_DELETEDPT 6011 - -// Max errors -#define TX_MAX 6012 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits