Skip to content

Commit 9d64188

Browse files
cfaildecfailde
committed
Remove unused includes and variables
and note happily it still compiles
1 parent 4d54f9e commit 9d64188

43 files changed

Lines changed: 3 additions & 76 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Basescape/PlaceStartFacilityState.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,16 @@
1717
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919
#include "PlaceStartFacilityState.h"
20-
#include <sstream>
2120
#include "../Engine/Game.h"
22-
#include "../Resource/ResourcePack.h"
2321
#include "../Engine/Language.h"
2422
#include "../Engine/Palette.h"
25-
#include "../Interface/TextButton.h"
26-
#include "../Interface/Window.h"
2723
#include "../Interface/Text.h"
2824
#include "BaseView.h"
2925
#include "../Savegame/Base.h"
3026
#include "../Savegame/BaseFacility.h"
3127
#include "../Ruleset/RuleBaseFacility.h"
3228
#include "../Savegame/SavedGame.h"
3329
#include "../Menu/ErrorMessageState.h"
34-
#include "BasescapeState.h"
3530
#include "SelectStartFacilityState.h"
3631

3732
namespace OpenXcom

‎src/Basescape/PlaceStartFacilityState.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,13 @@
2525
namespace OpenXcom
2626
{
2727

28-
class Globe;
29-
3028
/**
3129
* Window shown when the player tries to
3230
* build a facility.
3331
*/
3432
class PlaceStartFacilityState : public PlaceFacilityState
3533
{
3634
private:
37-
Globe *_globe;
3835
SelectStartFacilityState *_select;
3936

4037
public:

‎src/Basescape/ResearchInfoState.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,11 @@
2626
#include "../Interface/TextButton.h"
2727
#include "../Interface/Window.h"
2828
#include "../Interface/Text.h"
29-
#include "../Interface/TextList.h"
3029
#include "../Savegame/Base.h"
3130
#include "../Ruleset/RuleResearch.h"
3231
#include "../Ruleset/Ruleset.h"
3332
#include "../Savegame/ItemContainer.h"
3433
#include "../Savegame/ResearchProject.h"
35-
#include "ResearchState.h"
36-
#include "NewResearchListState.h"
3734
#include "../Interface/ArrowButton.h"
3835
#include "../Engine/Timer.h"
3936
#include "../Engine/RNG.h"

‎src/Basescape/ResearchInfoState.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class TextList;
3131
class Base;
3232
class RuleResearch;
3333
class ResearchProject;
34-
class ResearchState;
35-
class NewResearchListState;
3634
class ArrowButton;
3735
class Timer;
3836
class InteractiveSurface;
@@ -49,8 +47,6 @@ class ResearchInfoState : public State
4947
ArrowButton * _btnMore, *_btnLess;
5048
Window *_window;
5149
Text *_txtTitle, *_txtAvailableScientist, *_txtAvailableSpace, *_txtAllocatedScientist, *_txtMore, *_txtLess;
52-
TextList *_lstResearch;
53-
std::vector<Text*> texts_;
5450
void SetAssignedScientist();
5551
ResearchProject * _project;
5652
RuleResearch * _rule;

‎src/Battlescape/Explosion.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace OpenXcom
2727
* @param startFrame A startframe - can be used to offset different explosions at different frames.
2828
* @param big Flag to indicate it is a bullet hit(false), or a real explosion(true).
2929
*/
30-
Explosion::Explosion(Position position, int startFrame, bool big, bool hit) : _res(0), _save(0), _item(0), _position(position), _currentFrame(startFrame), _startFrame(startFrame), _big(big), _hit(hit)
30+
Explosion::Explosion(Position position, int startFrame, bool big, bool hit) : _position(position), _currentFrame(startFrame), _startFrame(startFrame), _big(big), _hit(hit)
3131
{
3232

3333
}

‎src/Battlescape/Explosion.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#ifndef OPENXCOM_EXPLOSION_H
2020
#define OPENXCOM_EXPLOSION_H
2121

22-
#include <vector>
2322
#include "Position.h"
2423

2524
namespace OpenXcom
@@ -36,9 +35,6 @@ class SavedBattleGame;
3635
class Explosion
3736
{
3837
private:
39-
ResourcePack *_res;
40-
SavedBattleGame *_save;
41-
BattleItem *_item;
4238
Position _position;
4339
int _currentFrame, _startFrame;
4440
bool _big, _hit;

‎src/Geoscape/GeoscapeState.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
#include <ctime>
100100
#include <algorithm>
101101
#include <functional>
102-
103102
#include <assert.h>
104103
#include "../Menu/SaveState.h"
105104
#include "../Menu/LoadState.h"

‎src/Geoscape/GeoscapeState.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class GeoscapeState : public State
5656
std::vector<State*> _popups;
5757
std::vector<DogfightState*> _dogfights, _dogfightsToBeStarted;
5858
size_t _minimizedDogfights;
59-
bool _gameStarted;
6059
bool _showFundsOnGeoscape; // this is a cache for Options::getBool("showFundsOnGeoscape")
6160
public:
6261
/// Creates the Geoscape state.

‎src/Menu/AdvancedOptionsState.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
#include "../Engine/Game.h"
2323
#include "../Resource/ResourcePack.h"
2424
#include "../Engine/Language.h"
25-
#include "../Engine/Font.h"
2625
#include "../Engine/Palette.h"
2726
#include "../Interface/TextButton.h"
2827
#include "../Interface/Window.h"
2928
#include "../Interface/Text.h"
3029
#include "../Interface/TextList.h"
3130
#include "../Engine/Options.h"
32-
#include "../Engine/InteractiveSurface.h"
3331
#include "../Engine/Action.h"
3432
#include <algorithm>
3533

‎src/Menu/AdvancedOptionsState.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define OPENXCOM_ADVANCEDOPTIONSSTATE_H
2121

2222
#include "../Engine/State.h"
23-
#include <SDL.h>
2423

2524
namespace OpenXcom
2625
{

0 commit comments

Comments
 (0)