diff --git a/AI/EmptyAI/Makefile.in b/AI/EmptyAI/Makefile.in index 2d57e9cb2..97d16a9ec 100644 --- a/AI/EmptyAI/Makefile.in +++ b/AI/EmptyAI/Makefile.in @@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ $(top_srcdir)/aclocal/m4/libtool.m4 \ @@ -144,6 +145,7 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ diff --git a/AI/GeniusAI/Makefile.in b/AI/GeniusAI/Makefile.in index ede48228b..3046a6b97 100644 --- a/AI/GeniusAI/Makefile.in +++ b/AI/GeniusAI/Makefile.in @@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ $(top_srcdir)/aclocal/m4/libtool.m4 \ @@ -146,6 +147,7 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ diff --git a/AI/Makefile.in b/AI/Makefile.in index 773192a21..3c53fe54a 100644 --- a/AI/Makefile.in +++ b/AI/Makefile.in @@ -39,6 +39,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ $(top_srcdir)/aclocal/m4/libtool.m4 \ @@ -113,6 +114,7 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ diff --git a/CCallback.h b/CCallback.h index 2cee4b04e..f64a5f0d1 100644 --- a/CCallback.h +++ b/CCallback.h @@ -227,8 +227,8 @@ public: si8 battleHasWallPenalty(const CStack * stack, THex destHex) OVERRIDE; //checks if given stack has wall penalty si8 battleCanTeleportTo(const CStack * stack, THex destHex, int telportLevel) OVERRIDE; //checks if teleportation of given stack to given position can take place - friend CCallback; - friend CClient; + friend class CCallback; + friend class CClient; }; class CCallback : public ICallback, public CBattleCallback diff --git a/Makefile.in b/Makefile.in index b43ac0e15..7805cf0ba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,6 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ $(top_srcdir)/aclocal/m4/libtool.m4 \ @@ -128,6 +129,7 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ diff --git a/aclocal.m4 b/aclocal.m4 index ab6878818..e10eb232e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -979,6 +979,7 @@ AC_SUBST([am__untar]) m4_include([aclocal/m4/ax_boost_base.m4]) m4_include([aclocal/m4/ax_boost_filesystem.m4]) m4_include([aclocal/m4/ax_boost_iostreams.m4]) +m4_include([aclocal/m4/ax_boost_program_options.m4]) m4_include([aclocal/m4/ax_boost_system.m4]) m4_include([aclocal/m4/ax_boost_thread.m4]) m4_include([aclocal/m4/libtool.m4]) diff --git a/aclocal/m4/ax_boost_program_options.m4 b/aclocal/m4/ax_boost_program_options.m4 new file mode 100644 index 000000000..d612f91da --- /dev/null +++ b/aclocal/m4/ax_boost_program_options.m4 @@ -0,0 +1,108 @@ +# ============================================================================ +# http://www.gnu.org/software/autoconf-archive/ax_boost_program_options.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_BOOST_PROGRAM_OPTIONS +# +# DESCRIPTION +# +# Test for program options library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) +# +# And sets: +# +# HAVE_BOOST_PROGRAM_OPTIONS +# +# LICENSE +# +# Copyright (c) 2009 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 20 + +AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS], +[ + AC_ARG_WITH([boost-program-options], + AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@], + [use the program options library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-program-options=boost_program_options-gcc-mt-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_program_options_lib="" + else + want_boost="yes" + ax_boost_user_program_options_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + export want_boost + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + AC_CACHE_CHECK([whether the Boost::Program_Options library is available], + ax_cv_boost_program_options, + [AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[boost::program_options::options_description generic("Generic options"); + return 0;]])], + ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no) + AC_LANG_POP([C++]) + ]) + if test "$ax_cv_boost_program_options" = yes; then + AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_program_options_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], + [link_program_options="no"]) + done + if test "x$link_program_options" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_program_options*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], + [link_program_options="no"]) + done + fi + else + for ax_lib in $ax_boost_user_program_options_lib boost_program_options-$ax_boost_user_program_options_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], + [link_program_options="no"]) + done + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_program_options" != "xyes"; then + AC_MSG_ERROR([Could not link against [$ax_lib] !]) + fi + fi + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff --git a/client/AdventureMapButton.cpp b/client/AdventureMapButton.cpp index 8a241761c..d9aa8fd0c 100644 --- a/client/AdventureMapButton.cpp +++ b/client/AdventureMapButton.cpp @@ -52,13 +52,13 @@ void CButtonBase::show(SDL_Surface * to) int img = std::min(state+bitmapOffset,int(imgs[curimg]->size()-1)); img = std::max(0, img); - SDL_Surface *toBlit = imgs[curimg]->image(img); + IImage *toBlit = imgs[curimg]->getImage(img); if (abs) { if(toBlit) { - blitAt(toBlit,pos.x,pos.y,to); + toBlit->draw(to, pos.x, pos.y); } else { @@ -72,7 +72,7 @@ void CButtonBase::show(SDL_Surface * to) } else { - blitAt(toBlit,pos.x+ourObj->pos.x,pos.y+ourObj->pos.y,to); + toBlit->draw(to, pos.x+ourObj->pos.x,pos.y+ourObj->pos.y); } } @@ -239,8 +239,8 @@ void AdventureMapButton::init(const CFunctionList &Callback, const std:: pos.x += x; pos.y += y; - pos.w = imgs[curimg]->image(0)->w; - pos.h = imgs[curimg]->image(0)->h -1; + pos.w = imgs[curimg]->getImage(0)->width(); + pos.h = imgs[curimg]->getImage(0)->height() -1; } void AdventureMapButton::block( ui8 on ) @@ -269,7 +269,7 @@ void AdventureMapButton::setPlayerColor(int player) for(size_t i =0; isize();j++) { - graphics->blueToPlayersAdv(imgs[i]->image(j),player); + imgs[i]->getImage(j)->playerColored(player); } } @@ -599,20 +599,19 @@ CSlider::CSlider(int x, int y, int totalw, boost::function Moved, int if(style == 0) { - CAnimation * pics = new CAnimation(horizontal?"IGPCRDIV.DEF":"OVBUTN2.DEF"); - pics->load(); + std::string name = horizontal?"IGPCRDIV.DEF":"OVBUTN2.DEF"; - left->imgs.push_back(new CAnimation()); - right->imgs.push_back(new CAnimation()); - slider->imgs.push_back(new CAnimation()); - - left->imgs.back()->add(pics->image(0), true); - left->imgs.back()->add(pics->image(1), true); - right->imgs.back()->add(pics->image(2), true); - right->imgs.back()->add(pics->image(3), true); - slider->imgs.back()->add(pics->image(4), true); - - delete pics; + left->imgs.push_back(new CAnimation(name)); + left->imgs.back()->load(); + left->bitmapOffset = 0; + + right->imgs.push_back(new CAnimation(name)); + right->imgs.back()->load(); + right->bitmapOffset = 2; + + slider->imgs.push_back(new CAnimation(name)); + slider->imgs.back()->load(); + slider->bitmapOffset = 4; } else { diff --git a/client/CAdvmapInterface.cpp b/client/CAdvmapInterface.cpp index 3709ea728..01244c485 100644 --- a/client/CAdvmapInterface.cpp +++ b/client/CAdvmapInterface.cpp @@ -7,6 +7,7 @@ #include "CHeroWindow.h" #include "CKingdomInterface.h" #include "CMessage.h" +#include "CPlayerInterface.h" #include "SDL_Extensions.h" #include "CBitmapHandler.h" #include "CConfigHandler.h" diff --git a/client/CAnimation.cpp b/client/CAnimation.cpp index b7978b23f..6195dfd19 100644 --- a/client/CAnimation.cpp +++ b/client/CAnimation.cpp @@ -1,15 +1,13 @@ -#include -#include -#include #include +#include -#include "SDL.h" #include "SDL_image.h" +#include "../lib/CLodHandler.h" #include "CBitmapHandler.h" +#include "Graphics.h" #include "CAnimation.h" #include "SDL_Extensions.h" -#include "../lib/CLodHandler.h" /* * CAnimation.cpp, part of VCMI engine @@ -23,303 +21,101 @@ extern DLL_EXPORT CLodHandler *spriteh; +typedef std::map > source_map; +typedef std::map image_map; +typedef std::map group_map; + +class SDLImageLoader +{ + SDLImage * image; + ui8 * lineStart; + ui8 * position; +public: + //load size raw pixels from data + inline void Load(size_t size, const ui8 * data); + //set size pixels to color + inline void Load(size_t size, ui8 color=0); + inline void EndLine(); + //init image with these sizes and palette + inline void init(Point SpriteSize, Point Margins, Point FullSize, SDL_Color *pal); + + SDLImageLoader(SDLImage * Img); + ~SDLImageLoader(); +}; + +class CompImageLoader +{ + CompImage * image; + ui8 *position; + ui8 *entry; + unsigned int currentLine; + + inline ui8 typeOf(ui8 color); + inline void NewEntry(ui8 color, size_t size); + inline void NewEntry(const ui8 * &data, size_t size); + +public: + //load size raw pixels from data + inline void Load(size_t size, const ui8 * data); + //set size pixels to color + inline void Load(size_t size, ui8 color=0); + inline void EndLine(); + //init image with these sizes and palette + inline void init(Point SpriteSize, Point Margins, Point FullSize, SDL_Color *pal); + + CompImageLoader(CompImage * Img); + ~CompImageLoader(); +}; + +//Small internal class for parsing texts +class TextParser +{ + int type; + size_t position; + std::string text; +public: + TextParser(const std::string &name); + int getType() const; + void parseFile(std::map > &result); +}; + /************************************************************************* * DefFile, class used for def loading * *************************************************************************/ -bool CDefFile::haveFrame(size_t frame, size_t group) const +size_t getPaletteSize(int type) { - if (offset.size() > group) - if (offset[group].size() > frame) - return true; - - return false; + switch (type) + { + case 66: return 32; + case 71: return 4; + default: return 20; + } } -SDL_Surface * CDefFile::loadFrame(size_t frame, size_t group) const -{ - if (haveFrame(frame, group)) - return loadFrame(( unsigned char * )data+offset[group][frame], colors); - return NULL; -} - -SDL_Surface * CDefFile::loadFrame (const unsigned char * FDef, const BMPPalette * palette) -{ - SDL_Surface * ret=NULL; - - unsigned int DefFormat, // format in which pixel data of sprite is encoded - FullHeight,FullWidth, // full width and height of sprite including borders - SpriteWidth, SpriteHeight, // width and height of encoded sprite - - TotalRowLength, - RowAdd, add, - BaseOffset; - - int LeftMargin, RightMargin, // position of 1st stored in sprite pixel on surface - TopMargin, BottomMargin; - - SSpriteDef sd = * reinterpret_cast(FDef); - - DefFormat = SDL_SwapLE32(sd.defType2); - FullWidth = SDL_SwapLE32(sd.FullWidth); - FullHeight = SDL_SwapLE32(sd.FullHeight); - SpriteWidth = SDL_SwapLE32(sd.SpriteWidth); - SpriteHeight = SDL_SwapLE32(sd.SpriteHeight); - LeftMargin = SDL_SwapLE32(sd.LeftMargin); - TopMargin = SDL_SwapLE32(sd.TopMargin); - RightMargin = FullWidth - SpriteWidth - LeftMargin; - BottomMargin = FullHeight - SpriteHeight - TopMargin; - - if (LeftMargin<0) - SpriteWidth+=LeftMargin; - if (RightMargin<0) - SpriteWidth+=RightMargin; - - // Note: this looks bogus because we allocate only FullWidth, not FullWidth+add - add = 4 - FullWidth%4; - if (add==4) - add=0; - - ret = SDL_CreateRGBSurface(SDL_SWSURFACE, FullWidth, FullHeight, 8, 0, 0, 0, 0); - - BaseOffset = sizeof(SSpriteDef); - int BaseOffsetor = BaseOffset; - - for (int i=0; i<256; ++i) - { - SDL_Color pr; - pr.r = palette[i].R; - pr.g = palette[i].G; - pr.b = palette[i].B; - pr.unused = palette[i].F; - (*(ret->format->palette->colors+i))=pr; - } - - // If there's a margin anywhere, just blank out the whole surface. - if (TopMargin > 0 || BottomMargin > 0 || LeftMargin > 0 || RightMargin > 0) - { - memset( reinterpret_cast(ret->pixels), 0, FullHeight*FullWidth); - } - - int current=0;//current pixel on output surface - - // Skip top margin - if (TopMargin > 0) - current += TopMargin*(FullWidth+add); - - switch (DefFormat) - { - //pixel data is not compressed, copy each line to surface - case 0: - { - for (unsigned int i=0; i0) - current += LeftMargin; - - memcpy(reinterpret_cast(ret->pixels)+current, &FDef[BaseOffset], SpriteWidth); - current += SpriteWidth; - BaseOffset += SpriteWidth; - - if (RightMargin>0) - current += RightMargin; - } - } - break; - - // RLE encoding: - // read offset of pixel data of each line - // for each line - // read type and size - // if type is 0xff - // no encoding, copy to output - // else - // RLE: set size pixels to type - // do this until all line is parsed - case 1: - { - //for each line we have offset of pixel data - const unsigned int * RWEntriesLoc = reinterpret_cast(FDef+BaseOffset); - BaseOffset += sizeof(int) * SpriteHeight; - - for (unsigned int i=0; i0) - current += LeftMargin; - - TotalRowLength=0; - do - { - unsigned char SegmentType=FDef[BaseOffset++]; - unsigned int SegmentLength=FDef[BaseOffset++] + 1; - - if (SegmentType==0xFF) - { - memcpy(reinterpret_cast(ret->pixels)+current, FDef + BaseOffset, SegmentLength); - BaseOffset+=SegmentLength; - } - else - { - memset(reinterpret_cast(ret->pixels)+current, SegmentType, SegmentLength); - } - current += SegmentLength; - TotalRowLength += SegmentLength; - } - while (TotalRowLength0) - current += RightMargin; - - if (add>0) - current += add+RowAdd; - } - } - break; - - // Something like RLE - // read base offset - // for each line - // read type, set code and value - // if code is 7 - // copy value pixels - // else - // set value pixels to code - case 2: - { - BaseOffset = BaseOffsetor + SDL_SwapLE16(read_unaligned_u16(FDef + BaseOffsetor)); - - for (unsigned int i=0; i0) - current += LeftMargin; - - TotalRowLength=0; - - do - { - unsigned char SegmentType=FDef[BaseOffset++]; - unsigned char code = SegmentType / 32; - unsigned char value = (SegmentType & 31) + 1; - if (code==7) - { - memcpy(reinterpret_cast(ret->pixels)+current, &FDef[BaseOffset], value); - current += value; - BaseOffset += value; - } - else - { - memset(reinterpret_cast(ret->pixels)+current, code, value); - current += value; - } - TotalRowLength+=value; - } - while (TotalRowLength0) - current += RightMargin; - - RowAdd=SpriteWidth-TotalRowLength; - - if (add>0) - current += add+RowAdd; - } - } - break; - - //combo of 1st and 2nd: - // offset for each line - // code and value combined in 1 byte - case 3: - { - for (unsigned int i=0; i0) - current += LeftMargin; - - TotalRowLength=0; - - do - { - unsigned char SegmentType=FDef[BaseOffset++]; - unsigned char code = SegmentType / 32; - unsigned char value = (SegmentType & 31) + 1; - - int len = std::min(value, SpriteWidth - TotalRowLength) - std::max(0, -LeftMargin); - amax(len, 0); - - if (code==7) - { - memcpy((ui8*)ret->pixels + current, FDef + BaseOffset, len); - current += len; - BaseOffset += len; - } - else - { - memset((ui8*)ret->pixels + current, code, len); - current += len; - } - TotalRowLength+=( LeftMargin>=0 ? value : value+LeftMargin ); - } - while (TotalRowLength0) - current += RightMargin; - - RowAdd=SpriteWidth-TotalRowLength; - - if (add>0) - current += add+RowAdd; - } - } - break; - - default: - throw std::string("Unknown sprite format."); - break; - } - - SDL_Color *col = ret->format->palette->colors; - - Uint32 keycol = SDL_MapRGBA(ret->format, col[0].r, col[0].b, col[0].g, col[0].unused); - SDL_SetColorKey(ret, SDL_SRCCOLORKEY, keycol); - return ret; -}; - -BMPPalette * CDefFile::getPalette() -{ - BMPPalette * ret = new BMPPalette[256]; - memcpy(ret, colors, sizeof(BMPPalette)*256); - return ret; -} - -CDefFile::CDefFile(std::string Name):data(NULL),colors(NULL) +CDefFile::CDefFile(std::string Name): + data(NULL), + palette(NULL) { //First 8 colors in def palette used for transparency - static SDL_Color H3Palette[8] = { - { 0, 0, 0, 255},// 100% - transparency - { 0, 0, 0, 192},// 75% - shadow border, - { 0, 0, 0, 128},// TODO: find exact value - { 0, 0, 0, 128},// TODO: for transparency - { 0, 0, 0, 128},// 50% - shadow body - { 0, 0, 0, 255},// 100% - selection highlight - { 0, 0, 0, 128},// 50% - shadow body below selection - { 0, 0, 0, 192}};// 75% - shadow border below selection - - data = spriteh->giveFile(Name, FILE_ANIMATION, &datasize); - if (!data) + static SDL_Color H3Palette[8] = { - tlog0<<"Error: file "<< Name <<" not found\n"; - return; - } + { 0, 0, 0, 0},// 100% - transparency + { 0, 0, 0, 192},// 75% - shadow border, + { 0, 0, 0, 128},// TODO: find exact value + { 0, 0, 0, 128},// TODO: for transparency + { 0, 0, 0, 128},// 50% - shadow body + { 0, 0, 0, 0},// 100% - selection highlight + { 0, 0, 0, 128},// 50% - shadow body below selection + { 0, 0, 0, 192} // 75% - shadow border below selection + }; - colors = new BMPPalette[256]; + data = spriteh->giveFile(Name, FILE_ANIMATION); + palette = new SDL_Color[256]; int it = 0; - type = readNormalNr(data, it); it+=4; + unsigned int type = readNormalNr(data, it); + it+=4; //int width = readNormalNr(data, it); it+=4;//not used //int height = readNormalNr(data, it); it+=4; it+=8; @@ -328,14 +124,12 @@ CDefFile::CDefFile(std::string Name):data(NULL),colors(NULL) for (unsigned int i= 0; i<256; i++) { - colors[i].R = data[it++]; - colors[i].G = data[it++]; - colors[i].B = data[it++]; - colors[i].F = 0; + palette[i].r = data[it++]; + palette[i].g = data[it++]; + palette[i].b = data[it++]; + palette[i].unused = 255; } - memcpy(colors, H3Palette, (type == 66)? 32:20);//initialize shadow\selection colors - - offList.insert(datasize); + memcpy(palette, H3Palette, getPaletteSize(type));//initialize shadow\selection colors for (unsigned int i=0; i +void CDefFile::loadFrame(size_t frame, size_t group, ImageLoader &loader) const { - if (offset.size() > group) + std::map >::const_iterator it; + it = offset.find(group); + assert (it != offset.end()); + + const ui8 * FDef = data+it->second[frame]; + + const SSpriteDef sd = * reinterpret_cast(FDef); + SSpriteDef sprite; + + //sprite.size = SDL_SwapLE32(sd.size);//unused + sprite.format = SDL_SwapLE32(sd.format); + sprite.fullWidth = SDL_SwapLE32(sd.fullWidth); + sprite.fullHeight = SDL_SwapLE32(sd.fullHeight); + sprite.width = SDL_SwapLE32(sd.width); + sprite.height = SDL_SwapLE32(sd.height); + sprite.leftMargin = SDL_SwapLE32(sd.leftMargin); + sprite.topMargin = SDL_SwapLE32(sd.topMargin); + + unsigned int currentOffset = sizeof(SSpriteDef); + unsigned int BaseOffset = sizeof(SSpriteDef); + + loader.init(Point(sprite.width, sprite.height), + Point(sprite.leftMargin, sprite.topMargin), + Point(sprite.fullWidth, sprite.fullHeight), palette); + + switch (sprite.format) { - if (offset[group].size() > frame) + case 0: { - size_t offs = offset[group][frame]; - - std::set::iterator it = offList.find(offs); - - if (it == offList.end() || ++it == offList.end()) - tlog0<<"Error: offset not found!\n"; - - size_t size = *it - offs; - - unsigned char * ret = new unsigned char[size]; - memcpy(ret, data+offs, size); - return ret; + //pixel data is not compressed, copy data to surface + for (unsigned int i=0; i(FDef+currentOffset); + currentOffset += sizeof(ui32) * sprite.height; + + for (unsigned int i=0; i > * CDefFile::getEntries() const { - return data != NULL; + return &offset; +} + +/************************************************************************* + * Classes for image loaders - helpers for loading from def files * + *************************************************************************/ + +SDLImageLoader::SDLImageLoader(SDLImage * Img): + image(Img), + lineStart(NULL), + position(NULL) +{ +} + +void SDLImageLoader::init(Point SpriteSize, Point Margins, Point FullSize, SDL_Color *pal) +{ + //Init image + image->surf = SDL_CreateRGBSurface(SDL_SWSURFACE, SpriteSize.x, SpriteSize.y, 8, 0, 0, 0, 0); + image->margins = Margins; + image->fullSize = FullSize; + + //Prepare surface + SDL_SetColors(image->surf, pal, 0, 256); + SDL_LockSurface(image->surf); + + lineStart = position = (ui8*)image->surf->pixels; +} + +inline void SDLImageLoader::Load(size_t size, const ui8 * data) +{ + if (size) + { + memcpy((void *)position, data, size); + position += size; + } +} + +inline void SDLImageLoader::Load(size_t size, ui8 color) +{ + if (size) + { + memset((void *)position, color, size); + position += size; + } +} + +inline void SDLImageLoader::EndLine() +{ + lineStart += image->surf->pitch; + position = lineStart; +} + +SDLImageLoader::~SDLImageLoader() +{ + SDL_UnlockSurface(image->surf); + SDL_SetColorKey(image->surf, SDL_SRCCOLORKEY, 0); + //TODO: RLE if compressed and bpp>1 +} + +//////////////////////////////////////////////////////////////////////////////// + +CompImageLoader::CompImageLoader(CompImage * Img): + image(Img), + position(NULL), + entry(NULL), + currentLine(0) +{ + +} + +void CompImageLoader::init(Point SpriteSize, Point Margins, Point FullSize, SDL_Color *pal) +{ + image->sprite = Rect(Margins, SpriteSize); + image->fullSize = FullSize; + if (SpriteSize.x && SpriteSize.y) + { + image->palette = new SDL_Color[256]; + memcpy((void*)image->palette, (void*)pal, 256*sizeof(SDL_Color)); + //Allocate enought space for worst possible case, c-style malloc used due to resizing after load + image->surf = (ui8*)malloc(SpriteSize.x*SpriteSize.y*3); + image->line = new unsigned int[SpriteSize.y+1]; + image->line[0] = 0; + position = image->surf; + } +} + +inline void CompImageLoader::NewEntry(ui8 color, size_t size) +{ + assert(color != 0xff); + assert(size && size<256); + entry = position; + entry[0] = color; + entry[1] = size; + position +=2; +} + +inline void CompImageLoader::NewEntry(const ui8 * &data, size_t size) +{ + assert(size && size<256); + entry = position; + entry[0] = 0xff; + entry[1] = size; + position +=2; + memcpy(position, data, size); + position+=size; + data+=size; +} + +inline ui8 CompImageLoader::typeOf(ui8 color) +{ + if (color == 0) + return 0; + if (image->palette[color].unused != 255) + return 1; + return 2; +} + +inline void CompImageLoader::Load(size_t size, const ui8 * data) +{ + while (size) + { + //Try to compress data + while(true) + { + ui8 color = data[0]; + if (color != 0xff) + { + size_t runLength = 1; + while (runLength < size && color == data[runLength]) + runLength++; + + if (runLength > 1)//Row of one color found - use RLE + { + Load(runLength, color); + data += runLength; + size -= runLength; + if (!size) + return; + } + else + break; + } + else + break; + } + //Select length for new raw entry + size_t runLength = 1; + ui8 color = data[0]; + ui8 type = typeOf(color); + ui8 color2; + ui8 type2; + + if (size > 1) + { + do + { + color2 = data[runLength]; + type2 = typeOf(color2); + runLength++; + } + //While we have data of this type and different colors + while ((runLength < size) && (type == type2) && ( (color2 != 0xff) || (color2 != color))); + } + size -= runLength; + + //add data to last entry + if (entry && entry[0] == 0xff && type == typeOf(entry[2])) + { + size_t toCopy = std::min(runLength, 255 - entry[1]); + runLength -= toCopy; + entry[1] += toCopy; + memcpy(position, data, toCopy); + data+=toCopy; + position+=toCopy; + } + //Create new entries + while (runLength > 255) + { + NewEntry(data, 255); + runLength -= 255; + } + if (runLength) + NewEntry(data, runLength); + } +} + +inline void CompImageLoader::Load(size_t size, ui8 color) +{ + if (!size) + return; + if (color==0xff) + { + ui8* tmpbuf = new ui8[size]; + memset((void*)tmpbuf, color, size); + Load(size, tmpbuf); + delete [] tmpbuf; + return; + } + //Current entry is RLE with same color as new block + if (entry && entry[0] == color) + { + size_t toCopy = std::min(size, 255 - entry[1]); + entry[1] = 255; + size -= toCopy; + entry[1] += toCopy; + } + //Create new entries + while (size > 255) + { + NewEntry(color, 255); + size -= 255; + } + if (size) + NewEntry(color, size); +} + +void CompImageLoader::EndLine() +{ + currentLine++; + image->line[currentLine] = position - image->surf; + entry = NULL; + +} + +CompImageLoader::~CompImageLoader() +{ + if (!image->surf) + return; + + ui8* newPtr = (ui8*)realloc((void*)image->surf, position - image->surf); + if (newPtr) + image->surf = newPtr; +} + +/************************************************************************* + * Classes for images, support loading from file and drawing on surface * + *************************************************************************/ + +IImage::IImage(): + refCount(1) +{ + +} + +bool IImage::decreaseRef() +{ + refCount--; + return refCount <= 0; +} + +void IImage::increaseRef() +{ + refCount++; +} + +SDLImage::SDLImage(CDefFile *data, size_t frame, size_t group, bool compressed): + surf(NULL) +{ + SDLImageLoader loader(this); + data->loadFrame(frame, group, loader); +} + +SDLImage::SDLImage(SDL_Surface * from, bool extraRef): + margins(0,0) +{ + surf = from; + if (extraRef) + surf->refcount++; + fullSize.x = surf->w; + fullSize.y = surf->h; +} + +SDLImage::SDLImage(std::string filename, bool compressed): + margins(0,0) +{ + int size; + unsigned char * pic = spriteh->giveFile(filename, FILE_GRAPHICS, &size); + surf = IMG_Load_RW( SDL_RWFromMem((void*)pic, size), 1); + fullSize.x = surf->w; + fullSize.y = surf->h; + delete [] pic; +} + +void SDLImage::draw(SDL_Surface *where, int posX, int posY, Rect *src) const +{ + Rect sourceRect(margins.x, margins.y, surf->w, surf->h); + //TODO: rotation and scaling + if (src) + { + sourceRect = sourceRect & *src; + } + Rect destRect(posX, posY, surf->w, surf->h); + destRect += sourceRect.topLeft(); + sourceRect -= margins; + CSDL_Ext::blitSurface(surf, &sourceRect, where, &destRect); +} + +void SDLImage::playerColored(int player) +{ + graphics->blueToPlayersAdv(surf, player); +} + +int SDLImage::width() const +{ + return fullSize.x; +} + +int SDLImage::height() const +{ + return fullSize.y; +} + +SDLImage::~SDLImage() +{ + SDL_FreeSurface(surf); +} + +CompImage::CompImage(const CDefFile *data, size_t frame, size_t group): + surf(NULL), + line(NULL), + palette(NULL) + +{ + CompImageLoader loader(this); + data->loadFrame(frame, group, loader); +} + +CompImage::CompImage(SDL_Surface * surf) +{ + //TODO + assert(0); +} + +void CompImage::draw(SDL_Surface *where, int posX, int posY, Rect *src) const +{ + if (!surf) + return; + Rect sourceRect(sprite); + //TODO: rotation and scaling + if (src) + sourceRect = sourceRect & *src; + //Limit source rect to sizes of surface + sourceRect = sourceRect & Rect(0, 0, where->w, where->h); + + //Starting point on SDL surface + Point dest(posX+sourceRect.x, posY+sourceRect.y); + sourceRect -= sprite.topLeft(); + + for (int currY = 0; currY size ) + { + currX -= size; + if (type == 0xff) + data += size; + type = *(data++); + size = *(data++); + } + //This block will be shown partially - calculate size\position + size -= currX; + if (type == 0xff) + data += currX; + + currX = 0; + ui8 bpp = where->format->BytesPerPixel; + + //Calculate position for blitting: pixels + Y + X + ui8* blitPos = (ui8*) where->pixels; + blitPos += (dest.y + currY) * where->pitch; + blitPos += dest.x * bpp; + + //Blit block that must be fully visible + while (currX + size < sourceRect.w) + { + //blit block, pointers will be incremented if needed + BlitBlockWithBpp(bpp, type, size, data, blitPos); + + currX += size; + type = *(data++); + size = *(data++); + } + //Blit last, semi-visible block + size = sourceRect.w - currX; + BlitBlockWithBpp(bpp, type, size, data, blitPos); + } +} + +void CompImage::BlitBlockWithBpp(ui8 bpp, ui8 type, ui8 size, ui8 *&data, ui8 *&dest) const +{ + switch (bpp) + { + case 2: BlitBlock<2>(type, size, data, dest); + break; + + case 3: BlitBlock<3>(type, size, data, dest); + break; + + case 4: BlitBlock<4>(type, size, data, dest); + break; + default: + assert(0); + break; + } +} + +//Blit one block from RLE-d surface +template +void CompImage::BlitBlock(ui8 type, ui8 size, ui8 *&data, ui8 *&dest) const +{ + //Raw data + if (type == 0xff) + { + ui8 color = *data; + if (palette[color].unused == 255) + { + //Put row of RGB data + for (int i=0; i::PutColor(dest, palette[*(data++)]); + } + else + { + //Put row of RGBA data + for (int i=0; i::PutColorAlpha(dest, palette[*(data++)]); + + } + } + //RLE-d sequence + else + { + switch (palette[type].unused) + { + case 0: + { + //Skip row + dest += size*bpp; + break; + } + case 255: + { + //Put RGB row + //FIXME: can be optimized + for (int i=0; i::PutColor(dest, palette[type]); + break; + } + default: + { + //Put RGBA row + //FIXME: can be optimized + for (int i=0; i::PutColorAlpha(dest, palette[type]); + break; + } + } + } +} + + +void CompImage::playerColored(int player) +{ + SDL_Color *pal = NULL; + if(player < PLAYER_LIMIT && player >= 0) + { + pal = graphics->playerColorPalette + 32*player; + } + else if(player == 255 || player == -1) + { + pal = graphics->neutralColorPalette; + } + else + assert(0); + + for(int i=0; i<32; ++i) + { + palette[224+i].r = pal[i].r; + palette[224+i].g = pal[i].g; + palette[224+i].b = pal[i].b; + palette[224+i].unused = pal[i].unused; + } +} + +int CompImage::width() const +{ + return fullSize.x; +} + +int CompImage::height() const +{ + return fullSize.y; +} + +CompImage::~CompImage() +{ + free(surf); + delete [] line; + delete [] palette; } /************************************************************************* * CAnimation for animations handling, can load part of file if needed * *************************************************************************/ -CAnimation::AnimEntry::AnimEntry(): - surf(NULL), - source(0), - refCount(0), - data(NULL), - dataSize(0) +TextParser::TextParser(const std::string &name): + type(0), + position(std::string::npos) { + if (!spriteh->haveFile(name, FILE_TEXT)) + return; + text = spriteh->getTextFile(name); + position = text.find('\n'); + std::string typeStr = text.substr(0, position); + boost::algorithm::trim(typeStr); + if (typeStr == "Replace") + type = 1; + else if (typeStr == "Append") + type = 2; +} +int TextParser::getType() const +{ + return type; +} + +void TextParser::parseFile(std::map > &result) +{ + while (position != std::string::npos) + { + size_t lineStart = position+1; + position = text.find('\n', lineStart); + std::string buf = text.substr(lineStart, position-lineStart); + size_t currentBlock = atoi(buf.c_str()); + + while (position != std::string::npos) + { + lineStart = position+1; + position = text.find('\n', lineStart); + std::string res = text.substr(lineStart, position-lineStart); + boost::algorithm::trim(res); + if (res.empty()) + break; + result[currentBlock].push_back(res); + } + } } bool CAnimation::loadFrame(CDefFile * file, size_t frame, size_t group) { - if (groupSize(group) <= frame) + if (size(group) <= frame) { printError(frame, group, "LoadFrame"); return false; } - AnimEntry &e = entries[group][frame]; - if (e.surf || e.data) + IImage *image = getImage(frame, group, false); + if (image) { - e.refCount++; + image->increaseRef(); return true; } - if (e.source & 6)//load frame with SDL_Image - { - int size; - unsigned char * pic = NULL; - - std::ostringstream str; - if ( e.source & 2 ) - str << name << '#' << (group+1) << '#' << (frame+1); // file#12#34.* - else - str << name << '#' << (frame+1);//file#34.* - - pic = spriteh->giveFile(str.str(), FILE_GRAPHICS, &size); - if (pic) - { - if (compressed) - { - e.data = pic; - e.dataSize = size; - } - else - { - e.surf = IMG_Load_RW( SDL_RWFromMem((void*)pic, size), 1); - delete [] pic; - } - } - } - else if (file && e.source & 1)//try to get image from def + //try to get image from def + if (source[group][frame].empty()) { if (compressed) - e.data = file->getFrame(frame, group); + images[group][frame] = new CompImage(file, frame, group); else - e.surf = file->loadFrame(frame, group); + images[group][frame] = new SDLImage(file, frame, group); } - - if (!(e.surf || e.data)) - return false;//failed to load - - e.refCount++; - return true; -} - -bool CAnimation::unloadFrame(size_t frame, size_t group) -{ - if (groupSize(group) > frame && entries[group][frame].refCount) + else //load from separate file { - AnimEntry &e = entries[group][frame]; - if (--e.refCount)//not last ref - return true; - - SDL_FreeSurface(e.surf); - delete [] e.data; - - e.surf = NULL; - e.data = NULL; + //TODO: compressed images + images[group][frame] = new SDLImage(source[group][frame].c_str()); return true; } return false; } -void CAnimation::decompress(AnimEntry &entry) +bool CAnimation::unloadFrame(size_t frame, size_t group) { - if (entry.source & 6)//load frame with SDL_Image - entry.surf = IMG_Load_RW( SDL_RWFromMem((void*)entry.data, entry.dataSize), 1); - - else if (entry.source & 1) - entry.surf = CDefFile::loadFrame(entry.data, defPalette); + IImage *image = getImage(frame, group, false); + if (image) + { + //decrease ref count for image and delete if needed + if (image->decreaseRef()) + { + delete image; + images[group].erase(frame); + } + if (images[group].empty()) + images.erase(group); + return true; + } + return false; } void CAnimation::init(CDefFile * file) { - if (compressed) - defPalette = file->getPalette(); + TextParser txtFile(name); - for (size_t group = 0; ; group++) + if ( txtFile.getType() != 1 ) { - std::vector toAdd; + const std::map > * defEntries = file->getEntries(); - for (size_t frame = 0; ; frame++) - { - unsigned char res=0; - - { - std::ostringstream str; - str << name << '#' << (group+1) << '#' << (frame+1); // format: file#12#34.* - if (spriteh->haveFile(str.str())) - res |= 2; - } - - if (group == 0) - { - std::ostringstream str; - str << name << '#' << (frame+1);// format: file#34.* - if ( spriteh->haveFile(str.str())) - res |=4; - } - - if (file)//we have def too. try to get image from def - { - if (file->haveFrame(frame, group)) - res |=1; - } - - if (res) - { - toAdd.push_back(AnimEntry()); - toAdd.back().source = res; - } - else - break; - } - if (!toAdd.empty()) - { - entries.push_back(toAdd); - } - else - { - entries.resize(entries.size()+1); - if (group > 21) - break;//FIXME: crude workaround: if some groups are not present - //(common for creatures) parser will exit before reaching them - } + for (std::map >::const_iterator mapIt = defEntries->begin(); mapIt!=defEntries->end(); ++mapIt) + source[mapIt->first].resize(mapIt->second.size()); } + txtFile.parseFile(source); } CDefFile * CAnimation::getFile() const { - CDefFile * file = new CDefFile(name); - if (!file->loaded()) - { - delete file; - return NULL; - } - return file; + if (spriteh->haveFile(name, FILE_ANIMATION)) + return new CDefFile(name); + return NULL; } void CAnimation::printError(size_t frame, size_t group, std::string type) const @@ -567,13 +927,12 @@ void CAnimation::printError(size_t frame, size_t group, std::string type) const CAnimation::CAnimation(std::string Name, bool Compressed): name(Name), - compressed(Compressed), - defPalette(NULL) + compressed(Compressed) { - std::transform(name.begin(), name.end(), name.begin(), (int(*)(int))toupper); - int dotPos = name.find_last_of('.'); - if ( dotPos != -1 ) + size_t dotPos = name.find_last_of('.'); + if ( dotPos!=-1 ) name.erase(dotPos); + std::transform(name.begin(), name.end(), name.begin(), toupper); CDefFile * file = getFile(); init(file); delete file; @@ -581,112 +940,80 @@ CAnimation::CAnimation(std::string Name, bool Compressed): CAnimation::CAnimation(): name(""), - compressed(false), - defPalette(NULL) + compressed(false) { } CAnimation::~CAnimation() { - delete [] defPalette; - for (size_t i = 0; i < entries.size(); i++) - for (size_t j = 0; j < entries.at(i).size(); j++) - { - delete [] entries[i][j].data; - if (entries[i][j].surf) - SDL_FreeSurface(entries[i][j].surf); - } + for (group_map::iterator group = images.begin(); group != images.end(); ++group ) + for (image_map::iterator image = group->second.begin(); image != group->second.end(); ++image ) + delete image->second; } -void CAnimation::add(SDL_Surface * surf, bool shared, size_t group) +void CAnimation::setCustom(IImage * newImage, size_t frame, size_t group) { - if (!surf) - return; + assert(newImage); - if (entries.size() <= group) - entries.resize(group+1); + IImage * oldImage = getImage(frame,group,false); + if (oldImage); + delete oldImage; + images[group][frame] = newImage; - if (shared) - surf->refcount++; - - entries[group].push_back(AnimEntry()); - entries[group].back().refCount = 1; - entries[group].back().surf = surf; + if (source[group].size() <= frame) + source[group].resize(frame+1); } -void CAnimation::removeDecompressed(size_t frame, size_t group) +IImage * CAnimation::getImage(size_t frame, size_t group, bool verbose) const { - AnimEntry &e = entries[group][frame]; - if (e.surf && e.data) + group_map::const_iterator groupIter = images.find(group); + if (groupIter != images.end()) { - SDL_FreeSurface(e.surf); - e.surf = NULL; + image_map::const_iterator imageIter = groupIter->second.find(frame); + if (imageIter != groupIter->second.end()) + return imageIter->second; } -} - -SDL_Surface * CAnimation::image(size_t frame) -{ - size_t group=0; - while (group entries[group].size()) - frame -= entries[group].size(); - - if (group frame ) - { - AnimEntry &e = entries[group][frame]; - if (!e.surf && e.data) - decompress(e); - return e.surf; - } - - printError(frame, group, "GetImage"); - return NULL; -} - -void CAnimation::clear() -{ - unload(); - entries.clear(); -} - void CAnimation::load() { CDefFile * file = getFile(); - for (size_t group = 0; groupsecond.size(); image++) + loadFrame(file, image, group->first); delete file; } void CAnimation::unload() { - for (size_t group = 0; groupsecond.size(); image++) + unloadFrame(image, group->first); + } void CAnimation::loadGroup(size_t group) { CDefFile * file = getFile(); - for (size_t frame = 0; frame > frames) -{ - CDefFile * file = getFile(); - for (size_t i=0; i > frames) -{ - for (size_t i=0; i 1 ) - std::swap(entries[0][1].surf, entries[0][0].surf); + group_map::iterator groupIter = images.find(0); + if (groupIter != images.end()) + { + image_map::iterator first = groupIter->second.find(0), + second = groupIter->second.find(1); + if (first != second) + { + std::swap (first->second, second->second); + } + } } -size_t CAnimation::groupSize(size_t group) const +size_t CAnimation::size(size_t group) const { - if (entries.size() > group) - return entries[group].size(); - + source_map::const_iterator iter = source.find(group); + if (iter != source.end()) + return iter->second.size(); return 0; } -size_t CAnimation::size() const -{ - size_t ret=0; - for (size_t i=0; iw; - pos.h = anim.image(frame, group)->h; + pos.w = anim.getImage(frame, group)->width(); + pos.h = anim.getImage(frame, group)->height(); } CAnimImage::~CAnimImage() @@ -754,16 +1065,16 @@ CAnimImage::~CAnimImage() } -void CAnimImage::show(SDL_Surface *to) +void CAnimImage::showAll(SDL_Surface *to) { - blitAtLoc(anim.image(frame, group), 0,0, to); + anim.getImage(frame, group)->draw(to); } void CAnimImage::setFrame(size_t Frame, size_t Group) { if (frame == Frame && group==Group) return; - if (anim.groupSize(Group) > Frame) + if (anim.size(Group) > Frame) { anim.unload(frame, group); anim.load(Frame, Group); @@ -771,25 +1082,25 @@ void CAnimImage::setFrame(size_t Frame, size_t Group) group = Group; } } -*/ + CShowableAnim::CShowableAnim(int x, int y, std::string name, unsigned char Flags, unsigned int Delay, size_t Group): - anim(name, Flags), + anim(name, Flags & USE_RLE), group(Group), frame(0), first(0), - flags(Flags), frameDelay(Delay), value(0), + flags(Flags), xOffset(0), yOffset(0) { - pos.x+=x; - pos.y+=y; - anim.loadGroup(group); - last = anim.groupSize(group); - pos.w = anim.image(0, group)->w; - pos.h = anim.image(0, group)->h; + last = anim.size(group); + + pos.w = anim.getImage(0, group)->width(); + pos.h = anim.getImage(0, group)->height(); + pos.x+= x; + pos.y+= y; } CShowableAnim::~CShowableAnim() @@ -799,7 +1110,7 @@ CShowableAnim::~CShowableAnim() bool CShowableAnim::set(size_t Group, size_t from, size_t to) { - size_t max = anim.groupSize(Group); + size_t max = anim.size(Group); if (max>to) max = to; @@ -818,7 +1129,7 @@ bool CShowableAnim::set(size_t Group, size_t from, size_t to) bool CShowableAnim::set(size_t Group) { - if (anim.groupSize(Group)== 0) + if (anim.size(Group)== 0) return false; if (group != Group) { @@ -826,7 +1137,7 @@ bool CShowableAnim::set(size_t Group) anim.unloadGroup(group); first = 0; group = Group; - last = anim.groupSize(Group); + last = anim.size(Group); } frame = value = 0; return true; @@ -840,96 +1151,80 @@ void CShowableAnim::reset() callback(); } -void CShowableAnim::movePic( int byX, int byY) +void CShowableAnim::clipRect(int posX, int posY, int width, int height) { - xOffset += byX; - yOffset += byY; + xOffset = posX; + yOffset = posY; + pos.w = width; + pos.h = height; } void CShowableAnim::show(SDL_Surface *to) { - if ( flags & FLAG_BASE && frame != first) - blitImage(anim.image(first, group), to); - blitImage(anim.image(frame, group), to); - + if ( flags & BASE && frame != first) + blitImage(first, group, to); + blitImage(frame, group, to); + if ( ++value == frameDelay ) { value = 0; - if (flags & FLAG_COMPRESSED) - anim.removeDecompressed(frame, group); if ( ++frame == last) reset(); } - } void CShowableAnim::showAll(SDL_Surface *to) { - show(to); + if ( flags & BASE && frame != first) + blitImage(first, group, to); + blitImage(frame, group, to); } -void CShowableAnim::blitImage(SDL_Surface *what, SDL_Surface *to) +void CShowableAnim::blitImage(size_t frame, size_t group, SDL_Surface *to) { - assert(what); - //TODO: SDL RLE? - SDL_Rect dstRect=genRect(pos.h, pos.w, pos.x, pos.y); - SDL_Rect srcRect; - - srcRect.x = xOffset; - srcRect.y = yOffset; - srcRect.w = pos.w; - srcRect.h = pos.h; - - /*if ( flags & FLAG_ROTATED ) - {} //TODO: rotate surface - else */ - if (flags & FLAG_ALPHA && what->format->BytesPerPixel == 1) //alpha on 8-bit surf - use custom blitter - CSDL_Ext::blit8bppAlphaTo24bpp(what, &srcRect, to, &dstRect); - else - CSDL_Ext::blitSurface(what, &srcRect, to, &dstRect); + assert(to); + Rect src( xOffset, yOffset, pos.w, pos.h); + IImage * img = anim.getImage(frame, group); + img->draw(to, pos.x-xOffset, pos.y-yOffset, &src); } -void CShowableAnim::rotate(bool on) +void CShowableAnim::rotate(bool on, bool vertical) { + unsigned char flag = vertical? VERTICAL_FLIP:HORIZONTAL_FLIP; if (on) - flags |= FLAG_ROTATED; + flags |= flag; else - flags &= ~FLAG_ROTATED; + flags &= ~flag; } -CCreatureAnim::CCreatureAnim(int x, int y, std::string name, unsigned char flags, EAnimType type): +CCreatureAnim::CCreatureAnim(int x, int y, std::string name, Rect picPos, unsigned char flags, EAnimType type): CShowableAnim(x,y,name,flags,3,type) { - if (flags & FLAG_PREVIEW) - callback = boost::bind(&CCreatureAnim::loopPreview,this); + xOffset = picPos.x; + yOffset = picPos.y; + if (picPos.w) + pos.w = picPos.w; + if (picPos.h) + pos.h = picPos.h; }; void CCreatureAnim::loopPreview() { std::vector available; - if (anim.groupSize(ANIM_HOLDING)) - available.push_back(ANIM_HOLDING); - - if (anim.groupSize(ANIM_HITTED)) - available.push_back(ANIM_HITTED); - - if (anim.groupSize(ANIM_DEFENCE)) - available.push_back(ANIM_DEFENCE); - - if (anim.groupSize(ANIM_ATTACK_FRONT)) - available.push_back(ANIM_ATTACK_FRONT); - - if (anim.groupSize(ANIM_CAST_FRONT)) - available.push_back(ANIM_CAST_FRONT); + static const EAnimType previewList[] = {HOLDING, HITTED, DEFENCE, ATTACK_FRONT, CAST_FRONT}; + + for (size_t i=0; i<5; i++) + if (anim.size(previewList[i])) + available.push_back(previewList[i]); size_t rnd = rand()%(available.size()*2); if (rnd >= available.size()) { - if ( anim.groupSize(ANIM_MOVING) == 0 )//no moving animation present - addLast( ANIM_HOLDING ); + if ( anim.size(MOVING) == 0 )//no moving animation present + addLast( HOLDING ); else - addLast( ANIM_MOVING ) ; + addLast( MOVING ) ; } else addLast(available[rnd]); @@ -937,15 +1232,15 @@ void CCreatureAnim::loopPreview() void CCreatureAnim::addLast(EAnimType newType) { - if (type != ANIM_MOVING && newType == ANIM_MOVING)//starting moving - play init sequence + if (type != MOVING && newType == MOVING)//starting moving - play init sequence { - queue.push( ANIM_MOVE_START ); + queue.push( MOVE_START ); } - else if (type == ANIM_MOVING && newType != ANIM_MOVING )//previous anim was moving - finish it + else if (type == MOVING && newType != MOVING )//previous anim was moving - finish it { - queue.push( ANIM_MOVE_END); + queue.push( MOVE_END ); } - if (newType == ANIM_TURN_L || newType == ANIM_TURN_R) + if (newType == TURN_L || newType == TURN_R) queue.push(newType); queue.push(newType); @@ -954,12 +1249,12 @@ void CCreatureAnim::addLast(EAnimType newType) void CCreatureAnim::reset() { //if we are in the middle of rotation - set flag - if (type == ANIM_TURN_L && !queue.empty() && queue.front() == ANIM_TURN_L) - flags |= FLAG_ROTATED; - if (type == ANIM_TURN_R && !queue.empty() && queue.front() == ANIM_TURN_R) - flags &= ~FLAG_ROTATED; + if (type == TURN_L && !queue.empty() && queue.front() == TURN_L) + rotate(true); + if (type == TURN_R && !queue.empty() && queue.front() == TURN_R) + rotate(false); - while (!queue.empty())//FIXME: remove dublication + while (!queue.empty()) { EAnimType at = queue.front(); queue.pop(); @@ -975,7 +1270,13 @@ void CCreatureAnim::reset() if (set(at)) return; } - tlog0<<"Warning: next sequence is not found for animation!\n"; + set(type); + tlog0<<"Warning: next sequence was not found for animation!\n"; +} + +void CCreatureAnim::startPreview() +{ + callback = boost::bind(&CCreatureAnim::loopPreview,this); } void CCreatureAnim::clearAndSet(EAnimType type) diff --git a/client/CAnimation.h b/client/CAnimation.h index 529e7346c..939eb6fac 100644 --- a/client/CAnimation.h +++ b/client/CAnimation.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "../global.h" #include "GUIBase.h" @@ -22,96 +22,160 @@ */ struct SDL_Surface; -struct BMPPalette; +class SDLImageLoader; +class CompImageLoader; -//class for def loading, methods are based on CDefHandler -//after loading will store general info (palette and frame offsets) and pointer to file itself +/* + * class for def loading, methods are based on CDefHandler + * after loading will store general info (palette and frame offsets) and pointer to file itself + */ class CDefFile { private: struct SSpriteDef { - ui32 prSize; - ui32 defType2; - ui32 FullWidth; - ui32 FullHeight; - ui32 SpriteWidth; - ui32 SpriteHeight; - ui32 LeftMargin; - ui32 TopMargin; + ui32 size; + ui32 format; /// format in which pixel data is stored + ui32 fullWidth; /// full width and height of frame, including borders + ui32 fullHeight; + ui32 width; /// width and height of pixel data, borders excluded + ui32 height; + si32 leftMargin; + si32 topMargin; }; - //offset[group][frame] - offset of frame data in file - std::vector< std::vector > offset; - - //sorted list of offsets used to determine size - std::set offList; + std::map > offset; unsigned char * data; - BMPPalette * colors; - int datasize; - unsigned int type; + SDL_Color * palette; public: CDefFile(std::string Name); ~CDefFile(); - //true if file was opened correctly - bool loaded() const; - - //get copy of palette to unpack compressed animation - BMPPalette * getPalette(); - - //true if frame is present in it - bool haveFrame(size_t frame, size_t group) const; - - //get copy of binary data - unsigned char * getFrame(size_t frame, size_t group) const; - //load frame as SDL_Surface - SDL_Surface * loadFrame(size_t frame, size_t group) const ; + template + void loadFrame(size_t frame, size_t group, ImageLoader &loader) const; - //static version of previous one for calling from compressed anim - static SDL_Surface * loadFrame(const unsigned char * FDef, const BMPPalette * palette); + const std::map > * getEntries() const; }; -// Class for handling animation. +/* + * Base class for images, can be used for non-animation pictures as well + */ +class IImage +{ + int refCount; +public: + + //draws image on surface "where" at position + virtual void draw(SDL_Surface *where, int posX=0, int posY=0, Rect *src=NULL) const=0; + + //decrease ref count, returns true if image can be deleted (refCount <= 0) + bool decreaseRef(); + void increaseRef(); + + //Change palette to specific player + virtual void playerColored(int player)=0; + virtual int width() const=0; + virtual int height() const=0; + IImage(); + virtual ~IImage() {}; +}; + +/* + * Wrapper around SDL_Surface + */ +class SDLImage : public IImage +{ +public: + //Surface without empty borders + SDL_Surface * surf; + //size of left and top borders + Point margins; + //total size including borders + Point fullSize; + +public: + //Load image from def file + SDLImage(CDefFile *data, size_t frame, size_t group=0, bool compressed=false); + //Load from bitmap file + SDLImage(std::string filename, bool compressed=false); + //Create using existing surface, extraRef will increase refcount on SDL_Surface + SDLImage(SDL_Surface * from, bool extraRef); + ~SDLImage(); + + void draw(SDL_Surface *where, int posX=0, int posY=0, Rect *src=NULL) const; + void playerColored(int player); + int width() const; + int height() const; + + friend class SDLImageLoader; +}; + +/* + * RLE-compressed image data for 8-bit images with alpha-channel, currently far from finished + * primary purpose is not high compression ratio but fast drawing. + * Consist of repeatable segments with format similar to H3 def compression: + * 1st byte: + * if (byte == 0xff) + * raw data, opaque and semi-transparent data always in separate blocks + * else + * RLE-compressed image data with this color + * 2nd byte = size of segment + * raw data (if any) + */ +class CompImage : public IImage +{ + //x,y - margins, w,h - sprite size + Rect sprite; + //total size including borders + Point fullSize; + + //RLE-d data + ui8 * surf; + //array of offsets for each line + unsigned int * line; + //palette + SDL_Color *palette; + + //Used internally to blit one block of data + template + void BlitBlock(ui8 type, ui8 size, ui8 *&data, ui8 *&dest) const; + void BlitBlockWithBpp(ui8 bpp, ui8 type, ui8 size, ui8 *&data, ui8 *&dest) const; + +public: + //Load image from def file + CompImage(const CDefFile *data, size_t frame, size_t group=0); + //TODO: load image from SDL_Surface + CompImage(SDL_Surface * surf); + ~CompImage(); + + void draw(SDL_Surface *where, int posX=0, int posY=0, Rect *src=NULL) const; + void playerColored(int player); + int width() const; + int height() const; + + friend class CompImageLoader; +}; + +/* + * Class for handling animation. + */ class CAnimation { private: + //source[group][position] - file with this frame, if string is empty - image located in def file + std::map > source; - //internal structure to hold all data of specific frame - struct AnimEntry - { - //surface for this entry - SDL_Surface * surf; - - //data for CompressedAnim - unsigned char * data; - - //reference count, changed by loadFrame \ unloadFrame - size_t refCount; - - //size of compressed data, unused for def files - size_t dataSize; - - //bitfield, location of image data: 1 - def, 2 - file#9.*, 4 - file#9#2.* - unsigned char source; - - AnimEntry(); - }; - - //palette from def file, used only for compressed anim - BMPPalette * defPalette; - - //entries[group][position], store all info regarding frames - std::vector< std::vector > entries; + //bitmap[group][position], store objects with loaded bitmaps + std::map > images; //animation file name std::string name; - //if true all frames will be stored in compressed state + //if true all frames will be stored in compressed (RLE) state const bool compressed; //loader, will be called by load(), require opened def file for loading from it. Returns true if image is loaded @@ -120,9 +184,6 @@ private: //unloadFrame, returns true if image has been unloaded ( either deleted or decreased refCount) bool unloadFrame(size_t frame, size_t group); - //decompress entry data - void decompress(AnimEntry &entry); - //initialize animation from file void init(CDefFile * file); @@ -138,21 +199,12 @@ public: CAnimation(); ~CAnimation(); - //add custom surface to the end of specific group. If shared==true surface needs to be deleted - //somewhere outside of CAnim as well (SDL_Surface::refcount will be increased) - void add(SDL_Surface * surf, bool shared=false, size_t group=0); + //add custom surface to the selected position. + //Known issue: IImage should not be used in another CAnimation (results in crash othervice) + void setCustom(IImage * newImage, size_t frame, size_t group=0); - //removes all surfaces which have compressed data - void removeDecompressed(size_t frame, size_t group); - - //get pointer to surface, this function ignores groups (like ourImages in DefHandler) - SDL_Surface * image (size_t frame); - - //get pointer to surface, from specific group - SDL_Surface * image(size_t frame, size_t group); - - //removes all frames as well as their entries - void clear(); + //get pointer to image from specific group, NULL if not found + IImage * getImage(size_t frame, size_t group=0, bool verbose=true) const; //all available frames void load (); @@ -166,26 +218,22 @@ public: void load (size_t frame, size_t group=0); void unload(size_t frame, size_t group=0); - //list of frames (first = group ID, second = frame ID) - void load (std::vector > frames); - void unload(std::vector > frames); - //helper to fix frame order on some buttons void fixButtonPos(); - //size of specific group, 0 if not present - size_t groupSize(size_t group) const; - - //total count of frames in whole anim - size_t size() const; + //total count of frames in group (including not loaded) + size_t size(size_t group=0) const; }; + /* -//Class for displaying one image from animation + * Class for displaying one image from animation + */ class CAnimImage: public CIntObject { private: CAnimation anim; - size_t frame;//displayed frame/group + //displayed frame/group + size_t frame; size_t group; public: @@ -194,38 +242,37 @@ public: //change displayed frame on this one void setFrame(size_t Frame, size_t Group=0); - void show(SDL_Surface *to); - //TODO: showAll(); + void showAll(SDL_Surface *to); }; -*/ -//Base class for displaying animation, used as superclass for different animations + +/* + * Base class for displaying animation, used as superclass for different animations + */ class CShowableAnim: public CIntObject { public: enum EFlags { - FLAG_BASE=1, //base frame will be blitted before current one - FLAG_COMPRESSED=2, //animations will be loaded in compressed state - FLAG_ROTATED=4, //will be displayed rotated - FLAG_ALPHA=8, //if image is 8bbp it will be printed with transparency (0=opaque, 255=transparent) - FLAG_USERLE=16, //not used for now, enable RLE compression from SDL - FLAG_PREVIEW=32 //for creatures only: several animation (move, attack, defence...) will be randomly selected + BASE=1, //base frame will be blitted before current one + HORIZONTAL_FLIP=2, //TODO: will be displayed rotated + VERTICAL_FLIP=4, //TODO: will be displayed rotated + USE_RLE=8, //RLE-d version, support full alpha-channel for 8-bit images }; - protected: CAnimation anim; + size_t group, frame;//current frame size_t first, last; //animation range - unsigned char flags;//flags from EFlags enum - + //TODO: replace with time delay(needed for battles) unsigned int frameDelay;//delay in frames of each image - unsigned int value;//how many times current frame was showed + unsigned char flags;//Flags from EFlags enum + //blit image with optional rotation, fitting into rect, etc - void blitImage(SDL_Surface *what, SDL_Surface *to); + void blitImage(size_t frame, size_t group, SDL_Surface *to); //For clipping in rect, offsets of picture coordinates int xOffset, yOffset; @@ -234,18 +281,18 @@ public: //called when next animation sequence is required boost::function callback; - CShowableAnim(int x, int y, std::string name, unsigned char flags, unsigned int Delay=4, size_t Group=0); + CShowableAnim(int x, int y, std::string name, unsigned char flags=0, unsigned int Delay=4, size_t Group=0); ~CShowableAnim(); //set animation to group or part of group bool set(size_t Group); bool set(size_t Group, size_t from, size_t to=-1); - //set rotation flag - void rotate(bool on); + //set rotation flags + void rotate(bool on, bool vertical=false); //move displayed part of picture (if picture is clipped to rect) - void movePic( int byX, int byY); + void clipRect(int posX, int posY, int width, int height); //set frame to first, call callback virtual void reset(); @@ -255,41 +302,44 @@ public: void showAll(SDL_Surface *to); }; +/* + * + */ class CCreatureAnim: public CShowableAnim { public: enum EAnimType // list of creature animations, numbers were taken from def files { - ANIM_MOVING=0, //will automatically add MOVE_START and MOVE_END to queue - ANIM_MOUSEON=1, - ANIM_HOLDING=2, - ANIM_HITTED=3, - ANIM_DEFENCE=4, - ANIM_DEATH=5, - //ANIM_DEATH2=6, //unused? - ANIM_TURN_L=7, //will automatically play second part of anim and rotate creature - ANIM_TURN_R=8, //same - //ANIM_TURN_L2=9, //identical to previous? - //ANIM_TURN_R2=10, - ANIM_ATTACK_UP=11, - ANIM_ATTACK_FRONT=12, - ANIM_ATTACK_DOWN=13, - ANIM_SHOOT_UP=14, - ANIM_SHOOT_FRONT=15, - ANIM_SHOOT_DOWN=16, - ANIM_CAST_UP=17, - ANIM_CAST_FRONT=18, - ANIM_CAST_DOWN=19, - ANIM_2HEX_ATTACK_UP=17, - ANIM_2HEX_ATTACK_FRONT=18, - ANIM_2HEX_ATTACK_DOWN=19, - ANIM_MOVE_START=20, //no need to use this two directly - ANIM_MOVING will be enought - ANIM_MOVE_END=21 + MOVING=0, //will automatically add MOVE_START and MOVE_END to queue + MOUSEON=1, + HOLDING=2, + HITTED=3, + DEFENCE=4, + DEATH=5, + //DEATH2=6, //unused? + TURN_L=7, //will automatically play second part of anim and rotate creature + TURN_R=8, //same + //TURN_L2=9, //identical to previous? + //TURN_R2=10, + ATTACK_UP=11, + ATTACK_FRONT=12, + ATTACK_DOWN=13, + SHOOT_UP=14, + SHOOT_FRONT=15, + SHOOT_DOWN=16, + CAST_UP=17, + CAST_FRONT=18, + CAST_DOWN=19, + DHEX_ATTACK_UP=17, + DHEX_ATTACK_FRONT=18, + DHEX_ATTACK_DOWN=19, + MOVE_START=20, //no need to use this two directly - MOVING will be enought + MOVE_END=21 }; private: - // queue of animations waiting to be displayed + //queue of animations waiting to be displayed std::queue queue; //this funcction is used as callback if preview flag was set during construction @@ -302,11 +352,13 @@ public: //add sequence to the end of queue void addLast(EAnimType newType); + void startPreview(); + //clear queue and set animation to this sequence void clearAndSet(EAnimType type); - CCreatureAnim(int x, int y, std::string name, unsigned char flags=FLAG_COMPRESSED | FLAG_ALPHA | FLAG_PREVIEW, - EAnimType type=ANIM_HOLDING); + CCreatureAnim(int x, int y, std::string name, Rect picPos, + unsigned char flags= USE_RLE, EAnimType = HOLDING ); }; diff --git a/client/CCastleInterface.cpp b/client/CCastleInterface.cpp index 347027d78..da8e07ed9 100644 --- a/client/CCastleInterface.cpp +++ b/client/CCastleInterface.cpp @@ -7,6 +7,7 @@ #include "CGameInfo.h" #include "CHeroWindow.h" #include "CMessage.h" +#include "CPlayerInterface.h" #include "SDL_Extensions.h" #include "CCreatureAnimation.h" #include "Graphics.h" @@ -57,35 +58,22 @@ int hordeToDwellingID(int bid)//helper, converts horde buiding ID into correspon } CBuildingRect::CBuildingRect(const Structure *Str) - :CShowableAnim(0, 0, Str->defName, CShowableAnim::FLAG_BASE), - moi(false), str(Str) + :CShowableAnim(0, 0, Str->defName, CShowableAnim::BASE | CShowableAnim::USE_RLE), + str(Str) { - + used |= LCLICK | RCLICK | HOVER; pos.x += str->pos.x + LOCPLINT->castleInt->pos.x; pos.y += str->pos.y + LOCPLINT->castleInt->pos.y; - if(str->ID == 33 && str->townID == 4) //little 'hack' for estate in necropolis - background color is not always the first color in the palette - for(size_t i=0; ipixels))); + if (!str->borderName.empty()) + border = BitmapHandler::loadBitmap(str->borderName, true); + else + border = NULL; - if(Str->ID<0 || (Str->ID>=27 && Str->ID<=29)) - { - area = border = NULL; - return; - } - - border = BitmapHandler::loadBitmap(str->borderName, true); - if (!border) - { - tlog2 << "Warning: no border for "<ID<areaName); - if (!area) - { - tlog2 << "Warning: no area for "<ID<areaName.empty()) + area = BitmapHandler::loadBitmap(str->areaName); + else + area = NULL; } CBuildingRect::~CBuildingRect() @@ -95,22 +83,7 @@ CBuildingRect::~CBuildingRect() if(area) SDL_FreeSurface(area); } -void CBuildingRect::activate() -{ - activateHover(); - activateLClick(); - activateRClick(); -} -void CBuildingRect::deactivate() -{ - deactivateHover(); - deactivateLClick(); - deactivateRClick(); - if(moi) - deactivateMouseMove(); - moi=false; -} bool CBuildingRect::operator<(const CBuildingRect & p2) const { if(str->pos.z != p2.str->pos.z) @@ -123,15 +96,14 @@ void CBuildingRect::hover(bool on) //Hoverable::hover(on); if(on) { - if(!moi) - activateMouseMove(); - moi = true; + if(!(active & MOVE)) + changeUsedEvents(MOVE, true, true); } else { - if(moi) - deactivateMouseMove(); - moi = false; + if(active & MOVE) + changeUsedEvents(MOVE, false, true); + if(LOCPLINT->castleInt->hBuild == this) { LOCPLINT->castleInt->hBuild = NULL; @@ -179,13 +151,16 @@ void CBuildingRect::show(SDL_Surface *to) { CShowableAnim::show(to); - if(LOCPLINT->castleInt->hBuild == this && border) //if this this higlighted structure and has border we'll blit it + if(LOCPLINT->castleInt->hBuild == this && border) blitAtLoc(border,0,0,to); } void CBuildingRect::showAll(SDL_Surface *to) { - show(to); + CShowableAnim::showAll(to); + + if(LOCPLINT->castleInt->hBuild == this && border && !active) + blitAtLoc(border,0,0,to); } std::string getBuildingSubtitle(int tid, int bid)//hover text for building @@ -765,8 +740,8 @@ void CCastleInterface::enterHall() void CCastleInterface::showAll( SDL_Surface * to/*=NULL*/) { - blitAt(cityBg,pos,to); blitAt(townInt,pos.x,pos.y+374,to); + blitAt(cityBg,pos,to); adventureInt->resdatabar.draw(to); townlist->draw(to); statusbar->show(to); @@ -792,8 +767,11 @@ void CCastleInterface::showAll( SDL_Surface * to/*=NULL*/) market->show(to); fort->show(to); hall->show(to); - show(to); - + for(size_t i=0;ishowAll(to); + } + statusbar->show(to);//refreshing statusbar if(screen->w != 800 || screen->h !=600) CMessage::drawBorder(LOCPLINT->playerID,to,828,628,pos.x-14,pos.y-15); exit->show(to); @@ -812,13 +790,10 @@ void CCastleInterface::townChange() void CCastleInterface::show(SDL_Surface * to) { - blitAt(cityBg,pos,to); - - //blit buildings for(size_t i=0;ishowAll(to); + buildings[i]->show(to); } statusbar->show(to);//refreshing statusbar } @@ -1502,7 +1477,7 @@ void CHallInterface::close() { GH.popInts(LOCPLINT->castleInt->winMode == 2? 2 : 1 ); } -void CHallInterface::show(SDL_Surface * to) +void CHallInterface::showAll(SDL_Surface * to) { blitAt(bg,pos,to); LOCPLINT->castleInt->statusbar->show(to); @@ -1700,14 +1675,23 @@ CFortScreen::~CFortScreen() void CFortScreen::show( SDL_Surface * to) { - blitAt(bg,pos,to); for (int i=0; ishow(to); } +} + +void CFortScreen::showAll( SDL_Surface * to) +{ + blitAt(bg,pos,to); + for (int i=0; ishowAll(to); + } exit->show(to); resdatabar->show(to); GH.statusbar->show(to); + } void CFortScreen::activate() @@ -1906,7 +1890,7 @@ CMageGuildScreen::CMageGuildScreen(CCastleInterface * owner) } else { - blitAt(scrolls.image(1),positions[i][j],*bg); + scrolls.getImage(0)->draw(*bg, positions[i][j].x, positions[i][j].y); } } } @@ -1973,20 +1957,20 @@ void CMageGuildScreen::Scroll::hover(bool on) CBlacksmithDialog::CBlacksmithDialog(bool possible, int creMachineID, int aid, int hid) { OBJ_CONSTRUCTION_CAPTURING_ALL; -// SDL_SetColorKey(bg2,SDL_SRCCOLORKEY,SDL_MapRGB(bg2->format,0,255,255)); bmp = new CPicture("TPSMITH"); bmp->colorizeAndConvert(LOCPLINT->playerID); pos = bmp->center(); - SDL_Surface *bg = BitmapHandler::loadBitmap("TPSMITBK.bmp"); - blitAt(bg,64,50,*bmp); - SDL_FreeSurface(bg); + animBG = new CPicture("TPSMITBK", 64, 50); + animBG->needRefresh = true; - CCreatureAnim cra(170, 120, CGI->creh->creatures[creMachineID]->animDefName); + anim = new CCreatureAnim(64, 50, CGI->creh->creatures[creMachineID]->animDefName, Rect()); + anim->clipRect(113,125,200,150); + anim->startPreview(); char pom[75]; sprintf(pom,CGI->generaltexth->allTexts[274].c_str(),CGI->creh->creatures[creMachineID]->nameSing.c_str()); //build a new ... - printAtMiddle(pom,165,28,FONT_MEDIUM,tytulowy,*bmp); + printAtMiddle(pom,165,28,FONT_BIG,tytulowy,*bmp); printAtMiddle(CGI->generaltexth->jktexts[43],165,218,FONT_MEDIUM,zwykly,*bmp); //resource cost SDL_itoa(CGI->arth->artifacts[aid]->price,pom,10); printAtMiddle(pom,165,290,FONT_MEDIUM,zwykly,*bmp); diff --git a/client/CCastleInterface.h b/client/CCastleInterface.h index 0caac35b5..9e74e6954 100644 --- a/client/CCastleInterface.h +++ b/client/CCastleInterface.h @@ -1,14 +1,10 @@ #ifndef __CCASTLEINTERFACE_H__ #define __CCASTLEINTERFACE_H__ - - #include "../global.h" -#include #include "CAnimation.h" #include "GUIBase.h" -#include "CMusicBase.h" -//#include "boost/tuple/tuple.hpp" + class CGTownInstance; class CTownHandler; class CHallInterface; @@ -37,14 +33,11 @@ class CMinorResDataBar; class CBuildingRect : public CShowableAnim { public: - bool moi; //motion interested is active const Structure* str; SDL_Surface* border; SDL_Surface* area; CBuildingRect(const Structure *Str); //c-tor ~CBuildingRect(); //d-tor - void activate(); - void deactivate(); bool operator<(const CBuildingRect & p2) const; void hover(bool on); void clickLeft(tribool down, bool previousState); @@ -119,7 +112,6 @@ public: AdventureMapButton *exit; AdventureMapButton *split; - musicBase::musicID musicID; std::vector creainfo;//small icons of creatures (bottom-left corner); std::vector buildings; //building id, building def, structure struct, border, filling @@ -198,7 +190,7 @@ public: CHallInterface(CCastleInterface * owner); //c-tor ~CHallInterface(); //d-tor void close(); - void show(SDL_Surface * to); + void showAll(SDL_Surface * to); void activate(); void deactivate(); }; @@ -228,6 +220,7 @@ public: ~CFortScreen(); //d-tor void close(); void show(SDL_Surface * to); + void showAll(SDL_Surface * to); void activate(); void deactivate(); }; @@ -240,7 +233,7 @@ public: public: const CSpell *spell; - Scroll(const CSpell *Spell); + Scroll(const CSpell *Spell); void clickLeft(tribool down, bool previousState); void clickRight(tribool down, bool previousState); void hover(bool on); @@ -264,6 +257,7 @@ class CBlacksmithDialog : public CIntObject public: AdventureMapButton *buy, *cancel; CPicture *bmp; //background + CPicture *animBG; CCreatureAnim * anim; CBlacksmithDialog(bool possible, int creMachineID, int aid, int hid); //c-tor diff --git a/client/CCreatureAnimation.cpp b/client/CCreatureAnimation.cpp index 0fed7ab7d..30b78fffd 100644 --- a/client/CCreatureAnimation.cpp +++ b/client/CCreatureAnimation.cpp @@ -240,7 +240,7 @@ int CCreatureAnimation::nextFrameT(SDL_Surface * dest, int x, int y, bool attack if(!destRect || (destRect->x <= xB && destRect->x + destRect->w > xB )) { const ui8 colorNr = SegmentType == 0xff ? FDef[BaseOffset+k] : SegmentType; - putPixel(dest, xB + yB*dest->w, palette[colorNr], colorNr, yellowBorder, blueBorder, aCountMod); + putPixel(dest, xB, yB, palette[colorNr], colorNr, yellowBorder, blueBorder, aCountMod); } } ftcp++; //increment pos @@ -300,7 +300,8 @@ CCreatureAnimation::~CCreatureAnimation() template inline void CCreatureAnimation::putPixel( SDL_Surface * dest, - const int & ftcp, + const int & ftcpX, + const int & ftcpY, const BMPPalette & color, const unsigned char & palc, const bool & yellowBorder, @@ -310,7 +311,7 @@ inline void CCreatureAnimation::putPixel( { if(palc!=0) { - Uint8 * p = (Uint8*)dest->pixels + ftcp*dest->format->BytesPerPixel; + Uint8 * p = (Uint8*)dest->pixels + ftcpX*dest->format->BytesPerPixel + ftcpY*dest->pitch; if(palc > 7) //normal color { ColorPutter::PutColor(p, color.R, color.G, color.B); @@ -332,9 +333,8 @@ inline void CCreatureAnimation::putPixel( else //shadow { //determining transparency value, 255 or 0 should be already filtered - Uint16 alpha; static Uint16 colToAlpha[8] = {255,192,128,128,128,255,128,192}; - alpha = colToAlpha[palc]; + Uint16 alpha = colToAlpha[palc]; if(bpp != 3 && bpp != 4) { diff --git a/client/CCreatureAnimation.h b/client/CCreatureAnimation.h index df966e954..9f0b9cc4b 100644 --- a/client/CCreatureAnimation.h +++ b/client/CCreatureAnimation.h @@ -49,7 +49,8 @@ private: template void putPixel( SDL_Surface * dest, - const int & ftcp, + const int & ftcpX, + const int & ftcpY, const BMPPalette & color, const unsigned char & palc, const bool & yellowBorder, diff --git a/client/CHeroWindow.cpp b/client/CHeroWindow.cpp index b0f7a5471..18d5e7c97 100644 --- a/client/CHeroWindow.cpp +++ b/client/CHeroWindow.cpp @@ -12,6 +12,7 @@ #include "Graphics.h" #include "CSpellWindow.h" #include "CConfigHandler.h" +#include "CPlayerInterface.h" #include "../global.h" #include "../lib/CArtHandler.h" #include "CDefHandler.h" diff --git a/client/CHeroWindow.h b/client/CHeroWindow.h index 190fd078e..8a3f60c6e 100644 --- a/client/CHeroWindow.h +++ b/client/CHeroWindow.h @@ -2,7 +2,7 @@ #define __CHEROWINDOW_H__ -#include "CPlayerInterface.h" +//#include "CPlayerInterface.h" /* * CHeroWindow.h, part of VCMI engine diff --git a/client/CMT.cpp b/client/CMT.cpp index 14a8900ee..405f744f3 100644 --- a/client/CMT.cpp +++ b/client/CMT.cpp @@ -629,7 +629,7 @@ static void listenForEvents() delete client; client = NULL; - delete CGI->dobjinfo; + delete CGI->dobjinfo.get(); const_cast(CGI)->dobjinfo = new CDefObjInfoHandler; const_cast(CGI)->dobjinfo->load(); @@ -710,4 +710,4 @@ void requestChangingResolution() ev.type = SDL_USEREVENT; ev.user.code = 1; SDL_PushEvent(&ev); -} \ No newline at end of file +} diff --git a/client/CMessage.cpp b/client/CMessage.cpp index 6e24ca1c9..aa4f6bae0 100644 --- a/client/CMessage.cpp +++ b/client/CMessage.cpp @@ -61,6 +61,8 @@ void CMessage::init() { for (int i=0;i n; piecesOfBox.push_back(n); @@ -417,7 +419,7 @@ void CMessage::drawIWindow(CInfoWindow * ret, std::string text, int player) // Compute total width of buttons bw = 20*(ret->buttons.size()-1); // space between all buttons for(size_t i=0; ibuttons.size(); i++) //and add buttons width - bw+=ret->buttons[i]->imgs[0]->image(0)->w; + bw+=ret->buttons[i]->imgs[0]->getImage(0)->width(); winSize.second += 20 + //before button ok->ourImages[0].bitmap->h; //button } @@ -454,13 +456,13 @@ void CMessage::drawIWindow(CInfoWindow * ret, std::string text, int player) { // Position the buttons at the bottom of the window bw = (ret->bitmap->w/2) - (bw/2); - curh = ret->bitmap->h - SIDE_MARGIN - ret->buttons[0]->imgs[0]->image(0)->h; + curh = ret->bitmap->h - SIDE_MARGIN - ret->buttons[0]->imgs[0]->getImage(0)->height(); for(size_t i=0; ibuttons.size(); i++) { ret->buttons[i]->pos.x = bw + ret->pos.x; ret->buttons[i]->pos.y = curh + ret->pos.y; - bw += ret->buttons[i]->imgs[0]->image(0)->w + 20; + bw += ret->buttons[i]->imgs[0]->getImage(0)->width() + 20; } } for(size_t i=0; icomponents.size(); i++) @@ -553,7 +555,7 @@ ComponentsToBlit::~ComponentsToBlit() ComponentsToBlit::ComponentsToBlit(std::vector & SComps, int maxw, SDL_Surface* _or) { w = h = 0; - if(!SComps.size()) + if(SComps.empty()) return; comps.resize(1); diff --git a/client/CMessage.h b/client/CMessage.h index 9e4003cb2..ff7b05fac 100644 --- a/client/CMessage.h +++ b/client/CMessage.h @@ -3,7 +3,7 @@ #include "FontBase.h" #include "../global.h" -#include +//#include #include /* @@ -15,7 +15,8 @@ * Full text of license available in license.txt file, in main folder * */ - + +struct SDL_Surface; enum EWindowType {infoOnly, infoOK, yesOrNO}; class CPreGame; class MapSel; diff --git a/client/CPreGame.cpp b/client/CPreGame.cpp index 3550b952c..2cd56377c 100644 --- a/client/CPreGame.cpp +++ b/client/CPreGame.cpp @@ -207,7 +207,7 @@ static CApplier *applier = NULL; CMenuScreen::CMenuScreen( EState which ) { - OBJ_CONSTRUCTION; + OBJ_CONSTRUCTION;//FIXME: Memory leak in buttons? Images on them definitely were not freed after game start bgAd = NULL; switch(which) @@ -2845,11 +2845,9 @@ void CBonusSelection::updateBonusSelection() for(int i = 0; i < bonDescs.size(); i++) { - SDL_Surface *notSelected, *selected; - CDefEssential * de = CDefHandler::giveDefEss(bonDefs[bonDescs[i].type]); SDL_Surface * surfToDuplicate = NULL; - bool freeDuplicatedSurface = false; + bool createNewRef = true; std::string desc; switch(bonDescs[i].type) @@ -2883,7 +2881,7 @@ void CBonusSelection::updateBonusSelection() std::string bldgBitmapName = graphics->ERMUtoPicture[faction][CBuildingHandler::campToERMU(bonDescs[i].info1, faction, std::set())]; surfToDuplicate = BitmapHandler::loadBitmap(bldgBitmapName); - freeDuplicatedSurface = true; + createNewRef = false; } break; case 3: //artifact @@ -2997,23 +2995,18 @@ void CBonusSelection::updateBonusSelection() bonuses->addButton(new CHighlightableButton(desc, desc, 0, 475 + i*68, 455, bonDefs[bonDescs[i].type], i)); - notSelected = SDL_ConvertSurface(surfToDuplicate, surfToDuplicate->format, surfToDuplicate->flags); - selected = SDL_ConvertSurface(notSelected, notSelected->format, notSelected->flags); - - //printing yellow border + //create separate surface with yellow border + SDL_Surface * selected = SDL_ConvertSurface(surfToDuplicate, surfToDuplicate->format, surfToDuplicate->flags); blitAt(twcp->ourImages[1].bitmap, 0, 0, selected); - //moving surfaces into button - bonuses->buttons.back()->imgs[0]->clear(); - bonuses->buttons.back()->imgs[0]->add(notSelected); - bonuses->buttons.back()->imgs[0]->add(selected); + //replace images on button with new ones + delete bonuses->buttons.back()->imgs[0]; + bonuses->buttons.back()->imgs[0] = new CAnimation(); + bonuses->buttons.back()->imgs[0]->setCustom(new SDLImage(surfToDuplicate, createNewRef), 0); + bonuses->buttons.back()->imgs[0]->setCustom(new SDLImage(selected, false), 1); //cleaning delete de; - if(freeDuplicatedSurface) - { - SDL_FreeSurface(surfToDuplicate); - } } } if (bonuses->buttons.size() > 0) diff --git a/client/GUIBase.cpp b/client/GUIBase.cpp index 9e86cc78d..21d9cd2ce 100644 --- a/client/GUIBase.cpp +++ b/client/GUIBase.cpp @@ -513,7 +513,8 @@ void CIntObject::tick() CIntObject::CIntObject() { - pressedL = pressedR = hovered = captureAllKeys = strongInterest = toNextTick = active = used = 0; + pressedL = pressedR = hovered = captureAllKeys = strongInterest = false; + toNextTick = active = used = 0; recActions = defActions = GH.defActionsDef; @@ -849,6 +850,7 @@ CPicture::CPicture(const Rect &r, ui32 color, bool screenFormat /*= false*/) CPicture::CPicture(SDL_Surface *BG, const Rect &SrcRect, int x /*= 0*/, int y /*= 0*/, bool free /*= false*/) { + needRefresh = false; srcRect = new Rect(SrcRect); pos.x += x; pos.y += y; @@ -865,9 +867,16 @@ CPicture::~CPicture() void CPicture::init() { + needRefresh = false; srcRect = NULL; } +void CPicture::show( SDL_Surface * to ) +{ + if (needRefresh) + showAll(to); +} + void CPicture::showAll( SDL_Surface * to ) { if(bg) diff --git a/client/GUIBase.h b/client/GUIBase.h index 1f0a0eb18..44c1de14d 100644 --- a/client/GUIBase.h +++ b/client/GUIBase.h @@ -135,6 +135,13 @@ struct Rect : public SDL_Rect w = W; h = H; } + Rect(const Point &position, const Point &size) //c-tor + { + x = position.x; + y = position.y; + w = size.x; + h = size.y; + } Rect(const SDL_Rect & r) //c-tor { x = r.x; @@ -465,6 +472,7 @@ public: SDL_Surface *bg; Rect *srcRect; //if NULL then whole surface will be used bool freeSurf; //whether surface will be freed upon CPicture destruction + bool needRefresh;//Surface needs to be displayed each frame operator SDL_Surface*() { @@ -480,6 +488,7 @@ public: void createSimpleRect(const Rect &r, bool screenFormat, ui32 color); ~CPicture(); + void show(SDL_Surface * to); void showAll(SDL_Surface * to); void convertToScreenBPP(); void colorizeAndConvert(int player); diff --git a/client/GUIClasses.cpp b/client/GUIClasses.cpp index d928b4514..dd4dfca51 100644 --- a/client/GUIClasses.cpp +++ b/client/GUIClasses.cpp @@ -14,6 +14,7 @@ #include "SDL_framerate.h" #include "CConfigHandler.h" #include "CCreatureAnimation.h" +#include "CPlayerInterface.h" #include "Graphics.h" #include "CAnimation.h" #include "../lib/CArtHandler.h" @@ -1640,19 +1641,19 @@ int CTownList::size() } CCreaturePic::CCreaturePic(int x, int y, const CCreature *cre, bool Big, bool Animated) -:c(cre),big(Big) { OBJ_CONSTRUCTION_CAPTURING_ALL; pos.x+=x; pos.y+=y; - x = 225 - (c->isDoubleWide()?63:78); - y = 225 - (big?75:65); - - anim = new CCreatureAnim(0,0, cre->animDefName); - anim->movePic(x,y); - anim->pos.w = 100; - anim->pos.h = big?130:120; + if(Big) + bg = new CPicture(graphics->backgrounds[cre->faction],0,0,false); + else + bg = new CPicture(graphics->backgroundsm[cre->faction],0,0,false); + bg->needRefresh = true; + anim = new CCreatureAnim(0, 0, cre->animDefName, Rect()); + anim->clipRect(cre->doubleWide?170:150, 155, bg->pos.w, bg->pos.h); + anim->startPreview(); } CCreaturePic::~CCreaturePic() @@ -1660,21 +1661,6 @@ CCreaturePic::~CCreaturePic() } -void CCreaturePic::show(SDL_Surface *to) -{ - if(big) - blitAtLoc(graphics->backgrounds[c->faction],0,0,to); - else - blitAtLoc(graphics->backgroundsm[c->faction],0,0,to); - - CIntObject::show(to); -} - -void CCreaturePic::showAll(SDL_Surface *to) -{ - show(to); -} - void CRecruitmentWindow::close() { GH.popIntTotally(this); diff --git a/client/GUIClasses.h b/client/GUIClasses.h index bc4035a5a..b10959bce 100644 --- a/client/GUIClasses.h +++ b/client/GUIClasses.h @@ -444,16 +444,12 @@ public: class CCreaturePic : public CIntObject //draws picture with creature on background, use Animated=true to get animation { private: - const CCreature *c; //which creature's picture - bool big; //big => 100x130; !big => 100x120 + CPicture *bg; //background CCreatureAnim *anim; //displayed animation public: CCreaturePic(int x, int y, const CCreature *cre, bool Big=true, bool Animated=true); //c-tor ~CCreaturePic(); //d-tor - void show(SDL_Surface *to); //prints creature on screen - void showAll(SDL_Surface *to); - }; class CRecruitmentWindow : public CIntObject diff --git a/client/Makefile.am b/client/Makefile.am index 1d3594e2f..4c5884935 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,44 +1,23 @@ bin_PROGRAMS = vcmiclient -vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ +vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ vcmiclient_CXXFLAGS = @SDL_CXXFLAGS@ @FFMPEG_CXXFLAGS@ vcmiclient_LDFLAGS = -L$(top_builddir)/lib vcmiclient_SOURCES = \ - ../AI_Base.h \ ../CCallback.cpp \ ../CCallback.h \ + ../CConsoleHandler.cpp \ + ../CConsoleHandler.h \ ../CGameInterface.cpp \ ../CGameInterface.h \ ../CThreadHelper.cpp \ ../CThreadHelper.h \ - ../StartInfo.h \ - ../global.h \ - ../hch/CBuildingHandler.h \ - ../hch/CDefHandler.cpp \ - ../hch/CDefHandler.h \ - ../hch/CHeroHandler.h \ - ../hch/CMusicBase.h \ - ../hch/CMusicHandler.cpp \ - ../hch/CMusicHandler.h \ - ../hch/CObjectHandler.h \ - ../hch/CSndHandler.cpp \ - ../hch/CSndHandler.h \ - ../hch/CSoundBase.h \ - ../hch/CVideoHandler.cpp \ - ../hch/CVideoHandler.h \ - ../lib/CMapInfo.cpp \ - ../lib/CMapInfo.h \ - ../int3.h \ - ../nodrze.h \ - ../stdafx.h \ - ../tchar_amigaos4.h \ - ../timeHandler.h \ AdventureMapButton.cpp \ AdventureMapButton.h \ CAdvmapInterface.cpp \ CAdvmapInterface.h \ - CAnimation.h \ CAnimation.cpp \ + CAnimation.h \ CBattleInterface.cpp \ CBattleInterface.h \ CBitmapHandler.cpp \ @@ -51,35 +30,45 @@ vcmiclient_SOURCES = \ CCreatureAnimation.h \ CCursorHandler.cpp \ CCursorHandler.h \ + CDefHandler.cpp \ + CDefHandler.h \ CGameInfo.cpp \ CGameInfo.h \ CHeroWindow.cpp \ CHeroWindow.h \ CKingdomInterface.cpp \ CKingdomInterface.h \ - CMT.cpp \ + Client.cpp \ + Client.h \ CMessage.cpp \ CMessage.h \ + CMT.cpp \ + CMusicBase.h \ + CMusicHandler.cpp \ + CMusicHandler.h \ CPlayerInterface.cpp \ CPlayerInterface.h \ CPreGame.cpp \ CPreGame.h \ + CSndHandler.cpp \ + CSndHandler.h \ + CSoundBase.h \ CSpellWindow.cpp \ CSpellWindow.h \ - Client.cpp \ - Client.h \ + CVideoHandler.cpp \ + CVideoHandler.h \ FontBase.h \ FunctionList.h \ + Graphics.cpp \ + Graphics.h \ GUIBase.cpp \ GUIBase.h \ GUIClasses.cpp \ GUIClasses.h \ - Graphics.cpp \ - Graphics.h \ + mapHandler.cpp \ + mapHandler.h \ NetPacksClient.cpp \ SDL_Extensions.cpp \ SDL_Extensions.h \ SDL_framerate.cpp \ - SDL_framerate.h \ - mapHandler.cpp \ - mapHandler.h + SDL_framerate.h diff --git a/client/Makefile.in b/client/Makefile.in index ac24c5424..5b3ec4f84 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ $(top_srcdir)/aclocal/m4/libtool.m4 \ @@ -57,13 +58,9 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_vcmiclient_OBJECTS = vcmiclient-CCallback.$(OBJEXT) \ + vcmiclient-CConsoleHandler.$(OBJEXT) \ vcmiclient-CGameInterface.$(OBJEXT) \ vcmiclient-CThreadHelper.$(OBJEXT) \ - vcmiclient-CDefHandler.$(OBJEXT) \ - vcmiclient-CMusicHandler.$(OBJEXT) \ - vcmiclient-CSndHandler.$(OBJEXT) \ - vcmiclient-CVideoHandler.$(OBJEXT) \ - vcmiclient-CMapInfo.$(OBJEXT) \ vcmiclient-AdventureMapButton.$(OBJEXT) \ vcmiclient-CAdvmapInterface.$(OBJEXT) \ vcmiclient-CAnimation.$(OBJEXT) \ @@ -73,19 +70,22 @@ am_vcmiclient_OBJECTS = vcmiclient-CCallback.$(OBJEXT) \ vcmiclient-CConfigHandler.$(OBJEXT) \ vcmiclient-CCreatureAnimation.$(OBJEXT) \ vcmiclient-CCursorHandler.$(OBJEXT) \ + vcmiclient-CDefHandler.$(OBJEXT) \ vcmiclient-CGameInfo.$(OBJEXT) \ vcmiclient-CHeroWindow.$(OBJEXT) \ vcmiclient-CKingdomInterface.$(OBJEXT) \ - vcmiclient-CMT.$(OBJEXT) vcmiclient-CMessage.$(OBJEXT) \ + vcmiclient-Client.$(OBJEXT) vcmiclient-CMessage.$(OBJEXT) \ + vcmiclient-CMT.$(OBJEXT) vcmiclient-CMusicHandler.$(OBJEXT) \ vcmiclient-CPlayerInterface.$(OBJEXT) \ - vcmiclient-CPreGame.$(OBJEXT) \ - vcmiclient-CSpellWindow.$(OBJEXT) vcmiclient-Client.$(OBJEXT) \ - vcmiclient-GUIBase.$(OBJEXT) vcmiclient-GUIClasses.$(OBJEXT) \ - vcmiclient-Graphics.$(OBJEXT) \ + vcmiclient-CPreGame.$(OBJEXT) vcmiclient-CSndHandler.$(OBJEXT) \ + vcmiclient-CSpellWindow.$(OBJEXT) \ + vcmiclient-CVideoHandler.$(OBJEXT) \ + vcmiclient-Graphics.$(OBJEXT) vcmiclient-GUIBase.$(OBJEXT) \ + vcmiclient-GUIClasses.$(OBJEXT) \ + vcmiclient-mapHandler.$(OBJEXT) \ vcmiclient-NetPacksClient.$(OBJEXT) \ vcmiclient-SDL_Extensions.$(OBJEXT) \ - vcmiclient-SDL_framerate.$(OBJEXT) \ - vcmiclient-mapHandler.$(OBJEXT) + vcmiclient-SDL_framerate.$(OBJEXT) vcmiclient_OBJECTS = $(am_vcmiclient_OBJECTS) vcmiclient_DEPENDENCIES = $(top_builddir)/lib/libvcmi.la AM_V_lt = $(am__v_lt_$(V)) @@ -153,6 +153,7 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ @@ -269,45 +270,24 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ +vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ vcmiclient_CXXFLAGS = @SDL_CXXFLAGS@ @FFMPEG_CXXFLAGS@ vcmiclient_LDFLAGS = -L$(top_builddir)/lib vcmiclient_SOURCES = \ - ../AI_Base.h \ ../CCallback.cpp \ ../CCallback.h \ + ../CConsoleHandler.cpp \ + ../CConsoleHandler.h \ ../CGameInterface.cpp \ ../CGameInterface.h \ ../CThreadHelper.cpp \ ../CThreadHelper.h \ - ../StartInfo.h \ - ../global.h \ - ../hch/CBuildingHandler.h \ - ../hch/CDefHandler.cpp \ - ../hch/CDefHandler.h \ - ../hch/CHeroHandler.h \ - ../hch/CMusicBase.h \ - ../hch/CMusicHandler.cpp \ - ../hch/CMusicHandler.h \ - ../hch/CObjectHandler.h \ - ../hch/CSndHandler.cpp \ - ../hch/CSndHandler.h \ - ../hch/CSoundBase.h \ - ../hch/CVideoHandler.cpp \ - ../hch/CVideoHandler.h \ - ../lib/CMapInfo.cpp \ - ../lib/CMapInfo.h \ - ../int3.h \ - ../nodrze.h \ - ../stdafx.h \ - ../tchar_amigaos4.h \ - ../timeHandler.h \ AdventureMapButton.cpp \ AdventureMapButton.h \ CAdvmapInterface.cpp \ CAdvmapInterface.h \ - CAnimation.h \ CAnimation.cpp \ + CAnimation.h \ CBattleInterface.cpp \ CBattleInterface.h \ CBitmapHandler.cpp \ @@ -320,38 +300,48 @@ vcmiclient_SOURCES = \ CCreatureAnimation.h \ CCursorHandler.cpp \ CCursorHandler.h \ + CDefHandler.cpp \ + CDefHandler.h \ CGameInfo.cpp \ CGameInfo.h \ CHeroWindow.cpp \ CHeroWindow.h \ CKingdomInterface.cpp \ CKingdomInterface.h \ - CMT.cpp \ + Client.cpp \ + Client.h \ CMessage.cpp \ CMessage.h \ + CMT.cpp \ + CMusicBase.h \ + CMusicHandler.cpp \ + CMusicHandler.h \ CPlayerInterface.cpp \ CPlayerInterface.h \ CPreGame.cpp \ CPreGame.h \ + CSndHandler.cpp \ + CSndHandler.h \ + CSoundBase.h \ CSpellWindow.cpp \ CSpellWindow.h \ - Client.cpp \ - Client.h \ + CVideoHandler.cpp \ + CVideoHandler.h \ FontBase.h \ FunctionList.h \ + Graphics.cpp \ + Graphics.h \ GUIBase.cpp \ GUIBase.h \ GUIClasses.cpp \ GUIClasses.h \ - Graphics.cpp \ - Graphics.h \ + mapHandler.cpp \ + mapHandler.h \ NetPacksClient.cpp \ SDL_Extensions.cpp \ SDL_Extensions.h \ SDL_framerate.cpp \ - SDL_framerate.h \ - mapHandler.cpp \ - mapHandler.h + SDL_framerate.h all: all-am @@ -448,6 +438,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CCallback.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CCastleInterface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CConfigHandler.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CConsoleHandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CCreatureAnimation.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CCursorHandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CDefHandler.Po@am__quote@ @@ -456,7 +447,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CHeroWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CKingdomInterface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CMT.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CMapInfo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CMessage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CMusicHandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CPlayerInterface.Po@am__quote@ @@ -514,6 +504,22 @@ vcmiclient-CCallback.obj: ../CCallback.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CCallback.obj `if test -f '../CCallback.cpp'; then $(CYGPATH_W) '../CCallback.cpp'; else $(CYGPATH_W) '$(srcdir)/../CCallback.cpp'; fi` +vcmiclient-CConsoleHandler.o: ../CConsoleHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CConsoleHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CConsoleHandler.Tpo -c -o vcmiclient-CConsoleHandler.o `test -f '../CConsoleHandler.cpp' || echo '$(srcdir)/'`../CConsoleHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CConsoleHandler.Tpo $(DEPDIR)/vcmiclient-CConsoleHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../CConsoleHandler.cpp' object='vcmiclient-CConsoleHandler.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CConsoleHandler.o `test -f '../CConsoleHandler.cpp' || echo '$(srcdir)/'`../CConsoleHandler.cpp + +vcmiclient-CConsoleHandler.obj: ../CConsoleHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CConsoleHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CConsoleHandler.Tpo -c -o vcmiclient-CConsoleHandler.obj `if test -f '../CConsoleHandler.cpp'; then $(CYGPATH_W) '../CConsoleHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../CConsoleHandler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CConsoleHandler.Tpo $(DEPDIR)/vcmiclient-CConsoleHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../CConsoleHandler.cpp' object='vcmiclient-CConsoleHandler.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CConsoleHandler.obj `if test -f '../CConsoleHandler.cpp'; then $(CYGPATH_W) '../CConsoleHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../CConsoleHandler.cpp'; fi` + vcmiclient-CGameInterface.o: ../CGameInterface.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CGameInterface.o -MD -MP -MF $(DEPDIR)/vcmiclient-CGameInterface.Tpo -c -o vcmiclient-CGameInterface.o `test -f '../CGameInterface.cpp' || echo '$(srcdir)/'`../CGameInterface.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CGameInterface.Tpo $(DEPDIR)/vcmiclient-CGameInterface.Po @@ -546,86 +552,6 @@ vcmiclient-CThreadHelper.obj: ../CThreadHelper.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CThreadHelper.obj `if test -f '../CThreadHelper.cpp'; then $(CYGPATH_W) '../CThreadHelper.cpp'; else $(CYGPATH_W) '$(srcdir)/../CThreadHelper.cpp'; fi` -vcmiclient-CDefHandler.o: ../hch/CDefHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CDefHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CDefHandler.Tpo -c -o vcmiclient-CDefHandler.o `test -f '../hch/CDefHandler.cpp' || echo '$(srcdir)/'`../hch/CDefHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CDefHandler.Tpo $(DEPDIR)/vcmiclient-CDefHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CDefHandler.cpp' object='vcmiclient-CDefHandler.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CDefHandler.o `test -f '../hch/CDefHandler.cpp' || echo '$(srcdir)/'`../hch/CDefHandler.cpp - -vcmiclient-CDefHandler.obj: ../hch/CDefHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CDefHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CDefHandler.Tpo -c -o vcmiclient-CDefHandler.obj `if test -f '../hch/CDefHandler.cpp'; then $(CYGPATH_W) '../hch/CDefHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CDefHandler.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CDefHandler.Tpo $(DEPDIR)/vcmiclient-CDefHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CDefHandler.cpp' object='vcmiclient-CDefHandler.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CDefHandler.obj `if test -f '../hch/CDefHandler.cpp'; then $(CYGPATH_W) '../hch/CDefHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CDefHandler.cpp'; fi` - -vcmiclient-CMusicHandler.o: ../hch/CMusicHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMusicHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CMusicHandler.Tpo -c -o vcmiclient-CMusicHandler.o `test -f '../hch/CMusicHandler.cpp' || echo '$(srcdir)/'`../hch/CMusicHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMusicHandler.Tpo $(DEPDIR)/vcmiclient-CMusicHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CMusicHandler.cpp' object='vcmiclient-CMusicHandler.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMusicHandler.o `test -f '../hch/CMusicHandler.cpp' || echo '$(srcdir)/'`../hch/CMusicHandler.cpp - -vcmiclient-CMusicHandler.obj: ../hch/CMusicHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMusicHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CMusicHandler.Tpo -c -o vcmiclient-CMusicHandler.obj `if test -f '../hch/CMusicHandler.cpp'; then $(CYGPATH_W) '../hch/CMusicHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CMusicHandler.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMusicHandler.Tpo $(DEPDIR)/vcmiclient-CMusicHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CMusicHandler.cpp' object='vcmiclient-CMusicHandler.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMusicHandler.obj `if test -f '../hch/CMusicHandler.cpp'; then $(CYGPATH_W) '../hch/CMusicHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CMusicHandler.cpp'; fi` - -vcmiclient-CSndHandler.o: ../hch/CSndHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CSndHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CSndHandler.Tpo -c -o vcmiclient-CSndHandler.o `test -f '../hch/CSndHandler.cpp' || echo '$(srcdir)/'`../hch/CSndHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CSndHandler.Tpo $(DEPDIR)/vcmiclient-CSndHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CSndHandler.cpp' object='vcmiclient-CSndHandler.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CSndHandler.o `test -f '../hch/CSndHandler.cpp' || echo '$(srcdir)/'`../hch/CSndHandler.cpp - -vcmiclient-CSndHandler.obj: ../hch/CSndHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CSndHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CSndHandler.Tpo -c -o vcmiclient-CSndHandler.obj `if test -f '../hch/CSndHandler.cpp'; then $(CYGPATH_W) '../hch/CSndHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CSndHandler.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CSndHandler.Tpo $(DEPDIR)/vcmiclient-CSndHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CSndHandler.cpp' object='vcmiclient-CSndHandler.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CSndHandler.obj `if test -f '../hch/CSndHandler.cpp'; then $(CYGPATH_W) '../hch/CSndHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CSndHandler.cpp'; fi` - -vcmiclient-CVideoHandler.o: ../hch/CVideoHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CVideoHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CVideoHandler.Tpo -c -o vcmiclient-CVideoHandler.o `test -f '../hch/CVideoHandler.cpp' || echo '$(srcdir)/'`../hch/CVideoHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CVideoHandler.Tpo $(DEPDIR)/vcmiclient-CVideoHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CVideoHandler.cpp' object='vcmiclient-CVideoHandler.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CVideoHandler.o `test -f '../hch/CVideoHandler.cpp' || echo '$(srcdir)/'`../hch/CVideoHandler.cpp - -vcmiclient-CVideoHandler.obj: ../hch/CVideoHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CVideoHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CVideoHandler.Tpo -c -o vcmiclient-CVideoHandler.obj `if test -f '../hch/CVideoHandler.cpp'; then $(CYGPATH_W) '../hch/CVideoHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CVideoHandler.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CVideoHandler.Tpo $(DEPDIR)/vcmiclient-CVideoHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CVideoHandler.cpp' object='vcmiclient-CVideoHandler.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CVideoHandler.obj `if test -f '../hch/CVideoHandler.cpp'; then $(CYGPATH_W) '../hch/CVideoHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../hch/CVideoHandler.cpp'; fi` - -vcmiclient-CMapInfo.o: ../lib/CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMapInfo.o -MD -MP -MF $(DEPDIR)/vcmiclient-CMapInfo.Tpo -c -o vcmiclient-CMapInfo.o `test -f '../lib/CMapInfo.cpp' || echo '$(srcdir)/'`../lib/CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMapInfo.Tpo $(DEPDIR)/vcmiclient-CMapInfo.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../lib/CMapInfo.cpp' object='vcmiclient-CMapInfo.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMapInfo.o `test -f '../lib/CMapInfo.cpp' || echo '$(srcdir)/'`../lib/CMapInfo.cpp - -vcmiclient-CMapInfo.obj: ../lib/CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMapInfo.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CMapInfo.Tpo -c -o vcmiclient-CMapInfo.obj `if test -f '../lib/CMapInfo.cpp'; then $(CYGPATH_W) '../lib/CMapInfo.cpp'; else $(CYGPATH_W) '$(srcdir)/../lib/CMapInfo.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMapInfo.Tpo $(DEPDIR)/vcmiclient-CMapInfo.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../lib/CMapInfo.cpp' object='vcmiclient-CMapInfo.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMapInfo.obj `if test -f '../lib/CMapInfo.cpp'; then $(CYGPATH_W) '../lib/CMapInfo.cpp'; else $(CYGPATH_W) '$(srcdir)/../lib/CMapInfo.cpp'; fi` - vcmiclient-AdventureMapButton.o: AdventureMapButton.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-AdventureMapButton.o -MD -MP -MF $(DEPDIR)/vcmiclient-AdventureMapButton.Tpo -c -o vcmiclient-AdventureMapButton.o `test -f 'AdventureMapButton.cpp' || echo '$(srcdir)/'`AdventureMapButton.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-AdventureMapButton.Tpo $(DEPDIR)/vcmiclient-AdventureMapButton.Po @@ -770,6 +696,22 @@ vcmiclient-CCursorHandler.obj: CCursorHandler.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CCursorHandler.obj `if test -f 'CCursorHandler.cpp'; then $(CYGPATH_W) 'CCursorHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CCursorHandler.cpp'; fi` +vcmiclient-CDefHandler.o: CDefHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CDefHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CDefHandler.Tpo -c -o vcmiclient-CDefHandler.o `test -f 'CDefHandler.cpp' || echo '$(srcdir)/'`CDefHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CDefHandler.Tpo $(DEPDIR)/vcmiclient-CDefHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CDefHandler.cpp' object='vcmiclient-CDefHandler.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CDefHandler.o `test -f 'CDefHandler.cpp' || echo '$(srcdir)/'`CDefHandler.cpp + +vcmiclient-CDefHandler.obj: CDefHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CDefHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CDefHandler.Tpo -c -o vcmiclient-CDefHandler.obj `if test -f 'CDefHandler.cpp'; then $(CYGPATH_W) 'CDefHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CDefHandler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CDefHandler.Tpo $(DEPDIR)/vcmiclient-CDefHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CDefHandler.cpp' object='vcmiclient-CDefHandler.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CDefHandler.obj `if test -f 'CDefHandler.cpp'; then $(CYGPATH_W) 'CDefHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CDefHandler.cpp'; fi` + vcmiclient-CGameInfo.o: CGameInfo.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CGameInfo.o -MD -MP -MF $(DEPDIR)/vcmiclient-CGameInfo.Tpo -c -o vcmiclient-CGameInfo.o `test -f 'CGameInfo.cpp' || echo '$(srcdir)/'`CGameInfo.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CGameInfo.Tpo $(DEPDIR)/vcmiclient-CGameInfo.Po @@ -818,21 +760,21 @@ vcmiclient-CKingdomInterface.obj: CKingdomInterface.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CKingdomInterface.obj `if test -f 'CKingdomInterface.cpp'; then $(CYGPATH_W) 'CKingdomInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/CKingdomInterface.cpp'; fi` -vcmiclient-CMT.o: CMT.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMT.o -MD -MP -MF $(DEPDIR)/vcmiclient-CMT.Tpo -c -o vcmiclient-CMT.o `test -f 'CMT.cpp' || echo '$(srcdir)/'`CMT.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMT.Tpo $(DEPDIR)/vcmiclient-CMT.Po +vcmiclient-Client.o: Client.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Client.o -MD -MP -MF $(DEPDIR)/vcmiclient-Client.Tpo -c -o vcmiclient-Client.o `test -f 'Client.cpp' || echo '$(srcdir)/'`Client.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Client.Tpo $(DEPDIR)/vcmiclient-Client.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMT.cpp' object='vcmiclient-CMT.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Client.cpp' object='vcmiclient-Client.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMT.o `test -f 'CMT.cpp' || echo '$(srcdir)/'`CMT.cpp +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Client.o `test -f 'Client.cpp' || echo '$(srcdir)/'`Client.cpp -vcmiclient-CMT.obj: CMT.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMT.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CMT.Tpo -c -o vcmiclient-CMT.obj `if test -f 'CMT.cpp'; then $(CYGPATH_W) 'CMT.cpp'; else $(CYGPATH_W) '$(srcdir)/CMT.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMT.Tpo $(DEPDIR)/vcmiclient-CMT.Po +vcmiclient-Client.obj: Client.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Client.obj -MD -MP -MF $(DEPDIR)/vcmiclient-Client.Tpo -c -o vcmiclient-Client.obj `if test -f 'Client.cpp'; then $(CYGPATH_W) 'Client.cpp'; else $(CYGPATH_W) '$(srcdir)/Client.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Client.Tpo $(DEPDIR)/vcmiclient-Client.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMT.cpp' object='vcmiclient-CMT.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Client.cpp' object='vcmiclient-Client.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMT.obj `if test -f 'CMT.cpp'; then $(CYGPATH_W) 'CMT.cpp'; else $(CYGPATH_W) '$(srcdir)/CMT.cpp'; fi` +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Client.obj `if test -f 'Client.cpp'; then $(CYGPATH_W) 'Client.cpp'; else $(CYGPATH_W) '$(srcdir)/Client.cpp'; fi` vcmiclient-CMessage.o: CMessage.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMessage.o -MD -MP -MF $(DEPDIR)/vcmiclient-CMessage.Tpo -c -o vcmiclient-CMessage.o `test -f 'CMessage.cpp' || echo '$(srcdir)/'`CMessage.cpp @@ -850,6 +792,38 @@ vcmiclient-CMessage.obj: CMessage.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMessage.obj `if test -f 'CMessage.cpp'; then $(CYGPATH_W) 'CMessage.cpp'; else $(CYGPATH_W) '$(srcdir)/CMessage.cpp'; fi` +vcmiclient-CMT.o: CMT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMT.o -MD -MP -MF $(DEPDIR)/vcmiclient-CMT.Tpo -c -o vcmiclient-CMT.o `test -f 'CMT.cpp' || echo '$(srcdir)/'`CMT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMT.Tpo $(DEPDIR)/vcmiclient-CMT.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMT.cpp' object='vcmiclient-CMT.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMT.o `test -f 'CMT.cpp' || echo '$(srcdir)/'`CMT.cpp + +vcmiclient-CMT.obj: CMT.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMT.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CMT.Tpo -c -o vcmiclient-CMT.obj `if test -f 'CMT.cpp'; then $(CYGPATH_W) 'CMT.cpp'; else $(CYGPATH_W) '$(srcdir)/CMT.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMT.Tpo $(DEPDIR)/vcmiclient-CMT.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMT.cpp' object='vcmiclient-CMT.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMT.obj `if test -f 'CMT.cpp'; then $(CYGPATH_W) 'CMT.cpp'; else $(CYGPATH_W) '$(srcdir)/CMT.cpp'; fi` + +vcmiclient-CMusicHandler.o: CMusicHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMusicHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CMusicHandler.Tpo -c -o vcmiclient-CMusicHandler.o `test -f 'CMusicHandler.cpp' || echo '$(srcdir)/'`CMusicHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMusicHandler.Tpo $(DEPDIR)/vcmiclient-CMusicHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMusicHandler.cpp' object='vcmiclient-CMusicHandler.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMusicHandler.o `test -f 'CMusicHandler.cpp' || echo '$(srcdir)/'`CMusicHandler.cpp + +vcmiclient-CMusicHandler.obj: CMusicHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CMusicHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CMusicHandler.Tpo -c -o vcmiclient-CMusicHandler.obj `if test -f 'CMusicHandler.cpp'; then $(CYGPATH_W) 'CMusicHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CMusicHandler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CMusicHandler.Tpo $(DEPDIR)/vcmiclient-CMusicHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMusicHandler.cpp' object='vcmiclient-CMusicHandler.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CMusicHandler.obj `if test -f 'CMusicHandler.cpp'; then $(CYGPATH_W) 'CMusicHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CMusicHandler.cpp'; fi` + vcmiclient-CPlayerInterface.o: CPlayerInterface.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CPlayerInterface.o -MD -MP -MF $(DEPDIR)/vcmiclient-CPlayerInterface.Tpo -c -o vcmiclient-CPlayerInterface.o `test -f 'CPlayerInterface.cpp' || echo '$(srcdir)/'`CPlayerInterface.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CPlayerInterface.Tpo $(DEPDIR)/vcmiclient-CPlayerInterface.Po @@ -882,6 +856,22 @@ vcmiclient-CPreGame.obj: CPreGame.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CPreGame.obj `if test -f 'CPreGame.cpp'; then $(CYGPATH_W) 'CPreGame.cpp'; else $(CYGPATH_W) '$(srcdir)/CPreGame.cpp'; fi` +vcmiclient-CSndHandler.o: CSndHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CSndHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CSndHandler.Tpo -c -o vcmiclient-CSndHandler.o `test -f 'CSndHandler.cpp' || echo '$(srcdir)/'`CSndHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CSndHandler.Tpo $(DEPDIR)/vcmiclient-CSndHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CSndHandler.cpp' object='vcmiclient-CSndHandler.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CSndHandler.o `test -f 'CSndHandler.cpp' || echo '$(srcdir)/'`CSndHandler.cpp + +vcmiclient-CSndHandler.obj: CSndHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CSndHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CSndHandler.Tpo -c -o vcmiclient-CSndHandler.obj `if test -f 'CSndHandler.cpp'; then $(CYGPATH_W) 'CSndHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CSndHandler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CSndHandler.Tpo $(DEPDIR)/vcmiclient-CSndHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CSndHandler.cpp' object='vcmiclient-CSndHandler.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CSndHandler.obj `if test -f 'CSndHandler.cpp'; then $(CYGPATH_W) 'CSndHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CSndHandler.cpp'; fi` + vcmiclient-CSpellWindow.o: CSpellWindow.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CSpellWindow.o -MD -MP -MF $(DEPDIR)/vcmiclient-CSpellWindow.Tpo -c -o vcmiclient-CSpellWindow.o `test -f 'CSpellWindow.cpp' || echo '$(srcdir)/'`CSpellWindow.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CSpellWindow.Tpo $(DEPDIR)/vcmiclient-CSpellWindow.Po @@ -898,21 +888,37 @@ vcmiclient-CSpellWindow.obj: CSpellWindow.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CSpellWindow.obj `if test -f 'CSpellWindow.cpp'; then $(CYGPATH_W) 'CSpellWindow.cpp'; else $(CYGPATH_W) '$(srcdir)/CSpellWindow.cpp'; fi` -vcmiclient-Client.o: Client.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Client.o -MD -MP -MF $(DEPDIR)/vcmiclient-Client.Tpo -c -o vcmiclient-Client.o `test -f 'Client.cpp' || echo '$(srcdir)/'`Client.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Client.Tpo $(DEPDIR)/vcmiclient-Client.Po +vcmiclient-CVideoHandler.o: CVideoHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CVideoHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-CVideoHandler.Tpo -c -o vcmiclient-CVideoHandler.o `test -f 'CVideoHandler.cpp' || echo '$(srcdir)/'`CVideoHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CVideoHandler.Tpo $(DEPDIR)/vcmiclient-CVideoHandler.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Client.cpp' object='vcmiclient-Client.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CVideoHandler.cpp' object='vcmiclient-CVideoHandler.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Client.o `test -f 'Client.cpp' || echo '$(srcdir)/'`Client.cpp +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CVideoHandler.o `test -f 'CVideoHandler.cpp' || echo '$(srcdir)/'`CVideoHandler.cpp -vcmiclient-Client.obj: Client.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Client.obj -MD -MP -MF $(DEPDIR)/vcmiclient-Client.Tpo -c -o vcmiclient-Client.obj `if test -f 'Client.cpp'; then $(CYGPATH_W) 'Client.cpp'; else $(CYGPATH_W) '$(srcdir)/Client.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Client.Tpo $(DEPDIR)/vcmiclient-Client.Po +vcmiclient-CVideoHandler.obj: CVideoHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-CVideoHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-CVideoHandler.Tpo -c -o vcmiclient-CVideoHandler.obj `if test -f 'CVideoHandler.cpp'; then $(CYGPATH_W) 'CVideoHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CVideoHandler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-CVideoHandler.Tpo $(DEPDIR)/vcmiclient-CVideoHandler.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Client.cpp' object='vcmiclient-Client.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CVideoHandler.cpp' object='vcmiclient-CVideoHandler.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Client.obj `if test -f 'Client.cpp'; then $(CYGPATH_W) 'Client.cpp'; else $(CYGPATH_W) '$(srcdir)/Client.cpp'; fi` +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-CVideoHandler.obj `if test -f 'CVideoHandler.cpp'; then $(CYGPATH_W) 'CVideoHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/CVideoHandler.cpp'; fi` + +vcmiclient-Graphics.o: Graphics.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Graphics.o -MD -MP -MF $(DEPDIR)/vcmiclient-Graphics.Tpo -c -o vcmiclient-Graphics.o `test -f 'Graphics.cpp' || echo '$(srcdir)/'`Graphics.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Graphics.Tpo $(DEPDIR)/vcmiclient-Graphics.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Graphics.cpp' object='vcmiclient-Graphics.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Graphics.o `test -f 'Graphics.cpp' || echo '$(srcdir)/'`Graphics.cpp + +vcmiclient-Graphics.obj: Graphics.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Graphics.obj -MD -MP -MF $(DEPDIR)/vcmiclient-Graphics.Tpo -c -o vcmiclient-Graphics.obj `if test -f 'Graphics.cpp'; then $(CYGPATH_W) 'Graphics.cpp'; else $(CYGPATH_W) '$(srcdir)/Graphics.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Graphics.Tpo $(DEPDIR)/vcmiclient-Graphics.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Graphics.cpp' object='vcmiclient-Graphics.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Graphics.obj `if test -f 'Graphics.cpp'; then $(CYGPATH_W) 'Graphics.cpp'; else $(CYGPATH_W) '$(srcdir)/Graphics.cpp'; fi` vcmiclient-GUIBase.o: GUIBase.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-GUIBase.o -MD -MP -MF $(DEPDIR)/vcmiclient-GUIBase.Tpo -c -o vcmiclient-GUIBase.o `test -f 'GUIBase.cpp' || echo '$(srcdir)/'`GUIBase.cpp @@ -946,21 +952,21 @@ vcmiclient-GUIClasses.obj: GUIClasses.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-GUIClasses.obj `if test -f 'GUIClasses.cpp'; then $(CYGPATH_W) 'GUIClasses.cpp'; else $(CYGPATH_W) '$(srcdir)/GUIClasses.cpp'; fi` -vcmiclient-Graphics.o: Graphics.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Graphics.o -MD -MP -MF $(DEPDIR)/vcmiclient-Graphics.Tpo -c -o vcmiclient-Graphics.o `test -f 'Graphics.cpp' || echo '$(srcdir)/'`Graphics.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Graphics.Tpo $(DEPDIR)/vcmiclient-Graphics.Po +vcmiclient-mapHandler.o: mapHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-mapHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-mapHandler.Tpo -c -o vcmiclient-mapHandler.o `test -f 'mapHandler.cpp' || echo '$(srcdir)/'`mapHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-mapHandler.Tpo $(DEPDIR)/vcmiclient-mapHandler.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Graphics.cpp' object='vcmiclient-Graphics.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mapHandler.cpp' object='vcmiclient-mapHandler.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Graphics.o `test -f 'Graphics.cpp' || echo '$(srcdir)/'`Graphics.cpp +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-mapHandler.o `test -f 'mapHandler.cpp' || echo '$(srcdir)/'`mapHandler.cpp -vcmiclient-Graphics.obj: Graphics.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-Graphics.obj -MD -MP -MF $(DEPDIR)/vcmiclient-Graphics.Tpo -c -o vcmiclient-Graphics.obj `if test -f 'Graphics.cpp'; then $(CYGPATH_W) 'Graphics.cpp'; else $(CYGPATH_W) '$(srcdir)/Graphics.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-Graphics.Tpo $(DEPDIR)/vcmiclient-Graphics.Po +vcmiclient-mapHandler.obj: mapHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-mapHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-mapHandler.Tpo -c -o vcmiclient-mapHandler.obj `if test -f 'mapHandler.cpp'; then $(CYGPATH_W) 'mapHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/mapHandler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-mapHandler.Tpo $(DEPDIR)/vcmiclient-mapHandler.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Graphics.cpp' object='vcmiclient-Graphics.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mapHandler.cpp' object='vcmiclient-mapHandler.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Graphics.obj `if test -f 'Graphics.cpp'; then $(CYGPATH_W) 'Graphics.cpp'; else $(CYGPATH_W) '$(srcdir)/Graphics.cpp'; fi` +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-mapHandler.obj `if test -f 'mapHandler.cpp'; then $(CYGPATH_W) 'mapHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/mapHandler.cpp'; fi` vcmiclient-NetPacksClient.o: NetPacksClient.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-NetPacksClient.o -MD -MP -MF $(DEPDIR)/vcmiclient-NetPacksClient.Tpo -c -o vcmiclient-NetPacksClient.o `test -f 'NetPacksClient.cpp' || echo '$(srcdir)/'`NetPacksClient.cpp @@ -1010,22 +1016,6 @@ vcmiclient-SDL_framerate.obj: SDL_framerate.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-SDL_framerate.obj `if test -f 'SDL_framerate.cpp'; then $(CYGPATH_W) 'SDL_framerate.cpp'; else $(CYGPATH_W) '$(srcdir)/SDL_framerate.cpp'; fi` -vcmiclient-mapHandler.o: mapHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-mapHandler.o -MD -MP -MF $(DEPDIR)/vcmiclient-mapHandler.Tpo -c -o vcmiclient-mapHandler.o `test -f 'mapHandler.cpp' || echo '$(srcdir)/'`mapHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-mapHandler.Tpo $(DEPDIR)/vcmiclient-mapHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mapHandler.cpp' object='vcmiclient-mapHandler.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-mapHandler.o `test -f 'mapHandler.cpp' || echo '$(srcdir)/'`mapHandler.cpp - -vcmiclient-mapHandler.obj: mapHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-mapHandler.obj -MD -MP -MF $(DEPDIR)/vcmiclient-mapHandler.Tpo -c -o vcmiclient-mapHandler.obj `if test -f 'mapHandler.cpp'; then $(CYGPATH_W) 'mapHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/mapHandler.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiclient-mapHandler.Tpo $(DEPDIR)/vcmiclient-mapHandler.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mapHandler.cpp' object='vcmiclient-mapHandler.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-mapHandler.obj `if test -f 'mapHandler.cpp'; then $(CYGPATH_W) 'mapHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/mapHandler.cpp'; fi` - mostlyclean-libtool: -rm -f *.lo diff --git a/client/SDL_Extensions.cpp b/client/SDL_Extensions.cpp index 7902f72e7..26eaa9648 100644 --- a/client/SDL_Extensions.cpp +++ b/client/SDL_Extensions.cpp @@ -61,9 +61,9 @@ STRONG_INLINE void ColorPutter::PutColorAlphaSwitch(Uint8 *&p template STRONG_INLINE void ColorPutter::PutColor(Uint8 *&ptr, const Uint8 & R, const Uint8 & G, const Uint8 & B, const Uint8 & A) { - PutColor(ptr, (((Uint32)ptr[2]-(Uint32)R)*(Uint32)A) >> (8 + (Uint32)R), - (((Uint32)ptr[1]-(Uint32)G)*(Uint32)A) >> (8 + (Uint32)G), - (((Uint32)ptr[0]-(Uint32)B)*(Uint32)A) >> (8 + (Uint32)B)); + PutColor(ptr, ((((Uint32)ptr[2]-(Uint32)R)*(Uint32)A) >> 8 ) + (Uint32)R, + ((((Uint32)ptr[1]-(Uint32)G)*(Uint32)A) >> 8 ) + (Uint32)G, + ((((Uint32)ptr[0]-(Uint32)B)*(Uint32)A) >> 8 ) + (Uint32)B); } @@ -1295,3 +1295,8 @@ void CSDL_Ext::fillRect( SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color ) } SDL_Surface * CSDL_Ext::std32bppSurface = NULL; + +//instantiation of templates used in CAnimation, required for correct linking +template struct ColorPutter<2,1>; +template struct ColorPutter<3,1>; +template struct ColorPutter<4,1>; \ No newline at end of file diff --git a/client/SDL_Extensions.h b/client/SDL_Extensions.h index 4726eb545..2889706ab 100644 --- a/client/SDL_Extensions.h +++ b/client/SDL_Extensions.h @@ -22,8 +22,9 @@ //A macro to force inlining some of our functions. Compiler (at least MSVC) is not so smart here-> without that displaying is MUCH slower #ifdef _MSC_VER #define STRONG_INLINE __forceinline +#elif __GNUC__ + #define STRONG_INLINE __attribute__((always_inline)) #else - //TODO: GCC counterpart? #define STRONG_INLINE inline #endif @@ -88,7 +89,8 @@ inline SDL_Rect genRect(const int & hh, const int & ww, const int & xx, const in return ret; } - +//TODO: inlining will work only if functions are defined in each compilation unit (like placing them in headers) +//however here PutColor defined in SDL_Extensions.cpp, but used in CAnimation.cpp and CCreatureAnimation.cpp template struct ColorPutter { diff --git a/configure b/configure index 9b71f462a..ffdf08c27 100755 --- a/configure +++ b/configure @@ -748,6 +748,7 @@ FFMPEG_LIBS SDL_CXXFLAGS SDL_LIBS HAVE_SDL_CONFIG +BOOST_PROGRAM_OPTIONS_LIB BOOST_IOSTREAMS_LIB BOOST_THREAD_LIB BOOST_FILESYSTEM_LIB @@ -886,6 +887,7 @@ with_boost_system with_boost_filesystem with_boost_thread with_boost_iostreams +with_boost_program_options ' ac_precious_vars='build_alias host_alias @@ -1562,6 +1564,11 @@ Optional Packages: possible to specify a certain library for the linker e.g. --with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 + --with-boost-program-options[=special-lib] + use the program options library from boost - it is + possible to specify a certain library for the linker + e.g. + --with-boost-program-options=boost_program_options-gcc-mt-1_33_1 Some influential environment variables: CXX C++ compiler command @@ -5206,13 +5213,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5209: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5216: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5212: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5219: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5215: output\"" >&5) + (eval echo "\"\$as_me:5222: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6418,7 +6425,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6421 "configure"' > conftest.$ac_ext + echo '#line 6428 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8414,11 +8421,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8417: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8424: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8421: \$? = $ac_status" >&5 + echo "$as_me:8428: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8753,11 +8760,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8756: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8763: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8760: \$? = $ac_status" >&5 + echo "$as_me:8767: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8858,11 +8865,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8861: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8868: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8865: \$? = $ac_status" >&5 + echo "$as_me:8872: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8913,11 +8920,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8916: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8923: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8920: \$? = $ac_status" >&5 + echo "$as_me:8927: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11293,7 +11300,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11296 "configure" +#line 11303 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11389,7 +11396,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11392 "configure" +#line 11399 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13345,11 +13352,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13348: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13355: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13352: \$? = $ac_status" >&5 + echo "$as_me:13359: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13444,11 +13451,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13447: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13454: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13451: \$? = $ac_status" >&5 + echo "$as_me:13458: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13496,11 +13503,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13499: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13506: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13503: \$? = $ac_status" >&5 + echo "$as_me:13510: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15707,6 +15714,231 @@ fi fi + +# Check whether --with-boost-program-options was given. +if test "${with_boost_program_options+set}" = set; then : + withval=$with_boost_program_options; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_program_options_lib="" + else + want_boost="yes" + ax_boost_user_program_options_lib="$withval" + fi + +else + want_boost="yes" + +fi + + + if test "x$want_boost" = "xyes"; then + + export want_boost + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Program_Options library is available" >&5 +$as_echo_n "checking whether the Boost::Program_Options library is available... " >&6; } +if test "${ax_cv_boost_program_options+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +boost::program_options::options_description generic("Generic options"); + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_program_options=yes +else + ax_cv_boost_program_options=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_program_options" >&5 +$as_echo "$ax_cv_boost_program_options" >&6; } + if test "$ax_cv_boost_program_options" = yes; then + +$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS /**/" >>confdefs.h + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + if test "x$ax_boost_user_program_options_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_program_options="yes"; break +else + link_program_options="no" +fi + + done + if test "x$link_program_options" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_program_options*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_program_options="yes"; break +else + link_program_options="no" +fi + + done + fi + else + for ax_lib in $ax_boost_user_program_options_lib boost_program_options-$ax_boost_user_program_options_lib; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5 +$as_echo_n "checking for main in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_program_options="yes"; break +else + link_program_options="no" +fi + + done + fi + if test "x$ax_lib" = "x"; then + as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 + fi + if test "x$link_program_options" != "xyes"; then + as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + fi + fi + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi + + # Check for SDL libraries saved_LIBS=$LIBS # Extract the first word of "sdl-config", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index be53bc40d..0f171e87d 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ AX_BOOST_SYSTEM AX_BOOST_FILESYSTEM AX_BOOST_THREAD AX_BOOST_IOSTREAMS +AX_BOOST_PROGRAM_OPTIONS # Check for SDL libraries saved_LIBS=$LIBS diff --git a/global.h b/global.h index 3ddf5bb02..633a02f6d 100644 --- a/global.h +++ b/global.h @@ -378,8 +378,7 @@ class bmap : public std::map public: const ValT & operator[](KeyT key) const { - const_iterator it = find(key); - return it->second; + return find(key)->second; } ValT & operator[](KeyT key) { diff --git a/lib/BattleAction.h b/lib/BattleAction.h index 5d702ebd0..ef5f0694f 100644 --- a/lib/BattleAction.h +++ b/lib/BattleAction.h @@ -1,4 +1,4 @@ -#pragma once; +#pragma once #ifndef __BATTLEACTION_H__ #define __BATTLEACTION_H__ diff --git a/lib/BattleState.h b/lib/BattleState.h index f9b8c7c02..e41becee8 100644 --- a/lib/BattleState.h +++ b/lib/BattleState.h @@ -3,6 +3,8 @@ #include "../global.h" #include "HeroBonus.h" #include "CCreatureSet.h" +#include "CObjectHandler.h" +#include "CCreatureHandler.h" #include "ConstTransitivePtr.h" @@ -112,7 +114,7 @@ struct DLL_EXPORT BattleInfo : public CBonusSystemNode const CGHeroInstance * battleGetOwner(const CStack * stack) const; //returns hero that owns given stack; NULL if none si8 battleMaxSpellLevel() const; //calculates maximum spell level possible to be cast on battlefield - takes into account artifacts of both heroes; if no effects are set, SPELL_LEVELS is returned void localInit(); - static BattleInfo * BattleInfo::setupBattle( int3 tile, int terrain, int terType, const CArmedInstance *armies[2], const CGHeroInstance * heroes[2], bool creatureBank, const CGTownInstance *town ); + static BattleInfo * setupBattle( int3 tile, int terrain, int terType, const CArmedInstance *armies[2], const CGHeroInstance * heroes[2], bool creatureBank, const CGTownInstance *town ); }; class DLL_EXPORT CStack : public CBonusSystemNode, public CStackBasicDescriptor diff --git a/lib/CBuildingHandler.cpp b/lib/CBuildingHandler.cpp index c8fd1bb6a..824f5616e 100644 --- a/lib/CBuildingHandler.cpp +++ b/lib/CBuildingHandler.cpp @@ -150,7 +150,7 @@ CBuildingHandler::~CBuildingHandler() { for(std::vector< bmap > >::iterator i=buildings.begin(); i!=buildings.end(); i++) for(std::map >::iterator j=i->begin(); j!=i->end(); j++) - delete j->second; + j->second.dellNull(); } static std::string emptyStr = ""; diff --git a/lib/CCreatureSet.cpp b/lib/CCreatureSet.cpp index 811252488..20d26bfa5 100644 --- a/lib/CCreatureSet.cpp +++ b/lib/CCreatureSet.cpp @@ -446,7 +446,7 @@ void CStackInstance::setType(const CCreature *c) } std::string CStackInstance::bonusToString(Bonus *bonus, bool description) const { - std::map>::iterator it = VLC->creh->stackBonuses.find(bonus->type); + std::map >::iterator it = VLC->creh->stackBonuses.find(bonus->type); if (it != VLC->creh->stackBonuses.end()) { std::string text; @@ -649,4 +649,4 @@ bool CSimpleArmy::setCreature(TSlot slot, TCreature cre, TQuantity count) assert(!vstd::contains(army, slot)); army[slot] = CStackBasicDescriptor(cre, count); return true; -} \ No newline at end of file +} diff --git a/lib/CDefObjInfoHandler.cpp b/lib/CDefObjInfoHandler.cpp index 40e5f4801..a95e20ba3 100644 --- a/lib/CDefObjInfoHandler.cpp +++ b/lib/CDefObjInfoHandler.cpp @@ -144,5 +144,5 @@ CDefObjInfoHandler::~CDefObjInfoHandler() { for(bmap > >::iterator i=gobjs.begin(); i!=gobjs.end(); i++) for(bmap >::iterator j=i->second.begin(); j!=i->second.end(); j++) - delete j->second; + j->second.dellNull(); } diff --git a/lib/CGameState.cpp b/lib/CGameState.cpp index f934377bc..6d5ab252e 100644 --- a/lib/CGameState.cpp +++ b/lib/CGameState.cpp @@ -766,8 +766,8 @@ CGameState::CGameState() CGameState::~CGameState() { delete mx; - delete map; - delete curB; + map.dellNull(); + curB.dellNull(); //delete scenarioOps; //TODO: fix for loading ind delete //delete initialOpts; delete applierGs; @@ -3132,4 +3132,4 @@ DuelParameters::DuelParameters() { terType = TerrainTile::dirt; bfieldType = 15; -} \ No newline at end of file +} diff --git a/lib/CHeroHandler.cpp b/lib/CHeroHandler.cpp index 8470c4452..1de57ac51 100644 --- a/lib/CHeroHandler.cpp +++ b/lib/CHeroHandler.cpp @@ -135,7 +135,7 @@ int CObstacleInfo::getMaxBlocked(int hex) const CHeroHandler::~CHeroHandler() { for (int i = 0; i < heroes.size(); i++) - delete heroes[i]; + heroes[i].dellNull(); for (int i = 0; i < heroClasses.size(); i++) delete heroClasses[i]; diff --git a/lib/CLodHandler.h b/lib/CLodHandler.h index 9014e3621..83cebe5d3 100644 --- a/lib/CLodHandler.h +++ b/lib/CLodHandler.h @@ -73,11 +73,13 @@ struct Entry Entry(std::string con): name(con){}; Entry(){}; }; - +namespace boost +{ template<> -struct boost::hash : public std::unary_function { +struct hash : public std::unary_function +{ private: - boost::hash stringHasher; + hash stringHasher; public: std::size_t operator()(Entry const& en) const { @@ -86,6 +88,8 @@ public: } }; +} + class DLL_EXPORT CLodHandler { std::map extMap;// to convert extensions to file type diff --git a/lib/Connection.cpp b/lib/Connection.cpp index ced8b68f9..b953c9949 100644 --- a/lib/Connection.cpp +++ b/lib/Connection.cpp @@ -13,6 +13,7 @@ //for smart objs serialization over net #include "../lib/CMapInfo.h" #include "../StartInfo.h" +#include "BattleState.h" #include "CGameState.h" #include "map.h" #include "CObjectHandler.h" diff --git a/lib/ConstTransitivePtr.h b/lib/ConstTransitivePtr.h index 2ccf390d1..ccaf8b9a4 100644 --- a/lib/ConstTransitivePtr.h +++ b/lib/ConstTransitivePtr.h @@ -62,5 +62,5 @@ public: h & ptr; } - friend CGameHandler; + friend class CGameHandler; }; diff --git a/lib/Makefile.am b/lib/Makefile.am index 3f28dc652..892d9fbd0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,52 +2,53 @@ pkglib_LTLIBRARIES = libvcmi.la libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz -lpthread libvcmi_la_CXXFLAGS = @SDL_CXXFLAGS@ libvcmi_la_SOURCES = \ - ../CConsoleHandler.cpp \ - ../CConsoleHandler.h \ - ../hch/CArtHandler.cpp \ - ../hch/CArtHandler.h \ - ../hch/CBuildingHandler.cpp \ - ../hch/CBuildingHandler.h \ - ../hch/CCampaignHandler.cpp \ - ../hch/CCampaignHandler.h \ - ../hch/CCreatureHandler.cpp \ - ../hch/CCreatureHandler.h \ - ../hch/CDefObjInfoHandler.cpp \ - ../hch/CDefObjInfoHandler.h \ - ../hch/CGeneralTextHandler.cpp \ - ../hch/CGeneralTextHandler.h \ - ../hch/CHeroHandler.cpp \ - ../hch/CHeroHandler.h \ - ../hch/CLodHandler.cpp \ - ../hch/CLodHandler.h \ - ../hch/CObjectHandler.cpp \ - ../hch/CObjectHandler.h \ - ../hch/CSpellHandler.cpp \ - ../hch/CSpellHandler.h \ - ../hch/CTownHandler.cpp \ - ../hch/CTownHandler.h \ - ../stdafx.cpp \ + BattleAction.cpp \ BattleAction.h \ + BattleState.cpp \ + BattleState.h \ + CArtHandler.cpp \ + CArtHandler.h \ + CBuildingHandler.cpp \ + CBuildingHandler.h \ + CCampaignHandler.cpp \ + CCampaignHandler.h \ + CCreatureHandler.cpp \ + CCreatureHandler.h \ CCreatureSet.cpp \ CCreatureSet.h \ - CMapInfo.cpp \ - CMapInfo.h \ + CDefObjInfoHandler.cpp \ + CDefObjInfoHandler.h \ CGameState.cpp \ CGameState.h \ + CGeneralTextHandler.cpp \ + CGeneralTextHandler.h \ + CHeroHandler.cpp \ + CHeroHandler.h \ + CLodHandler.cpp \ + CLodHandler.h \ + CMapInfo.cpp \ + CMapInfo.h \ + CObjectHandler.cpp \ + CObjectHandler.h \ CondSh.h \ Connection.cpp \ Connection.h \ + ConstTransitivePtr.h \ + CSpellHandler.cpp \ + CSpellHandler.h \ + CTownHandler.cpp \ + CTownHandler.h \ HeroBonus.cpp \ HeroBonus.h \ IGameCallback.cpp \ IGameCallback.h \ Interprocess.h \ + map.cpp \ + map.h \ NetPacks.h \ NetPacksLib.cpp \ RegisterTypes.cpp \ RegisterTypes.h \ - StackFeature.h \ - VCMI_Lib.cpp \ - VCMI_Lib.h \ - map.cpp \ - map.h + VCMIDirs.h \ + VCMI_Lib.cpp + VCMI_Lib.h diff --git a/lib/Makefile.in b/lib/Makefile.in index 6db205dac..0c5ff05bd 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ $(top_srcdir)/aclocal/m4/libtool.m4 \ @@ -77,19 +78,18 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libvcmi_la_DEPENDENCIES = -am_libvcmi_la_OBJECTS = libvcmi_la-CConsoleHandler.lo \ - libvcmi_la-CArtHandler.lo libvcmi_la-CBuildingHandler.lo \ - libvcmi_la-CCampaignHandler.lo libvcmi_la-CCreatureHandler.lo \ - libvcmi_la-CDefObjInfoHandler.lo \ +am_libvcmi_la_OBJECTS = libvcmi_la-BattleAction.lo \ + libvcmi_la-BattleState.lo libvcmi_la-CArtHandler.lo \ + libvcmi_la-CBuildingHandler.lo libvcmi_la-CCampaignHandler.lo \ + libvcmi_la-CCreatureHandler.lo libvcmi_la-CCreatureSet.lo \ + libvcmi_la-CDefObjInfoHandler.lo libvcmi_la-CGameState.lo \ libvcmi_la-CGeneralTextHandler.lo libvcmi_la-CHeroHandler.lo \ - libvcmi_la-CLodHandler.lo libvcmi_la-CObjectHandler.lo \ + libvcmi_la-CLodHandler.lo libvcmi_la-CMapInfo.lo \ + libvcmi_la-CObjectHandler.lo libvcmi_la-Connection.lo \ libvcmi_la-CSpellHandler.lo libvcmi_la-CTownHandler.lo \ - libvcmi_la-stdafx.lo libvcmi_la-CCreatureSet.lo \ - libvcmi_la-CMapInfo.lo libvcmi_la-CGameState.lo \ - libvcmi_la-Connection.lo libvcmi_la-HeroBonus.lo \ - libvcmi_la-IGameCallback.lo libvcmi_la-NetPacksLib.lo \ - libvcmi_la-RegisterTypes.lo libvcmi_la-VCMI_Lib.lo \ - libvcmi_la-map.lo + libvcmi_la-HeroBonus.lo libvcmi_la-IGameCallback.lo \ + libvcmi_la-map.lo libvcmi_la-NetPacksLib.lo \ + libvcmi_la-RegisterTypes.lo libvcmi_la-VCMI_Lib.lo libvcmi_la_OBJECTS = $(am_libvcmi_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -156,6 +156,7 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ @@ -276,55 +277,55 @@ pkglib_LTLIBRARIES = libvcmi.la libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz -lpthread libvcmi_la_CXXFLAGS = @SDL_CXXFLAGS@ libvcmi_la_SOURCES = \ - ../CConsoleHandler.cpp \ - ../CConsoleHandler.h \ - ../hch/CArtHandler.cpp \ - ../hch/CArtHandler.h \ - ../hch/CBuildingHandler.cpp \ - ../hch/CBuildingHandler.h \ - ../hch/CCampaignHandler.cpp \ - ../hch/CCampaignHandler.h \ - ../hch/CCreatureHandler.cpp \ - ../hch/CCreatureHandler.h \ - ../hch/CDefObjInfoHandler.cpp \ - ../hch/CDefObjInfoHandler.h \ - ../hch/CGeneralTextHandler.cpp \ - ../hch/CGeneralTextHandler.h \ - ../hch/CHeroHandler.cpp \ - ../hch/CHeroHandler.h \ - ../hch/CLodHandler.cpp \ - ../hch/CLodHandler.h \ - ../hch/CObjectHandler.cpp \ - ../hch/CObjectHandler.h \ - ../hch/CSpellHandler.cpp \ - ../hch/CSpellHandler.h \ - ../hch/CTownHandler.cpp \ - ../hch/CTownHandler.h \ - ../stdafx.cpp \ + BattleAction.cpp \ BattleAction.h \ + BattleState.cpp \ + BattleState.h \ + CArtHandler.cpp \ + CArtHandler.h \ + CBuildingHandler.cpp \ + CBuildingHandler.h \ + CCampaignHandler.cpp \ + CCampaignHandler.h \ + CCreatureHandler.cpp \ + CCreatureHandler.h \ CCreatureSet.cpp \ CCreatureSet.h \ - CMapInfo.cpp \ - CMapInfo.h \ + CDefObjInfoHandler.cpp \ + CDefObjInfoHandler.h \ CGameState.cpp \ CGameState.h \ + CGeneralTextHandler.cpp \ + CGeneralTextHandler.h \ + CHeroHandler.cpp \ + CHeroHandler.h \ + CLodHandler.cpp \ + CLodHandler.h \ + CMapInfo.cpp \ + CMapInfo.h \ + CObjectHandler.cpp \ + CObjectHandler.h \ CondSh.h \ Connection.cpp \ Connection.h \ + ConstTransitivePtr.h \ + CSpellHandler.cpp \ + CSpellHandler.h \ + CTownHandler.cpp \ + CTownHandler.h \ HeroBonus.cpp \ HeroBonus.h \ IGameCallback.cpp \ IGameCallback.h \ Interprocess.h \ + map.cpp \ + map.h \ NetPacks.h \ NetPacksLib.cpp \ RegisterTypes.cpp \ RegisterTypes.h \ - StackFeature.h \ - VCMI_Lib.cpp \ - VCMI_Lib.h \ - map.cpp \ - map.h + VCMIDirs.h \ + VCMI_Lib.cpp all: all-am @@ -400,10 +401,11 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-BattleAction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-BattleState.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CArtHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CBuildingHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CCampaignHandler.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CConsoleHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CCreatureHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CCreatureSet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CDefObjInfoHandler.Plo@am__quote@ @@ -422,7 +424,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-RegisterTypes.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-VCMI_Lib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-map.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-stdafx.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -448,109 +449,53 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -libvcmi_la-CConsoleHandler.lo: ../CConsoleHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CConsoleHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CConsoleHandler.Tpo -c -o libvcmi_la-CConsoleHandler.lo `test -f '../CConsoleHandler.cpp' || echo '$(srcdir)/'`../CConsoleHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CConsoleHandler.Tpo $(DEPDIR)/libvcmi_la-CConsoleHandler.Plo +libvcmi_la-BattleAction.lo: BattleAction.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-BattleAction.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-BattleAction.Tpo -c -o libvcmi_la-BattleAction.lo `test -f 'BattleAction.cpp' || echo '$(srcdir)/'`BattleAction.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-BattleAction.Tpo $(DEPDIR)/libvcmi_la-BattleAction.Plo @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../CConsoleHandler.cpp' object='libvcmi_la-CConsoleHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='BattleAction.cpp' object='libvcmi_la-BattleAction.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CConsoleHandler.lo `test -f '../CConsoleHandler.cpp' || echo '$(srcdir)/'`../CConsoleHandler.cpp +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-BattleAction.lo `test -f 'BattleAction.cpp' || echo '$(srcdir)/'`BattleAction.cpp -libvcmi_la-CArtHandler.lo: ../hch/CArtHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CArtHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CArtHandler.Tpo -c -o libvcmi_la-CArtHandler.lo `test -f '../hch/CArtHandler.cpp' || echo '$(srcdir)/'`../hch/CArtHandler.cpp +libvcmi_la-BattleState.lo: BattleState.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-BattleState.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-BattleState.Tpo -c -o libvcmi_la-BattleState.lo `test -f 'BattleState.cpp' || echo '$(srcdir)/'`BattleState.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-BattleState.Tpo $(DEPDIR)/libvcmi_la-BattleState.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='BattleState.cpp' object='libvcmi_la-BattleState.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-BattleState.lo `test -f 'BattleState.cpp' || echo '$(srcdir)/'`BattleState.cpp + +libvcmi_la-CArtHandler.lo: CArtHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CArtHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CArtHandler.Tpo -c -o libvcmi_la-CArtHandler.lo `test -f 'CArtHandler.cpp' || echo '$(srcdir)/'`CArtHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CArtHandler.Tpo $(DEPDIR)/libvcmi_la-CArtHandler.Plo @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CArtHandler.cpp' object='libvcmi_la-CArtHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CArtHandler.cpp' object='libvcmi_la-CArtHandler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CArtHandler.lo `test -f '../hch/CArtHandler.cpp' || echo '$(srcdir)/'`../hch/CArtHandler.cpp +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CArtHandler.lo `test -f 'CArtHandler.cpp' || echo '$(srcdir)/'`CArtHandler.cpp -libvcmi_la-CBuildingHandler.lo: ../hch/CBuildingHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CBuildingHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CBuildingHandler.Tpo -c -o libvcmi_la-CBuildingHandler.lo `test -f '../hch/CBuildingHandler.cpp' || echo '$(srcdir)/'`../hch/CBuildingHandler.cpp +libvcmi_la-CBuildingHandler.lo: CBuildingHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CBuildingHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CBuildingHandler.Tpo -c -o libvcmi_la-CBuildingHandler.lo `test -f 'CBuildingHandler.cpp' || echo '$(srcdir)/'`CBuildingHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CBuildingHandler.Tpo $(DEPDIR)/libvcmi_la-CBuildingHandler.Plo @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CBuildingHandler.cpp' object='libvcmi_la-CBuildingHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CBuildingHandler.cpp' object='libvcmi_la-CBuildingHandler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CBuildingHandler.lo `test -f '../hch/CBuildingHandler.cpp' || echo '$(srcdir)/'`../hch/CBuildingHandler.cpp +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CBuildingHandler.lo `test -f 'CBuildingHandler.cpp' || echo '$(srcdir)/'`CBuildingHandler.cpp -libvcmi_la-CCampaignHandler.lo: ../hch/CCampaignHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CCampaignHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CCampaignHandler.Tpo -c -o libvcmi_la-CCampaignHandler.lo `test -f '../hch/CCampaignHandler.cpp' || echo '$(srcdir)/'`../hch/CCampaignHandler.cpp +libvcmi_la-CCampaignHandler.lo: CCampaignHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CCampaignHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CCampaignHandler.Tpo -c -o libvcmi_la-CCampaignHandler.lo `test -f 'CCampaignHandler.cpp' || echo '$(srcdir)/'`CCampaignHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CCampaignHandler.Tpo $(DEPDIR)/libvcmi_la-CCampaignHandler.Plo @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CCampaignHandler.cpp' object='libvcmi_la-CCampaignHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CCampaignHandler.cpp' object='libvcmi_la-CCampaignHandler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CCampaignHandler.lo `test -f '../hch/CCampaignHandler.cpp' || echo '$(srcdir)/'`../hch/CCampaignHandler.cpp +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CCampaignHandler.lo `test -f 'CCampaignHandler.cpp' || echo '$(srcdir)/'`CCampaignHandler.cpp -libvcmi_la-CCreatureHandler.lo: ../hch/CCreatureHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CCreatureHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CCreatureHandler.Tpo -c -o libvcmi_la-CCreatureHandler.lo `test -f '../hch/CCreatureHandler.cpp' || echo '$(srcdir)/'`../hch/CCreatureHandler.cpp +libvcmi_la-CCreatureHandler.lo: CCreatureHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CCreatureHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CCreatureHandler.Tpo -c -o libvcmi_la-CCreatureHandler.lo `test -f 'CCreatureHandler.cpp' || echo '$(srcdir)/'`CCreatureHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CCreatureHandler.Tpo $(DEPDIR)/libvcmi_la-CCreatureHandler.Plo @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CCreatureHandler.cpp' object='libvcmi_la-CCreatureHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CCreatureHandler.cpp' object='libvcmi_la-CCreatureHandler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CCreatureHandler.lo `test -f '../hch/CCreatureHandler.cpp' || echo '$(srcdir)/'`../hch/CCreatureHandler.cpp - -libvcmi_la-CDefObjInfoHandler.lo: ../hch/CDefObjInfoHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CDefObjInfoHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CDefObjInfoHandler.Tpo -c -o libvcmi_la-CDefObjInfoHandler.lo `test -f '../hch/CDefObjInfoHandler.cpp' || echo '$(srcdir)/'`../hch/CDefObjInfoHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CDefObjInfoHandler.Tpo $(DEPDIR)/libvcmi_la-CDefObjInfoHandler.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CDefObjInfoHandler.cpp' object='libvcmi_la-CDefObjInfoHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CDefObjInfoHandler.lo `test -f '../hch/CDefObjInfoHandler.cpp' || echo '$(srcdir)/'`../hch/CDefObjInfoHandler.cpp - -libvcmi_la-CGeneralTextHandler.lo: ../hch/CGeneralTextHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CGeneralTextHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CGeneralTextHandler.Tpo -c -o libvcmi_la-CGeneralTextHandler.lo `test -f '../hch/CGeneralTextHandler.cpp' || echo '$(srcdir)/'`../hch/CGeneralTextHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CGeneralTextHandler.Tpo $(DEPDIR)/libvcmi_la-CGeneralTextHandler.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CGeneralTextHandler.cpp' object='libvcmi_la-CGeneralTextHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CGeneralTextHandler.lo `test -f '../hch/CGeneralTextHandler.cpp' || echo '$(srcdir)/'`../hch/CGeneralTextHandler.cpp - -libvcmi_la-CHeroHandler.lo: ../hch/CHeroHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CHeroHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CHeroHandler.Tpo -c -o libvcmi_la-CHeroHandler.lo `test -f '../hch/CHeroHandler.cpp' || echo '$(srcdir)/'`../hch/CHeroHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CHeroHandler.Tpo $(DEPDIR)/libvcmi_la-CHeroHandler.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CHeroHandler.cpp' object='libvcmi_la-CHeroHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CHeroHandler.lo `test -f '../hch/CHeroHandler.cpp' || echo '$(srcdir)/'`../hch/CHeroHandler.cpp - -libvcmi_la-CLodHandler.lo: ../hch/CLodHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CLodHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CLodHandler.Tpo -c -o libvcmi_la-CLodHandler.lo `test -f '../hch/CLodHandler.cpp' || echo '$(srcdir)/'`../hch/CLodHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CLodHandler.Tpo $(DEPDIR)/libvcmi_la-CLodHandler.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CLodHandler.cpp' object='libvcmi_la-CLodHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CLodHandler.lo `test -f '../hch/CLodHandler.cpp' || echo '$(srcdir)/'`../hch/CLodHandler.cpp - -libvcmi_la-CObjectHandler.lo: ../hch/CObjectHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CObjectHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CObjectHandler.Tpo -c -o libvcmi_la-CObjectHandler.lo `test -f '../hch/CObjectHandler.cpp' || echo '$(srcdir)/'`../hch/CObjectHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CObjectHandler.Tpo $(DEPDIR)/libvcmi_la-CObjectHandler.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CObjectHandler.cpp' object='libvcmi_la-CObjectHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CObjectHandler.lo `test -f '../hch/CObjectHandler.cpp' || echo '$(srcdir)/'`../hch/CObjectHandler.cpp - -libvcmi_la-CSpellHandler.lo: ../hch/CSpellHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CSpellHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CSpellHandler.Tpo -c -o libvcmi_la-CSpellHandler.lo `test -f '../hch/CSpellHandler.cpp' || echo '$(srcdir)/'`../hch/CSpellHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CSpellHandler.Tpo $(DEPDIR)/libvcmi_la-CSpellHandler.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CSpellHandler.cpp' object='libvcmi_la-CSpellHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CSpellHandler.lo `test -f '../hch/CSpellHandler.cpp' || echo '$(srcdir)/'`../hch/CSpellHandler.cpp - -libvcmi_la-CTownHandler.lo: ../hch/CTownHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CTownHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CTownHandler.Tpo -c -o libvcmi_la-CTownHandler.lo `test -f '../hch/CTownHandler.cpp' || echo '$(srcdir)/'`../hch/CTownHandler.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CTownHandler.Tpo $(DEPDIR)/libvcmi_la-CTownHandler.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../hch/CTownHandler.cpp' object='libvcmi_la-CTownHandler.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CTownHandler.lo `test -f '../hch/CTownHandler.cpp' || echo '$(srcdir)/'`../hch/CTownHandler.cpp - -libvcmi_la-stdafx.lo: ../stdafx.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-stdafx.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-stdafx.Tpo -c -o libvcmi_la-stdafx.lo `test -f '../stdafx.cpp' || echo '$(srcdir)/'`../stdafx.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-stdafx.Tpo $(DEPDIR)/libvcmi_la-stdafx.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../stdafx.cpp' object='libvcmi_la-stdafx.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-stdafx.lo `test -f '../stdafx.cpp' || echo '$(srcdir)/'`../stdafx.cpp +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CCreatureHandler.lo `test -f 'CCreatureHandler.cpp' || echo '$(srcdir)/'`CCreatureHandler.cpp libvcmi_la-CCreatureSet.lo: CCreatureSet.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CCreatureSet.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CCreatureSet.Tpo -c -o libvcmi_la-CCreatureSet.lo `test -f 'CCreatureSet.cpp' || echo '$(srcdir)/'`CCreatureSet.cpp @@ -560,13 +505,13 @@ libvcmi_la-CCreatureSet.lo: CCreatureSet.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CCreatureSet.lo `test -f 'CCreatureSet.cpp' || echo '$(srcdir)/'`CCreatureSet.cpp -libvcmi_la-CMapInfo.lo: CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CMapInfo.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CMapInfo.Tpo -c -o libvcmi_la-CMapInfo.lo `test -f 'CMapInfo.cpp' || echo '$(srcdir)/'`CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CMapInfo.Tpo $(DEPDIR)/libvcmi_la-CMapInfo.Plo +libvcmi_la-CDefObjInfoHandler.lo: CDefObjInfoHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CDefObjInfoHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CDefObjInfoHandler.Tpo -c -o libvcmi_la-CDefObjInfoHandler.lo `test -f 'CDefObjInfoHandler.cpp' || echo '$(srcdir)/'`CDefObjInfoHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CDefObjInfoHandler.Tpo $(DEPDIR)/libvcmi_la-CDefObjInfoHandler.Plo @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMapInfo.cpp' object='libvcmi_la-CMapInfo.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CDefObjInfoHandler.cpp' object='libvcmi_la-CDefObjInfoHandler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CMapInfo.lo `test -f 'CMapInfo.cpp' || echo '$(srcdir)/'`CMapInfo.cpp +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CDefObjInfoHandler.lo `test -f 'CDefObjInfoHandler.cpp' || echo '$(srcdir)/'`CDefObjInfoHandler.cpp libvcmi_la-CGameState.lo: CGameState.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CGameState.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CGameState.Tpo -c -o libvcmi_la-CGameState.lo `test -f 'CGameState.cpp' || echo '$(srcdir)/'`CGameState.cpp @@ -576,6 +521,46 @@ libvcmi_la-CGameState.lo: CGameState.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CGameState.lo `test -f 'CGameState.cpp' || echo '$(srcdir)/'`CGameState.cpp +libvcmi_la-CGeneralTextHandler.lo: CGeneralTextHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CGeneralTextHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CGeneralTextHandler.Tpo -c -o libvcmi_la-CGeneralTextHandler.lo `test -f 'CGeneralTextHandler.cpp' || echo '$(srcdir)/'`CGeneralTextHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CGeneralTextHandler.Tpo $(DEPDIR)/libvcmi_la-CGeneralTextHandler.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CGeneralTextHandler.cpp' object='libvcmi_la-CGeneralTextHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CGeneralTextHandler.lo `test -f 'CGeneralTextHandler.cpp' || echo '$(srcdir)/'`CGeneralTextHandler.cpp + +libvcmi_la-CHeroHandler.lo: CHeroHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CHeroHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CHeroHandler.Tpo -c -o libvcmi_la-CHeroHandler.lo `test -f 'CHeroHandler.cpp' || echo '$(srcdir)/'`CHeroHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CHeroHandler.Tpo $(DEPDIR)/libvcmi_la-CHeroHandler.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CHeroHandler.cpp' object='libvcmi_la-CHeroHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CHeroHandler.lo `test -f 'CHeroHandler.cpp' || echo '$(srcdir)/'`CHeroHandler.cpp + +libvcmi_la-CLodHandler.lo: CLodHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CLodHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CLodHandler.Tpo -c -o libvcmi_la-CLodHandler.lo `test -f 'CLodHandler.cpp' || echo '$(srcdir)/'`CLodHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CLodHandler.Tpo $(DEPDIR)/libvcmi_la-CLodHandler.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CLodHandler.cpp' object='libvcmi_la-CLodHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CLodHandler.lo `test -f 'CLodHandler.cpp' || echo '$(srcdir)/'`CLodHandler.cpp + +libvcmi_la-CMapInfo.lo: CMapInfo.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CMapInfo.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CMapInfo.Tpo -c -o libvcmi_la-CMapInfo.lo `test -f 'CMapInfo.cpp' || echo '$(srcdir)/'`CMapInfo.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CMapInfo.Tpo $(DEPDIR)/libvcmi_la-CMapInfo.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CMapInfo.cpp' object='libvcmi_la-CMapInfo.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CMapInfo.lo `test -f 'CMapInfo.cpp' || echo '$(srcdir)/'`CMapInfo.cpp + +libvcmi_la-CObjectHandler.lo: CObjectHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CObjectHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CObjectHandler.Tpo -c -o libvcmi_la-CObjectHandler.lo `test -f 'CObjectHandler.cpp' || echo '$(srcdir)/'`CObjectHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CObjectHandler.Tpo $(DEPDIR)/libvcmi_la-CObjectHandler.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CObjectHandler.cpp' object='libvcmi_la-CObjectHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CObjectHandler.lo `test -f 'CObjectHandler.cpp' || echo '$(srcdir)/'`CObjectHandler.cpp + libvcmi_la-Connection.lo: Connection.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-Connection.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-Connection.Tpo -c -o libvcmi_la-Connection.lo `test -f 'Connection.cpp' || echo '$(srcdir)/'`Connection.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-Connection.Tpo $(DEPDIR)/libvcmi_la-Connection.Plo @@ -584,6 +569,22 @@ libvcmi_la-Connection.lo: Connection.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-Connection.lo `test -f 'Connection.cpp' || echo '$(srcdir)/'`Connection.cpp +libvcmi_la-CSpellHandler.lo: CSpellHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CSpellHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CSpellHandler.Tpo -c -o libvcmi_la-CSpellHandler.lo `test -f 'CSpellHandler.cpp' || echo '$(srcdir)/'`CSpellHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CSpellHandler.Tpo $(DEPDIR)/libvcmi_la-CSpellHandler.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CSpellHandler.cpp' object='libvcmi_la-CSpellHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CSpellHandler.lo `test -f 'CSpellHandler.cpp' || echo '$(srcdir)/'`CSpellHandler.cpp + +libvcmi_la-CTownHandler.lo: CTownHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CTownHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CTownHandler.Tpo -c -o libvcmi_la-CTownHandler.lo `test -f 'CTownHandler.cpp' || echo '$(srcdir)/'`CTownHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CTownHandler.Tpo $(DEPDIR)/libvcmi_la-CTownHandler.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CTownHandler.cpp' object='libvcmi_la-CTownHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CTownHandler.lo `test -f 'CTownHandler.cpp' || echo '$(srcdir)/'`CTownHandler.cpp + libvcmi_la-HeroBonus.lo: HeroBonus.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-HeroBonus.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-HeroBonus.Tpo -c -o libvcmi_la-HeroBonus.lo `test -f 'HeroBonus.cpp' || echo '$(srcdir)/'`HeroBonus.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-HeroBonus.Tpo $(DEPDIR)/libvcmi_la-HeroBonus.Plo @@ -600,6 +601,14 @@ libvcmi_la-IGameCallback.lo: IGameCallback.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-IGameCallback.lo `test -f 'IGameCallback.cpp' || echo '$(srcdir)/'`IGameCallback.cpp +libvcmi_la-map.lo: map.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-map.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-map.Tpo -c -o libvcmi_la-map.lo `test -f 'map.cpp' || echo '$(srcdir)/'`map.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-map.Tpo $(DEPDIR)/libvcmi_la-map.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='map.cpp' object='libvcmi_la-map.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-map.lo `test -f 'map.cpp' || echo '$(srcdir)/'`map.cpp + libvcmi_la-NetPacksLib.lo: NetPacksLib.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-NetPacksLib.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-NetPacksLib.Tpo -c -o libvcmi_la-NetPacksLib.lo `test -f 'NetPacksLib.cpp' || echo '$(srcdir)/'`NetPacksLib.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-NetPacksLib.Tpo $(DEPDIR)/libvcmi_la-NetPacksLib.Plo @@ -624,14 +633,6 @@ libvcmi_la-VCMI_Lib.lo: VCMI_Lib.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-VCMI_Lib.lo `test -f 'VCMI_Lib.cpp' || echo '$(srcdir)/'`VCMI_Lib.cpp -libvcmi_la-map.lo: map.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-map.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-map.Tpo -c -o libvcmi_la-map.lo `test -f 'map.cpp' || echo '$(srcdir)/'`map.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-map.Tpo $(DEPDIR)/libvcmi_la-map.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='map.cpp' object='libvcmi_la-map.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-map.lo `test -f 'map.cpp' || echo '$(srcdir)/'`map.cpp - mostlyclean-libtool: -rm -f *.lo @@ -839,6 +840,7 @@ uninstall-am: uninstall-pkglibLTLIBRARIES mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES + VCMI_Lib.h # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/RegisterTypes.cpp b/lib/RegisterTypes.cpp index fa5574405..281a5af79 100644 --- a/lib/RegisterTypes.cpp +++ b/lib/RegisterTypes.cpp @@ -3,7 +3,9 @@ #include "Connection.h" #include "NetPacks.h" #include "VCMI_Lib.h" +#include "CArtHandler.h" #include "CObjectHandler.h" +#include "CGameState.h" #include "CHeroHandler.h" #include "CTownHandler.h" /* diff --git a/lib/map.cpp b/lib/map.cpp index fd2a2f139..a039e8880 100644 --- a/lib/map.cpp +++ b/lib/map.cpp @@ -518,7 +518,7 @@ Mapa::~Mapa() delete [] terrain; } for(std::list >::iterator i = events.begin(); i != events.end(); i++) - delete *i; + i->dellNull(); } CGHeroInstance * Mapa::getHero(int ID, int mode) @@ -2131,4 +2131,4 @@ bool TerrainTile::entrableTerrain(bool allowLand, bool allowSea) const bool TerrainTile::isClear(const TerrainTile *from /*= NULL*/) const { return entrableTerrain(from) && !blocked; -} \ No newline at end of file +} diff --git a/server/Makefile.am b/server/Makefile.am index d80555a0f..b300812bc 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -4,10 +4,12 @@ vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la vcmiserver_CXXFLAGS = @SDL_CXXFLAGS@ vcmiserver_LDFLAGS = -L$(top_builddir)/lib vcmiserver_SOURCES = \ + ../CConsoleHandler.cpp \ + ../CConsoleHandler.h \ CGameHandler.cpp \ CGameHandler.h \ CVCMIServer.cpp \ CVCMIServer.h \ NetPacksServer.cpp \ - ../lib/CMapInfo.cpp \ - ../lib/CMapInfo.h + stdafx.cpp \ + stdafx.h diff --git a/server/Makefile.in b/server/Makefile.in index 66c934724..9b5a62240 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ $(top_srcdir)/aclocal/m4/libtool.m4 \ @@ -56,10 +57,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_vcmiserver_OBJECTS = vcmiserver-CGameHandler.$(OBJEXT) \ +am_vcmiserver_OBJECTS = vcmiserver-CConsoleHandler.$(OBJEXT) \ + vcmiserver-CGameHandler.$(OBJEXT) \ vcmiserver-CVCMIServer.$(OBJEXT) \ vcmiserver-NetPacksServer.$(OBJEXT) \ - vcmiserver-CMapInfo.$(OBJEXT) + vcmiserver-stdafx.$(OBJEXT) vcmiserver_OBJECTS = $(am_vcmiserver_OBJECTS) vcmiserver_DEPENDENCIES = $(top_builddir)/lib/libvcmi.la AM_V_lt = $(am__v_lt_$(V)) @@ -127,6 +129,7 @@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ @@ -247,13 +250,15 @@ vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la vcmiserver_CXXFLAGS = @SDL_CXXFLAGS@ vcmiserver_LDFLAGS = -L$(top_builddir)/lib vcmiserver_SOURCES = \ + ../CConsoleHandler.cpp \ + ../CConsoleHandler.h \ CGameHandler.cpp \ CGameHandler.h \ CVCMIServer.cpp \ CVCMIServer.h \ NetPacksServer.cpp \ - ../lib/CMapInfo.cpp \ - ../lib/CMapInfo.h + stdafx.cpp \ + stdafx.h all: all-am @@ -342,10 +347,11 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiserver-CConsoleHandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiserver-CGameHandler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiserver-CMapInfo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiserver-CVCMIServer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiserver-NetPacksServer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiserver-stdafx.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -371,6 +377,22 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +vcmiserver-CConsoleHandler.o: ../CConsoleHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -MT vcmiserver-CConsoleHandler.o -MD -MP -MF $(DEPDIR)/vcmiserver-CConsoleHandler.Tpo -c -o vcmiserver-CConsoleHandler.o `test -f '../CConsoleHandler.cpp' || echo '$(srcdir)/'`../CConsoleHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiserver-CConsoleHandler.Tpo $(DEPDIR)/vcmiserver-CConsoleHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../CConsoleHandler.cpp' object='vcmiserver-CConsoleHandler.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -c -o vcmiserver-CConsoleHandler.o `test -f '../CConsoleHandler.cpp' || echo '$(srcdir)/'`../CConsoleHandler.cpp + +vcmiserver-CConsoleHandler.obj: ../CConsoleHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -MT vcmiserver-CConsoleHandler.obj -MD -MP -MF $(DEPDIR)/vcmiserver-CConsoleHandler.Tpo -c -o vcmiserver-CConsoleHandler.obj `if test -f '../CConsoleHandler.cpp'; then $(CYGPATH_W) '../CConsoleHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../CConsoleHandler.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiserver-CConsoleHandler.Tpo $(DEPDIR)/vcmiserver-CConsoleHandler.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../CConsoleHandler.cpp' object='vcmiserver-CConsoleHandler.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -c -o vcmiserver-CConsoleHandler.obj `if test -f '../CConsoleHandler.cpp'; then $(CYGPATH_W) '../CConsoleHandler.cpp'; else $(CYGPATH_W) '$(srcdir)/../CConsoleHandler.cpp'; fi` + vcmiserver-CGameHandler.o: CGameHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -MT vcmiserver-CGameHandler.o -MD -MP -MF $(DEPDIR)/vcmiserver-CGameHandler.Tpo -c -o vcmiserver-CGameHandler.o `test -f 'CGameHandler.cpp' || echo '$(srcdir)/'`CGameHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiserver-CGameHandler.Tpo $(DEPDIR)/vcmiserver-CGameHandler.Po @@ -419,21 +441,21 @@ vcmiserver-NetPacksServer.obj: NetPacksServer.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -c -o vcmiserver-NetPacksServer.obj `if test -f 'NetPacksServer.cpp'; then $(CYGPATH_W) 'NetPacksServer.cpp'; else $(CYGPATH_W) '$(srcdir)/NetPacksServer.cpp'; fi` -vcmiserver-CMapInfo.o: ../lib/CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -MT vcmiserver-CMapInfo.o -MD -MP -MF $(DEPDIR)/vcmiserver-CMapInfo.Tpo -c -o vcmiserver-CMapInfo.o `test -f '../lib/CMapInfo.cpp' || echo '$(srcdir)/'`../lib/CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiserver-CMapInfo.Tpo $(DEPDIR)/vcmiserver-CMapInfo.Po +vcmiserver-stdafx.o: stdafx.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -MT vcmiserver-stdafx.o -MD -MP -MF $(DEPDIR)/vcmiserver-stdafx.Tpo -c -o vcmiserver-stdafx.o `test -f 'stdafx.cpp' || echo '$(srcdir)/'`stdafx.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiserver-stdafx.Tpo $(DEPDIR)/vcmiserver-stdafx.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../lib/CMapInfo.cpp' object='vcmiserver-CMapInfo.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='stdafx.cpp' object='vcmiserver-stdafx.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -c -o vcmiserver-CMapInfo.o `test -f '../lib/CMapInfo.cpp' || echo '$(srcdir)/'`../lib/CMapInfo.cpp +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -c -o vcmiserver-stdafx.o `test -f 'stdafx.cpp' || echo '$(srcdir)/'`stdafx.cpp -vcmiserver-CMapInfo.obj: ../lib/CMapInfo.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -MT vcmiserver-CMapInfo.obj -MD -MP -MF $(DEPDIR)/vcmiserver-CMapInfo.Tpo -c -o vcmiserver-CMapInfo.obj `if test -f '../lib/CMapInfo.cpp'; then $(CYGPATH_W) '../lib/CMapInfo.cpp'; else $(CYGPATH_W) '$(srcdir)/../lib/CMapInfo.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiserver-CMapInfo.Tpo $(DEPDIR)/vcmiserver-CMapInfo.Po +vcmiserver-stdafx.obj: stdafx.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -MT vcmiserver-stdafx.obj -MD -MP -MF $(DEPDIR)/vcmiserver-stdafx.Tpo -c -o vcmiserver-stdafx.obj `if test -f 'stdafx.cpp'; then $(CYGPATH_W) 'stdafx.cpp'; else $(CYGPATH_W) '$(srcdir)/stdafx.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vcmiserver-stdafx.Tpo $(DEPDIR)/vcmiserver-stdafx.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../lib/CMapInfo.cpp' object='vcmiserver-CMapInfo.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='stdafx.cpp' object='vcmiserver-stdafx.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -c -o vcmiserver-CMapInfo.obj `if test -f '../lib/CMapInfo.cpp'; then $(CYGPATH_W) '../lib/CMapInfo.cpp'; else $(CYGPATH_W) '$(srcdir)/../lib/CMapInfo.cpp'; fi` +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiserver_CXXFLAGS) $(CXXFLAGS) -c -o vcmiserver-stdafx.obj `if test -f 'stdafx.cpp'; then $(CYGPATH_W) 'stdafx.cpp'; else $(CYGPATH_W) '$(srcdir)/stdafx.cpp'; fi` mostlyclean-libtool: -rm -f *.lo