games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

cleanup

Browse Source
This commit is contained in:
AlexVinS 2016-10-16 03:52:11 +03:00
parent 523e33a5e5
commit abb875b400
7 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/widgets/Buttons.h
View File

@ -10,7 +10,6 @@ struct Rect;
class CAnimImage; class CAnimImage;
class CLabel; class CLabel;
class CAnimation; class CAnimation;
class CDefHandler;
namespace config namespace config
{ {
@ -268,7 +267,7 @@ public:
void wheelScrolled(bool down, bool in) override; void wheelScrolled(bool down, bool in) override;
void clickLeft(tribool down, bool previousState) override; void clickLeft(tribool down, bool previousState) override;
void mouseMoved (const SDL_MouseMotionEvent & sEvent) override; void mouseMoved (const SDL_MouseMotionEvent & sEvent) override;
void showAll(SDL_Surface * to) override; void showAll(SDL_Surface * to) override;
/// @param position coordinates of slider /// @param position coordinates of slider
/// @param length length of slider ribbon, including left/right buttons /// @param length length of slider ribbon, including left/right buttons

3
client/widgets/Images.h
View File

@ -8,7 +8,6 @@ struct Rect;
class CAnimImage; class CAnimImage;
class CLabel; class CLabel;
class CAnimation; class CAnimation;
class CDefHandler;
/* /*
* Images.h, part of VCMI engine * Images.h, part of VCMI engine
@ -24,7 +23,7 @@ class CDefHandler;
class CPicture : public CIntObject class CPicture : public CIntObject
{ {
void setSurface(SDL_Surface *to); void setSurface(SDL_Surface *to);
public: public:
SDL_Surface * bg; SDL_Surface * bg;
Rect * srcRect; //if nullptr then whole surface will be used Rect * srcRect; //if nullptr then whole surface will be used
bool freeSurf; //whether surface will be freed upon CPicture destruction bool freeSurf; //whether surface will be freed upon CPicture destruction

1
client/widgets/ObjectLists.h
View File

@ -8,7 +8,6 @@ class CAnimImage;
class CSlider; class CSlider;
class CLabel; class CLabel;
class CAnimation; class CAnimation;
class CDefHandler;
/* /*
* ObjectLists.h, part of VCMI engine * ObjectLists.h, part of VCMI engine

1
client/windows/CCastleInterface.cpp
View File

@ -7,7 +7,6 @@
#include "GUIClasses.h" #include "GUIClasses.h"
#include "../CBitmapHandler.h" #include "../CBitmapHandler.h"
#include "../CDefHandler.h"
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CMessage.h" #include "../CMessage.h"
#include "../CMusicHandler.h" #include "../CMusicHandler.h"

1
client/windows/CHeroWindow.cpp
View File

@ -8,7 +8,6 @@
#include "GUIClasses.h" #include "GUIClasses.h"
#include "../CBitmapHandler.h" #include "../CBitmapHandler.h"
#include "../CDefHandler.h"
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CMessage.h" #include "../CMessage.h"
#include "../CMT.h" #include "../CMT.h"

3
client/windows/CHeroWindow.h
View File

@ -17,7 +17,6 @@
class CButton; class CButton;
struct SDL_Surface; struct SDL_Surface;
class CGHeroInstance; class CGHeroInstance;
class CDefHandler;
class CArtifact; class CArtifact;
class CHeroWindow; class CHeroWindow;
class LClickableAreaHero; class LClickableAreaHero;
@ -75,7 +74,7 @@ class CHeroWindow: public CWindowObject, public CWindowWithGarrison, public CWin
CHeroWithMaybePickedArtifact heroWArt; CHeroWithMaybePickedArtifact heroWArt;
CButton * quitButton, * dismissButton, * questlogButton, * commanderButton; //general CButton * quitButton, * dismissButton, * questlogButton, * commanderButton; //general
CToggleButton *tacticsButton; //garrison / formation handling; CToggleButton *tacticsButton; //garrison / formation handling;
CToggleGroup *formations; CToggleGroup *formations;

3
client/windows/CQuestLog.cpp
View File

@ -4,7 +4,6 @@
#include "CAdvmapInterface.h" #include "CAdvmapInterface.h"
#include "../CBitmapHandler.h" #include "../CBitmapHandler.h"
#include "../CDefHandler.h"
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../Graphics.h" #include "../Graphics.h"
@ -121,7 +120,7 @@ CQuestLog::CQuestLog (const std::vector<QuestInfo> & Quests) :
currentQuest(nullptr), currentQuest(nullptr),
componentsBox(nullptr), componentsBox(nullptr),
hideComplete(false), hideComplete(false),
quests(Quests), quests(Quests),
slider(nullptr) slider(nullptr)
{ {
OBJ_CONSTRUCTION_CAPTURING_ALL; OBJ_CONSTRUCTION_CAPTURING_ALL;