* upgrades in moveHero function

* new folder structure

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
 

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"

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; i<ourPath->nodes.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; j<CGI->state->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;
 }

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;
 

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/logic/tribool.hpp>
 BOOST_TRIBOOL_THIRD_STATE(outOfRange)

CGameState.h

@@ -9,7 +9,7 @@ struct PlayerState
 {
 public:
 	int color;
-	std::vector<std::vector<std::vector<bool> > >fogOfWarMap;
+	std::vector<std::vector<std::vector<char> > >fogOfWarMap; //true - visible, false - hidden
 	std::vector<int> resources;
 	std::vector<CHeroInstance *> heroes;
 	std::vector<CTownInstance *> towns;

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 <cmath>
@@ -17,26 +17,26 @@
 #include "zlib.h"
 #include <cmath>
 #include <ctime>
-#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"

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);

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"

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 :()
 {

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;
 

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;
 

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()

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 <set>

hch/CAmbarCendamo.h

@@ -4,9 +4,9 @@
 #include <fstream>
 #include <string>
 #include <vector>
-#include "global.h"
+#include "../global.h"
 #include "SDL.h"
-#include "map.h"
+#include "../map.h"
 #include "CSemiDefHandler.h"
 #include "CDefHandler.h"
 #include "CCreatureHandler.h"

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"
 

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"
 

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"
 

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 <sstream>
 

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 <fstream>
 

hch/CHeroHandler.cpp

@@ -1,8 +1,8 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CHeroHandler.h"
-#include "CGameInfo.h"
+#include "../CGameInfo.h"
 #include <sstream>
-#include "CGameInfo.h"
+#include "../CGameInfo.h"
 #include "CGeneralTextHandler.h"
 #include "CLodHandler.h"
 #include "CAbilityHandler.h"

hch/CHeroHandler.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include "CCreatureHandler.h"
 #include "SDL.h"
-#include "int3.h"
+#include "../int3.h"
 
 class CHeroClass;
 

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 <sstream>
 #include <algorithm>
 #include <cctype>

hch/CLodHandler.h

@@ -7,7 +7,7 @@
 #include <string>
 #include "zlib.h"
 #include "CDefHandler.h"
-#include "nodrze.h"
+#include "../nodrze.h"
 
 enum Epcxformat {PCX8B, PCX24B};
 

hch/CMusicHandler.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CMusicHandler.h"
 
 void CMusicHandler::initMusics()

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"

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)
 {

hch/CSemiDefHandler.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CSemiDefHandler.h"
 #include <fstream>
 extern SDL_Surface * ekran;

hch/CSemiDefHandler.h

@@ -1,6 +1,6 @@
 #ifndef SEMIDEF_H
 #define SEMIDEF_H
-#include "global.h"
+#include "../global.h"
 #include <string>
 #include "SDL.h"
 #include "SDL_image.h"

hch/CSemiLodHandler.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CSemiLodHandler.h"
 void CSemiLodHandler::openLod(std::string path)
 {

hch/CSndHandler.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "CSndHandler.h"
 
 

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()

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 <sstream>
 

hch/CTownHandler.h

@@ -3,7 +3,7 @@
 #include "CDefHandler.h"
 #include "CCreatureHandler.h"
 #include "SDL.h"
-#include "int3.h"
+#include "../int3.h"
 #include <string>
 #include <vector>
 class CTown

hch/CVideoHandler.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include <iostream>
 #include "CVideoHandler.h"
 #include "SDL.h"

map.h

@@ -4,8 +4,8 @@
 #include <string>
 #include <vector>
 #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

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 <algorithm>
 
 extern SDL_Surface * ekran;

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 <boost/logic/tribool.hpp>
-#include "CObjectHandler.h"
+#include "hch\CObjectHandler.h"
 const int Woff = 4; //width of map's frame
 const int Hoff = 4;