games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merged most of the changes from trunk.

Browse Source 
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
This commit is contained in:
Michał W. Urbańczyk
2008-08-02 15:08:03 +00:00
parent dc82232e70
commit cc7be20b07
79 changed files with 1635 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CAdvmapInterface.h
View File

@@ -8,7 +8,7 @@
#include "AdventureMapButton.h"
class CDefHandler;
class CCallback;
struct CPath;
struct CPath;
class CAdvMapInt;
class CGHeroInstance;
class CGTownInstance;
@@ -18,7 +18,7 @@ class CMinimap
: public ClickableL, public ClickableR, public Hoverable, public MotionInterested, public virtual CIntObject
{
public:
SDL_Surface * radar;
SDL_Surface * radar;
SDL_Surface * temps;
std::map<int,SDL_Color> colors;
std::map<int,SDL_Color> colorsBlocked;
@@ -26,7 +26,7 @@ public:
//TODO flagged buildings
std::string statusbarTxt, rcText;
CMinimap(bool draw=true);
CMinimap(bool draw=true);
void draw();
void redraw(int level=-1);// (level==-1) => redraw all levels
void updateRadar();
@@ -51,7 +51,7 @@ public:
CDefHandler * arrows;
CTerrainRect();
CPath * currentPath;
void activate();
void activate();
void deactivate();
void clickLeft(tribool down);
void clickRight(tribool down);
@@ -60,7 +60,7 @@ public:
void keyPressed (SDL_KeyboardEvent & key);
void show();
void showPath();
int3 whichTileIsIt(int x, int y); //x,y are cursor position
int3 whichTileIsIt(int x, int y); //x,y are cursor position
int3 whichTileIsIt(); //uses current cursor pos
};
class CResDataBar
@@ -72,7 +72,7 @@ public:
std::string datetext;
void clickRight (tribool down);
void activate();
void activate();
void deactivate();
CResDataBar();
~CResDataBar();
@@ -108,7 +108,7 @@ public:
int player;
std::vector<CDefHandler *> gems;
bool scrollingLeft ;
bool scrollingRight ;
bool scrollingUp ;
@@ -128,7 +128,7 @@ public:
moveHero, //- move hero
spellbook,//- spellbook
advOptions, //- adventure options
sysOptions,//- system options
sysOptions,//- system options
nextHero, //- next hero
endTurn;//- end turn
//CHeroList herolist;
@@ -137,13 +137,13 @@ public:
CStatusBar statusbar;
CResDataBar resdatabar;
CHeroList heroList;
CTownList townList;
CTownList townList;
CInfoBar infoBar;
CHeroWindow * heroWindow;
struct CurrentSelection
{
int type; //0 - hero, 1 - town
@@ -153,8 +153,8 @@ public:
//fuctions binded to buttons
void fshowOverview();
void fswitchLevel();
void fshowQuestlog();
void fswitchLevel();
void fshowQuestlog();
void fsleepWake();
void fmoveHero();
void fshowSpellbok();
@@ -177,4 +177,4 @@ public:
};
#endif //CADVENTUREMAPINTERFACE_H
#endif //CADVENTUREMAPINTERFACE_H