From 6dcf31fae9e397971431dfe42586c147009c418b Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Mon, 7 Aug 2017 18:12:11 +0200 Subject: [PATCH] Cosmetic: rename some actions from french to english --- src/decblupi.cxx | 84 +++++++++++++++++++-------------------- src/decgoal.cxx | 100 +++++++++++++++++++++++------------------------ src/decor.cxx | 36 ++++++++--------- src/def.h | 70 ++++++++++++++++----------------- src/obstacle.cxx | 24 ++++++------ 5 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/decblupi.cxx b/src/decblupi.cxx index 6e5ccbe..7307be3 100644 --- a/src/decblupi.cxx +++ b/src/decblupi.cxx @@ -30,13 +30,13 @@ // Cette table donne l'action à effectuer pour un bouton // enfoncé. const Sint16 table_actions[] = { - WM_ACTION_GO, WM_ACTION_STOP, WM_ACTION_MANGE, WM_ACTION_CARRY, - WM_ACTION_DEPOSE, WM_ACTION_ABAT1, WM_ACTION_ROC1, WM_ACTION_CULTIVE, + WM_ACTION_GO, WM_ACTION_STOP, WM_ACTION_EAT, WM_ACTION_CARRY, + WM_ACTION_DROP, WM_ACTION_ABAT1, WM_ACTION_ROC1, WM_ACTION_CULTIVE, WM_ACTION_BUILD1, WM_ACTION_BUILD2, WM_ACTION_BUILD3, WM_ACTION_BUILD4, - WM_ACTION_BUILD5, WM_ACTION_BUILD6, WM_ACTION_MUR, WM_ACTION_PALIS, - WM_ACTION_ABAT1, WM_ACTION_ROC1, WM_ACTION_PONTE, WM_ACTION_TOUR, - WM_ACTION_BOIT, WM_ACTION_LABO, WM_ACTION_FLEUR1, WM_ACTION_FLEUR1, - WM_ACTION_DYNAMITE, WM_ACTION_BATEAUE, WM_ACTION_DJEEP, WM_ACTION_DRAPEAU, + WM_ACTION_BUILD5, WM_ACTION_BUILD6, WM_ACTION_WALL, WM_ACTION_PALIS, + WM_ACTION_ABAT1, WM_ACTION_ROC1, WM_ACTION_BRIDGEE, WM_ACTION_TOWER, + WM_ACTION_DRINK, WM_ACTION_LABO, WM_ACTION_FLOWER1, WM_ACTION_FLOWER1, + WM_ACTION_DYNAMITE, WM_ACTION_BOATE, WM_ACTION_DJEEP, WM_ACTION_FLAG, WM_ACTION_EXTRAIT, WM_ACTION_FABJEEP, WM_ACTION_FABMINE, WM_ACTION_FABDISC, WM_ACTION_REPEAT, WM_ACTION_DARMURE, WM_ACTION_FABARMURE, }; @@ -1052,7 +1052,7 @@ bool CDecor::RepeatAdjust ( if ( IsValid (test) && m_decor[test.x / 2][test.y / 2].floorIcon == 15 && // dalle grise ? - CelOkForAction (test, WM_ACTION_DEPOSE, rank) == 0) + CelOkForAction (test, WM_ACTION_DROP, rank) == 0) { cel = test; cMem = test; @@ -1064,7 +1064,7 @@ bool CDecor::RepeatAdjust ( if (flags == 0) { - if (CelOkForAction (cel, WM_ACTION_DEPOSE, rank) == 0) + if (CelOkForAction (cel, WM_ACTION_DROP, rank) == 0) goto ok; } @@ -1074,7 +1074,7 @@ bool CDecor::RepeatAdjust ( { test.x = cel.x + table_mur[i * 2 + 0]; test.y = cel.y + table_mur[i * 2 + 1]; - if (CelOkForAction (test, WM_ACTION_DEPOSE, rank) == 0) + if (CelOkForAction (test, WM_ACTION_DROP, rank) == 0) { cel = test; cMem = test; @@ -1287,25 +1287,25 @@ void CDecor::GoalAdjustCel (Sint32 rank, Sint32 & x, Sint32 & y) { if (x == -10 && y == -10) { - if (m_blupi[rank].goalAction == WM_ACTION_PONTEL) + if (m_blupi[rank].goalAction == WM_ACTION_BRIDGEEL) { x = m_blupi[rank].fix.x + m_blupi[rank].cLoop * 2; y = m_blupi[rank].fix.y; return; } - if (m_blupi[rank].goalAction == WM_ACTION_PONTOL) + if (m_blupi[rank].goalAction == WM_ACTION_BRIDGEOL) { x = m_blupi[rank].fix.x - m_blupi[rank].cLoop * 2; y = m_blupi[rank].fix.y; return; } - if (m_blupi[rank].goalAction == WM_ACTION_PONTSL) + if (m_blupi[rank].goalAction == WM_ACTION_BRIDGESL) { x = m_blupi[rank].fix.x; y = m_blupi[rank].fix.y + m_blupi[rank].cLoop * 2; return; } - if (m_blupi[rank].goalAction == WM_ACTION_PONTNL) + if (m_blupi[rank].goalAction == WM_ACTION_BRIDGENL) { x = m_blupi[rank].fix.x; y = m_blupi[rank].fix.y - m_blupi[rank].cLoop * 2; @@ -2548,8 +2548,8 @@ bool CDecor::BlupiNextAction (Sint32 rank) a = 1; min = 0; if ( - m_blupi[rank].goalAction == WM_ACTION_MUR || - m_blupi[rank].goalAction == WM_ACTION_TOUR) + m_blupi[rank].goalAction == WM_ACTION_WALL || + m_blupi[rank].goalAction == WM_ACTION_TOWER) { a = 5; min = 1; @@ -2666,14 +2666,14 @@ void CDecor::BlupiNextGoal (Sint32 rank) m_blupi[rank].goalAction != WM_ACTION_GRILLE && m_blupi[rank].goalAction != WM_ACTION_ELECTRO && m_blupi[rank].goalAction != WM_ACTION_ELECTROm && - m_blupi[rank].goalAction != WM_ACTION_BATEAUDE && - m_blupi[rank].goalAction != WM_ACTION_BATEAUDS && - m_blupi[rank].goalAction != WM_ACTION_BATEAUDO && - m_blupi[rank].goalAction != WM_ACTION_BATEAUDN && - m_blupi[rank].goalAction != WM_ACTION_BATEAUAE && - m_blupi[rank].goalAction != WM_ACTION_BATEAUAS && - m_blupi[rank].goalAction != WM_ACTION_BATEAUAO && - m_blupi[rank].goalAction != WM_ACTION_BATEAUAN && !m_bInvincible && + m_blupi[rank].goalAction != WM_ACTION_BOATDE && + m_blupi[rank].goalAction != WM_ACTION_BOATDS && + m_blupi[rank].goalAction != WM_ACTION_BOATDO && + m_blupi[rank].goalAction != WM_ACTION_BOATDN && + m_blupi[rank].goalAction != WM_ACTION_BOATAE && + m_blupi[rank].goalAction != WM_ACTION_BOATAS && + m_blupi[rank].goalAction != WM_ACTION_BOATAO && + m_blupi[rank].goalAction != WM_ACTION_BOATAN && !m_bInvincible && IsVirusCel (m_blupi[rank].cel)) // blupi chope un virus ? { m_blupi[rank].bMalade = true; @@ -3832,7 +3832,7 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem) if ( m_blupi[rank].perso != 8 && // pas disciple ? channel == CHOBJECT && icon == 113) // maison ? - action = WM_ACTION_MAISON; + action = WM_ACTION_HOUSE; GetFloor (goalHili2, channel, icon); if ( m_blupi[rank].perso == 0 && m_blupi[rank].vehicule == 0 && // à pied ? @@ -3852,7 +3852,7 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem) IsFreeCelDebarque (goalHili, rank, action, goal); } - if (action == WM_ACTION_DEPOSE && m_blupi[rank].energy <= MAXENERGY / 4) + if (action == WM_ACTION_DROP && m_blupi[rank].energy <= MAXENERGY / 4) { // Energie juste pour déposer l'objet transporté. m_blupi[rank].energy = MAXENERGY / 4 + 20; @@ -3876,16 +3876,16 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem) } } - if (action == WM_ACTION_FLEUR1) + if (action == WM_ACTION_FLOWER1) { GetObject (goalHili2, channel, icon); if (channel == CHOBJECT && icon == 83) // fleurs foncées ? - action = WM_ACTION_FLEUR2; + action = WM_ACTION_FLOWER2; if (channel == CHOBJECT && icon == 94) // fleurs vertes ? - action = WM_ACTION_FLEUR3; + action = WM_ACTION_FLOWER3; } - if (action == WM_ACTION_PONTE) + if (action == WM_ACTION_BRIDGEE) { cel = goalHili2; test = goalHili2; @@ -3899,24 +3899,24 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem) m_blupi[rank].fix = cel; if (test.x - cel.x < 0) - action = WM_ACTION_PONTO; + action = WM_ACTION_BRIDGEO; if (test.y - cel.y > 0) - action = WM_ACTION_PONTS; + action = WM_ACTION_BRIDGES; if (test.y - cel.y < 0) - action = WM_ACTION_PONTN; + action = WM_ACTION_BRIDGEN; } - if (action == WM_ACTION_BATEAUE) + if (action == WM_ACTION_BOATE) { if (!IsBuildBateau (goalHili2, direct)) return false; if (direct == DIRECT_S) - action = WM_ACTION_BATEAUS; + action = WM_ACTION_BOATS; if (direct == DIRECT_O) - action = WM_ACTION_BATEAUO; + action = WM_ACTION_BOATO; if (direct == DIRECT_N) - action = WM_ACTION_BATEAUN; + action = WM_ACTION_BOATN; } if (action == WM_ACTION_CARRY) @@ -3925,7 +3925,7 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem) action = WM_ACTION_CARRY2; } - if (action == WM_ACTION_DEPOSE) + if (action == WM_ACTION_DROP) { GetFloor (goalHili2, channel, icon); if ( @@ -3936,19 +3936,19 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem) if ( !IsFreeCelDepose (GetCel (goalHili2, 0, 1), rank) || IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true)) - action = WM_ACTION_DEPOSE2; + action = WM_ACTION_DROP2; } - if (action == WM_ACTION_MANGE) + if (action == WM_ACTION_EAT) { if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true)) - action = WM_ACTION_MANGE2; + action = WM_ACTION_EAT2; } - if (action == WM_ACTION_BOIT) + if (action == WM_ACTION_DRINK) { if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true)) - action = WM_ACTION_BOIT2; + action = WM_ACTION_DRINK2; } if (action == WM_ACTION_DYNAMITE) diff --git a/src/decgoal.cxx b/src/decgoal.cxx index e704dcd..b75fd52 100644 --- a/src/decgoal.cxx +++ b/src/decgoal.cxx @@ -89,7 +89,7 @@ static Sint16 table_goal_go[] = // Blupi va dans sa maison. static Sint16 table_goal_maison[] = { - WM_ACTION_MAISON, + WM_ACTION_HOUSE, GOAL_GOHILI2, +1, +1, false, GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_CONTENT, DIRECT_E, @@ -852,7 +852,7 @@ static Sint16 table_goal_build6[] = // Construction d'un mur. static Sint16 table_goal_mur[] = { - WM_ACTION_MUR, + WM_ACTION_WALL, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, false, GOAL_ENERGY, MAXENERGY / 4, @@ -896,7 +896,7 @@ static Sint16 table_goal_mur[] = // Construction d'une tour. static Sint16 table_goal_tour[] = { - WM_ACTION_TOUR, + WM_ACTION_TOWER, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, false, GOAL_ENERGY, MAXENERGY / 4, @@ -995,7 +995,7 @@ static Sint16 table_goal_carry2[] = // Repose (est). static Sint16 table_goal_depose[] = { - WM_ACTION_DEPOSE, + WM_ACTION_DROP, GOAL_GOHILI2, 0, +1, false, GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_GROUP, 6, @@ -1015,7 +1015,7 @@ static Sint16 table_goal_depose[] = // Repose (sud). static Sint16 table_goal_depose2[] = { - WM_ACTION_DEPOSE2, + WM_ACTION_DROP2, GOAL_GOHILI2, +1, 0, false, GOAL_ACTION, ACTION_STOP, DIRECT_S, GOAL_GROUP, 6, @@ -1135,7 +1135,7 @@ static Sint16 table_goal_cultive2[] = // Bouffe des tomates (est). static Sint16 table_goal_mange[] = { - WM_ACTION_MANGE, + WM_ACTION_EAT, GOAL_GOHILI2, 0, +1, false, GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_GROUP, 4, @@ -1158,7 +1158,7 @@ static Sint16 table_goal_mange[] = // Bouffe des tomates (sud). static Sint16 table_goal_mange2[] = { - WM_ACTION_MANGE2, + WM_ACTION_EAT2, GOAL_GOHILI2, +1, 0, false, GOAL_ACTION, ACTION_STOP, DIRECT_S, GOAL_GROUP, 4, @@ -1181,7 +1181,7 @@ static Sint16 table_goal_mange2[] = // Boit à la bouteille (est). static Sint16 table_goal_boit[] = { - WM_ACTION_BOIT, + WM_ACTION_DRINK, GOAL_GOHILI2, 0, +1, false, GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_GROUP, 5, @@ -1200,7 +1200,7 @@ static Sint16 table_goal_boit[] = // Boit à la bouteille (sud). static Sint16 table_goal_boit2[] = { - WM_ACTION_BOIT2, + WM_ACTION_DRINK2, GOAL_GOHILI2, +1, 0, false, GOAL_ACTION, ACTION_STOP, DIRECT_S, GOAL_GROUP, 5, @@ -1219,7 +1219,7 @@ static Sint16 table_goal_boit2[] = // Cueille des fleurs. static Sint16 table_goal_fleur1[] = { - WM_ACTION_FLEUR1, + WM_ACTION_FLOWER1, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, true, GOAL_GROUP, 4, @@ -1239,7 +1239,7 @@ static Sint16 table_goal_fleur1[] = GOAL_ACTION, ACTION_CUEILLE1, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE1, DIRECT_S, GOAL_FINISHMOVE, - GOAL_OTHER, CHOBJECT, 81, 81, -1, -1, WM_ACTION_FLEUR1, + GOAL_OTHER, CHOBJECT, 81, 81, -1, -1, WM_ACTION_FLOWER1, GOAL_TERM, 0 }; @@ -1247,7 +1247,7 @@ static Sint16 table_goal_fleur1[] = // Cueille des fleurs. static Sint16 table_goal_fleur2[] = { - WM_ACTION_FLEUR2, + WM_ACTION_FLOWER2, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, true, GOAL_GROUP, 4, @@ -1267,7 +1267,7 @@ static Sint16 table_goal_fleur2[] = GOAL_ACTION, ACTION_CUEILLE2, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE2, DIRECT_S, GOAL_FINISHMOVE, - GOAL_OTHER, CHOBJECT, 83, 83, -1, -1, WM_ACTION_FLEUR2, + GOAL_OTHER, CHOBJECT, 83, 83, -1, -1, WM_ACTION_FLOWER2, GOAL_TERM, 0 }; @@ -1275,7 +1275,7 @@ static Sint16 table_goal_fleur2[] = // Cueille des fleurs. static Sint16 table_goal_fleur3[] = { - WM_ACTION_FLEUR3, + WM_ACTION_FLOWER3, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, true, GOAL_GROUP, 4, @@ -1295,7 +1295,7 @@ static Sint16 table_goal_fleur3[] = GOAL_ACTION, ACTION_CUEILLE3, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE3, DIRECT_S, GOAL_FINISHMOVE, - GOAL_OTHER, CHOBJECT, 94, 94, -1, -1, WM_ACTION_FLEUR3, + GOAL_OTHER, CHOBJECT, 94, 94, -1, -1, WM_ACTION_FLOWER3, GOAL_TERM, 0 }; @@ -1713,7 +1713,7 @@ static Sint16 table_goal_mine2[] = // Construit un pont en direction de l'est. static Sint16 table_goal_ponte[] = { - WM_ACTION_PONTE, + WM_ACTION_BRIDGEE, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -1727,14 +1727,14 @@ static Sint16 table_goal_ponte[] = GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, GOAL_GOBLUPI, +1, 0, true, - GOAL_OTHERLOOP, WM_ACTION_PONTEL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGEEL, GOAL_TERM, 0 }; static Sint16 table_goal_pontel[] = { - WM_ACTION_PONTEL, + WM_ACTION_BRIDGEEL, GOAL_GROUP, 3, GOAL_INTERRUPT, 0, // prioritaire GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100, @@ -1745,7 +1745,7 @@ static Sint16 table_goal_pontel[] = GOAL_PUTOBJECT, -10, -10, -1, -1, GOAL_NEXTLOOP, GOAL_PUTOBJECT, -10, -10, CHOBJECT, 72, - GOAL_OTHERLOOP, WM_ACTION_PONTEL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGEEL, GOAL_GROUP, 3, GOAL_PUTOBJECT, -10, -10, -1, -1, @@ -1760,7 +1760,7 @@ static Sint16 table_goal_pontel[] = // Construit un pont en direction de l'ouest. static Sint16 table_goal_ponto[] = { - WM_ACTION_PONTO, + WM_ACTION_BRIDGEO, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -1773,14 +1773,14 @@ static Sint16 table_goal_ponto[] = GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, - GOAL_OTHERLOOP, WM_ACTION_PONTOL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGEOL, GOAL_TERM, 0 }; static Sint16 table_goal_pontol[] = { - WM_ACTION_PONTOL, + WM_ACTION_BRIDGEOL, GOAL_GROUP, 3, GOAL_INTERRUPT, 0, // prioritaire GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100, @@ -1791,7 +1791,7 @@ static Sint16 table_goal_pontol[] = GOAL_PUTOBJECT, -10, -10, -1, -1, GOAL_NEXTLOOP, GOAL_PUTOBJECT, -10, -10, CHOBJECT, 72, - GOAL_OTHERLOOP, WM_ACTION_PONTOL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGEOL, GOAL_GROUP, 3, GOAL_PUTOBJECT, -10, -10, -1, -1, @@ -1806,7 +1806,7 @@ static Sint16 table_goal_pontol[] = // Construit un pont en direction du sud. static Sint16 table_goal_ponts[] = { - WM_ACTION_PONTS, + WM_ACTION_BRIDGES, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -1819,14 +1819,14 @@ static Sint16 table_goal_ponts[] = GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, GOAL_GOBLUPI, 0, +1, true, - GOAL_OTHERLOOP, WM_ACTION_PONTSL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGESL, GOAL_TERM, 0 }; static Sint16 table_goal_pontsl[] = { - WM_ACTION_PONTSL, + WM_ACTION_BRIDGESL, GOAL_GROUP, 3, GOAL_INTERRUPT, 0, // prioritaire GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 73, -1, -1, DIMOBJY, 1, -1 * 100, @@ -1837,7 +1837,7 @@ static Sint16 table_goal_pontsl[] = GOAL_PUTOBJECT, -10, -10, -1, -1, GOAL_NEXTLOOP, GOAL_PUTOBJECT, -10, -10, CHOBJECT, 73, - GOAL_OTHERLOOP, WM_ACTION_PONTSL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGESL, GOAL_GROUP, 3, GOAL_PUTOBJECT, -10, -10, -1, -1, @@ -1852,7 +1852,7 @@ static Sint16 table_goal_pontsl[] = // Construit un pont en direction du nord. static Sint16 table_goal_pontn[] = { - WM_ACTION_PONTN, + WM_ACTION_BRIDGEN, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -1864,14 +1864,14 @@ static Sint16 table_goal_pontn[] = GOAL_ACTION, ACTION_SCIE, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, - GOAL_OTHERLOOP, WM_ACTION_PONTNL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGENL, GOAL_TERM, 0 }; static Sint16 table_goal_pontnl[] = { - WM_ACTION_PONTNL, + WM_ACTION_BRIDGENL, GOAL_GROUP, 3, GOAL_INTERRUPT, 0, // prioritaire GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 73, -1, -1, DIMOBJY, 1, -1 * 100, @@ -1882,7 +1882,7 @@ static Sint16 table_goal_pontnl[] = GOAL_PUTOBJECT, -10, -10, -1, -1, GOAL_NEXTLOOP, GOAL_PUTOBJECT, -10, -10, CHOBJECT, 73, - GOAL_OTHERLOOP, WM_ACTION_PONTNL, + GOAL_OTHERLOOP, WM_ACTION_BRIDGENL, GOAL_GROUP, 3, GOAL_PUTOBJECT, -10, -10, -1, -1, @@ -1897,7 +1897,7 @@ static Sint16 table_goal_pontnl[] = // Construit un bateau. static Sint16 table_goal_bateaue[] = { - WM_ACTION_BATEAUE, + WM_ACTION_BOATE, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -1930,7 +1930,7 @@ static Sint16 table_goal_bateaue[] = static Sint16 table_goal_bateaus[] = { - WM_ACTION_BATEAUS, + WM_ACTION_BOATS, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -1962,7 +1962,7 @@ static Sint16 table_goal_bateaus[] = static Sint16 table_goal_bateauo[] = { - WM_ACTION_BATEAUO, + WM_ACTION_BOATO, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -1995,7 +1995,7 @@ static Sint16 table_goal_bateauo[] = static Sint16 table_goal_bateaun[] = { - WM_ACTION_BATEAUN, + WM_ACTION_BOATN, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, +1, 0, false, GOAL_ENERGY, MAXENERGY / 4, @@ -2028,7 +2028,7 @@ static Sint16 table_goal_bateaun[] = // Départ en bateau. static Sint16 table_goal_bateaude[] = { - WM_ACTION_BATEAUDE, + WM_ACTION_BOATDE, GOAL_ISNOMALADE, GOAL_GOHILI2, +1, +1, true, GOAL_ISNOMALADE, @@ -2052,7 +2052,7 @@ static Sint16 table_goal_bateaude[] = static Sint16 table_goal_bateauds[] = { - WM_ACTION_BATEAUDS, + WM_ACTION_BOATDS, GOAL_ISNOMALADE, GOAL_GOHILI2, +1, +1, false, GOAL_ISNOMALADE, @@ -2075,7 +2075,7 @@ static Sint16 table_goal_bateauds[] = static Sint16 table_goal_bateaudo[] = { - WM_ACTION_BATEAUDO, + WM_ACTION_BOATDO, GOAL_ISNOMALADE, GOAL_GOHILI2, 0, +1, false, GOAL_ISNOMALADE, @@ -2098,7 +2098,7 @@ static Sint16 table_goal_bateaudo[] = static Sint16 table_goal_bateaudn[] = { - WM_ACTION_BATEAUDN, + WM_ACTION_BOATDN, GOAL_ISNOMALADE, GOAL_GOHILI2, +1, 0, false, GOAL_ISNOMALADE, @@ -2122,7 +2122,7 @@ static Sint16 table_goal_bateaudn[] = // Arrivée en bateau. static Sint16 table_goal_bateauae[] = { - WM_ACTION_BATEAUAE, + WM_ACTION_BOATAE, GOAL_GOHILI2, 0, +1, false, GOAL_GROUP, 4, GOAL_IFDEBARQUE, -3, 0, @@ -2149,7 +2149,7 @@ static Sint16 table_goal_bateauae[] = static Sint16 table_goal_bateauas[] = { - WM_ACTION_BATEAUAS, + WM_ACTION_BOATAS, GOAL_GOHILI2, +1, 0, false, GOAL_GROUP, 4, GOAL_IFDEBARQUE, 0, -3, @@ -2168,7 +2168,7 @@ static Sint16 table_goal_bateauas[] = static Sint16 table_goal_bateauao[] = { - WM_ACTION_BATEAUAO, + WM_ACTION_BOATAO, GOAL_GOHILI2, 0, +1, false, GOAL_GROUP, 4, GOAL_IFDEBARQUE, +2, 0, @@ -2187,7 +2187,7 @@ static Sint16 table_goal_bateauao[] = static Sint16 table_goal_bateauan[] = { - WM_ACTION_BATEAUAN, + WM_ACTION_BOATAN, GOAL_GOHILI2, +1, 0, false, GOAL_GROUP, 4, GOAL_IFDEBARQUE, 0, +2, @@ -2895,21 +2895,21 @@ static Sint16 table_goal_darmure[] = // Blupi cherche où planter des drapeaux. static Sint16 table_goal_drapeau[] = { - WM_ACTION_DRAPEAU, + WM_ACTION_FLAG, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, false, GOAL_ENERGY, MAXENERGY / 4, GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_FIX, 0, -1, GOAL_REPEAT, true, - GOAL_OTHERFIX, CHFLOOR, 33, 48, 71, 71, WM_ACTION_DRAPEAU2, + GOAL_OTHERFIX, CHFLOOR, 33, 48, 71, 71, WM_ACTION_FLAG2, GOAL_TERM, 0 }; static Sint16 table_goal_drapeau2[] = { - WM_ACTION_DRAPEAU2, + WM_ACTION_FLAG2, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, false, GOAL_ENERGY, MAXENERGY / 4, @@ -2920,10 +2920,10 @@ static Sint16 table_goal_drapeau2[] = GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_GOBLUPI, +1, -1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, - GOAL_FLOORJUMP, CHFLOOR, 71, WM_ACTION_DRAPEAU3, + GOAL_FLOORJUMP, CHFLOOR, 71, WM_ACTION_FLAG3, GOAL_ADDDRAPEAU, -1, 0, - GOAL_OTHERFIX, CHFLOOR, 33, 48, 71, 71, WM_ACTION_DRAPEAU2, + GOAL_OTHERFIX, CHFLOOR, 33, 48, 71, 71, WM_ACTION_FLAG2, GOAL_TERM, 0 }; @@ -2931,7 +2931,7 @@ static Sint16 table_goal_drapeau2[] = // Plante un drapeau. static Sint16 table_goal_drapeau3[] = { - WM_ACTION_DRAPEAU3, + WM_ACTION_FLAG3, GOAL_ENERGY, MAXENERGY / 4, GOAL_GOHILI2, 0, +1, false, GOAL_ENERGY, MAXENERGY / 4, @@ -2946,7 +2946,7 @@ static Sint16 table_goal_drapeau3[] = GOAL_ADDDRAPEAU, -1, 0, GOAL_FINISHMOVE, - //? GOAL_OTHERFIX, CHFLOOR,33,48,71,71, WM_ACTION_DRAPEAU2, + //? GOAL_OTHERFIX, CHFLOOR,33,48,71,71, WM_ACTION_FLAG2, GOAL_TERM, 0 }; diff --git a/src/decor.cxx b/src/decor.cxx index b972a3f..adbd2db 100644 --- a/src/decor.cxx +++ b/src/decor.cxx @@ -1592,9 +1592,9 @@ Errors CDecor::CelOkForAction ( if ( action == 2 || action == WM_ACTION_ABAT1 || action == WM_ACTION_ROC1 || - action == WM_ACTION_DEPOSE || action == WM_ACTION_LABO || - action == WM_ACTION_FLEUR1 || action == WM_ACTION_CULTIVE || - action == WM_ACTION_DRAPEAU) + action == WM_ACTION_DROP || action == WM_ACTION_LABO || + action == WM_ACTION_FLOWER1 || action == WM_ACTION_CULTIVE || + action == WM_ACTION_FLAG) { cel.x = (cel.x / 2) * 2; cel.y = (cel.y / 2) * 2; @@ -1652,12 +1652,12 @@ Errors CDecor::CelOkForAction ( m_blupi[rank].goalAction <= WM_ACTION_ROC7) || m_blupi[rank].goalAction == WM_ACTION_CULTIVE || m_blupi[rank].goalAction == WM_ACTION_CULTIVE2 || - m_blupi[rank].goalAction == WM_ACTION_DRAPEAU || - m_blupi[rank].goalAction == WM_ACTION_DRAPEAU2 || - m_blupi[rank].goalAction == WM_ACTION_DRAPEAU3 || - m_blupi[rank].goalAction == WM_ACTION_FLEUR1 || - m_blupi[rank].goalAction == WM_ACTION_FLEUR2 || - m_blupi[rank].goalAction == WM_ACTION_FLEUR3)) + m_blupi[rank].goalAction == WM_ACTION_FLAG || + m_blupi[rank].goalAction == WM_ACTION_FLAG2 || + m_blupi[rank].goalAction == WM_ACTION_FLAG3 || + m_blupi[rank].goalAction == WM_ACTION_FLOWER1 || + m_blupi[rank].goalAction == WM_ACTION_FLOWER2 || + m_blupi[rank].goalAction == WM_ACTION_FLOWER3)) error = Errors::NONE; if ( m_blupi[rank].stop == 0 && m_blupi[rank].goalAction != 0 && @@ -1845,7 +1845,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_MUR) + if (action == WM_ACTION_WALL) { if (cel.x % 2 != 1 || cel.y % 2 != 1) { @@ -1898,7 +1898,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_TOUR) + if (action == WM_ACTION_TOWER) { bool bTour; @@ -2037,7 +2037,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_PONTE) + if (action == WM_ACTION_BRIDGEE) { POINT test; @@ -2130,7 +2130,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_DEPOSE) + if (action == WM_ACTION_DROP) { if (!bTransport || bVehiculeA) { @@ -2275,7 +2275,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_FLEUR1) + if (action == WM_ACTION_FLOWER1) { GetObject (cel, channel, icon); if ( @@ -2356,7 +2356,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_MANGE) + if (action == WM_ACTION_EAT) { if (cel.x % 2 != 1 || cel.y % 2 != 1) { @@ -2383,7 +2383,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_BOIT) + if (action == WM_ACTION_DRINK) { if (cel.x % 2 != 1 || cel.y % 2 != 1) { @@ -2410,7 +2410,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_BATEAUE) + if (action == WM_ACTION_BOATE) { POINT test; @@ -2530,7 +2530,7 @@ Errors CDecor::CelOkForAction ( } } - if (action == WM_ACTION_DRAPEAU) + if (action == WM_ACTION_FLAG) { if (!bStrong || bTransport || bVehicule) { diff --git a/src/def.h b/src/def.h index 6d8663b..121c262 100644 --- a/src/def.h +++ b/src/def.h @@ -419,7 +419,7 @@ enum MouseSprites { #define WM_ACTION_BUILD6 (WM_USER+42) #define WM_ACTION_STOP (WM_USER+43) #define WM_ACTION_CARRY (WM_USER+44) -#define WM_ACTION_DEPOSE (WM_USER+45) +#define WM_ACTION_DROP (WM_USER+45) #define WM_ACTION_ROC1 (WM_USER+46) #define WM_ACTION_ROC2 (WM_USER+47) #define WM_ACTION_ROC3 (WM_USER+48) @@ -427,35 +427,35 @@ enum MouseSprites { #define WM_ACTION_ROC5 (WM_USER+50) #define WM_ACTION_ROC6 (WM_USER+51) #define WM_ACTION_ROC7 (WM_USER+52) -#define WM_ACTION_MUR (WM_USER+53) +#define WM_ACTION_WALL (WM_USER+53) #define WM_ACTION_CULTIVE (WM_USER+54) #define WM_ACTION_CULTIVE2 (WM_USER+55) -#define WM_ACTION_MANGE (WM_USER+56) +#define WM_ACTION_EAT (WM_USER+56) #define WM_ACTION_MAKE (WM_USER+57) #define WM_ACTION_BUILD (WM_USER+58) #define WM_ACTION_PALIS (WM_USER+59) #define WM_ACTION_NEWBLUPI (WM_USER+60) -#define WM_ACTION_PONTE (WM_USER+61) -#define WM_ACTION_PONTS (WM_USER+62) -#define WM_ACTION_PONTO (WM_USER+63) -#define WM_ACTION_PONTN (WM_USER+64) -#define WM_ACTION_PONTEL (WM_USER+65) -#define WM_ACTION_PONTSL (WM_USER+66) -#define WM_ACTION_PONTOL (WM_USER+67) -#define WM_ACTION_PONTNL (WM_USER+68) -#define WM_ACTION_TOUR (WM_USER+69) +#define WM_ACTION_BRIDGEE (WM_USER+61) +#define WM_ACTION_BRIDGES (WM_USER+62) +#define WM_ACTION_BRIDGEO (WM_USER+63) +#define WM_ACTION_BRIDGEN (WM_USER+64) +#define WM_ACTION_BRIDGEEL (WM_USER+65) +#define WM_ACTION_BRIDGESL (WM_USER+66) +#define WM_ACTION_BRIDGEOL (WM_USER+67) +#define WM_ACTION_BRIDGENL (WM_USER+68) +#define WM_ACTION_TOWER (WM_USER+69) #define WM_ACTION_CARRY2 (WM_USER+70) -#define WM_ACTION_DEPOSE2 (WM_USER+71) -#define WM_ACTION_MANGE2 (WM_USER+72) -#define WM_ACTION_BOIT (WM_USER+73) -#define WM_ACTION_BOIT2 (WM_USER+74) +#define WM_ACTION_DROP2 (WM_USER+71) +#define WM_ACTION_EAT2 (WM_USER+72) +#define WM_ACTION_DRINK (WM_USER+73) +#define WM_ACTION_DRINK2 (WM_USER+74) #define WM_ACTION_LABO (WM_USER+75) -#define WM_ACTION_FLEUR1 (WM_USER+76) -#define WM_ACTION_FLEUR2 (WM_USER+77) +#define WM_ACTION_FLOWER1 (WM_USER+76) +#define WM_ACTION_FLOWER2 (WM_USER+77) #define WM_ACTION_DYNAMITE (WM_USER+78) #define WM_ACTION_DYNAMITE2 (WM_USER+79) #define WM_ACTION_T_DYNAMITE (WM_USER+80) -#define WM_ACTION_FLEUR3 (WM_USER+81) +#define WM_ACTION_FLOWER3 (WM_USER+81) #define WM_ACTION_R_BUILD1 (WM_USER+82) #define WM_ACTION_R_BUILD2 (WM_USER+83) #define WM_ACTION_R_BUILD3 (WM_USER+84) @@ -466,23 +466,23 @@ enum MouseSprites { #define WM_ACTION_R_MAKE4 (WM_USER+89) #define WM_ACTION_R_BUILD5 (WM_USER+90) #define WM_ACTION_R_MAKE5 (WM_USER+91) -#define WM_ACTION_BATEAUE (WM_USER+92) -#define WM_ACTION_BATEAUS (WM_USER+93) -#define WM_ACTION_BATEAUO (WM_USER+94) -#define WM_ACTION_BATEAUN (WM_USER+95) -#define WM_ACTION_BATEAUDE (WM_USER+96) -#define WM_ACTION_BATEAUDS (WM_USER+97) -#define WM_ACTION_BATEAUDO (WM_USER+98) -#define WM_ACTION_BATEAUDN (WM_USER+99) -#define WM_ACTION_BATEAUAE (WM_USER+100) -#define WM_ACTION_BATEAUAS (WM_USER+101) -#define WM_ACTION_BATEAUAO (WM_USER+102) -#define WM_ACTION_BATEAUAN (WM_USER+103) +#define WM_ACTION_BOATE (WM_USER+92) +#define WM_ACTION_BOATS (WM_USER+93) +#define WM_ACTION_BOATO (WM_USER+94) +#define WM_ACTION_BOATN (WM_USER+95) +#define WM_ACTION_BOATDE (WM_USER+96) +#define WM_ACTION_BOATDS (WM_USER+97) +#define WM_ACTION_BOATDO (WM_USER+98) +#define WM_ACTION_BOATDN (WM_USER+99) +#define WM_ACTION_BOATAE (WM_USER+100) +#define WM_ACTION_BOATAS (WM_USER+101) +#define WM_ACTION_BOATAO (WM_USER+102) +#define WM_ACTION_BOATAN (WM_USER+103) #define WM_ACTION_MJEEP (WM_USER+104) #define WM_ACTION_DJEEP (WM_USER+105) -#define WM_ACTION_DRAPEAU (WM_USER+106) -#define WM_ACTION_DRAPEAU2 (WM_USER+107) -#define WM_ACTION_DRAPEAU3 (WM_USER+108) +#define WM_ACTION_FLAG (WM_USER+106) +#define WM_ACTION_FLAG2 (WM_USER+107) +#define WM_ACTION_FLAG3 (WM_USER+108) #define WM_ACTION_EXTRAIT (WM_USER+109) #define WM_ACTION_FABJEEP (WM_USER+110) #define WM_ACTION_FABMINE (WM_USER+111) @@ -494,7 +494,7 @@ enum MouseSprites { #define WM_ACTION_ELECTRO (WM_USER+117) #define WM_ACTION_ELECTROm (WM_USER+118) #define WM_ACTION_GRILLE (WM_USER+119) -#define WM_ACTION_MAISON (WM_USER+120) +#define WM_ACTION_HOUSE (WM_USER+120) #define WM_ACTION_FABDISC (WM_USER+121) #define WM_ACTION_A_MORT (WM_USER+122) #define WM_ACTION_REPEAT (WM_USER+123) diff --git a/src/obstacle.cxx b/src/obstacle.cxx index 767c241..c2b76b3 100644 --- a/src/obstacle.cxx +++ b/src/obstacle.cxx @@ -1934,7 +1934,7 @@ bool CDecor::IsFreeCelEmbarque ( if (bOK) { limit = GetCel (cel, -2, 0); - action = WM_ACTION_BATEAUDE; + action = WM_ACTION_BOATDE; return true; } } @@ -1948,7 +1948,7 @@ bool CDecor::IsFreeCelEmbarque ( if (bOK) { limit = GetCel (cel, 0, -2); - action = WM_ACTION_BATEAUDS; + action = WM_ACTION_BOATDS; return true; } } @@ -1962,7 +1962,7 @@ bool CDecor::IsFreeCelEmbarque ( if (bOK) { limit = GetCel (cel, +1, 0); - action = WM_ACTION_BATEAUDO; + action = WM_ACTION_BOATDO; return true; } } @@ -1976,7 +1976,7 @@ bool CDecor::IsFreeCelEmbarque ( if (bOK) { limit = GetCel (cel, 0, +1); - action = WM_ACTION_BATEAUDN; + action = WM_ACTION_BOATDN; return true; } } @@ -2013,7 +2013,7 @@ bool CDecor::IsFreeCelDebarque ( cel.x % 2 == 1 && cel.y % 2 == 1) { limit = GetCel (cel, +3, 0); - action = WM_ACTION_BATEAUAE; + action = WM_ACTION_BOATAE; return true; } @@ -2025,7 +2025,7 @@ bool CDecor::IsFreeCelDebarque ( cel.x % 2 == 1 && cel.y % 2 == 1) { limit = GetCel (cel, 0, +3); - action = WM_ACTION_BATEAUAS; + action = WM_ACTION_BOATAS; return true; } @@ -2037,7 +2037,7 @@ bool CDecor::IsFreeCelDebarque ( cel.x % 2 == 0 && cel.y % 2 == 1) { limit = GetCel (cel, -2, 0); - action = WM_ACTION_BATEAUAO; + action = WM_ACTION_BOATAO; return true; } @@ -2049,7 +2049,7 @@ bool CDecor::IsFreeCelDebarque ( cel.x % 2 == 1 && cel.y % 2 == 0) { limit = GetCel (cel, 0, -2); - action = WM_ACTION_BATEAUAN; + action = WM_ACTION_BOATAN; return true; } @@ -2630,10 +2630,10 @@ bool CDecor::SearchOtherObject ( action == WM_ACTION_BUILD2 || action == WM_ACTION_BUILD3 || action == WM_ACTION_BUILD4 || action == WM_ACTION_BUILD5 || action == WM_ACTION_BUILD6 || action == WM_ACTION_ROC1 || - action == WM_ACTION_MUR || action == WM_ACTION_PONTE || - action == WM_ACTION_TOUR || action == WM_ACTION_BATEAUE || - action == WM_ACTION_CULTIVE2 || action == WM_ACTION_DRAPEAU2 || - action == WM_ACTION_DEPOSE) + action == WM_ACTION_WALL || action == WM_ACTION_BRIDGEE || + action == WM_ACTION_TOWER || action == WM_ACTION_BOATE || + action == WM_ACTION_CULTIVE2 || action == WM_ACTION_FLAG2 || + action == WM_ACTION_DROP) { if (!IsWorkableObject (cel, rank)) continue;