Skip to content
Permalink
Browse files

Merge pull request #1226 from R1dO/fix/multipleGCCwarnings

Fix multiple GCC warnings
  • Loading branch information...
SupSuper committed Aug 20, 2019
2 parents 4fc8c8b + df85764 commit 8d6694b8d86859765c7a3ebdbde9e3e03f3a61c0
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/Battlescape/MiniMapView.cpp
  2. +1 −1 src/Menu/OptionsInformExtendedState.cpp
  3. +1 −1 src/Mod/Mod.cpp
@@ -49,7 +49,7 @@ const int MAX_FRAME = 2;
* @param camera The Battlescape camera.
* @param battleGame Pointer to the SavedBattleGame.
*/
MiniMapView::MiniMapView(int w, int h, int x, int y, Game * game, Camera * camera, SavedBattleGame * battleGame) : InteractiveSurface(w, h, x, y), _game(game), _camera(camera), _battleGame(battleGame), _frame(0), _mouseScrollingStartTime(0), _isMouseScrolling(false), _isMouseScrolled(false), _xBeforeMouseScrolling(0), _yBeforeMouseScrolling(0), _mouseScrollX(0), _mouseScrollY(0), _totalMouseMoveX(0), _totalMouseMoveY(0), _mouseMovedOverThreshold(false)
MiniMapView::MiniMapView(int w, int h, int x, int y, Game * game, Camera * camera, SavedBattleGame * battleGame) : InteractiveSurface(w, h, x, y), _game(game), _camera(camera), _battleGame(battleGame), _frame(0), _isMouseScrolling(false), _isMouseScrolled(false), _xBeforeMouseScrolling(0), _yBeforeMouseScrolling(0), _mouseScrollX(0), _mouseScrollY(0), _mouseScrollingStartTime(0), _totalMouseMoveX(0), _totalMouseMoveY(0), _mouseMovedOverThreshold(false)
{
_set = _game->getMod()->getSurfaceSet("SCANG.DAT");
}
@@ -80,7 +80,7 @@ namespace OpenXcom
* Closes the window. Enables the mod.
* @param action Pointer to an action.
*/
void OptionsInformExtendedState::btnYesClick(Action *action)
void OptionsInformExtendedState::btnYesClick(Action *)
{
_game->popState();

@@ -1694,7 +1694,7 @@ SavedGame *Mod::newSave() const
maxSoldiersInTransportCraft = transportCraft->getRules()->getSoldiers();
for (std::vector<Vehicle*>::iterator v = transportCraft->getVehicles()->begin(); v != transportCraft->getVehicles()->end();)
{
if (maxSoldiersInTransportCraft < (*v)->getSize())
if ((int)maxSoldiersInTransportCraft < (*v)->getSize())
{
base->getStorageItems()->addItem((*v)->getRules()->getType(), 1);
if ((*v)->getAmmo() > 0 && !(*v)->getRules()->getCompatibleAmmo()->empty())

0 comments on commit 8d6694b

Please sign in to comment.
You can’t perform that action at this time.