From 3d9dc0642d7f91f11a1ecabcea0f0dfb80c60562 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Fri, 24 Dec 2010 15:37:48 +0000 Subject: [PATCH] - gcc compile fixes - corrected projectiles for some units --- AI/EmptyAI/CEmptyAI.h | 2 ++ CConsoleHandler.cpp | 13 +++++++------ config/cr_shots.txt | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/AI/EmptyAI/CEmptyAI.h b/AI/EmptyAI/CEmptyAI.h index 1bd637a58..988e3796c 100644 --- a/AI/EmptyAI/CEmptyAI.h +++ b/AI/EmptyAI/CEmptyAI.h @@ -1,6 +1,8 @@ #include "../../AI_Base.h" #include "../../CCallback.h" +struct HeroMoveDetails; + class CEmptyAI : public CGlobalAI { ICallback * cb; diff --git a/CConsoleHandler.cpp b/CConsoleHandler.cpp index 84c0d4871..2249364c8 100644 --- a/CConsoleHandler.cpp +++ b/CConsoleHandler.cpp @@ -19,12 +19,13 @@ typedef std::string TColor; #define _kill_thread(a) pthread_cancel(a) typedef pthread_t ThreadHandle; - #define CONSOLE_GREEN "\x1b[1;40;32m" - #define CONSOLE_RED "\x1b[1;40;32m" - #define CONSOLE_MAGENTA "\x1b[1;40;35m" - #define CONSOLE_YELLOW "\x1b[1;40;32m" - #define CONSOLE_WHITE "\x1b[1;40;39m" - #define CONSOLE_GRAY "\x1b[0;40;39m" + #define CONSOLE_GREEN "\x1b[1;32m" + #define CONSOLE_RED "\x1b[1;32m" + #define CONSOLE_MAGENTA "\x1b[1;35m" + #define CONSOLE_YELLOW "\x1b[1;32m" + #define CONSOLE_WHITE "\x1b[1;39m" + #define CONSOLE_GRAY "\x1b[1;30m" + #define CONSOLE_TEAL "\x1b[1;36m" #else #define WIN32_LEAN_AND_MEAN //excludes rarely used stuff from windows headers - delete this line if something is missing #include diff --git a/config/cr_shots.txt b/config/cr_shots.txt index be4b65abc..b6a3f55f9 100644 --- a/config/cr_shots.txt +++ b/config/cr_shots.txt @@ -26,12 +26,12 @@ 123 PICEE.DEF 0 127 CPRGTIX.DEF 0 136 SMBALX.DEF 0 -137 PLCBOWX.DEF 0 +137 PELFX.DEF 0 138 PHALF.DEF 1 145 SMCATX.DEF 1 146 SMBALX.DEF 0 -152 SMBALX.DEF 0 -169 SMBALX.DEF 0 +152 CPRGTIX.DEF 0 +169 CPRZEAX.DEF 0 170 PLCBOWX.DEF 0 171 PLCBOWX.DEF 0 173 CPRGRE.DEF 1