Skip to content

Commit b841546

Browse files
nilekurtnilekurt
committed
Style conformity changes
1 parent 4af9dcd commit b841546

73 files changed

Lines changed: 181 additions & 181 deletions

File tree

Some content is hidden

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

‎src/Battlescape/BattlescapeGame.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ void BattlescapeGame::handleAI(BattleUnit *unit)
299299
// show a little infobox with the name of the unit and "... is under alien control"
300300
Game *game = _parentState->getGame();
301301
BattleUnit *unit = _save->getTile(action.target)->getUnit();
302-
game->pushState(new InfoboxState(game->getLanguage()->getString("STR_IS_UNDER_ALIEN_CONTROL", unit->getGender()).arg(unit->getName(game->getLanguage()))));
302+
game->pushState(new InfoboxState(game->getLanguage()->getString("STR_IS_UNDER_ALIEN_CONTROL", unit->getGender()).arg(unit->getName(game->getLanguage()))));
303303
}
304304
_save->removeItem(action.weapon);
305305
}
@@ -471,7 +471,7 @@ void BattlescapeGame::endTurn()
471471
if ((_save->getSide() != FACTION_NEUTRAL || battleComplete)
472472
&& _endTurnRequested)
473473
{
474-
_parentState->getGame()->pushState(new NextTurnState(_save, _parentState));
474+
_parentState->getGame()->pushState(new NextTurnState(_save, _parentState));
475475
}
476476
_endTurnRequested = false;
477477
}
@@ -1230,7 +1230,7 @@ void BattlescapeGame::primaryAction(const Position &pos)
12301230
if (_currentAction.actor->spendTimeUnits(_currentAction.TU))
12311231
{
12321232
_parentState->getGame()->getResourcePack()->getSound("BATTLE.CAT", _currentAction.weapon->getRules()->getHitSound())->play();
1233-
_parentState->getGame()->pushState (new UnitInfoState(_save->selectUnit(pos), _parentState, false, true));
1233+
_parentState->getGame()->pushState (new UnitInfoState(_save->selectUnit(pos), _parentState, false, true));
12341234
cancelCurrentAction();
12351235
}
12361236
else
@@ -1270,9 +1270,9 @@ void BattlescapeGame::primaryAction(const Position &pos)
12701270
// show a little infobox if it's successful
12711271
Game *game = _parentState->getGame();
12721272
if (_currentAction.type == BA_PANIC)
1273-
game->pushState(new InfoboxState(game->getLanguage()->getString("STR_MORALE_ATTACK_SUCCESSFUL")));
1273+
game->pushState(new InfoboxState(game->getLanguage()->getString("STR_MORALE_ATTACK_SUCCESSFUL")));
12741274
else if (_currentAction.type == BA_MINDCONTROL)
1275-
game->pushState(new InfoboxState(game->getLanguage()->getString("STR_MIND_CONTROL_SUCCESSFUL")));
1275+
game->pushState(new InfoboxState(game->getLanguage()->getString("STR_MIND_CONTROL_SUCCESSFUL")));
12761276
_parentState->updateSoldierInfo();
12771277
}
12781278
}

‎src/Battlescape/BattlescapeGenerator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BattlescapeGenerator
9999
RuleTerrain *getTerrain(int tex, double lat);
100100
public:
101101
/// Creates a new BattlescapeGenerator class
102-
BattlescapeGenerator(Game* game);
102+
BattlescapeGenerator(Game* game);
103103
/// Cleans up the BattlescapeGenerator.
104104
~BattlescapeGenerator();
105105
/// Sets the XCom craft.

‎src/Battlescape/BattlescapeState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ void BattlescapeState::btnStatsClick(Action *action)
10651065

10661066
_battleGame->cancelCurrentAction(true);
10671067

1068-
if (b) popup(new UnitInfoState(_save->getSelectedUnit(), this, false, false));
1068+
if (b) popup(new UnitInfoState(_save->getSelectedUnit(), this, false, false));
10691069
}
10701070
}
10711071

‎src/Battlescape/InventoryState.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -569,11 +569,11 @@ void InventoryState::btnApplyTemplateClick(Action *action)
569569
return;
570570
}
571571

572-
BattleUnit *unit = _battleGame->getSelectedUnit();
573-
std::vector<BattleItem*> *unitInv = unit->getInventory();
574-
Tile *groundTile = unit->getTile();
575-
std::vector<BattleItem*> *groundInv = groundTile->getInventory();
576-
RuleInventory *groundRuleInv = _game->getRuleset()->getInventory("STR_GROUND");
572+
BattleUnit *unit = _battleGame->getSelectedUnit();
573+
std::vector<BattleItem*> *unitInv = unit->getInventory();
574+
Tile *groundTile = unit->getTile();
575+
std::vector<BattleItem*> *groundInv = groundTile->getInventory();
576+
RuleInventory *groundRuleInv = _game->getRuleset()->getInventory("STR_GROUND");
577577

578578
// clear unit's inventory (i.e. move everything to the ground)
579579
for (std::vector<BattleItem*>::iterator i = unitInv->begin(); i != unitInv->end(); )

‎src/Battlescape/Map.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Map : public InteractiveSurface
7777
static const int ICON_HEIGHT = 56;
7878
static const int ICON_WIDTH = 320;
7979
/// Creates a new map at the specified position and size.
80-
Map(Game* game, int width, int height, int x, int y, int visibleMapHeight);
80+
Map(Game* game, int width, int height, int x, int y, int visibleMapHeight);
8181
/// Cleans up the map.
8282
~Map();
8383
/// Initializes the map.

‎src/Engine/Game.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ void Game::run()
247247
{
248248
if (action.getDetails()->key.keysym.sym == SDLK_t && (SDL_GetModState() & KMOD_CTRL) != 0)
249249
{
250-
setState(new TestState);
250+
setState(new TestState);
251251
}
252252
// "ctrl-u" debug UI
253253
else if (action.getDetails()->key.keysym.sym == SDLK_u && (SDL_GetModState() & KMOD_CTRL) != 0)

‎src/Engine/State.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ class State
4646
friend class Timer;
4747

4848
protected:
49-
static Game *_game;
49+
static Game *_game;
5050
std::vector<Surface*> _surfaces;
5151
bool _screen;
5252
InteractiveSurface *_modal;
5353
SDL_Color _palette[256];
5454
public:
5555
/// Creates a new state linked to a game.
56-
State();
56+
State();
5757
/// Cleans up the state.
5858
virtual ~State();
5959
/// Adds a child element to the state.
@@ -88,8 +88,8 @@ class State
8888
void lowerAllSurfaces();
8989
/// switch the colours to use the battlescape palette.
9090
void applyBattlescapeTheme();
91-
/// Sets game object pointer
92-
static void setGamePtr(Game* game);
91+
/// Sets game object pointer
92+
static void setGamePtr(Game* game);
9393
/// Sets a modal surface.
9494
void setModal(InteractiveSurface *surface);
9595
/// Changes a set of colors on the state's 8bpp palette.

‎src/Geoscape/AlienBaseState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace OpenXcom
4444
* @param base Pointer to the alien base to get info from.
4545
* @param state Pointer to the Geoscape.
4646
*/
47-
AlienBaseState::AlienBaseState( AlienBase *base, GeoscapeState *state) : _state(state), _base(base)
47+
AlienBaseState::AlienBaseState(AlienBase *base, GeoscapeState *state) : _state(state), _base(base)
4848
{
4949
// Create objects
5050
_window = new Window(this, 320, 200, 0, 0);

‎src/Geoscape/AlienBaseState.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class AlienBaseState : public State
4444
Text *_txtTitle;
4545
public:
4646
/// Creates the Alien Base Detected state.
47-
AlienBaseState( AlienBase *base, GeoscapeState *state);
47+
AlienBaseState(AlienBase *base, GeoscapeState *state);
4848
/// Cleans up the Alien Base Detected state.
4949
~AlienBaseState();
5050
/// Handler for clicking the OK button.

‎src/Geoscape/AlienTerrorState.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace OpenXcom
4242
* @param city Terrorized city name.
4343
* @param state Pointer to the Geoscape.
4444
*/
45-
AlienTerrorState::AlienTerrorState( TerrorSite *terror, const std::string &city, GeoscapeState *state) : _terror(terror), _state(state)
45+
AlienTerrorState::AlienTerrorState(TerrorSite *terror, const std::string &city, GeoscapeState *state) : _terror(terror), _state(state)
4646
{
4747
_screen = false;
4848

@@ -111,7 +111,7 @@ void AlienTerrorState::btnInterceptClick(Action *)
111111
{
112112
_state->timerReset();
113113
_state->getGlobe()->center(_terror->getLongitude(), _terror->getLatitude());
114-
_game->pushState(new InterceptState( _state->getGlobe(), 0, _terror));
114+
_game->pushState(new InterceptState(_state->getGlobe(), 0, _terror));
115115
}
116116

117117
/**

0 commit comments

Comments
 (0)