diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h index bea5ce75..11595183 100644 --- a/src/CBot/CBot.h +++ b/src/CBot/CBot.h @@ -18,7 +18,6 @@ */ // Modules inlcude -#include "CBot/resource.h" #include "CBot/CBotFileUtils.h" #include "CBot/CBotClass.h" #include "CBot/CBotToken.h" diff --git a/src/CBot/CBotEnums.h b/src/CBot/CBotEnums.h index 524f00c1..17dbef69 100644 --- a/src/CBot/CBotEnums.h +++ b/src/CBot/CBotEnums.h @@ -58,3 +58,97 @@ enum CBotGet GetPosParam = 3, GetPosBloc = 4 }; + + +enum EID +{ + ID_IF = 2000, + ID_ELSE, + ID_WHILE, + ID_DO, + ID_FOR, + ID_BREAK, + ID_CONTINUE, + ID_SWITCH, + ID_CASE, + ID_DEFAULT, + ID_TRY, + ID_THROW, + ID_CATCH, + ID_FINALLY, + ID_TXT_AND, + ID_TXT_OR, + ID_TXT_NOT, + ID_RETURN, + ID_CLASS, + ID_EXTENDS, + ID_SYNCHO, + ID_NEW, + ID_PUBLIC, + ID_EXTERN, + ID_STATIC, + ID_PROTECTED, + ID_PRIVATE, + ID_INT, + ID_FLOAT, + ID_BOOLEAN, + ID_STRING, + ID_VOID, + ID_BOOL, + + ID_TRUE = 2200, + ID_FALSE, + ID_NULL, + ID_NAN, + + ID_OPENPAR = 2300, + ID_CLOSEPAR, + ID_OPBLK, + ID_CLBLK, + ID_SEP, + ID_COMMA, + ID_DOTS, + ID_DOT, + ID_OPBRK, + ID_CLBRK, + ID_DBLDOTS, + ID_LOGIC, + ID_ADD, + ID_SUB, + ID_MUL, + ID_DIV, + ID_ASS, + ID_ASSADD, + ID_ASSSUB, + ID_ASSMUL, + ID_ASSDIV, + ID_ASSOR, + ID_ASSAND, + ID_ASSXOR, + ID_ASSSL, + ID_ASSSR, + ID_ASSASR, + ID_SL, + ID_SR, + ID_ASR, + ID_INC, + ID_DEC, + ID_LO, + ID_HI, + ID_LS, + ID_HS, + ID_EQ, + ID_NE, + ID_AND, + ID_XOR, + ID_OR, + ID_LOG_AND, + ID_LOG_OR, + ID_LOG_NOT, + ID_NOT, + ID_MODULO, + ID_POWER, + ID_ASSMODULO, + TX_UNDEF = 4000, + TX_NAN +}; diff --git a/src/CBot/CBotInstr/CBotInstrUtils.cpp b/src/CBot/CBotInstr/CBotInstrUtils.cpp index 576cfa30..1b7e65c7 100644 --- a/src/CBot/CBotInstr/CBotInstrUtils.cpp +++ b/src/CBot/CBotInstr/CBotInstrUtils.cpp @@ -28,8 +28,6 @@ #include "CBotVar/CBotVar.h" -#include "resource.h" - // Local include // Global include diff --git a/src/CBot/CBotString.h b/src/CBot/CBotString.h index ea065b29..58630ea6 100644 --- a/src/CBot/CBotString.h +++ b/src/CBot/CBotString.h @@ -21,7 +21,8 @@ // Modules inlcude #include "CBotUtils.h" -#include "resource.h" + +#include "CBotEnums.h" // Local include