backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Cosmetic: rename coin to corner (2)

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-10-28 20:04:51 +02:00
parent 0a17d2d92e
commit 93c386a4ce
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/button.h
View File

@ -71,7 +71,7 @@ protected:
bool m_bEnable; // true si bouton actif bool m_bEnable; // true si bouton actif
bool m_bHide; // true si bouton caché bool m_bHide; // true si bouton caché
Uint32 m_message; // message envoyé si bouton actionné Uint32 m_message; // message envoyé si bouton actionné
Point m_pos; // coin sup/gauche Point m_pos; // up/left corner
Point m_dim; // dimensions Point m_dim; // dimensions
Sint32 m_state; // 0=relâché, 1=pressé, +2=survollé Sint32 m_state; // 0=relâché, 1=pressé, +2=survollé
Sint32 m_mouseState; // 0=relâché, 1=pressé, +2=survollé Sint32 m_mouseState; // 0=relâché, 1=pressé, +2=survollé

28
src/decor.cxx
View File

@ -2985,8 +2985,8 @@ CDecor::GetResHili (Point posMouse)
{ {
Sint32 icon; Sint32 icon;
// Les valeurs `corner == true` correspondent aux objets placés // The `corner == true` values are corresponding to the objects
// au coin inf/droit de la cellule. // positionned at the bottom/right corner of the cell.
struct object_t { struct object_t {
bool corner; bool corner;
const char * text; const char * text;
@ -3261,24 +3261,24 @@ CDecor::HideTooltips (bool bHide)
// Modifie l'origine supérieure/gauche du décor. // Modifie l'origine supérieure/gauche du décor.
void void
CDecor::SetCorner (Point coin, bool bCenter) CDecor::SetCorner (Point corner, bool bCenter)
{ {
if (bCenter) if (bCenter)
{ {
coin.x -= 10; corner.x -= 10;
coin.y -= 2; corner.y -= 2;
} }
if (coin.x < -8) if (corner.x < -8)
coin.x = -8; corner.x = -8;
if (coin.x > MAXCELX - 12) if (corner.x > MAXCELX - 12)
coin.x = MAXCELX - 12; corner.x = MAXCELX - 12;
if (coin.y < -2) if (corner.y < -2)
coin.y = -2; corner.y = -2;
if (coin.y > MAXCELY - 4) if (corner.y > MAXCELY - 4)
coin.y = MAXCELY - 4; corner.y = MAXCELY - 4;
m_celCorner = coin; m_celCorner = corner;
m_bGroundRedraw = true; // faudra redessiner les sols m_bGroundRedraw = true; // faudra redessiner les sols
m_celHili.x = -1; m_celHili.x = -1;
m_textLastPos.x = -1; // tooltips plus lavable ! m_textLastPos.x = -1; // tooltips plus lavable !

2
src/decor.h
View File

@ -406,7 +406,7 @@ public:
bool GetObject (Point cel, Sint32 & channel, Sint32 & icon); bool GetObject (Point cel, Sint32 & channel, Sint32 & icon);
bool SetFire (Point cel, bool bFire); bool SetFire (Point cel, bool bFire);
void SetCorner (Point coin, bool bCenter = false); void SetCorner (Point corner, bool bCenter = false);
Point GetCorner (); Point GetCorner ();
Point GetHome (); Point GetHome ();
void MemoPos (Sint32 rank, bool bRecord); void MemoPos (Sint32 rank, bool bRecord);

2
src/menu.h
View File

@ -60,7 +60,7 @@ protected:
CDecor * m_pDecor; CDecor * m_pDecor;
CSound * m_pSound; CSound * m_pSound;
CEvent * m_pEvent; CEvent * m_pEvent;
Point m_pos; // coin sup/gauche Point m_pos; // up/left corner
Point m_dim; // dimensions Point m_dim; // dimensions
Sint32 m_nbButtons; Sint32 m_nbButtons;
Point m_nbCel; Point m_nbCel;

2
src/progress.h
View File

@ -46,7 +46,7 @@ protected:
CDecor * m_pDecor; CDecor * m_pDecor;
CSound * m_pSound; CSound * m_pSound;
bool m_bHide; // true si bouton caché bool m_bHide; // true si bouton caché
Point m_pos; // coin sup/gauche Point m_pos; // up/left corner
Point m_dim; // dimensions Point m_dim; // dimensions
Sint32 m_type; Sint32 m_type;
Sint32 m_level; Sint32 m_level;