diff --git a/CAdvmapInterface.cpp b/CAdvmapInterface.cpp index 0832ddd99..dc4c32b6a 100644 --- a/CAdvmapInterface.cpp +++ b/CAdvmapInterface.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "CAdvmapInterface.h" -#include "CLodHandler.h" -#include "CPreGameTextHandler.h" +#include "hch\CLodHandler.h" +#include "hch\CPreGameTextHandler.h" extern TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX; //fonts diff --git a/CAdvmapInterface.h b/CAdvmapInterface.h index 1fd1a7d6e..b9070ffce 100644 --- a/CAdvmapInterface.h +++ b/CAdvmapInterface.h @@ -2,7 +2,7 @@ #define CADVENTUREMAPINTERFACE_H #include "SDL.h" -#include "CDefHandler.h" +#include "hch\CDefHandler.h" #include "SDL_Extensions.h" #include "CGameInterface.h" #include "CGameInfo.h" diff --git a/CCallback.cpp b/CCallback.cpp index aad72aeb4..f84ef2b8b 100644 --- a/CCallback.cpp +++ b/CCallback.cpp @@ -1,10 +1,12 @@ #include "stdafx.h" #include "CCallback.h" #include "CPathfinder.h" -#include "CHeroHandler.h" +#include "hch\CHeroHandler.h" #include "CGameInfo.h" -#include "CAmbarCendamo.h" +#include "hch\CAmbarCendamo.h" #include "mapHandler.h" +#include "CGameState.h" +#include "CGameInterface.h" bool CCallback::moveHero(int ID, int3 destPoint) { @@ -19,5 +21,28 @@ bool CCallback::moveHero(int ID, int3 destPoint) CPath * ourPath = CGI->pathf->getPath(CGI->heroh->heroInstances[ID]->pos, destPoint, CGI->heroh->heroInstances[ID]); if(!ourPath) return false; - return false; + for(int i=0; inodes.size()-1; ++i) + { + int3 stpos, endpos; + stpos = int3(ourPath->nodes[i].x, ourPath->nodes[i].y, CGI->heroh->heroInstances[ID]->pos.z); + endpos = int3(ourPath->nodes[i+1].x, ourPath->nodes[i+1].y, CGI->heroh->heroInstances[ID]->pos.z); + HeroMoveDetails curd; + curd.src = stpos; + curd.dst = endpos; + curd.heroID = ID; + curd.owner = CGI->heroh->heroInstances[ID]->owner; + if(CGI->heroh->heroInstances[ID]->movement>=CGI->mh->getCost(stpos, endpos, CGI->heroh->heroInstances[ID])) + { //performing move + for(int j=0; jstate->players.size(); ++j) + { + if(CGI->state->players[j].fogOfWarMap[stpos.x][stpos.y][stpos.z] || CGI->state->players[j].fogOfWarMap[endpos.x][endpos.y][endpos.z]) + { //player should be notified + CGI->playerint[j]->heroMoved(curd); + } + } + } + else + return true; //move ended - no more movement points + } + return true; } diff --git a/CCursorHandler.cpp b/CCursorHandler.cpp index a3bd2e056..4e81c629c 100644 --- a/CCursorHandler.cpp +++ b/CCursorHandler.cpp @@ -4,7 +4,7 @@ #include "SDL_thread.h" #include "CGameInfo.h" #include "SDL_framerate.h" -#include "CLodHandler.h" +#include "hch\CLodHandler.h" extern SDL_Surface * screen; diff --git a/CGameInterface.h b/CGameInterface.h index 9ad1f24ec..b96eee01b 100644 --- a/CGameInterface.h +++ b/CGameInterface.h @@ -2,7 +2,7 @@ #define CGAMEINTERFACE_H #include "SDL.h" -#include "CDefHandler.h" +#include "hch\CDefHandler.h" #include "SDL_Extensions.h" #include BOOST_TRIBOOL_THIRD_STATE(outOfRange) diff --git a/CGameState.h b/CGameState.h index 2b3d46431..46f4d4c0a 100644 --- a/CGameState.h +++ b/CGameState.h @@ -9,7 +9,7 @@ struct PlayerState { public: int color; - std::vector > >fogOfWarMap; + std::vector > >fogOfWarMap; //true - visible, false - hidden std::vector resources; std::vector heroes; std::vector towns; diff --git a/CMT.cpp b/CMT.cpp index 88d0a40dd..2b2edac56 100644 --- a/CMT.cpp +++ b/CMT.cpp @@ -3,9 +3,9 @@ #include "stdafx.h" #include "SDL.h" #include "SDL_TTF.h" -#include "CVideoHandler.h" +#include "hch\CVideoHandler.h" #include "SDL_mixer.h" -#include "CBuildingHandler.h" +#include "hch\CBuildingHandler.h" #include "SDL_Extensions.h" #include "SDL_framerate.h" #include @@ -17,26 +17,26 @@ #include "zlib.h" #include #include -#include "CArtHandler.h" -#include "CHeroHandler.h" -#include "CCreatureHandler.h" -#include "CAbilityHandler.h" -#include "CSpellHandler.h" -#include "CBuildingHandler.h" -#include "CObjectHandler.h" +#include "hch\CArtHandler.h" +#include "hch\CHeroHandler.h" +#include "hch\CCreatureHandler.h" +#include "hch\CAbilityHandler.h" +#include "hch\CSpellHandler.h" +#include "hch\CBuildingHandler.h" +#include "hch\CObjectHandler.h" #include "CGameInfo.h" -#include "CMusicHandler.h" -#include "CSemiLodHandler.h" -#include "CLodHandler.h" -#include "CDefHandler.h" -#include "CSndHandler.h" -#include "CTownHandler.h" -#include "CDefObjInfoHandler.h" -#include "CAmbarCendamo.h" +#include "hch\CMusicHandler.h" +#include "hch\CSemiLodHandler.h" +#include "hch\CLodHandler.h" +#include "hch\CDefHandler.h" +#include "hch\CSndHandler.h" +#include "hch\CTownHandler.h" +#include "hch\CDefObjInfoHandler.h" +#include "hch\CAmbarCendamo.h" #include "mapHandler.h" #include "global.h" #include "CPreGame.h" -#include "CGeneralTextHandler.h" +#include "hch\CGeneralTextHandler.h" #include "CConsoleHandler.h" #include "CCursorHandler.h" #include "CScreenHandler.h" diff --git a/CMessage.cpp b/CMessage.cpp index 91021bddd..898ed33ed 100644 --- a/CMessage.cpp +++ b/CMessage.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "CMessage.h" #include "SDL_TTF.h" -#include "CSemiDefHandler.h" -#include "CDefHandler.h" +#include "hch\CSemiDefHandler.h" +#include "hch\CDefHandler.h" #include "CGameInfo.h" #include "SDL_Extensions.h" -#include "CLodHandler.h" +#include "hch\CLodHandler.h" SDL_Color tytulowy, tlo, zwykly ; SDL_Rect genRect(int hh, int ww, int xx, int yy); diff --git a/CMessage.h b/CMessage.h index f1bfb0960..4c6a0f53b 100644 --- a/CMessage.h +++ b/CMessage.h @@ -4,8 +4,8 @@ #include "global.h" #include "SDL_TTF.h" #include "SDL.h" -#include "CSemiDefHandler.h" -#include "CDefHandler.h" +#include "hch\CSemiDefHandler.h" +#include "hch\CDefHandler.h" #include "CGameInterface.h" #include "CGameInfo.h" #include "SDL_Extensions.h" diff --git a/CPathfinder.cpp b/CPathfinder.cpp index f8c0ba1c9..8926a7c21 100644 --- a/CPathfinder.cpp +++ b/CPathfinder.cpp @@ -2,7 +2,7 @@ #include "global.h" #include "CPathfinder.h" #include "CGameInfo.h" -#include "CAmbarCendamo.h" +#include "hch\CAmbarCendamo.h" #include "mapHandler.h" CPath * CPathfinder::getPath(int3 &src, int3 &dest, CHeroInstance * hero) //TODO: test it (seems to be finished, but relies on unwritten functions :() { diff --git a/CPreGame.cpp b/CPreGame.cpp index e92c5a280..8591dd34b 100644 Binary files a/CPreGame.cpp and b/CPreGame.cpp differ diff --git a/CPreGame.h b/CPreGame.h index e56a36911..9d9a7b086 100644 --- a/CPreGame.h +++ b/CPreGame.h @@ -2,12 +2,12 @@ #define CPREGAME_H #include "SDL.h" #include "StartInfo.h" -#include "CSemiDefHandler.h" -#include "CSemiLodHandler.h" -#include "CPreGameTextHandler.h" +#include "hch\CSemiDefHandler.h" +#include "hch\CSemiLodHandler.h" +#include "hch\CPreGameTextHandler.h" #include "CMessage.h" #include "map.h" -#include "CMusicHandler.h" +#include "hch\CMusicHandler.h" class CPreGame; extern CPreGame * CPG; diff --git a/CScreenHandler.cpp b/CScreenHandler.cpp index 13f16660a..c74b4f783 100644 --- a/CScreenHandler.cpp +++ b/CScreenHandler.cpp @@ -6,7 +6,7 @@ #include "SDL_Extensions.h" #include "CCursorHandler.h" #include "CGameInfo.h" -#include "CDefHandler.h" +#include "hch\CDefHandler.h" extern SDL_Surface * screen, * screen2; diff --git a/CAbilityHandler.cpp b/hch/CAbilityHandler.cpp similarity index 90% rename from CAbilityHandler.cpp rename to hch/CAbilityHandler.cpp index cf5d8ee91..d696bfc1b 100644 --- a/CAbilityHandler.cpp +++ b/hch/CAbilityHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CAbilityHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CGeneralTextHandler.h" #include "CLodHandler.h" void CAbilityHandler::loadAbilities() diff --git a/CAbilityHandler.h b/hch/CAbilityHandler.h similarity index 100% rename from CAbilityHandler.h rename to hch/CAbilityHandler.h diff --git a/CAmbarCendamo.cpp b/hch/CAmbarCendamo.cpp similarity index 96% rename from CAmbarCendamo.cpp rename to hch/CAmbarCendamo.cpp index f39b09249..e1b8c8c1e 100644 --- a/CAmbarCendamo.cpp +++ b/hch/CAmbarCendamo.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CAmbarCendamo.h" #include "CSemiDefHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CObjectHandler.h" #include "CCastleHandler.h" #include "CDefObjInfoHandler.h" -#include "SDL_Extensions.h" +#include "../SDL_Extensions.h" #include "boost\filesystem.hpp" #include "CLodHandler.h" #include diff --git a/CAmbarCendamo.h b/hch/CAmbarCendamo.h similarity index 95% rename from CAmbarCendamo.h rename to hch/CAmbarCendamo.h index 32f0ecd3e..0d4f79154 100644 --- a/CAmbarCendamo.h +++ b/hch/CAmbarCendamo.h @@ -4,9 +4,9 @@ #include #include #include -#include "global.h" +#include "../global.h" #include "SDL.h" -#include "map.h" +#include "../map.h" #include "CSemiDefHandler.h" #include "CDefHandler.h" #include "CCreatureHandler.h" diff --git a/CArtHandler.cpp b/hch/CArtHandler.cpp similarity index 94% rename from CArtHandler.cpp rename to hch/CArtHandler.cpp index 06e3d6637..02ac6e20d 100644 --- a/CArtHandler.cpp +++ b/hch/CArtHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CArtHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CGeneralTextHandler.h" #include "CLodHandler.h" diff --git a/CArtHandler.h b/hch/CArtHandler.h similarity index 100% rename from CArtHandler.h rename to hch/CArtHandler.h diff --git a/CBuildingHandler.cpp b/hch/CBuildingHandler.cpp similarity index 94% rename from CBuildingHandler.cpp rename to hch/CBuildingHandler.cpp index e008cbae5..8c3bcb3f5 100644 --- a/CBuildingHandler.cpp +++ b/hch/CBuildingHandler.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "CGameInfo.h" +#include "../stdafx.h" +#include "../CGameInfo.h" #include "CBuildingHandler.h" #include "CLodHandler.h" diff --git a/CBuildingHandler.h b/hch/CBuildingHandler.h similarity index 100% rename from CBuildingHandler.h rename to hch/CBuildingHandler.h diff --git a/CCastleHandler.cpp b/hch/CCastleHandler.cpp similarity index 100% rename from CCastleHandler.cpp rename to hch/CCastleHandler.cpp diff --git a/CCastleHandler.h b/hch/CCastleHandler.h similarity index 100% rename from CCastleHandler.h rename to hch/CCastleHandler.h diff --git a/CCreatureHandler.cpp b/hch/CCreatureHandler.cpp similarity index 93% rename from CCreatureHandler.cpp rename to hch/CCreatureHandler.cpp index f60340a54..8be543b2a 100644 --- a/CCreatureHandler.cpp +++ b/hch/CCreatureHandler.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "CGameInfo.h" +#include "../stdafx.h" +#include "../CGameInfo.h" #include "CCreatureHandler.h" #include "CLodHandler.h" diff --git a/CCreatureHandler.h b/hch/CCreatureHandler.h similarity index 100% rename from CCreatureHandler.h rename to hch/CCreatureHandler.h diff --git a/CDefHandler.cpp b/hch/CDefHandler.cpp similarity index 99% rename from CDefHandler.cpp rename to hch/CDefHandler.cpp index ee5e2342e..fca0055a2 100644 Binary files a/CDefHandler.cpp and b/hch/CDefHandler.cpp differ diff --git a/CDefHandler.h b/hch/CDefHandler.h similarity index 100% rename from CDefHandler.h rename to hch/CDefHandler.h diff --git a/CDefObjInfoHandler.cpp b/hch/CDefObjInfoHandler.cpp similarity index 90% rename from CDefObjInfoHandler.cpp rename to hch/CDefObjInfoHandler.cpp index 867d1eaa0..a5f1aaf29 100644 --- a/CDefObjInfoHandler.cpp +++ b/hch/CDefObjInfoHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CDefObjInfoHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CLodHandler.h" #include diff --git a/CDefObjInfoHandler.h b/hch/CDefObjInfoHandler.h similarity index 100% rename from CDefObjInfoHandler.h rename to hch/CDefObjInfoHandler.h diff --git a/CGeneralTextHandler.cpp b/hch/CGeneralTextHandler.cpp similarity index 95% rename from CGeneralTextHandler.cpp rename to hch/CGeneralTextHandler.cpp index 13e0ae02e..0eb03dc84 100644 --- a/CGeneralTextHandler.cpp +++ b/hch/CGeneralTextHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CGeneralTextHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CLodHandler.h" #include diff --git a/CGeneralTextHandler.h b/hch/CGeneralTextHandler.h similarity index 100% rename from CGeneralTextHandler.h rename to hch/CGeneralTextHandler.h diff --git a/CHeroHandler.cpp b/hch/CHeroHandler.cpp similarity index 95% rename from CHeroHandler.cpp rename to hch/CHeroHandler.cpp index d097af46b..6288b6346 100644 --- a/CHeroHandler.cpp +++ b/hch/CHeroHandler.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CHeroHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CGeneralTextHandler.h" #include "CLodHandler.h" #include "CAbilityHandler.h" diff --git a/CHeroHandler.h b/hch/CHeroHandler.h similarity index 96% rename from CHeroHandler.h rename to hch/CHeroHandler.h index 9e3ccce5b..42fe16a99 100644 --- a/CHeroHandler.h +++ b/hch/CHeroHandler.h @@ -5,7 +5,7 @@ #include #include "CCreatureHandler.h" #include "SDL.h" -#include "int3.h" +#include "../int3.h" class CHeroClass; diff --git a/CLodHandler.cpp b/hch/CLodHandler.cpp similarity index 95% rename from CLodHandler.cpp rename to hch/CLodHandler.cpp index 080957e19..bc6934b17 100644 --- a/CLodHandler.cpp +++ b/hch/CLodHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CLodHandler.h" -#include "SDL_Extensions.h" +#include "../SDL_Extensions.h" #include #include #include diff --git a/CLodHandler.h b/hch/CLodHandler.h similarity index 95% rename from CLodHandler.h rename to hch/CLodHandler.h index faa94f2c7..1833119a1 100644 --- a/CLodHandler.h +++ b/hch/CLodHandler.h @@ -7,7 +7,7 @@ #include #include "zlib.h" #include "CDefHandler.h" -#include "nodrze.h" +#include "../nodrze.h" enum Epcxformat {PCX8B, PCX24B}; diff --git a/CMusicHandler.cpp b/hch/CMusicHandler.cpp similarity index 96% rename from CMusicHandler.cpp rename to hch/CMusicHandler.cpp index 3a9aee8ec..595f773b5 100644 --- a/CMusicHandler.cpp +++ b/hch/CMusicHandler.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CMusicHandler.h" void CMusicHandler::initMusics() diff --git a/CMusicHandler.h b/hch/CMusicHandler.h similarity index 100% rename from CMusicHandler.h rename to hch/CMusicHandler.h diff --git a/CObjectHandler.cpp b/hch/CObjectHandler.cpp similarity index 93% rename from CObjectHandler.cpp rename to hch/CObjectHandler.cpp index 0af0133e7..d758f3fd3 100644 --- a/CObjectHandler.cpp +++ b/hch/CObjectHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CObjectHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CGeneralTextHandler.h" #include "CLodHandler.h" #include "CAmbarCendamo.h" diff --git a/CObjectHandler.h b/hch/CObjectHandler.h similarity index 100% rename from CObjectHandler.h rename to hch/CObjectHandler.h diff --git a/CPreGameTextHandler.cpp b/hch/CPreGameTextHandler.cpp similarity index 95% rename from CPreGameTextHandler.cpp rename to hch/CPreGameTextHandler.cpp index 7c447b632..5212c2005 100644 --- a/CPreGameTextHandler.cpp +++ b/hch/CPreGameTextHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CPreGameTextHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CLodHandler.h" std::string CPreGameTextHandler::getTitle(std::string text) { diff --git a/CPreGameTextHandler.h b/hch/CPreGameTextHandler.h similarity index 100% rename from CPreGameTextHandler.h rename to hch/CPreGameTextHandler.h diff --git a/CSemiDefHandler.cpp b/hch/CSemiDefHandler.cpp similarity index 94% rename from CSemiDefHandler.cpp rename to hch/CSemiDefHandler.cpp index b15e92a17..4e6ca30e9 100644 --- a/CSemiDefHandler.cpp +++ b/hch/CSemiDefHandler.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CSemiDefHandler.h" #include extern SDL_Surface * ekran; diff --git a/CSemiDefHandler.h b/hch/CSemiDefHandler.h similarity index 92% rename from CSemiDefHandler.h rename to hch/CSemiDefHandler.h index db90b8596..3324c132c 100644 --- a/CSemiDefHandler.h +++ b/hch/CSemiDefHandler.h @@ -1,6 +1,6 @@ #ifndef SEMIDEF_H #define SEMIDEF_H -#include "global.h" +#include "../global.h" #include #include "SDL.h" #include "SDL_image.h" diff --git a/CSemiLodHandler.cpp b/hch/CSemiLodHandler.cpp similarity index 88% rename from CSemiLodHandler.cpp rename to hch/CSemiLodHandler.cpp index cf2dbfbb0..1043774d4 100644 --- a/CSemiLodHandler.cpp +++ b/hch/CSemiLodHandler.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CSemiLodHandler.h" void CSemiLodHandler::openLod(std::string path) { diff --git a/CSemiLodHandler.h b/hch/CSemiLodHandler.h similarity index 100% rename from CSemiLodHandler.h rename to hch/CSemiLodHandler.h diff --git a/CSndHandler.cpp b/hch/CSndHandler.cpp similarity index 95% rename from CSndHandler.cpp rename to hch/CSndHandler.cpp index f020a7027..275011f75 100644 --- a/CSndHandler.cpp +++ b/hch/CSndHandler.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CSndHandler.h" diff --git a/CSndHandler.h b/hch/CSndHandler.h similarity index 100% rename from CSndHandler.h rename to hch/CSndHandler.h diff --git a/CSpellHandler.cpp b/hch/CSpellHandler.cpp similarity index 93% rename from CSpellHandler.cpp rename to hch/CSpellHandler.cpp index fe4d1e1fd..0b2d1bae8 100644 --- a/CSpellHandler.cpp +++ b/hch/CSpellHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CSpellHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CLodHandler.h" void CSpellHandler::loadSpells() diff --git a/CSpellHandler.h b/hch/CSpellHandler.h similarity index 100% rename from CSpellHandler.h rename to hch/CSpellHandler.h diff --git a/CTownHandler.cpp b/hch/CTownHandler.cpp similarity index 90% rename from CTownHandler.cpp rename to hch/CTownHandler.cpp index ff978e2b1..d830e074b 100644 --- a/CTownHandler.cpp +++ b/hch/CTownHandler.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "../stdafx.h" #include "CTownHandler.h" -#include "CGameInfo.h" +#include "../CGameInfo.h" #include "CLodHandler.h" #include diff --git a/CTownHandler.h b/hch/CTownHandler.h similarity index 93% rename from CTownHandler.h rename to hch/CTownHandler.h index 17fbf6cad..cdbeaf286 100644 --- a/CTownHandler.h +++ b/hch/CTownHandler.h @@ -3,7 +3,7 @@ #include "CDefHandler.h" #include "CCreatureHandler.h" #include "SDL.h" -#include "int3.h" +#include "../int3.h" #include #include class CTown diff --git a/CVideoHandler.cpp b/hch/CVideoHandler.cpp similarity index 95% rename from CVideoHandler.cpp rename to hch/CVideoHandler.cpp index ac59141c7..e76ea5af2 100644 --- a/CVideoHandler.cpp +++ b/hch/CVideoHandler.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "../stdafx.h" #include #include "CVideoHandler.h" #include "SDL.h" diff --git a/CVideoHandler.h b/hch/CVideoHandler.h similarity index 100% rename from CVideoHandler.h rename to hch/CVideoHandler.h diff --git a/map.h b/map.h index 9e4d0ff7a..d01a38e5e 100644 --- a/map.h +++ b/map.h @@ -4,8 +4,8 @@ #include #include #include "global.h" -#include "CSemiDefHandler.h" -#include "CDefHandler.h" +#include "hch\CSemiDefHandler.h" +#include "hch\CDefHandler.h" enum ESortBy{name,playerAm,size,format, viccon,loscon}; struct Sresource diff --git a/mapHandler.cpp b/mapHandler.cpp index 56a7bbe0d..746c5566a 100644 --- a/mapHandler.cpp +++ b/mapHandler.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "mapHandler.h" -#include "CSemiDefHandler.h" +#include "hch\CSemiDefHandler.h" #include "SDL_rotozoom.h" #include "SDL_Extensions.h" #include "CGameInfo.h" #include "stdlib.h" -#include "CLodHandler.h" -#include "CDefObjInfoHandler.h" +#include "hch\CLodHandler.h" +#include "hch\CDefObjInfoHandler.h" #include extern SDL_Surface * ekran; diff --git a/mapHandler.h b/mapHandler.h index b4e5fa80e..c585ade9f 100644 --- a/mapHandler.h +++ b/mapHandler.h @@ -1,12 +1,12 @@ #ifndef MAPHANDLER_H #define MAPHANDLER_H -#include "CAmbarCendamo.h" -#include "CSemiDefHandler.h" +#include "hch\CAmbarCendamo.h" +#include "hch\CSemiDefHandler.h" #include "CGameInfo.h" -#include "CDefHandler.h" +#include "hch\CDefHandler.h" #include -#include "CObjectHandler.h" +#include "hch\CObjectHandler.h" const int Woff = 4; //width of map's frame const int Hoff = 4;