[planetblupi] 02/15: Cosmetic
Didier Raboud
odyx at moszumanska.debian.org
Thu Mar 15 07:59:40 UTC 2018
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository planetblupi.
commit 0bc1d0007459ce3bbac60d65a4dbc52b284a8e6b
Author: Mathieu Schroeter <mathieu at schroetersa.ch>
Date: Tue Feb 13 23:44:08 2018 +0100
Cosmetic
---
src/button.cxx | 4 +---
src/decmap.cxx | 20 ++++++++++++++++----
src/event.cxx | 4 +++-
src/fifo.cxx | 6 ++++--
src/menu.cxx | 4 +---
src/pixmap.cxx | 14 +++++++-------
src/progress.cxx | 4 +---
7 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/button.cxx b/src/button.cxx
index 7247a63..d31ca01 100644
--- a/src/button.cxx
+++ b/src/button.cxx
@@ -48,9 +48,7 @@ CButton::CButton ()
m_toolTips = nullptr;
}
-CButton::~CButton ()
-{
-}
+CButton::~CButton () {}
// Crée un nouveau bouton.
diff --git a/src/decmap.cxx b/src/decmap.cxx
index 66d4d5b..9b68ca2 100644
--- a/src/decmap.cxx
+++ b/src/decmap.cxx
@@ -406,19 +406,31 @@ static char color_object[] =
// clang-format on
static char color_deffog[4] = {
- MAP_FOG, MAP_FOG, MAP_FOG, MAP_FOG,
+ MAP_FOG,
+ MAP_FOG,
+ MAP_FOG,
+ MAP_FOG,
};
static char color_deftree[4] = {
- MAP_TREE, MAP_TREE, MAP_TREE, MAP_TREE,
+ MAP_TREE,
+ MAP_TREE,
+ MAP_TREE,
+ MAP_TREE,
};
static char color_deffloor[4] = {
- MAP_HERB1, MAP_HERB1, MAP_HERB1, MAP_HERB1,
+ MAP_HERB1,
+ MAP_HERB1,
+ MAP_HERB1,
+ MAP_HERB1,
};
static char color_fire[4] = {
- MAP_FIRE, MAP_FIRE, MAP_FIRE, MAP_FIRE,
+ MAP_FIRE,
+ MAP_FIRE,
+ MAP_FIRE,
+ MAP_FIRE,
};
// Met le contenu d'une cellule dans le bitmap de la carte
diff --git a/src/event.cxx b/src/event.cxx
index 3e5b65c..2a38d3f 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3839,7 +3839,9 @@ bool
CEvent::PlayUp (Point pos)
{
static Sounds table_sound_boing[] = {
- SOUND_BOING1, SOUND_BOING2, SOUND_BOING3,
+ SOUND_BOING1,
+ SOUND_BOING2,
+ SOUND_BOING3,
};
m_pDecor->StatisticUp (pos);
diff --git a/src/fifo.cxx b/src/fifo.cxx
index 2aed801..b012964 100644
--- a/src/fifo.cxx
+++ b/src/fifo.cxx
@@ -39,7 +39,8 @@ CPileTriee::~CPileTriee ()
free (m_data);
}
-Sint32 CPileTriee::get ()
+Sint32
+CPileTriee::get ()
{
if (m_out == m_max)
return -1;
@@ -50,7 +51,8 @@ Sint32 CPileTriee::get ()
return val;
}
-void CPileTriee::put (Sint32 pos, Sint32 dist)
+void
+CPileTriee::put (Sint32 pos, Sint32 dist)
{
Sint32 i = m_out;
Sint32 p, d, m;
diff --git a/src/menu.cxx b/src/menu.cxx
index 35b1145..19a242a 100644
--- a/src/menu.cxx
+++ b/src/menu.cxx
@@ -148,9 +148,7 @@ CMenu::CMenu ()
// Destructeur.
-CMenu::~CMenu ()
-{
-}
+CMenu::~CMenu () {}
// Crée un nouveau bouton.
diff --git a/src/pixmap.cxx b/src/pixmap.cxx
index aef25d1..d23181c 100644
--- a/src/pixmap.cxx
+++ b/src/pixmap.cxx
@@ -226,14 +226,14 @@ bool
CPixmap::Cache (
size_t channel, const std::string & pFilename, Point totalDim, Point iconDim)
{
- std::string file = GetBaseDir () + pFilename;
- SDL_Surface * surface = IMG_Load (file.c_str ());
- bool blupiChSet = false;
+ std::string file = GetBaseDir () + pFilename;
+ SDL_Surface * surface = IMG_Load (file.c_str ());
+ bool blupiChSet = false;
if (channel == CHBLUPI && !m_lpSDLBlupi)
{
m_lpSDLBlupi = surface;
- blupiChSet = true;
+ blupiChSet = true;
}
SDL_Texture * texture = SDL_CreateTextureFromSurface (g_renderer, surface);
@@ -789,13 +789,13 @@ on the endianness (byte order) of the machine */
for (int i = SPRITE_BEGIN; i <= SPRITE_END; ++i)
{
- MouseSprites sprite = static_cast<MouseSprites> (i);
+ MouseSprites sprite = static_cast<MouseSprites> (i);
if (m_lpSDLCursors[sprite - 1])
SDL_FreeCursor (m_lpSDLCursors[sprite - 1]);
- SDL_Point hotspot = this->GetCursorHotSpot (sprite);
- SDL_Rect rect = this->GetCursorRect (sprite);
+ SDL_Point hotspot = this->GetCursorHotSpot (sprite);
+ SDL_Rect rect = this->GetCursorRect (sprite);
SDL_Surface * surface = SDL_CreateRGBSurface (
0, rect.w * scale, rect.h * scale, 32, rmask, gmask, bmask, amask);
diff --git a/src/progress.cxx b/src/progress.cxx
index 6b131aa..9eb049c 100644
--- a/src/progress.cxx
+++ b/src/progress.cxx
@@ -37,9 +37,7 @@ CJauge::CJauge ()
m_pSound = nullptr;
}
-CJauge::~CJauge ()
-{
-}
+CJauge::~CJauge () {}
// Crée un nouveau bouton.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git
More information about the Pkg-games-commits
mailing list