|
@@ -320,6 +320,7 @@ class CAdvMapPanel : public CIntObject
|
|
{
|
|
{
|
|
/// ptrs to child-buttons that can be recolored with setPlayerColor()
|
|
/// ptrs to child-buttons that can be recolored with setPlayerColor()
|
|
std::vector<CButton *> buttons;
|
|
std::vector<CButton *> buttons;
|
|
|
|
+protected:
|
|
/// the surface passed to this obj will be freed in dtor
|
|
/// the surface passed to this obj will be freed in dtor
|
|
SDL_Surface * background;
|
|
SDL_Surface * background;
|
|
public:
|
|
public:
|
|
@@ -341,13 +342,16 @@ class CAdvMapWorldViewPanel : public CAdvMapPanel
|
|
std::vector<std::pair<int, Point>> iconsData;
|
|
std::vector<std::pair<int, Point>> iconsData;
|
|
/// ptrs to child-pictures constructed from iconsData
|
|
/// ptrs to child-pictures constructed from iconsData
|
|
std::vector<CPicture *> currentIcons;
|
|
std::vector<CPicture *> currentIcons;
|
|
|
|
+ /// temporary surface drawn below world view panel on higher resolutions (won't be needed when world view panel is configured for extraResolutions mod)
|
|
|
|
+ SDL_Surface * tmpBackgroundFiller;
|
|
public:
|
|
public:
|
|
- CAdvMapWorldViewPanel(SDL_Surface * bg, Point position);
|
|
|
|
- virtual ~CAdvMapWorldViewPanel(){}
|
|
|
|
|
|
+ CAdvMapWorldViewPanel(SDL_Surface * bg, Point position, int spaceBottom, const PlayerColor &color);
|
|
|
|
+ virtual ~CAdvMapWorldViewPanel();
|
|
|
|
|
|
void addChildIcon(std::pair<int, Point> data, const CDefHandler *def, int indexOffset);
|
|
void addChildIcon(std::pair<int, Point> data, const CDefHandler *def, int indexOffset);
|
|
/// recreates all pictures from given def to recolor them according to current player color
|
|
/// recreates all pictures from given def to recolor them according to current player color
|
|
void recolorIcons(const CDefHandler *def, int indexOffset);
|
|
void recolorIcons(const CDefHandler *def, int indexOffset);
|
|
|
|
+ void showAll(SDL_Surface * to);
|
|
};
|
|
};
|
|
|
|
|
|
class CInGameConsole : public CIntObject
|
|
class CInGameConsole : public CIntObject
|