* minimap fix

* headers fix
* commented LUA stuff

CAdvmapInterface.cpp

@@ -7,10 +7,6 @@ extern TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX; //fonts
 
 using namespace boost::logic;
 using namespace CSDL_Ext;
-CDefHandler * CHeroList::arrdo = NULL;
-CDefHandler * CHeroList::arrup = NULL;
-CDefHandler * CTownList::arrdo = NULL;
-CDefHandler * CTownList::arrup = NULL;
 CAdvMapInt::~CAdvMapInt()
 {
 	SDL_FreeSurface(bg);
@@ -133,6 +129,11 @@ void CList::clickLeft(tribool down)
 CHeroList::CHeroList()
 {
 	pos = genRect(192,64,609,196);
+
+	arrup = CGI->spriteh->giveDef("IAM012.DEF");
+	arrdo = CGI->spriteh->giveDef("IAM013.DEF");
+	mobile = CGI->spriteh->giveDef("IMOBIL.DEF");
+	mana = CGI->spriteh->giveDef("IMANA.DEF");
 }
 void CHeroList::select(int which)
 {
@@ -152,7 +153,8 @@ void CHeroList::keyPressed (SDL_KeyboardEvent & key)
 CTownList::CTownList()
 {
 	pos = genRect(192,48,747,196);
-	arrdo = NULL;
+	arrup = CGI->spriteh->giveDef("IAM014.DEF");
+	arrdo = CGI->spriteh->giveDef("IAM015.DEF");
 }
 void CTownList::select(int which)
 {
@@ -636,6 +638,7 @@ void CAdvMapInt::fswitchLevel()
 		underground.show();
 	}
 	updateScreen = true;
+	minimap.draw();
 }
 void CAdvMapInt::fshowQuestlog()
 {

CAdvmapInterface.h

@@ -38,7 +38,8 @@ class CList
 {
 public:
 	SDL_Surface * bg;
-	//arrow up, arrow down
+	CDefHandler *arrup, *arrdo;
+	SDL_Rect arrupp, arrdop;
 	int posw, posh; //position width/height
 
 	void clickLeft(tribool down);
@@ -50,7 +51,7 @@ class CHeroList
 	: public CList
 {
 public:
-	static CDefHandler *arrup, *arrdo;
+	CDefHandler *mobile, *mana;
 
 	CHeroList();
 	void select(int which);
@@ -62,8 +63,7 @@ public:
 class CTownList 
 	: public CList
 {
-public:
-	static CDefHandler *arrup, *arrdo;
+public: 
 
 	CTownList();
 	void select(int which);

CMT.cpp

@@ -63,8 +63,58 @@ const char * NAME = "VCMI 0.3";
 SDL_Surface * ekran, * screen, * screen2;
 TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX, *GEORM;
 
+//	#include "lua.h"
+//	#include "lualib.h"
+//	#include "lauxlib.h"
+//#include <luabind/luabind.hpp>
+//#include <luabind/function.hpp>
+//#include <luabind/class.hpp>
+//
+//#if (LUA_VERSION_NUM < 500)
+//#  define LUA_OPEN_LIB(L, lib) lib(L)
+//#else
+//#  define LUA_OPEN_LIB(L, lib) \
+//     lua_pushcfunction((L), lib); \
+//     lua_pcall((L), 0, 0, 0);
+//#endif
+//void piszpowitanie2(std::string i)
+//{
+//	std::cout<<"powitanie2zc++. Liczba dnia to " << i;
+//}
+
 int _tmain(int argc, _TCHAR* argv[])
 { 
+
+//int iErr = 0;
+//lua_State *lua = lua_open ();  // Open Lua
+//	LUA_OPEN_LIB(lua, luaopen_base);
+//	LUA_OPEN_LIB(lua, luaopen_io);
+//
+//if ((iErr = luaL_loadfile (lua, "test.lua")) == 0)
+//{
+//	
+//
+//   // Call main...
+//   if ((iErr = lua_pcall (lua, 0, LUA_MULTRET, 0)) == 0)
+//   {    luabind::open(lua);
+//   luabind::module(lua)
+//	[
+//		luabind::def("powitanie",&piszpowitanie2,NULL)
+//
+//	];
+//
+//   int ret = luabind::call_function<int>(lua, "helloWorld2");
+//      // Push the function name onto the stack
+//      lua_pushstring (lua, "helloWorld");
+//      // Function is located in the Global Table
+//      lua_gettable (lua, LUA_GLOBALSINDEX);  
+//      lua_pcall (lua, 0, 0, 0);
+//   }
+//
+//}
+//lua_close (lua);
+
+
 		//CBIKHandler cb;
 		//cb.open("CSECRET.BIK");
 	THC timeHandler tmh;

hch/CAbilityHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CAbilityHandler.h"
 #include "../CGameInfo.h"
 #include "CGeneralTextHandler.h"

hch/CAmbarCendamo.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CAmbarCendamo.h"
 #include "CSemiDefHandler.h"
 #include "../CGameInfo.h"

hch/CArtHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CArtHandler.h"
 #include "../CGameInfo.h"
 #include "CGeneralTextHandler.h"

hch/CBuildingHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "../CGameInfo.h"
 #include "CBuildingHandler.h"
 #include "CLodHandler.h"

hch/CCastleHandler.cpp

@@ -1 +1,2 @@
+#include "stdafx.h"
 #include "CCastleHandler.h"

hch/CCreatureHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "../CGameInfo.h"
 #include "CCreatureHandler.h"
 #include "CLodHandler.h"

hch/CDefObjInfoHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CDefObjInfoHandler.h"
 #include "../CGameInfo.h"
 #include "CLodHandler.h"

hch/CGeneralTextHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CGeneralTextHandler.h"
 #include "../CGameInfo.h"
 #include "CLodHandler.h"

hch/CHeroHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CHeroHandler.h"
 #include "../CGameInfo.h"
 #include <sstream>

hch/CLodHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CLodHandler.h"
 #include "../SDL_Extensions.h"
 #include <sstream>

hch/CMusicHandler.cpp

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

hch/CObjectHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CObjectHandler.h"
 #include "../CGameInfo.h"
 #include "CGeneralTextHandler.h"

hch/CPreGameTextHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CPreGameTextHandler.h"
 #include "../CGameInfo.h"
 #include "CLodHandler.h"

hch/CSemiDefHandler.cpp

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

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,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CSpellHandler.h"
 #include "../CGameInfo.h"
 #include "CLodHandler.h"

hch/CTownHandler.cpp

@@ -1,4 +1,4 @@
-#include "../stdafx.h"
+#include "stdafx.h"
 #include "CTownHandler.h"
 #include "../CGameInfo.h"
 #include "CLodHandler.h"

hch/CVideoHandler.cpp

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