From 5980889f8dd526dcbbe9be124237f5df64fb1d32 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Wed, 9 Aug 2017 23:37:53 +0200 Subject: [PATCH] Cosmetic: rename some french def to english --- src/action.cxx | 8 ++-- src/decblupi.cxx | 12 +++--- src/decgoal.cxx | 106 +++++++++++++++++++++++------------------------ src/def.h | 8 ++-- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/action.cxx b/src/action.cxx index 7bb7651..c520982 100644 --- a/src/action.cxx +++ b/src/action.cxx @@ -886,7 +886,7 @@ static const DescAction action_table[] = }, }, { - ACTION_PIOCHE, + ACTION_PICKAXE, CHBLUPI, { { 16 + 4 + 16 + 4, @@ -985,7 +985,7 @@ static const DescAction action_table[] = }, }, { - ACTION_SCIE, + ACTION_SAW, CHBLUPI, { {1, 100}, // e @@ -1764,7 +1764,7 @@ static const DescAction action_table[] = {0}, }, { - ACTION_D_PIOCHE, + ACTION_D_PICKAXE, CHBLUPI, { {1, 290}, // e @@ -1839,7 +1839,7 @@ static const DescAction action_table[] = {0}, }, { - ACTION_D_SCIE, + ACTION_D_SAW, CHBLUPI, { {8, 290, 290, 304, 304, 290, 290, 292, 292}, // e diff --git a/src/decblupi.cxx b/src/decblupi.cxx index 4da007b..ca7a7e2 100644 --- a/src/decblupi.cxx +++ b/src/decblupi.cxx @@ -598,12 +598,12 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct) m_blupi[rank].action == ACTION_BUILDSEC || m_blupi[rank].action == ACTION_BUILDSOURD || m_blupi[rank].action == ACTION_BUILDPIERRE || - m_blupi[rank].action == ACTION_PIOCHE || + m_blupi[rank].action == ACTION_PICKAXE || m_blupi[rank].action == ACTION_PIOCHEPIERRE || m_blupi[rank].action == ACTION_PIOCHESOURD || m_blupi[rank].action == ACTION_ARROSE || m_blupi[rank].action == ACTION_BECHE || - m_blupi[rank].action == ACTION_SCIE || + m_blupi[rank].action == ACTION_SAW || m_blupi[rank].action == ACTION_CARRY || m_blupi[rank].action == ACTION_DROP || m_blupi[rank].action == ACTION_BURN || @@ -722,14 +722,14 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct) if (m_blupi[rank].action == ACTION_STOP) m_blupi[rank].action = ACTION_D_STOP; - if (m_blupi[rank].action == ACTION_PIOCHE) - m_blupi[rank].action = ACTION_D_PIOCHE; + if (m_blupi[rank].action == ACTION_PICKAXE) + m_blupi[rank].action = ACTION_D_PICKAXE; if (m_blupi[rank].action == ACTION_BUILD) m_blupi[rank].action = ACTION_D_BUILD; - if (m_blupi[rank].action == ACTION_SCIE) - m_blupi[rank].action = ACTION_D_SCIE; + if (m_blupi[rank].action == ACTION_SAW) + m_blupi[rank].action = ACTION_D_SAW; if (m_blupi[rank].action == ACTION_TCHAO) m_blupi[rank].action = ACTION_D_TCHAO; diff --git a/src/decgoal.cxx b/src/decgoal.cxx index 6790869..a136287 100644 --- a/src/decgoal.cxx +++ b/src/decgoal.cxx @@ -128,7 +128,7 @@ static Sint16 table_goal_abat1[] = GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_FINISHMOVE, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_OTHER, CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1, GOAL_TERM, 0 @@ -164,7 +164,7 @@ static Sint16 table_goal_abat2[] = GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_FINISHMOVE, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_OTHER, CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1, GOAL_TERM, 0 @@ -200,7 +200,7 @@ static Sint16 table_goal_abat3[] = GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_FINISHMOVE, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_OTHER, CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1, GOAL_TERM, 0 @@ -235,7 +235,7 @@ static Sint16 table_goal_abat4[] = GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_FINISHMOVE, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_OTHER, CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1, GOAL_TERM, 0 @@ -270,7 +270,7 @@ static Sint16 table_goal_abat5[] = GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_FINISHMOVE, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_OTHER, CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1, GOAL_TERM, 0 @@ -305,7 +305,7 @@ static Sint16 table_goal_abat6[] = GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_FINISHMOVE, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_OTHER, CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1, GOAL_TERM, 0 @@ -624,18 +624,18 @@ static Sint16 table_goal_build1[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDFLOOR, 0, -1, CHFLOOR, 16, CHMASK1, 0, 16, 14, 1 * 100, // briques - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, -1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, -1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, //? GOAL_ENERGY, MAXENERGY/4, // échaffaudage GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 62, -1, -1, DIMOBJY / 10, 18, 10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, 0, -1, true, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, GOAL_GOBLUPI, +1, +1, true, @@ -643,7 +643,7 @@ static Sint16 table_goal_build1[] = GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_GOBLUPI, 0, -2, true, GOAL_GOBLUPI, -2, 0, true, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, +2, 0, true, GOAL_GOBLUPI, 0, +1, true, // maison @@ -674,14 +674,14 @@ static Sint16 table_goal_build2[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDFLOOR, 0, -1, CHFLOOR, 52, CHMASK1, 0, 16, 14, 1 * 100, // nurserie - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, -1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, -1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_PUTOBJECT, -1, 0, -1, -1, // enlève les planches GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, @@ -708,14 +708,14 @@ static Sint16 table_goal_build3[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDFLOOR, 0, -1, CHFLOOR, 16, CHMASK1, 0, 16, 14, 1 * 100, // briques - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, -1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, -1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, 0, +1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, +1, 0, true, // laboratoire @@ -749,13 +749,13 @@ static Sint16 table_goal_build4[] = GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 126, -1, -1, DIMOBJY / 10, 18, 10 * 100, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, GOAL_GOBLUPI, +1, -1, true, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, 0, +1, true, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_GOBLUPI, 0, -2, true, GOAL_GOBLUPI, -1, 0, true, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, 0, +1, true, // mine @@ -786,14 +786,14 @@ static Sint16 table_goal_build5[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDFLOOR, 0, -1, CHFLOOR, 16, CHMASK1, 0, 16, 14, 1 * 100, // briques - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, -1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, -1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, 0, +1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, +1, 0, true, // usine @@ -824,14 +824,14 @@ static Sint16 table_goal_build6[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDFLOOR, 0, -1, CHFLOOR, 80, CHMASK1, 0, 16, 14, 1 * 100, // téléporteur - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, -1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, -1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, +1, 0, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_PUTOBJECT, -1, 0, -1, -1, // enlève les planches GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, @@ -940,9 +940,9 @@ static Sint16 table_goal_palis[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 71, -1, -1, DIMOBJY / 10, 20, 10 * 100, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_GOBLUPI, 0, -1, true, - GOAL_ACTION, ACTION_PIOCHE, DIRECT_E, + GOAL_ACTION, ACTION_PICKAXE, DIRECT_E, GOAL_PUTOBJECT, 0, 0, -1, -1, // enlève les planches GOAL_GOBLUPI, +1, +1, true, GOAL_ACTION, ACTION_PIOCHESOURD, DIRECT_E, @@ -1721,8 +1721,8 @@ static Sint16 table_goal_ponte[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 72, -1, -1, DIMOBJY / 10, 12, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, @@ -1768,8 +1768,8 @@ static Sint16 table_goal_ponto[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 72, -1, -1, DIMOBJY / 10, 12, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, @@ -1814,8 +1814,8 @@ static Sint16 table_goal_ponts[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 73, -1, -1, DIMOBJY / 10, 12, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, GOAL_GOBLUPI, 0, +1, true, @@ -1860,8 +1860,8 @@ static Sint16 table_goal_pontn[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 73, -1, -1, DIMOBJY / 10, 12, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_FINISHMOVE, GOAL_OTHERLOOP, EV_ACTION_BRIDGENL, @@ -1905,9 +1905,9 @@ static Sint16 table_goal_bateaue[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY / 10, 20, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, @@ -1938,9 +1938,9 @@ static Sint16 table_goal_bateaus[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY / 10, 20, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, @@ -1970,9 +1970,9 @@ static Sint16 table_goal_bateauo[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY / 10, 20, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, @@ -2003,9 +2003,9 @@ static Sint16 table_goal_bateaun[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, 0, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY / 10, 20, -10 * 100, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, - GOAL_ACTION, ACTION_SCIE, DIRECT_S, + GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_GOBLUPI, -1, +1, true, GOAL_ACTION, ACTION_BUILD, DIRECT_S, GOAL_ACTION, ACTION_BUILD, DIRECT_S, diff --git a/src/def.h b/src/def.h index a8e52ff..e5c24b9 100644 --- a/src/def.h +++ b/src/def.h @@ -121,11 +121,11 @@ #define ACTION_WALK 2 // walk #define ACTION_WALKTIRED 3 // walk tiredness #define ACTION_BUILD 4 // build -#define ACTION_PIOCHE 5 // pioche +#define ACTION_PICKAXE 5 // pickaxe #define ACTION_ENERGY 6 // prend de l'énergie #define ACTION_CARRY 8 // take with a jump the object on the head (est) #define ACTION_DROP 9 // drop the object which is on the head (est) -#define ACTION_SCIE 10 // scie du bois +#define ACTION_SAW 10 // saw wood #define ACTION_BURN 11 // blupi is burning ! #define ACTION_TCHAO 12 // blupi disappeard ! #define ACTION_EAT 13 // blupi eats @@ -215,8 +215,8 @@ #define ACTION_D_STOP 800 // disciple: stop #define ACTION_D_WALK 801 // disciple: walk #define ACTION_D_BUILD 802 // disciple: build -#define ACTION_D_PIOCHE 803 // disciple: pioche -#define ACTION_D_SCIE 804 // disciple: scie du bois +#define ACTION_D_PICKAXE 803 // disciple: pickaxe +#define ACTION_D_SAW 804 // disciple: saw wood #define ACTION_D_TCHAO 805 // disciple: disappeard ! #define ACTION_D_CUEILLE1 806 // disciple: cueille des fleurs #define ACTION_D_CUEILLE2 807 // disciple: cueille des fleurs