From 93c386a4ce112f3a5028ac57ce1ab41011a5ef7b Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sat, 28 Oct 2017 20:04:51 +0200 Subject: [PATCH] Cosmetic: rename coin to corner (2) --- src/button.h | 2 +- src/decor.cxx | 28 ++++++++++++++-------------- src/decor.h | 2 +- src/menu.h | 2 +- src/progress.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/button.h b/src/button.h index 21fbc1d..a666f35 100644 --- a/src/button.h +++ b/src/button.h @@ -71,7 +71,7 @@ protected: bool m_bEnable; // true si bouton actif bool m_bHide; // true si bouton caché Uint32 m_message; // message envoyé si bouton actionné - Point m_pos; // coin sup/gauche + Point m_pos; // up/left corner Point m_dim; // dimensions Sint32 m_state; // 0=relâché, 1=pressé, +2=survollé Sint32 m_mouseState; // 0=relâché, 1=pressé, +2=survollé diff --git a/src/decor.cxx b/src/decor.cxx index b6f5a20..e110a2f 100644 --- a/src/decor.cxx +++ b/src/decor.cxx @@ -2985,8 +2985,8 @@ CDecor::GetResHili (Point posMouse) { Sint32 icon; - // Les valeurs `corner == true` correspondent aux objets placés - // au coin inf/droit de la cellule. + // The `corner == true` values are corresponding to the objects + // positionned at the bottom/right corner of the cell. struct object_t { bool corner; const char * text; @@ -3261,24 +3261,24 @@ CDecor::HideTooltips (bool bHide) // Modifie l'origine supérieure/gauche du décor. void -CDecor::SetCorner (Point coin, bool bCenter) +CDecor::SetCorner (Point corner, bool bCenter) { if (bCenter) { - coin.x -= 10; - coin.y -= 2; + corner.x -= 10; + corner.y -= 2; } - if (coin.x < -8) - coin.x = -8; - if (coin.x > MAXCELX - 12) - coin.x = MAXCELX - 12; - if (coin.y < -2) - coin.y = -2; - if (coin.y > MAXCELY - 4) - coin.y = MAXCELY - 4; + if (corner.x < -8) + corner.x = -8; + if (corner.x > MAXCELX - 12) + corner.x = MAXCELX - 12; + if (corner.y < -2) + corner.y = -2; + if (corner.y > MAXCELY - 4) + corner.y = MAXCELY - 4; - m_celCorner = coin; + m_celCorner = corner; m_bGroundRedraw = true; // faudra redessiner les sols m_celHili.x = -1; m_textLastPos.x = -1; // tooltips plus lavable ! diff --git a/src/decor.h b/src/decor.h index cb67462..01e4ec4 100644 --- a/src/decor.h +++ b/src/decor.h @@ -406,7 +406,7 @@ public: bool GetObject (Point cel, Sint32 & channel, Sint32 & icon); bool SetFire (Point cel, bool bFire); - void SetCorner (Point coin, bool bCenter = false); + void SetCorner (Point corner, bool bCenter = false); Point GetCorner (); Point GetHome (); void MemoPos (Sint32 rank, bool bRecord); diff --git a/src/menu.h b/src/menu.h index d3f728c..ccd7c0f 100644 --- a/src/menu.h +++ b/src/menu.h @@ -60,7 +60,7 @@ protected: CDecor * m_pDecor; CSound * m_pSound; CEvent * m_pEvent; - Point m_pos; // coin sup/gauche + Point m_pos; // up/left corner Point m_dim; // dimensions Sint32 m_nbButtons; Point m_nbCel; diff --git a/src/progress.h b/src/progress.h index 478fc2e..3ac2184 100644 --- a/src/progress.h +++ b/src/progress.h @@ -46,7 +46,7 @@ protected: CDecor * m_pDecor; CSound * m_pSound; bool m_bHide; // true si bouton caché - Point m_pos; // coin sup/gauche + Point m_pos; // up/left corner Point m_dim; // dimensions Sint32 m_type; Sint32 m_level;