Skip to content

Commit 047cf5c

Browse files
nilekurtnilekurt
committed
Many fixes and some style conformity changes
1 parent 18b7534 commit 047cf5c

16 files changed

Lines changed: 25 additions & 25 deletions

‎src/Menu/OptionsBaseState.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,22 +157,22 @@ OptionsBaseState::~OptionsBaseState()
157157

158158
}
159159

160-
void OptionsBaseState::restart(Game *game, OptionsOrigin origin)
160+
void OptionsBaseState::restart(OptionsOrigin origin)
161161
{
162162
if (origin == OPT_MENU)
163163
{
164-
game->setState(new MainMenuState(game));
164+
_game->setState(new MainMenuState);
165165
}
166166
else if (origin == OPT_GEOSCAPE)
167167
{
168-
game->setState(new GeoscapeState(game));
168+
_game->setState(new GeoscapeState);
169169
}
170170
else if (origin == OPT_BATTLESCAPE)
171171
{
172-
game->setState(new GeoscapeState(game));
173-
BattlescapeState *bs = new BattlescapeState(game);
174-
game->pushState(bs);
175-
game->getSavedGame()->getSavedBattle()->setBattleState(bs);
172+
_game->setState(new GeoscapeState);
173+
BattlescapeState *bs = new BattlescapeState;
174+
_game->pushState(bs);
175+
_game->getSavedGame()->getSavedBattle()->setBattleState(bs);
176176
}
177177
}
178178

‎src/Menu/OptionsBaseState.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class OptionsBaseState : public State
5252
TextButton *_group;
5353
public:
5454
/// Creates the Options state.
55-
OptionsBaseState( OptionsOrigin origin);
55+
OptionsBaseState(OptionsOrigin origin);
5656
/// Cleans up the Options state.
5757
~OptionsBaseState();
5858
/// Restarts the game states.
59-
static void restart(Game *game, OptionsOrigin origin);
59+
static void restart(OptionsOrigin origin);
6060
/// Initializes palettes.
6161
void init();
6262
/// Presses a certain category button.

‎src/Menu/OptionsConfirmState.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace OpenXcom
3838
* @param game Pointer to the core game.
3939
* @param origin Game section that originated this state.
4040
*/
41-
OptionsConfirmState::OptionsConfirmState(Game *game, OptionsOrigin origin) : State(game), _origin(origin), _countdown(15)
41+
OptionsConfirmState::OptionsConfirmState(OptionsOrigin origin) : _origin(origin), _countdown(15)
4242
{
4343
_screen = false;
4444

@@ -140,7 +140,7 @@ void OptionsConfirmState::countdown()
140140
void OptionsConfirmState::btnYesClick(Action *)
141141
{
142142
_game->popState();
143-
OptionsBaseState::restart(_game, _origin);
143+
OptionsBaseState::restart(_origin);
144144
}
145145

146146
/**
@@ -153,7 +153,7 @@ void OptionsConfirmState::btnNoClick(Action *)
153153
Options::save();
154154
_game->getScreen()->resetDisplay();
155155
_game->popState();
156-
OptionsBaseState::restart(_game, _origin);
156+
OptionsBaseState::restart(_origin);
157157
}
158158

159159
}

‎src/Menu/OptionsConfirmState.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class OptionsConfirmState : public State
4545
int _countdown;
4646
public:
4747
/// Creates the Confirm Display Options state.
48-
OptionsConfirmState(Game *game, OptionsOrigin origin);
48+
OptionsConfirmState(OptionsOrigin origin);
4949
/// Cleans up the Confirm Display Options state.
5050
~OptionsConfirmState();
5151
/// Handle timers.

‎src/Menu/OptionsControlsState.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class OptionsControlsState : public OptionsBaseState
4747
std::string ucWords(std::string str);
4848
public:
4949
/// Creates the Controls state.
50-
OptionsControlsState( OptionsOrigin origin);
50+
OptionsControlsState(OptionsOrigin origin);
5151
/// Cleans up the Controls state.
5252
~OptionsControlsState();
5353
/// Fills controls list.

‎src/Menu/OptionsDefaultsState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OpenXcom
3535
* @param origin Game section that originated this state.
3636
* @param state Pointer to the base Options state.
3737
*/
38-
OptionsDefaultsState::OptionsDefaultsState(Game *game, OptionsOrigin origin, OptionsBaseState *state) : State(game), _origin(origin), _state(state)
38+
OptionsDefaultsState::OptionsDefaultsState(OptionsOrigin origin, OptionsBaseState *state) : _origin(origin), _state(state)
3939
{
4040
_screen = false;
4141

‎src/Menu/OptionsDefaultsState.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class OptionsDefaultsState : public State
4343
OptionsBaseState *_state;
4444
public:
4545
/// Creates the Restore Defaults state.
46-
OptionsDefaultsState(Game *game, OptionsOrigin origin, OptionsBaseState *state);
46+
OptionsDefaultsState(OptionsOrigin origin, OptionsBaseState *state);
4747
/// Cleans up the Restore Defaults state.
4848
~OptionsDefaultsState();
4949
/// Handler for clicking the Yes button.

‎src/Menu/OptionsGeoscapeState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace OpenXcom
4040
* @param game Pointer to the core game.
4141
* @param origin Game section that originated this state.
4242
*/
43-
OptionsGeoscapeState::OptionsGeoscapeState(Game *game, OptionsOrigin origin) : OptionsBaseState(game, origin)
43+
OptionsGeoscapeState::OptionsGeoscapeState(OptionsOrigin origin) : OptionsBaseState(origin)
4444
{
4545
setCategory(_btnGeoscape);
4646

‎src/Menu/OptionsGeoscapeState.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class OptionsGeoscapeState : public OptionsBaseState
4747
ToggleTextButton *_btnShowFunds;
4848
public:
4949
/// Creates the Geoscape Options state.
50-
OptionsGeoscapeState(Game *game, OptionsOrigin origin);
50+
OptionsGeoscapeState(OptionsOrigin origin);
5151
/// Cleans up the Geoscape Options state.
5252
~OptionsGeoscapeState();
5353
/// Handler for changing the Drag Scroll combobox.

‎src/Menu/OptionsModsState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace OpenXcom
3838
* @param game Pointer to the core game.
3939
* @param origin Game section that originated this state.
4040
*/
41-
OptionsModsState::OptionsModsState(Game *game, OptionsOrigin origin) : OptionsBaseState(game, origin)
41+
OptionsModsState::OptionsModsState(OptionsOrigin origin) : OptionsBaseState(origin)
4242
{
4343
setCategory(_btnMods);
4444

0 commit comments

Comments
 (0)