games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Code style: remove senseless comments

Browse Source
This commit is contained in:
Arseniy Shestakov
2017-07-18 00:04:00 +03:00
parent b2f74a93cf
commit 2da3d8a563
29 changed files with 100 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/CDefHandler.h
View File

@@ -70,7 +70,7 @@ class CDefEssential //DefHandler with images only
{
public:
std::vector<Cimage> ourImages;
~CDefEssential(); //d-tor
~CDefEssential();
};
class CDefHandler
@@ -93,8 +93,8 @@ public:
std::vector<Cimage> ourImages;
bool notFreeImgs;
CDefHandler(); //c-tor
~CDefHandler(); //d-tor
CDefHandler();
~CDefHandler();
CDefEssential * essentialize();

10
client/CMessage.cpp
View File

@@ -44,9 +44,9 @@ public:
//blit component with image centered at this position
void showAll(SDL_Surface * to) override;
//ComponentResolved(); //c-tor
ComponentResolved(CComponent *Comp); //c-tor
~ComponentResolved(); //d-tor
//ComponentResolved();
ComponentResolved(CComponent *Comp);
~ComponentResolved();
};
// Full set of components for blitting on dialog box
struct ComponentsToBlit
@@ -55,8 +55,8 @@ struct ComponentsToBlit
int w, h;
void blitCompsOnSur(bool blitOr, int inter, int &curh, SDL_Surface *ret);
ComponentsToBlit(std::vector<CComponent*> & SComps, int maxw, bool blitOr); //c-tor
~ComponentsToBlit(); //d-tor
ComponentsToBlit(std::vector<CComponent*> & SComps, int maxw, bool blitOr);
~ComponentsToBlit();
};
namespace

4
client/CPlayerInterface.h
View File

@@ -263,8 +263,8 @@ public:
///returns true if all events are processed internally
bool capturedAllEvents();
CPlayerInterface(PlayerColor Player);//c-tor
~CPlayerInterface();//d-tor
CPlayerInterface(PlayerColor Player);
~CPlayerInterface();
private:

2
client/CPreGame.cpp
View File

@@ -1325,7 +1325,7 @@ SelectionTab::SelectionTab(CMenuScreen::EState Type, const std::function<void(CM
select(0);
break;
case CMenuScreen::loadGame:
case CMenuScreen::saveGame:;
case CMenuScreen::saveGame:
if(saveGameName.empty())
{
if(tabType == CMenuScreen::saveGame)

8
client/battle/CBattleInterface.h
View File

@@ -197,8 +197,8 @@ private:
public:
const CGTownInstance *town; //besieged town
SiegeHelper(const CGTownInstance *siegeTown, const CBattleInterface *_owner); //c-tor
~SiegeHelper(); //d-tor
SiegeHelper(const CGTownInstance *siegeTown, const CBattleInterface *_owner);
~SiegeHelper();
std::string getSiegeName(ui16 what) const;
std::string getSiegeName(ui16 what, int state) const; // state uses EWallState enum
@@ -271,8 +271,8 @@ public:
ui32 animIDhelper; //for giving IDs for animations
CBattleInterface(const CCreatureSet *army1, const CCreatureSet *army2, const CGHeroInstance *hero1, const CGHeroInstance *hero2, const SDL_Rect & myRect, std::shared_ptr<CPlayerInterface> att, std::shared_ptr<CPlayerInterface> defen, std::shared_ptr<CPlayerInterface> spectatorInt = nullptr); //c-tor
virtual ~CBattleInterface(); //d-tor
CBattleInterface(const CCreatureSet *army1, const CCreatureSet *army2, const CGHeroInstance *hero1, const CGHeroInstance *hero2, const SDL_Rect & myRect, std::shared_ptr<CPlayerInterface> att, std::shared_ptr<CPlayerInterface> defen, std::shared_ptr<CPlayerInterface> spectatorInt = nullptr);
virtual ~CBattleInterface();
//std::vector<TimeInterested*> timeinterested; //animation handling
void setPrintCellBorders(bool set); //if true, cell borders will be printed

10
client/battle/CBattleInterfaceClasses.h
View File

@@ -65,8 +65,8 @@ public:
void hover(bool on) override;
void clickLeft(tribool down, bool previousState) override; //call-in
void clickRight(tribool down, bool previousState) override; //call-in
CBattleHero(const std::string &defName, bool filpG, PlayerColor player, const CGHeroInstance *hero, const CBattleInterface *owner); //c-tor
~CBattleHero(); //d-tor
CBattleHero(const std::string &defName, bool filpG, PlayerColor player, const CGHeroInstance *hero, const CBattleInterface *owner);
~CBattleHero();
};
class CHeroInfoWindow : public CWindowObject
@@ -86,7 +86,7 @@ private:
std::vector<CLabel*> labels;
public:
CBattleOptionsWindow(const SDL_Rect &position, CBattleInterface *owner); //c-tor
CBattleOptionsWindow(const SDL_Rect &position, CBattleInterface *owner);
void bDefaultf(); //default button callback
void bExitf(); //exit button callback
@@ -99,8 +99,8 @@ private:
CButton *exit;
CPlayerInterface &owner;
public:
CBattleResultWindow(const BattleResult & br, const SDL_Rect & pos, CPlayerInterface &_owner); //c-tor
~CBattleResultWindow(); //d-tor
CBattleResultWindow(const BattleResult & br, const SDL_Rect & pos, CPlayerInterface &_owner);
~CBattleResultWindow();
void bExitf(); //exit button callback

2
client/battle/CCreatureAnimation.h
View File

@@ -113,7 +113,7 @@ public:
/// name - path to .def file, relative to SPRITES/ directory
/// controller - function that will return for how long *each* frame
/// in specified group of animation should be played, measured in seconds
CCreatureAnimation(std::string name, TSpeedController speedController); //c-tor
CCreatureAnimation(std::string name, TSpeedController speedController);
void setType(CCreatureAnim::EAnimType type); //sets type of animation and cleares framecount
CCreatureAnim::EAnimType getType() const; //returns type of animation

10
client/gui/CIntObject.h
View File

@@ -27,14 +27,14 @@ class IActivatable
public:
virtual void activate()=0;
virtual void deactivate()=0;
virtual ~IActivatable(){}; //d-tor
virtual ~IActivatable(){};
};
class IUpdateable
{
public:
virtual void update()=0;
virtual ~IUpdateable(){}; //d-tor
virtual ~IUpdateable(){};
};
// Defines a show method
@@ -47,7 +47,7 @@ public:
{
show(to);
}
virtual ~IShowable(){}; //d-tor
virtual ~IShowable(){};
};
class IShowActivatable : public IShowable, public IActivatable
@@ -57,7 +57,7 @@ public:
enum {BLOCK_ADV_HOTKEYS = 2, REDRAW_PARENT=8};
int type; //bin flags using etype
IShowActivatable();
virtual ~IShowActivatable(){}; //d-tor
virtual ~IShowActivatable(){};
};
enum class EIntObjMouseBtnType { LEFT, MIDDLE, RIGHT };
@@ -104,7 +104,7 @@ public:
/*const*/ Rect pos;
CIntObject(int used=0, Point offset=Point());
virtual ~CIntObject(); //d-tor
virtual ~CIntObject();
void updateMouseState(EIntObjMouseBtnType btn, bool state) { currentMouseState[btn] = state; }
bool mouseState(EIntObjMouseBtnType btn) const { return currentMouseState.count(btn) ? currentMouseState.at(btn) : false; }

6
client/gui/Geometries.h
View File

@@ -98,21 +98,21 @@ struct Rect : public SDL_Rect
{
x = y = w = h = -1;
}
Rect(int X, int Y, int W, int H) //c-tor
Rect(int X, int Y, int W, int H)
{
x = X;
y = Y;
w = W;
h = H;
}
Rect(const Point & position, const Point & size) //c-tor
Rect(const Point & position, const Point & size)
{
x = position.x;
y = position.y;
w = size.x;
h = size.y;
}
Rect(const SDL_Rect & r) //c-tor
Rect(const SDL_Rect & r)
{
x = r.x;
y = r.y;

4
client/mapHandler.h
View File

@@ -370,8 +370,8 @@ public:
mutable std::map<const CGObjectInstance*, ui8> animationPhase;
CMapHandler(); //c-tor
~CMapHandler(); //d-tor
CMapHandler();
~CMapHandler();
void getTerrainDescr(const int3 &pos, std::string & out, bool terName); //if tername == false => empty string when tile is clear
bool printObject(const CGObjectInstance * obj, bool fadein = false); //puts appropriate things to tiles, so obj will be visible on map

2
client/widgets/AdventureMapClasses.h
View File

@@ -378,5 +378,5 @@ public:
void endEnteringText(bool printEnteredText);
void refreshEnteredText();
CInGameConsole(); //c-tor
CInGameConsole();
};

8
client/widgets/CArtifactHolder.h
View File

@@ -48,7 +48,7 @@ protected:
public:
const CArtifactInstance * ourArt; // should be changed only with setArtifact()
CArtPlace(Point position, const CArtifactInstance * Art = nullptr); //c-tor
CArtPlace(Point position, const CArtifactInstance * Art = nullptr);
void clickLeft(tribool down, bool previousState) override;
void clickRight(tribool down, bool previousState) override;
@@ -64,7 +64,7 @@ protected:
void createImage() override;
void returnArtToHeroCallback();
public:
CCommanderArtPlace(Point position, const CGHeroInstance * commanderOwner, ArtifactPosition artSlot, const CArtifactInstance * Art = nullptr); //c-tor
CCommanderArtPlace(Point position, const CGHeroInstance * commanderOwner, ArtifactPosition artSlot, const CArtifactInstance * Art = nullptr);
void clickLeft(tribool down, bool previousState) override;
void clickRight(tribool down, bool previousState) override;
@@ -89,7 +89,7 @@ public:
CArtifactsOfHero * ourOwner;
CHeroArtPlace(Point position, const CArtifactInstance * Art = nullptr); //c-tor
CHeroArtPlace(Point position, const CArtifactInstance * Art = nullptr);
void lockSlot(bool on);
void pickSlot(bool on);
@@ -173,7 +173,7 @@ public:
//Alternative constructor, used if custom artifacts positioning required (Kingdom interface)
CArtifactsOfHero(std::map<ArtifactPosition, CHeroArtPlace *> ArtWorn, std::vector<CHeroArtPlace *> Backpack,
CButton *leftScroll, CButton *rightScroll, bool createCommonPart = false);
~CArtifactsOfHero(); //d-tor
~CArtifactsOfHero();
void updateParentWindow();
friend class CHeroArtPlace;
};

8
client/widgets/CComponent.h
View File

@@ -53,8 +53,8 @@ public:
std::string getDescription();
std::string getSubtitle();
CComponent(Etype Type, int Subtype, int Val = 0, ESize imageSize=large);//c-tor
CComponent(const Component &c, ESize imageSize=large); //c-tor
CComponent(Etype Type, int Subtype, int Val = 0, ESize imageSize=large);
CComponent(const Component &c, ESize imageSize=large);
void clickRight(tribool down, bool previousState) override; //call-in
};
@@ -71,8 +71,8 @@ public:
void select(bool on);
void clickLeft(tribool down, bool previousState) override; //call-in
CSelectableComponent(Etype Type, int Sub, int Val, ESize imageSize=large, std::function<void()> OnSelect = nullptr); //c-tor
CSelectableComponent(const Component &c, std::function<void()> OnSelect = nullptr); //c-tor
CSelectableComponent(Etype Type, int Sub, int Val, ESize imageSize=large, std::function<void()> OnSelect = nullptr);
CSelectableComponent(const Component &c, std::function<void()> OnSelect = nullptr);
};
/// box with multiple components (up to 8?)

2
client/widgets/CGarrisonInt.h
View File

@@ -135,5 +135,5 @@ class CGarrisonWindow : public CWindowObject, public CWindowWithGarrison
public:
CButton * quit;
CGarrisonWindow(const CArmedInstance *up, const CGHeroInstance *down, bool removableUnits); //c-tor
CGarrisonWindow(const CArmedInstance *up, const CGHeroInstance *down, bool removableUnits);
};

2
client/widgets/Images.h
View File

@@ -83,7 +83,7 @@ public:
CAnimImage(const std::string & name, size_t Frame, size_t Group=0, int x=0, int y=0, ui8 Flags=0);
CAnimImage(std::shared_ptr<CAnimation> Anim, size_t Frame, size_t Group=0, int x=0, int y=0, ui8 Flags=0);
~CAnimImage();//d-tor
~CAnimImage();
//size of animation
size_t size();

6
client/widgets/MiscWidgets.h
View File

@@ -89,7 +89,7 @@ private:
void show(SDL_Surface *to) override;
public:
CCreaturePic(int x, int y, const CCreature *cre, bool Big=true, bool Animated=true); //c-tor
CCreaturePic(int x, int y, const CCreature *cre, bool Big=true, bool Animated=true);
void setAmount(int newAmount);
};
@@ -101,8 +101,8 @@ public:
SDL_Surface *bg; //background bitmap
void show(SDL_Surface * to) override;
void showAll(SDL_Surface * to) override;
CMinorResDataBar(); //c-tor
~CMinorResDataBar(); //d-tor
CMinorResDataBar();
~CMinorResDataBar();
};
/// Opens hero window by left-clicking on it

16
client/windows/CCastleInterface.h
View File

@@ -46,8 +46,8 @@ public:
ui32 stateCounter;//For building construction - current stage in animation
CBuildingRect(CCastleBuildings * Par, const CGTownInstance *Town, const CStructure *Str); //c-tor
~CBuildingRect(); //d-tor
CBuildingRect(CCastleBuildings * Par, const CGTownInstance *Town, const CStructure *Str);
~CBuildingRect();
bool operator<(const CBuildingRect & p2) const;
void hover(bool on) override;
void clickLeft(tribool down, bool previousState) override;
@@ -90,8 +90,8 @@ public:
void clickLeft(tribool down, bool previousState) override;
void clickRight(tribool down, bool previousState) override;
void deactivate() override;
CHeroGSlot(int x, int y, int updown, const CGHeroInstance *h, HeroSlots * Owner); //c-tor
~CHeroGSlot(); //d-tor
CHeroGSlot(int x, int y, int updown, const CGHeroInstance *h, HeroSlots * Owner);
~CHeroGSlot();
};
/// Two hero slots that can interact with each other
@@ -216,7 +216,7 @@ public:
CCastleBuildings *builds;
//from - previously selected castle (if any)
CCastleInterface(const CGTownInstance * Town, const CGTownInstance * from = nullptr); //c-tor
CCastleInterface(const CGTownInstance * Town, const CGTownInstance * from = nullptr);
~CCastleInterface();
void castleTeleport(int where);
@@ -253,7 +253,7 @@ class CHallInterface : public CWindowObject
CButton *exit;
public:
CHallInterface(const CGTownInstance * Town); //c-tor
CHallInterface(const CGTownInstance * Town);
};
/// Window where you can decide to buy a building or not
@@ -265,7 +265,7 @@ class CBuildWindow: public CWindowObject
std::string getTextForState(int state);
void buyFunc();
public:
CBuildWindow(const CGTownInstance *Town, const CBuilding * building, int State, bool rightClick); //c-tor
CBuildWindow(const CGTownInstance *Town, const CBuilding * building, int State, bool rightClick);
};
//Small class to display
@@ -315,7 +315,7 @@ class CFortScreen : public CWindowObject
std::string getBgName(const CGTownInstance *town);
public:
CFortScreen(const CGTownInstance * town); //c-tor
CFortScreen(const CGTownInstance * town);
void creaturesChanged();
};

2
client/windows/CHeroWindow.h
View File

@@ -80,7 +80,7 @@ class CHeroWindow: public CWindowObject, public CWindowWithGarrison, public CWin
public:
const CGHeroInstance * curHero;
CHeroWindow(const CGHeroInstance *hero); //c-tor
CHeroWindow(const CGHeroInstance *hero);
void update(const CGHeroInstance * hero, bool redrawNeeded = false); //sets main displayed hero
void showAll(SDL_Surface * to) override;

6
client/windows/CSpellWindow.h
View File

@@ -59,7 +59,7 @@ class CSpellWindow : public CWindowObject
void clickRight(tribool down, bool previousState) override;
void hover(bool on) override;
InteractiveArea(const SDL_Rect & myRect, std::function<void()> funcL, int helpTextId, CSpellWindow * _owner);//c-tor
InteractiveArea(const SDL_Rect & myRect, std::function<void()> funcL, int helpTextId, CSpellWindow * _owner);
};
CPicture * leftCorner, * rightCorner;
@@ -92,8 +92,8 @@ class CSpellWindow : public CWindowObject
void turnPageRight();
public:
CSpellWindow(const CGHeroInstance * _myHero, CPlayerInterface * _myInt, bool openOnBattleSpells = true); //c-tor
~CSpellWindow(); //d-tor
CSpellWindow(const CGHeroInstance * _myHero, CPlayerInterface * _myInt, bool openOnBattleSpells = true);
~CSpellWindow();
void fexitb();
void fadvSpellsb();

8
client/windows/CTradeWindow.h
View File

@@ -109,8 +109,8 @@ public:
void sliderMoved(int to);
void makeDeal();
void selectionChanged(bool side) override; //true == left
CMarketplaceWindow(const IMarket *Market, const CGHeroInstance *Hero = nullptr, EMarketMode::EMarketMode Mode = EMarketMode::RESOURCE_RESOURCE); //c-tor
~CMarketplaceWindow(); //d-tor
CMarketplaceWindow(const IMarket *Market, const CGHeroInstance *Hero = nullptr, EMarketMode::EMarketMode Mode = EMarketMode::RESOURCE_RESOURCE);
~CMarketplaceWindow();
Point selectionOffset(bool Left) const override;
std::string selectionSubtitle(bool Left) const override;
@@ -128,10 +128,10 @@ class CAltarWindow : public CTradeWindow
{
CAnimImage * artIcon;
public:
CAltarWindow(const IMarket *Market, const CGHeroInstance *Hero, EMarketMode::EMarketMode Mode); //c-tor
CAltarWindow(const IMarket *Market, const CGHeroInstance *Hero, EMarketMode::EMarketMode Mode);
void getExpValues();
~CAltarWindow(); //d-tor
~CAltarWindow();
std::vector<int> sacrificedUnits, //[slot_nr] -> how many creatures from that slot will be sacrificed
expPerUnit;

2
client/windows/GUIClasses.cpp
View File

@@ -999,7 +999,7 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2,
garr->addSplitBtn(new CButton( Point(740, 132), "TSBTNS.DEF", CButton::tooltip(CGI->generaltexth->tcommands[3]), std::bind(&CGarrisonInt::splitClick, garr)));
}
CExchangeWindow::~CExchangeWindow() //d-tor
CExchangeWindow::~CExchangeWindow()
{
artifs[0]->commonInfo = nullptr;
artifs[1]->commonInfo = nullptr;

22
client/windows/GUIClasses.h
View File

@@ -134,8 +134,8 @@ class CLevelWindow : public CWindowObject
void selectionChanged(unsigned to);
public:
CLevelWindow(const CGHeroInstance *hero, PrimarySkill::PrimarySkill pskill, std::vector<SecondarySkill> &skills, std::function<void(ui32)> callback); //c-tor
~CLevelWindow(); //d-tor
CLevelWindow(const CGHeroInstance *hero, PrimarySkill::PrimarySkill pskill, std::vector<SecondarySkill> &skills, std::function<void(ui32)> callback);
~CLevelWindow();
};
@@ -222,7 +222,7 @@ private:
void closeAndPushEvent(int eventType, int code = 0);
public:
CSystemOptionsWindow(); //c-tor
CSystemOptionsWindow();
};
class CTavernWindow : public CWindowObject
@@ -252,8 +252,8 @@ public:
CButton *thiefGuild, *cancel, *recruit;
const CGObjectInstance *tavernObj;
CTavernWindow(const CGObjectInstance *TavernObj); //c-tor
~CTavernWindow(); //d-tor
CTavernWindow(const CGObjectInstance *TavernObj);
~CTavernWindow();
void recruitb();
void thievesguildb();
@@ -284,8 +284,8 @@ public:
void prepareBackground(); //prepares or redraws bg
CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2, QueryID queryID); //c-tor
~CExchangeWindow(); //d-tor
CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2, QueryID queryID);
~CExchangeWindow();
};
/// Here you can buy ships
@@ -356,7 +356,7 @@ public:
void makeDeal();
void addAll();
void updateGarrisons() override;
CTransformerWindow(const CGHeroInstance * _hero, const CGTownInstance * _town); //c-tor
CTransformerWindow(const CGHeroInstance * _hero, const CGTownInstance * _town);
};
class CUniversityWindow : public CWindowObject
@@ -385,7 +385,7 @@ public:
CButton *cancel;
CGStatusBar *bar;
CUniversityWindow(const CGHeroInstance * _hero, const IMarket * _market); //c-tor
CUniversityWindow(const CGHeroInstance * _hero, const IMarket * _market);
};
/// Confirmation window for University
@@ -396,7 +396,7 @@ public:
CGStatusBar *bar;
CButton *confirm, *cancel;
CUnivConfirmWindow(CUniversityWindow * PARENT, int SKILL, bool available); //c-tor
CUnivConfirmWindow(CUniversityWindow * PARENT, int SKILL, bool available);
void makeDeal(int skill);
};
@@ -431,7 +431,7 @@ private:
void makeDeal(SlotID slot);//-1 for upgrading all creatures
int getState(SlotID slot); //-1 = no creature 0=can't upgrade, 1=upgraded, 2=can upgrade
public:
CHillFortWindow(const CGHeroInstance * visitor, const CGObjectInstance * object); //c-tor
CHillFortWindow(const CGHeroInstance * visitor, const CGObjectInstance * object);
void updateGarrisons() override;//update buttons after garrison changes
};

28
client/windows/InfoWindows.h
View File

@@ -31,8 +31,8 @@ class CSimpleWindow : public CIntObject
public:
SDL_Surface * bitmap; //background
virtual void show(SDL_Surface * to) override;
CSimpleWindow():bitmap(nullptr){}; //c-tor
virtual ~CSimpleWindow(); //d-tor
CSimpleWindow():bitmap(nullptr){};
virtual ~CSimpleWindow();
};
/// text + comp. + ok button
@@ -55,9 +55,9 @@ public:
void showAll(SDL_Surface * to) override;
void sliderMoved(int to);
CInfoWindow(std::string Text, PlayerColor player, const TCompsInfo &comps = TCompsInfo(), const TButtonsInfo &Buttons = TButtonsInfo(), bool delComps = true); //c-tor
CInfoWindow(); //c-tor
~CInfoWindow(); //d-tor
CInfoWindow(std::string Text, PlayerColor player, const TCompsInfo &comps = TCompsInfo(), const TButtonsInfo &Buttons = TButtonsInfo(), bool delComps = true);
CInfoWindow();
~CInfoWindow();
//use only before the game starts! (showYesNoDialog in LOCPLINT must be used then)
static void showInfoDialog( const std::string & text, const std::vector<CComponent*> *components, bool DelComps = true, PlayerColor player = PlayerColor(1));
@@ -77,7 +77,7 @@ public:
void clickRight(tribool down, bool previousState) override;
CRClickPopup();
virtual ~CRClickPopup(); //d-tor
virtual ~CRClickPopup();
static CIntObject* createInfoWin(Point position, const CGObjectInstance * specific);
static void createAndPush(const std::string &txt, const CInfoWindow::TCompsInfo &comps = CInfoWindow::TCompsInfo());
@@ -94,8 +94,8 @@ public:
void show(SDL_Surface * to) override;
void showAll(SDL_Surface * to) override;
CRClickPopupInt(IShowActivatable *our, bool deleteInt); //c-tor
virtual ~CRClickPopupInt(); //d-tor
CRClickPopupInt(IShowActivatable *our, bool deleteInt);
virtual ~CRClickPopupInt();
};
class CInfoPopup : public CRClickPopup
@@ -105,12 +105,12 @@ public:
SDL_Surface * bitmap; //popup background
void close() override;
void show(SDL_Surface * to) override;
CInfoPopup(SDL_Surface * Bitmap, int x, int y, bool Free=false); //c-tor
CInfoPopup(SDL_Surface * Bitmap, const Point &p, EAlignment alignment, bool Free=false); //c-tor
CInfoPopup(SDL_Surface * Bitmap = nullptr, bool Free = false); //default c-tor
CInfoPopup(SDL_Surface * Bitmap, int x, int y, bool Free=false);
CInfoPopup(SDL_Surface * Bitmap, const Point &p, EAlignment alignment, bool Free=false);
CInfoPopup(SDL_Surface * Bitmap = nullptr, bool Free = false);
void init(int x, int y);
~CInfoPopup(); //d-tor
~CInfoPopup();
};
/// popup on adventure map for town\hero objects
@@ -129,7 +129,7 @@ class CSelWindow : public CInfoWindow
public:
void selectionChange(unsigned to);
void madeChoice(); //looks for selected component and calls callback
CSelWindow(const std::string& text, PlayerColor player, int charperline ,const std::vector<CSelectableComponent*> &comps, const std::vector<std::pair<std::string,CFunctionList<void()> > > &Buttons, QueryID askID); //c-tor
CSelWindow(){}; //c-tor
CSelWindow(const std::string& text, PlayerColor player, int charperline ,const std::vector<CSelectableComponent*> &comps, const std::vector<std::pair<std::string,CFunctionList<void()> > > &Buttons, QueryID askID);
CSelWindow(){};
//notification - this class inherits important destructor from CInfoWindow
};

4
lib/CConfigHandler.h
View File

@@ -169,8 +169,8 @@ namespace config
typedef std::map<std::pair<int,int>, GUIOptions > GuiOptionsMap;
GuiOptionsMap guiOptions;
void init();
CConfigHandler(void); //c-tor
~CConfigHandler(void); //d-tor
CConfigHandler(void);
~CConfigHandler(void);
GUIOptions *go() { return current; };
void SetResolution(int x, int y)

4
lib/CConsoleHandler.h
View File

@@ -30,8 +30,8 @@ enum EConsoleTextColor
class DLL_LINKAGE CConsoleHandler
{
public:
CConsoleHandler(); //c-tor
~CConsoleHandler(); //d-tor
CConsoleHandler();
~CConsoleHandler();
void start(); //starts listening thread
template<typename T> void print(const T &data, bool addNewLine = false, EConsoleTextColor::EConsoleTextColor color = EConsoleTextColor::DEFAULT, bool printToStdErr = false)

4
lib/CHeroHandler.h
View File

@@ -243,8 +243,8 @@ public:
void loadObject(std::string scope, std::string name, const JsonNode & data) override;
void loadObject(std::string scope, std::string name, const JsonNode & data, size_t index) override;
CHeroHandler(); //c-tor
~CHeroHandler(); //d-tor
CHeroHandler();
~CHeroHandler();
std::vector<bool> getDefaultAllowed() const override;

6
lib/CStack.h
View File

@@ -152,9 +152,9 @@ public:
si32 cloneID;
std::set<EBattleStackState::EBattleStackState> state;
CStack(const CStackInstance * base, PlayerColor O, int I, ui8 Side, SlotID S); //c-tor
CStack(const CStackBasicDescriptor * stack, PlayerColor O, int I, ui8 Side, SlotID S = SlotID(255)); //c-tor
CStack(); //c-tor
CStack(const CStackInstance * base, PlayerColor O, int I, ui8 Side, SlotID S);
CStack(const CStackBasicDescriptor * stack, PlayerColor O, int I, ui8 Side, SlotID S = SlotID(255));
CStack();
~CStack();
int32_t getKilled() const;

3
lib/logging/CLogger.cpp
View File

@@ -24,7 +24,8 @@ namespace ELogLevel
case INFO: return ANDROID_LOG_INFO;
case WARN: return ANDROID_LOG_WARN;
case ERROR: return ANDROID_LOG_ERROR;
default:;
default:
break;
}
return ANDROID_LOG_UNKNOWN;
}

4
server/CVCMIServer.h
View File

@@ -50,8 +50,8 @@ class CVCMIServer
CConnection *firstConnection;
public:
CVCMIServer(); //c-tor
~CVCMIServer(); //d-tor
CVCMIServer();
~CVCMIServer();
void start();
CGameHandler *initGhFromHostingConnection(CConnection &c);