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 to english

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-10-04 07:05:55 +02:00
parent 13a5229a87
commit c099ccb9e2
5 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/decblupi.cxx
View File

@ -4014,7 +4014,7 @@ CDecor::BlupiGoal (Sint32 rank, Buttons button, Point cel, Point cMem)
if (direct == DIRECT_S) if (direct == DIRECT_S)
action = EV_ACTION_BOATS; action = EV_ACTION_BOATS;
if (direct == DIRECT_O) if (direct == DIRECT_W)
action = EV_ACTION_BOATO; action = EV_ACTION_BOATO;
if (direct == DIRECT_N) if (direct == DIRECT_N)
action = EV_ACTION_BOATN; action = EV_ACTION_BOATN;

160
src/decgoal.cxx
View File

@ -640,7 +640,7 @@ static Sint16 table_goal_build1[] =
GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S,
GOAL_GOBLUPI, +1, +1, true, GOAL_GOBLUPI, +1, +1, true,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -2, true, GOAL_GOBLUPI, 0, -2, true,
GOAL_GOBLUPI, -2, 0, true, GOAL_GOBLUPI, -2, 0, true,
GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_SAW, DIRECT_S,
@ -648,11 +648,11 @@ static Sint16 table_goal_build1[] =
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
// maison // maison
GOAL_BUILDOBJECT, -2, 0, CHOBJECT, 61, -1, -1, DIMOBJY / 10, 20, 10 * 100, GOAL_BUILDOBJECT, -2, 0, CHOBJECT, 61, -1, -1, DIMOBJY / 10, 20, 10 * 100,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S,
@ -723,11 +723,11 @@ static Sint16 table_goal_build3[] =
GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
@ -752,7 +752,7 @@ static Sint16 table_goal_build4[] =
GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_SAW, DIRECT_S,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -2, true, GOAL_GOBLUPI, 0, -2, true,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_ACTION, ACTION_SAW, DIRECT_S, GOAL_ACTION, ACTION_SAW, DIRECT_S,
@ -760,11 +760,11 @@ static Sint16 table_goal_build4[] =
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
// mine // mine
GOAL_BUILDOBJECT, -2, 0, CHOBJECT, 122, -1, -1, DIMOBJY / 10, 20, 10 * 100, GOAL_BUILDOBJECT, -2, 0, CHOBJECT, 122, -1, -1, DIMOBJY / 10, 20, 10 * 100,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S,
@ -801,11 +801,11 @@ static Sint16 table_goal_build5[] =
GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S, GOAL_ACTION, ACTION_BUILDSEC, DIRECT_S,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_O, GOAL_ACTION, ACTION_BUILDSOURD, DIRECT_W,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
@ -876,16 +876,16 @@ static Sint16 table_goal_mur[] =
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_S,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_TCHAO, DIRECT_E, GOAL_ACTION, ACTION_TCHAO, DIRECT_E,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
@ -911,16 +911,16 @@ static Sint16 table_goal_tour[] =
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_PUTOBJECT, -1, 0, -1, -1, // enlève les pierres GOAL_PUTOBJECT, -1, 0, -1, -1, // enlève les pierres
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E, GOAL_ACTION, ACTION_PIOCHEPIERRE, DIRECT_E,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_BUILDBREF, DIRECT_O, GOAL_ACTION, ACTION_BUILDBREF, DIRECT_W,
GOAL_ACTION, ACTION_STOP, DIRECT_S, GOAL_ACTION, ACTION_STOP, DIRECT_S,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
GOAL_ARRANGEOBJECT, -1, -1, GOAL_ARRANGEOBJECT, -1, -1,
@ -1317,7 +1317,7 @@ static Sint16 table_goal_labo[] =
GOAL_ADDMOVES, -1, -1, 10, // secoue GOAL_ADDMOVES, -1, -1, 10, // secoue
GOAL_CACHE, true, false, GOAL_CACHE, true, false,
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_ACTION, ACTION_STOP, DIRECT_W,
GOAL_SOUND, SOUND_LABO, GOAL_SOUND, SOUND_LABO,
GOAL_ACTION, ACTION_LABO, DIRECT_E, GOAL_ACTION, ACTION_LABO, DIRECT_E,
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
@ -1785,7 +1785,7 @@ static Sint16 table_goal_pontol[] =
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100, GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -10, -10, 7, // pont vers l'ouest GOAL_ADDMOVES, -10, -10, 7, // pont vers l'ouest
GOAL_ACTION, ACTION_BRIDGE, DIRECT_O, GOAL_ACTION, ACTION_BRIDGE, DIRECT_W,
GOAL_GROUP, 4, GOAL_GROUP, 4,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -10, -10, -1, -1, GOAL_PUTOBJECT, -10, -10, -1, -1,
@ -1798,7 +1798,7 @@ static Sint16 table_goal_pontol[] =
GOAL_PUTFLOOR, -10, -10, CHFLOOR, -2, // vIcon GOAL_PUTFLOOR, -10, -10, CHFLOOR, -2, // vIcon
GOAL_SOUND, SOUND_PLOUF, GOAL_SOUND, SOUND_PLOUF,
//? GOAL_GOBLUPI, 0,-1, true, //? GOAL_GOBLUPI, 0,-1, true,
GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_ACTION, ACTION_STOP, DIRECT_W,
GOAL_TERM, GOAL_TERM,
0 0
}; };
@ -1982,7 +1982,7 @@ static Sint16 table_goal_bateauo[] =
GOAL_GROUP, 2, GOAL_GROUP, 2,
GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY, 1, -1 * 100, GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -1, 0, 7, // bateau vers l'ouest GOAL_ADDMOVES, -1, 0, 7, // bateau vers l'ouest
GOAL_ACTION, ACTION_BRIDGE, DIRECT_O, GOAL_ACTION, ACTION_BRIDGE, DIRECT_W,
GOAL_GROUP, 4, GOAL_GROUP, 4,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -1, 0, -1, -1, GOAL_PUTOBJECT, -1, 0, -1, -1,
@ -2227,7 +2227,7 @@ static Sint16 table_goal_r_build1[] =
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_E, GOAL_ACTION, ACTION_R_APLAT, DIRECT_E,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O, GOAL_ACTION, ACTION_R_BUILD, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_E, GOAL_ACTION, ACTION_R_BUILD, DIRECT_E,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
@ -2235,7 +2235,7 @@ static Sint16 table_goal_r_build1[] =
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_E, GOAL_ACTION, ACTION_R_BUILD, DIRECT_E,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_O, GOAL_ACTION, ACTION_R_APLAT, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_S, GOAL_ACTION, ACTION_R_STOP, DIRECT_S,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
GOAL_TERM, GOAL_TERM,
@ -2265,7 +2265,7 @@ static Sint16 table_goal_r_build2[] =
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_E, GOAL_ACTION, ACTION_R_APLAT, DIRECT_E,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_O, GOAL_ACTION, ACTION_R_APLAT, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_S, GOAL_ACTION, ACTION_R_BUILD, DIRECT_S,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
@ -2273,7 +2273,7 @@ static Sint16 table_goal_r_build2[] =
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_S, GOAL_ACTION, ACTION_R_APLAT, DIRECT_S,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_O, GOAL_ACTION, ACTION_R_APLAT, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_S, GOAL_ACTION, ACTION_R_STOP, DIRECT_S,
GOAL_FINISHMOVE, GOAL_FINISHMOVE,
GOAL_TERM, GOAL_TERM,
@ -2301,7 +2301,7 @@ static Sint16 table_goal_r_build3[] =
GOAL_BUILDOBJECT, -1, -1, CHOBJECT, 102, -1, -1, DIMOBJY / 4, 20, 4 * 100, GOAL_BUILDOBJECT, -1, -1, CHOBJECT, 102, -1, -1, DIMOBJY / 4, 20, 4 * 100,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_E, GOAL_ACTION, ACTION_R_BUILD, DIRECT_E,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_O, GOAL_ACTION, ACTION_R_APLAT, DIRECT_W,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_N, GOAL_ACTION, ACTION_R_BUILD, DIRECT_N,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
@ -2341,7 +2341,7 @@ static Sint16 table_goal_r_build4[] =
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_S, GOAL_ACTION, ACTION_R_BUILD, DIRECT_S,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_O, GOAL_ACTION, ACTION_R_APLAT, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_S, GOAL_ACTION, ACTION_R_BUILD, DIRECT_S,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
@ -2379,7 +2379,7 @@ static Sint16 table_goal_r_build5[] =
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_S, GOAL_ACTION, ACTION_R_BUILD, DIRECT_S,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_O, GOAL_ACTION, ACTION_R_APLAT, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_S, GOAL_ACTION, ACTION_R_BUILD, DIRECT_S,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
@ -2417,7 +2417,7 @@ static Sint16 table_goal_r_build6[] =
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_S, GOAL_ACTION, ACTION_R_BUILD, DIRECT_S,
GOAL_GOBLUPI, +1, 0, true, GOAL_GOBLUPI, +1, 0, true,
GOAL_ACTION, ACTION_R_APLAT, DIRECT_O, GOAL_ACTION, ACTION_R_APLAT, DIRECT_W,
GOAL_GOBLUPI, 0, +1, true, GOAL_GOBLUPI, 0, +1, true,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_S, GOAL_ACTION, ACTION_R_BUILD, DIRECT_S,
GOAL_GOBLUPI, 0, -1, true, GOAL_GOBLUPI, 0, -1, true,
@ -2440,17 +2440,17 @@ static Sint16 table_goal_r_make1[] =
GOAL_GROUP, 2, GOAL_GROUP, 2,
GOAL_USINEFREE, -1, -1, GOAL_USINEFREE, -1, -1,
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O, GOAL_ACTION, ACTION_R_LOAD, DIRECT_W,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O, GOAL_ACTION, ACTION_R_LOAD, DIRECT_W,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O, GOAL_ACTION, ACTION_R_BUILD, DIRECT_W,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O, GOAL_ACTION, ACTION_R_LOAD, DIRECT_W,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O, GOAL_ACTION, ACTION_R_LOAD, DIRECT_W,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O, GOAL_ACTION, ACTION_R_BUILD, DIRECT_W,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O, GOAL_ACTION, ACTION_R_LOAD, DIRECT_W,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O, GOAL_ACTION, ACTION_R_BUILD, DIRECT_W,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O, GOAL_ACTION, ACTION_R_LOAD, DIRECT_W,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O, GOAL_ACTION, ACTION_R_LOAD, DIRECT_W,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O, GOAL_ACTION, ACTION_R_BUILD, DIRECT_W,
GOAL_TERM, GOAL_TERM,
0 0
}; };
@ -2465,11 +2465,11 @@ static Sint16 table_goal_r_make2[] =
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_PUTOBJECT, -2, -1, CHOBJECT, 101, // ouvre la porte GOAL_PUTOBJECT, -2, -1, CHOBJECT, 101, // ouvre la porte
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -2530,11 +2530,11 @@ static Sint16 table_goal_r_make3[] =
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_PUTOBJECT, -2, -1, CHOBJECT, 103, // ouvre la porte GOAL_PUTOBJECT, -2, -1, CHOBJECT, 103, // ouvre la porte
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -2594,11 +2594,11 @@ static Sint16 table_goal_r_make4[] =
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_PUTOBJECT, -2, -1, CHOBJECT, 105, // ouvre la porte GOAL_PUTOBJECT, -2, -1, CHOBJECT, 105, // ouvre la porte
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -2658,11 +2658,11 @@ static Sint16 table_goal_r_make5[] =
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_PUTOBJECT, -2, -1, CHOBJECT, 116, // ouvre la porte GOAL_PUTOBJECT, -2, -1, CHOBJECT, 116, // ouvre la porte
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -2722,11 +2722,11 @@ static Sint16 table_goal_r_make6[] =
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_PUTOBJECT, -2, -1, CHOBJECT, 18, // ouvre la porte GOAL_PUTOBJECT, -2, -1, CHOBJECT, 18, // ouvre la porte
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_W,
GOAL_GOBLUPI, -1, 0, true, GOAL_GOBLUPI, -1, 0, true,
GOAL_SOUND, SOUND_DOOR, GOAL_SOUND, SOUND_DOOR,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -2940,7 +2940,7 @@ static Sint16 table_goal_drapeau3[] =
GOAL_INTERRUPT, 0, // prioritaire GOAL_INTERRUPT, 0, // prioritaire
GOAL_WORK, 0, -1, GOAL_WORK, 0, -1,
GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 124, -1, -1, DIMOBJY / 10, 8, 10 * 100, GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 124, -1, -1, DIMOBJY / 10, 8, 10 * 100,
GOAL_ACTION, ACTION_PIOCHESOURD, DIRECT_O, GOAL_ACTION, ACTION_PIOCHESOURD, DIRECT_W,
GOAL_GOBLUPI, +1, -1, true, GOAL_GOBLUPI, +1, -1, true,
GOAL_ACTION, ACTION_PIOCHESOURD, DIRECT_E, GOAL_ACTION, ACTION_PIOCHESOURD, DIRECT_E,
GOAL_ADDDRAPEAU, -1, 0, GOAL_ADDDRAPEAU, -1, 0,
@ -2968,7 +2968,7 @@ static Sint16 table_goal_extrait[] =
GOAL_ADDMOVES, -1, -1, 11, // secoue GOAL_ADDMOVES, -1, -1, 11, // secoue
GOAL_CACHE, true, false, GOAL_CACHE, true, false,
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_ACTION, ACTION_STOP, DIRECT_W,
GOAL_SOUND, SOUND_MINE, GOAL_SOUND, SOUND_MINE,
GOAL_ACTION, ACTION_LABO, DIRECT_E, GOAL_ACTION, ACTION_LABO, DIRECT_E,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -3015,7 +3015,7 @@ static Sint16 table_goal_fabjeep[] =
GOAL_ADDMOVES, -1, -1, 12, // secoue GOAL_ADDMOVES, -1, -1, 12, // secoue
GOAL_CACHE, true, false, GOAL_CACHE, true, false,
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_ACTION, ACTION_STOP, DIRECT_W,
GOAL_SOUND, SOUND_USINE, GOAL_SOUND, SOUND_USINE,
GOAL_ACTION, ACTION_LABO, DIRECT_E, GOAL_ACTION, ACTION_LABO, DIRECT_E,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -3058,7 +3058,7 @@ static Sint16 table_goal_fabarmure[] =
GOAL_ADDMOVES, -1, -1, 12, // secoue GOAL_ADDMOVES, -1, -1, 12, // secoue
GOAL_CACHE, true, false, GOAL_CACHE, true, false,
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_ACTION, ACTION_STOP, DIRECT_W,
GOAL_SOUND, SOUND_USINE, GOAL_SOUND, SOUND_USINE,
GOAL_ACTION, ACTION_LABO, DIRECT_E, GOAL_ACTION, ACTION_LABO, DIRECT_E,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -3101,7 +3101,7 @@ static Sint16 table_goal_fabmine[] =
GOAL_ADDMOVES, -1, -1, 12, // secoue GOAL_ADDMOVES, -1, -1, 12, // secoue
GOAL_CACHE, true, false, GOAL_CACHE, true, false,
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_ACTION, ACTION_STOP, DIRECT_W,
GOAL_SOUND, SOUND_USINE, GOAL_SOUND, SOUND_USINE,
GOAL_ACTION, ACTION_LABO, DIRECT_E, GOAL_ACTION, ACTION_LABO, DIRECT_E,
GOAL_GROUP, 2, GOAL_GROUP, 2,
@ -3150,7 +3150,7 @@ static Sint16 table_goal_fabdisc[] =
GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 119, -1, -1, DIMOBJY, 1, -1 * 100, GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 119, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, 0, -1, 12, // secoue GOAL_ADDMOVES, 0, -1, 12, // secoue
GOAL_ACTION, ACTION_STOP, DIRECT_E, GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_ACTION, ACTION_STOP, DIRECT_W,
GOAL_SOUND, SOUND_USINE, GOAL_SOUND, SOUND_USINE,
GOAL_ACTION, ACTION_LABO, DIRECT_E, GOAL_ACTION, ACTION_LABO, DIRECT_E,
GOAL_GROUP, 2, GOAL_GROUP, 2,

6
src/decor.cxx
View File

@ -90,14 +90,14 @@ GetVector (Sint32 direct)
case DIRECT_S: case DIRECT_S:
vector.y = +1; vector.y = +1;
break; break;
case DIRECT_SO: case DIRECT_SW:
vector.x = -1; vector.x = -1;
vector.y = +1; vector.y = +1;
break; break;
case DIRECT_O: case DIRECT_W:
vector.x = -1; vector.x = -1;
break; break;
case DIRECT_NO: case DIRECT_NW:
vector.x = -1; vector.x = -1;
vector.y = -1; vector.y = -1;
break; break;

6
src/def.h
View File

@ -94,9 +94,9 @@ enum Directions {
DIRECT_E = (0 * 16), // east DIRECT_E = (0 * 16), // east
DIRECT_SE = (1 * 16), // south-east DIRECT_SE = (1 * 16), // south-east
DIRECT_S = (2 * 16), // south DIRECT_S = (2 * 16), // south
DIRECT_SO = (3 * 16), // south-west DIRECT_SW = (3 * 16), // south-west
DIRECT_O = (4 * 16), // west DIRECT_W = (4 * 16), // west
DIRECT_NO = (5 * 16), // north-west DIRECT_NW = (5 * 16), // north-west
DIRECT_N = (6 * 16), // north DIRECT_N = (6 * 16), // north
DIRECT_NE = (7 * 16), // north-east DIRECT_NE = (7 * 16), // north-east
}; };

10
src/obstacle.cxx
View File

@ -2228,17 +2228,17 @@ CDecor::DirectSearch (Point cel, Point goal)
{ {
if (dir.y > 0) if (dir.y > 0)
{ {
direct = DIRECT_SO; direct = DIRECT_SW;
if (tan < 41) if (tan < 41)
direct = DIRECT_O; direct = DIRECT_W;
if (tan > 241) if (tan > 241)
direct = DIRECT_S; direct = DIRECT_S;
} }
else else
{ {
direct = DIRECT_NO; direct = DIRECT_NW;
if (tan < 41) if (tan < 41)
direct = DIRECT_O; direct = DIRECT_W;
if (tan > 241) if (tan > 241)
direct = DIRECT_N; direct = DIRECT_N;
} }
@ -3724,7 +3724,7 @@ CDecor::IsBuildBateau (Point cel, Sint32 & direct)
fChannel == CHFLOOR && fIcon == 4 && // rivage ? fChannel == CHFLOOR && fIcon == 4 && // rivage ?
oChannel == -1 && oIcon == -1) oChannel == -1 && oIcon == -1)
{ {
direct = DIRECT_O; direct = DIRECT_W;
return true; return true;
} }