1
0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
This commit is contained in:
Mathieu Schroeter 2018-02-13 23:44:08 +01:00
parent 0239d1e4ee
commit 0bc1d00074
7 changed files with 33 additions and 23 deletions

View File

@ -48,9 +48,7 @@ CButton::CButton ()
m_toolTips = nullptr;
}
CButton::~CButton ()
{
}
CButton::~CButton () {}
// Crée un nouveau bouton.

View File

@ -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

View File

@ -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);

View File

@ -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;

View File

@ -148,9 +148,7 @@ CMenu::CMenu ()
// Destructeur.
CMenu::~CMenu ()
{
}
CMenu::~CMenu () {}
// Crée un nouveau bouton.

View File

@ -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);

View File

@ -37,9 +37,7 @@ CJauge::CJauge ()
m_pSound = nullptr;
}
CJauge::~CJauge ()
{
}
CJauge::~CJauge () {}
// Crée un nouveau bouton.