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 a lot of action from french to english

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-08-08 18:49:01 +02:00
parent 4072c534ff
commit 12acbf2106
7 changed files with 236 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/action.cxx
View File

@ -66,7 +66,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_STOPf,
ACTION_STOPTIRED,
CHBLUPI,
{
{1, 69}, // e
@ -132,7 +132,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_STOPj,
ACTION_STOPJEEP,
CHBLUPI,
{
{1, 48}, // e
@ -157,7 +157,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_STOPa,
ACTION_STOPARMOR,
CHBLUPI,
{
{1, 322}, // e
@ -207,7 +207,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_MARCHE,
ACTION_WALK,
CHBLUPI,
{
{6, 0, 1, 2, 3, 4, 5}, // e
@ -243,7 +243,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_MARCHEf,
ACTION_WALKTIRED,
CHBLUPI,
{
{8, 69, 69, 70, 70, 69, 69, 71, 71}, // e
@ -330,7 +330,7 @@ static const DescAction action_table[] =
},
},
{
ACTION_MARCHEj,
ACTION_WALKJEEP,
CHBLUPI,
{
{1, 48}, // e
@ -357,7 +357,7 @@ static const DescAction action_table[] =
},
},
{
ACTION_MARCHEa,
ACTION_WALKARMOR,
CHBLUPI,
{
{8, 322, 322, 323, 323, 322, 322, 324, 324}, // e
@ -382,7 +382,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_SAUTE1,
ACTION_JUMPJEEP,
CHBLUPI,
{
{ 15, 106, 106, 106, 106, 106, 136, 136, 136, 136, 136,
@ -1167,7 +1167,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_PONT,
ACTION_BRIDGE,
CHBLUPI,
{
{8, 48, 49, 50, 51, 52, 53, 54, 55}, // e
@ -1239,7 +1239,7 @@ static const DescAction action_table[] =
},
},
{
ACTION_DEPOSE,
ACTION_DROP,
CHBLUPI,
{
{10, 106, 106, 106, 106, 106, 48, 48, 48, 48, 48},
@ -1266,7 +1266,7 @@ static const DescAction action_table[] =
},
},
{
ACTION_BRULE,
ACTION_BURN,
CHBLUPI,
{
{8, 48, 49, 50, 51, 52, 53, 54, 55},
@ -1311,7 +1311,7 @@ static const DescAction action_table[] =
},
},
{
ACTION_GRILLE1,
ACTION_GRILL1,
CHBLUPI,
{
{ 40, 273, 273, 273, 273, 273, 273, 273, 273, 273, 274,
@ -1327,7 +1327,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_GRILLE2,
ACTION_GRILL2,
CHBLUPI,
{
{ 12, 275, 273, 275,
@ -1343,7 +1343,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_GRILLE3,
ACTION_GRILL3,
CHBLUPI,
{
{ 50, 279, 280, 279, 280, 280, 279, 280, 279, 279, 280,
@ -1360,7 +1360,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_MANGE,
ACTION_EAT,
CHBLUPI,
{
{ 39, 113, 114, 114, 113, 113, 113, 114, 114, 113, 114,
@ -1376,7 +1376,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_BOIT,
ACTION_DRINK,
CHBLUPI,
{
{1, 193},
@ -1388,7 +1388,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_CONTENT,
ACTION_HAPPY,
CHBLUPI,
{
{1, 48}, // e
@ -1413,7 +1413,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_NAISSANCE,
ACTION_BORN,
CHBLUPI,
{
{ 20 + 9, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
@ -1658,7 +1658,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_ARMUREOPEN,
ACTION_ARMOROPEN,
CHBLUPI,
{
{1, 346},
@ -1672,7 +1672,7 @@ static const DescAction action_table[] =
},
},
{
ACTION_ARMURECLOSE,
ACTION_ARMORCLOSE,
CHBLUPI,
{
{1, 346},
@ -1714,7 +1714,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_D_MARCHE,
ACTION_D_WALK,
CHBLUPI,
{
{1, 48}, // e
@ -1967,7 +1967,7 @@ static const DescAction action_table[] =
// Araignée :
{
ACTION_A_STOP,
ACTION_S_STOP,
CHBLUPI,
{
{4, 116, 117, 117, 116}, // e
@ -1992,7 +1992,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_A_MARCHE,
ACTION_S_WALK,
CHBLUPI,
{
{10, 117, 117, 117, 117, 117, 117, 117, 117, 116, 116},
@ -2033,7 +2033,7 @@ static const DescAction action_table[] =
{10, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_A_SAUT},
},
{
ACTION_A_GRILLE,
ACTION_S_GRILL,
CHBLUPI,
{
{ 40, 165, 165, 166, 165, 165, 166, 165, 166, 165, 165,
@ -2055,7 +2055,7 @@ static const DescAction action_table[] =
},
},
{
ACTION_A_POISON,
ACTION_S_POISON,
CHBLUPI,
{
{8, 117, 119, 121, 123, 125, 127, 129, 131},
@ -2067,7 +2067,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_A_MORT1,
ACTION_S_DEAD1,
CHBLUPI,
{
{6, 314, 315, 316, 317, 316, 315},
@ -2079,7 +2079,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_A_MORT2,
ACTION_S_DEAD2,
CHBLUPI,
{
{ 50, 314, 314, 314, 314, 314, 315, 316, 315, 315, 316,
@ -2096,7 +2096,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_A_MORT3,
ACTION_S_DEAD3,
CHBLUPI,
{
{1, 317},
@ -2123,7 +2123,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_V_MARCHE,
ACTION_V_WALK,
CHBLUPI,
{
{10, 160, 161, 162, 163, 161, 160, 162, 161, 163, 162},
@ -2148,7 +2148,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_V_GRILLE,
ACTION_V_GRILL,
CHBLUPI,
{
{5, 164, 160, 164, 164, 160},
@ -2195,7 +2195,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_T_MARCHE,
ACTION_T_WALK,
CHBLUPI,
{
{1, 200}, // e
@ -2220,7 +2220,7 @@ static const DescAction action_table[] =
{5, SOUND_T_MOTEUR, -1, -1, -1, -1},
},
{
ACTION_T_ECRASE,
ACTION_T_CRUSHED,
CHBLUPI,
{
{8, 200, 201, 201, 200, 200, 215, 215, 200}, // e
@ -2273,7 +2273,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_R_MARCHE,
ACTION_R_WALK,
CHBLUPI,
{
{1, 216}, // e
@ -2438,7 +2438,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_R_CHARGE,
ACTION_R_LOAD,
CHBLUPI,
{
{1, 216}, // e
@ -2463,7 +2463,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_R_ECRASE,
ACTION_R_CRUSHED,
CHBLUPI,
{
{8, 216, 217, 217, 216, 216, 231, 231, 216}, // e
@ -2516,7 +2516,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_B_MARCHE,
ACTION_B_WALK,
CHBLUPI,
{
{10, 233, 233, 233, 233, 232, 232, 232, 232, 232, 232},
@ -2646,7 +2646,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_E_MARCHE,
ACTION_E_WALK,
CHBLUPI,
{
{1, 266},
@ -2671,7 +2671,7 @@ static const DescAction action_table[] =
{0},
},
{
ACTION_E_DEBUT,
ACTION_E_BEGIN,
CHBLUPI,
{
{1, 266},

164
src/decblupi.cxx
View File

@ -63,10 +63,10 @@ Sint32 CDecor::BlupiCreate (
if (
perso == 0 && action == ACTION_STOP && // blupi ?
energy <= MAXENERGY / 4)
action = ACTION_STOPf;
action = ACTION_STOPTIRED;
if (perso == 1 && action == ACTION_STOP) // araignée ?
action = ACTION_A_STOP;
action = ACTION_S_STOP;
if (perso == 2 && action == ACTION_STOP) // virus ?
action = ACTION_V_STOP;
@ -465,12 +465,12 @@ void CDecor::BlupiSound (Sint32 rank, Sint32 sound, POINT pos, bool bStop)
// Sons associés à des actions.
// clang-format off
static const Sint16 tableSound[] = {
ACTION_BRULE, SOUND_BRULE,
ACTION_BURN, SOUND_BRULE,
ACTION_TCHAO, SOUND_TCHAO,
ACTION_MANGE, SOUND_MANGE,
ACTION_BOIT, SOUND_BOIT,
ACTION_EAT, SOUND_MANGE,
ACTION_DRINK, SOUND_BOIT,
ACTION_GLISSE, SOUND_GLISSE,
ACTION_R_CHARGE, SOUND_R_CHARGE,
ACTION_R_LOAD, SOUND_R_CHARGE,
-1
};
// clang-format on
@ -503,27 +503,27 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_STOPb;
if (m_blupi[rank].action == ACTION_MARCHE)
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_MARCHEb;
}
if (m_blupi[rank].vehicule == 2) // en jeep ?
{
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_STOPj;
m_blupi[rank].action = ACTION_STOPJEEP;
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_MARCHEj;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_WALKJEEP;
}
if (m_blupi[rank].vehicule == 3) // armure ?
{
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_STOPa;
m_blupi[rank].action = ACTION_STOPARMOR;
if (m_blupi[rank].action == ACTION_MARCHE)
if (m_blupi[rank].action == ACTION_WALK)
{
m_blupi[rank].action = ACTION_MARCHEa;
m_blupi[rank].action = ACTION_WALKARMOR;
m_blupi[rank].step = (m_blupi[rank].step / 2) * 2;
}
}
@ -531,11 +531,11 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (m_blupi[rank].energy <= MAXENERGY / 4) // peu de forces ?
{
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_STOPf;
m_blupi[rank].action = ACTION_STOPTIRED;
if (m_blupi[rank].action == ACTION_MARCHE)
if (m_blupi[rank].action == ACTION_WALK)
{
m_blupi[rank].action = ACTION_MARCHEf;
m_blupi[rank].action = ACTION_WALKTIRED;
m_blupi[rank].step = (m_blupi[rank].step / 2) * 2;
}
}
@ -576,7 +576,7 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
m_blupi[rank].step = 0;
}
}
if (m_blupi[rank].action == ACTION_STOPf && m_blupi[rank].goalAction == 0)
if (m_blupi[rank].action == ACTION_STOPTIRED && m_blupi[rank].goalAction == 0)
{
rand = Random (0, 100);
if (
@ -604,51 +604,51 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
m_blupi[rank].action == ACTION_BECHE ||
m_blupi[rank].action == ACTION_SCIE ||
m_blupi[rank].action == ACTION_TAKE ||
m_blupi[rank].action == ACTION_DEPOSE ||
m_blupi[rank].action == ACTION_BRULE ||
m_blupi[rank].action == ACTION_DROP ||
m_blupi[rank].action == ACTION_BURN ||
m_blupi[rank].action == ACTION_TCHAO ||
m_blupi[rank].action == ACTION_GRILLE1 ||
m_blupi[rank].action == ACTION_GRILLE2 ||
m_blupi[rank].action == ACTION_GRILLE3 ||
m_blupi[rank].action == ACTION_GRILL1 ||
m_blupi[rank].action == ACTION_GRILL2 ||
m_blupi[rank].action == ACTION_GRILL3 ||
m_blupi[rank].action == ACTION_ELECTRO ||
m_blupi[rank].action == ACTION_MANGE ||
m_blupi[rank].action == ACTION_BOIT ||
m_blupi[rank].action == ACTION_NAISSANCE ||
m_blupi[rank].action == ACTION_SAUTE1 ||
m_blupi[rank].action == ACTION_EAT ||
m_blupi[rank].action == ACTION_DRINK ||
m_blupi[rank].action == ACTION_BORN ||
m_blupi[rank].action == ACTION_JUMPJEEP ||
m_blupi[rank].action == ACTION_SAUTE2 ||
m_blupi[rank].action == ACTION_SAUTE3 ||
m_blupi[rank].action == ACTION_SAUTE4 ||
m_blupi[rank].action == ACTION_SAUTE5 ||
//? m_blupi[rank].action == ACTION_GLISSE ||
m_blupi[rank].action == ACTION_PONT ||
m_blupi[rank].action == ACTION_BRIDGE ||
m_blupi[rank].action == ACTION_MECHE ||
m_blupi[rank].action == ACTION_A_GRILLE ||
m_blupi[rank].action == ACTION_V_GRILLE ||
m_blupi[rank].action == ACTION_T_ECRASE ||
m_blupi[rank].action == ACTION_R_MARCHE ||
m_blupi[rank].action == ACTION_S_GRILL ||
m_blupi[rank].action == ACTION_V_GRILL ||
m_blupi[rank].action == ACTION_T_CRUSHED ||
m_blupi[rank].action == ACTION_R_WALK ||
m_blupi[rank].action == ACTION_R_APLAT ||
m_blupi[rank].action == ACTION_R_BUILD ||
m_blupi[rank].action == ACTION_R_CHARGE ||
m_blupi[rank].action == ACTION_B_MARCHE ||
m_blupi[rank].action == ACTION_E_MARCHE ||
m_blupi[rank].action == ACTION_R_LOAD ||
m_blupi[rank].action == ACTION_B_WALK ||
m_blupi[rank].action == ACTION_E_WALK ||
m_blupi[rank].action == ACTION_MARCHEb ||
m_blupi[rank].action == ACTION_MARCHEj ||
m_blupi[rank].action == ACTION_WALKJEEP ||
m_blupi[rank].action == ACTION_TELEPORTE1 ||
m_blupi[rank].action == ACTION_TELEPORTE2 ||
m_blupi[rank].action == ACTION_TELEPORTE3 ||
m_blupi[rank].action == ACTION_ARMUREOPEN ||
m_blupi[rank].action == ACTION_ARMURECLOSE)
m_blupi[rank].action == ACTION_ARMOROPEN ||
m_blupi[rank].action == ACTION_ARMORCLOSE)
m_blupi[rank].step = 0;
}
if (m_blupi[rank].perso == 1) // araignée ?
{
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_A_MARCHE;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_S_WALK;
if (m_blupi[rank].action == ACTION_STOP)
{
m_blupi[rank].action = ACTION_A_STOP;
m_blupi[rank].action = ACTION_S_STOP;
m_blupi[rank].sDirect = Random (0, 7) * 16;
}
@ -657,8 +657,8 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (m_blupi[rank].perso == 2) // virus ?
{
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_V_MARCHE;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_V_WALK;
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_V_STOP;
@ -668,8 +668,8 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (m_blupi[rank].perso == 3) // tracks ?
{
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_T_MARCHE;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_T_WALK;
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_T_STOP;
@ -679,8 +679,8 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (m_blupi[rank].perso == 4) // robot ?
{
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_R_MARCHE;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_R_WALK;
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_R_STOP;
@ -690,8 +690,8 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (m_blupi[rank].perso == 5) // bombe ?
{
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_B_MARCHE;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_B_WALK;
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_B_STOP;
@ -701,8 +701,8 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (m_blupi[rank].perso == 7) // électro ?
{
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_E_MARCHE;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_E_WALK;
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_E_STOP;
@ -715,8 +715,8 @@ void CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
if (direct != -1)
m_blupi[rank].sDirect = direct;
if (m_blupi[rank].action == ACTION_MARCHE)
m_blupi[rank].action = ACTION_D_MARCHE;
if (m_blupi[rank].action == ACTION_WALK)
m_blupi[rank].action = ACTION_D_WALK;
if (m_blupi[rank].action == ACTION_STOP)
m_blupi[rank].action = ACTION_D_STOP;
@ -1706,7 +1706,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
if (rank >= 0)
{
m_blupi[rank].energy = MAXENERGY / 4;
BlupiInitAction (rank, ACTION_NAISSANCE);
BlupiInitAction (rank, ACTION_BORN);
}
cel.x++;
@ -1714,7 +1714,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
if (rank >= 0)
{
m_blupi[rank].energy = MAXENERGY / 4;
BlupiInitAction (rank, ACTION_NAISSANCE);
BlupiInitAction (rank, ACTION_BORN);
}
cel.x--;
@ -1723,7 +1723,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
if (rank >= 0)
{
m_blupi[rank].energy = MAXENERGY / 4;
BlupiInitAction (rank, ACTION_NAISSANCE);
BlupiInitAction (rank, ACTION_BORN);
}
cel.x++;
@ -1731,7 +1731,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
if (rank >= 0)
{
m_blupi[rank].energy = MAXENERGY / 4;
BlupiInitAction (rank, ACTION_NAISSANCE);
BlupiInitAction (rank, ACTION_BORN);
}
return true;
}
@ -2527,9 +2527,9 @@ bool CDecor::BlupiNextAction (Sint32 rank)
// Blupi perd de l'énergie s'il fait qq chose.
if (
m_blupi[rank].action != ACTION_STOP &&
m_blupi[rank].action != ACTION_STOPf &&
m_blupi[rank].action != ACTION_STOPTIRED &&
m_blupi[rank].action != ACTION_STOPb &&
m_blupi[rank].action != ACTION_STOPj &&
m_blupi[rank].action != ACTION_STOPJEEP &&
m_blupi[rank].action != ACTION_MISC1 &&
m_blupi[rank].action != ACTION_MISC2 &&
m_blupi[rank].action != ACTION_MISC3 &&
@ -2548,7 +2548,7 @@ bool CDecor::BlupiNextAction (Sint32 rank)
a = 1;
min = 0;
if (
m_blupi[rank].action != ACTION_MARCHE &&
m_blupi[rank].action != ACTION_WALK &&
(m_blupi[rank].goalAction == EV_ACTION_WALL ||
m_blupi[rank].goalAction == EV_ACTION_TOWER))
{
@ -2569,7 +2569,7 @@ bool CDecor::BlupiNextAction (Sint32 rank)
}
// Blupi prend de l'énergie s'il mange.
if (m_blupi[rank].action == ACTION_MANGE)
if (m_blupi[rank].action == ACTION_EAT)
{
if (m_blupi[rank].energy < MAXENERGY)
m_blupi[rank].energy += MAXENERGY / (40 * 3);
@ -2587,14 +2587,14 @@ bool CDecor::BlupiNextAction (Sint32 rank)
}
// Le robot prend de l'énergie s'il se recharge.
if (m_blupi[rank].action == ACTION_R_CHARGE)
if (m_blupi[rank].action == ACTION_R_LOAD)
{
if (m_blupi[rank].energy < MAXENERGY)
m_blupi[rank].energy = MAXENERGY;
}
// Blupi guérrit s'il boit.
if (m_blupi[rank].action == ACTION_BOIT)
if (m_blupi[rank].action == ACTION_DRINK)
{
m_blupi[rank].bMalade = false;
if (m_blupi[rank].energy < MAXENERGY)
@ -2604,7 +2604,7 @@ bool CDecor::BlupiNextAction (Sint32 rank)
// Si blupi est presque complètement épuisé, il stoppe.
if (
!bOK && m_blupi[rank].perso == 0 && m_blupi[rank].energy < 50 &&
m_blupi[rank].energy != 0 && m_blupi[rank].action == ACTION_MARCHEf)
m_blupi[rank].energy != 0 && m_blupi[rank].action == ACTION_WALKTIRED)
{
BlupiInitAction (rank, ACTION_STOP);
GoalStop (rank, true);
@ -2627,10 +2627,10 @@ void CDecor::BlupiNextGoal (Sint32 rank)
// Si blupi termine une action "mort", il doit disparaître.
if (
m_blupi[rank].action == ACTION_BRULE ||
m_blupi[rank].action == ACTION_BURN ||
m_blupi[rank].action == ACTION_TCHAO ||
m_blupi[rank].action == ACTION_A_GRILLE ||
m_blupi[rank].action == ACTION_V_GRILLE)
m_blupi[rank].action == ACTION_S_GRILL ||
m_blupi[rank].action == ACTION_V_GRILL)
{
BlupiDelete (rank); // snif ...
return;
@ -2712,7 +2712,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
channel == CHOBJECT && (icon == 10000 || icon == 10001) && // rayon ?
MoveIsUsed (cel)) // enclenché ?
{
BlupiInitAction (rank, ACTION_A_GRILLE);
BlupiInitAction (rank, ACTION_S_GRILL);
goto init;
}
@ -2777,7 +2777,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
channel == CHOBJECT && (icon == 10000 || icon == 10001) && // rayon ?
MoveIsUsed (cel)) // enclenché ?
{
BlupiInitAction (rank, ACTION_V_GRILLE);
BlupiInitAction (rank, ACTION_V_GRILL);
goto init;
}
@ -2846,7 +2846,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
PutObject (cel, -1, -1); // plus d'objet
BlupiSound (rank, SOUND_T_ECRASE, pos);
BlupiInitAction (rank, ACTION_T_ECRASE);
BlupiInitAction (rank, ACTION_T_CRUSHED);
goto init;
}
}
@ -2868,7 +2868,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
}
BlupiDelete (m_blupiHere); // plus de blupi !
BlupiSound (rank, SOUND_AIE, pos);
BlupiInitAction (rank, ACTION_T_ECRASE); // écrase blupi
BlupiInitAction (rank, ACTION_T_CRUSHED); // écrase blupi
goto init;
}
m_blupi[rank].bExist = true;
@ -2926,7 +2926,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
PutObject (cel, -1, -1); // plus d'objet
BlupiSound (rank, SOUND_T_ECRASE, pos);
BlupiInitAction (rank, ACTION_R_ECRASE);
BlupiInitAction (rank, ACTION_R_CRUSHED);
goto init;
}
}
@ -3129,18 +3129,18 @@ void CDecor::BlupiDestCel (Sint32 rank)
m_blupi[rank].destCel = m_blupi[rank].cel;
if (
m_blupi[rank].action == ACTION_MARCHE ||
m_blupi[rank].action == ACTION_MARCHEf ||
m_blupi[rank].action == ACTION_WALK ||
m_blupi[rank].action == ACTION_WALKTIRED ||
m_blupi[rank].action == ACTION_MARCHEb ||
m_blupi[rank].action == ACTION_MARCHEj ||
m_blupi[rank].action == ACTION_MARCHEa ||
m_blupi[rank].action == ACTION_A_MARCHE ||
m_blupi[rank].action == ACTION_V_MARCHE ||
m_blupi[rank].action == ACTION_T_MARCHE ||
m_blupi[rank].action == ACTION_R_MARCHE ||
m_blupi[rank].action == ACTION_B_MARCHE ||
m_blupi[rank].action == ACTION_E_MARCHE ||
m_blupi[rank].action == ACTION_D_MARCHE)
m_blupi[rank].action == ACTION_WALKJEEP ||
m_blupi[rank].action == ACTION_WALKARMOR ||
m_blupi[rank].action == ACTION_S_WALK ||
m_blupi[rank].action == ACTION_V_WALK ||
m_blupi[rank].action == ACTION_T_WALK ||
m_blupi[rank].action == ACTION_R_WALK ||
m_blupi[rank].action == ACTION_B_WALK ||
m_blupi[rank].action == ACTION_E_WALK ||
m_blupi[rank].action == ACTION_D_WALK)
{
vector = GetVector (m_blupi[rank].sDirect);

118
src/decgoal.cxx
View File

@ -92,7 +92,7 @@ static Sint16 table_goal_maison[] =
EV_ACTION_HOUSE,
GOAL_GOHILI2, +1, +1, false,
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_CONTENT, DIRECT_E,
GOAL_ACTION, ACTION_HAPPY, DIRECT_E,
GOAL_TERM,
0
};
@ -1006,7 +1006,7 @@ static Sint16 table_goal_depose[] =
GOAL_BUILDOBJECT, 0, -1, -2, -2, -1, -1, 11, 1, 1 * 100,
GOAL_ADDMOVES, 0, -1, 4,
GOAL_DEPOSE,
GOAL_ACTION, ACTION_DEPOSE, DIRECT_E,
GOAL_ACTION, ACTION_DROP, DIRECT_E,
GOAL_FINISHMOVE,
GOAL_TERM,
0
@ -1026,7 +1026,7 @@ static Sint16 table_goal_depose2[] =
GOAL_BUILDOBJECT, -1, 0, -2, -2, -1, -1, 11, 1, 1 * 100,
GOAL_ADDMOVES, -1, 0, 5,
GOAL_DEPOSE,
GOAL_ACTION, ACTION_DEPOSE, DIRECT_S,
GOAL_ACTION, ACTION_DROP, DIRECT_S,
GOAL_FINISHMOVE,
GOAL_TERM,
0
@ -1045,7 +1045,7 @@ static Sint16 table_goal_newblupi[] =
GOAL_BUILDOBJECT, 0, -1, -2, -2, -1, -1, 11, 1, 1 * 100,
GOAL_ADDMOVES, 0, -1, 4,
GOAL_DEPOSE,
GOAL_ACTION, ACTION_DEPOSE, DIRECT_E,
GOAL_ACTION, ACTION_DROP, DIRECT_E,
GOAL_FINISHMOVE,
GOAL_GOBLUPI, -1, 0, true,
GOAL_GROUP, 3,
@ -1143,9 +1143,9 @@ static Sint16 table_goal_mange[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_WORK, 0, -1,
GOAL_BUILDOBJECT, 0, -1, -1, -1, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ACTION, ACTION_MANGE, DIRECT_E,
GOAL_ACTION, ACTION_MANGE, DIRECT_E,
GOAL_ACTION, ACTION_MANGE, DIRECT_E,
GOAL_ACTION, ACTION_EAT, DIRECT_E,
GOAL_ACTION, ACTION_EAT, DIRECT_E,
GOAL_ACTION, ACTION_EAT, DIRECT_E,
GOAL_GROUP, 2,
GOAL_FINISHMOVE,
@ -1166,9 +1166,9 @@ static Sint16 table_goal_mange2[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_WORK, -1, 0,
GOAL_BUILDOBJECT, -1, 0, -1, -1, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ACTION, ACTION_MANGE, DIRECT_E,
GOAL_ACTION, ACTION_MANGE, DIRECT_E,
GOAL_ACTION, ACTION_MANGE, DIRECT_E,
GOAL_ACTION, ACTION_EAT, DIRECT_E,
GOAL_ACTION, ACTION_EAT, DIRECT_E,
GOAL_ACTION, ACTION_EAT, DIRECT_E,
GOAL_GROUP, 2,
GOAL_FINISHMOVE,
@ -1189,9 +1189,9 @@ static Sint16 table_goal_boit[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_WORK, 0, -1,
GOAL_PUTOBJECT, 0, -1, -1, -1,
GOAL_ACTION, ACTION_BOIT, DIRECT_E,
GOAL_ACTION, ACTION_BOIT, DIRECT_E,
GOAL_ACTION, ACTION_BOIT, DIRECT_E,
GOAL_ACTION, ACTION_DRINK, DIRECT_E,
GOAL_ACTION, ACTION_DRINK, DIRECT_E,
GOAL_ACTION, ACTION_DRINK, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_TERM,
0
@ -1208,9 +1208,9 @@ static Sint16 table_goal_boit2[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_WORK, -1, 0,
GOAL_PUTOBJECT, -1, 0, -1, -1,
GOAL_ACTION, ACTION_BOIT, DIRECT_E,
GOAL_ACTION, ACTION_BOIT, DIRECT_E,
GOAL_ACTION, ACTION_BOIT, DIRECT_E,
GOAL_ACTION, ACTION_DRINK, DIRECT_E,
GOAL_ACTION, ACTION_DRINK, DIRECT_E,
GOAL_ACTION, ACTION_DRINK, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_S,
GOAL_TERM,
0
@ -1739,7 +1739,7 @@ static Sint16 table_goal_pontel[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -10, -10, 6, // pont vers l'est
GOAL_ACTION, ACTION_PONT, DIRECT_E,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_E,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -10, -10, -1, -1,
@ -1785,7 +1785,7 @@ static Sint16 table_goal_pontol[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -10, -10, 7, // pont vers l'ouest
GOAL_ACTION, ACTION_PONT, DIRECT_O,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_O,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -10, -10, -1, -1,
@ -1831,7 +1831,7 @@ static Sint16 table_goal_pontsl[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 73, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -10, -10, 8, // pont vers le sud
GOAL_ACTION, ACTION_PONT, DIRECT_S,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_S,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -10, -10, -1, -1,
@ -1876,7 +1876,7 @@ static Sint16 table_goal_pontnl[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_BUILDOBJECT, -10, -10, CHOBJECT, 73, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -10, -10, 9, // pont vers le nord
GOAL_ACTION, ACTION_PONT, DIRECT_N,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_N,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -10, -10, -1, -1,
@ -1917,7 +1917,7 @@ static Sint16 table_goal_bateaue[] =
GOAL_GROUP, 2,
GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -1, 0, 6, // bateau vers l'est
GOAL_ACTION, ACTION_PONT, DIRECT_E,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_E,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -1, 0, -1, -1,
@ -1949,7 +1949,7 @@ static Sint16 table_goal_bateaus[] =
GOAL_GROUP, 2,
GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 117, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, 0, -1, 8, // bateau vers le sud
GOAL_ACTION, ACTION_PONT, DIRECT_S,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_S,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, 0, -1, -1, -1,
@ -1982,7 +1982,7 @@ static Sint16 table_goal_bateauo[] =
GOAL_GROUP, 2,
GOAL_BUILDOBJECT, -1, 0, CHOBJECT, 117, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, -1, 0, 7, // bateau vers l'ouest
GOAL_ACTION, ACTION_PONT, DIRECT_O,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_O,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, -1, 0, -1, -1,
@ -2014,7 +2014,7 @@ static Sint16 table_goal_bateaun[] =
GOAL_GROUP, 2,
GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 117, -1, -1, DIMOBJY, 1, -1 * 100,
GOAL_ADDMOVES, 0, -1, 9, // bateau vers le nord
GOAL_ACTION, ACTION_PONT, DIRECT_N,
GOAL_ACTION, ACTION_BRIDGE, DIRECT_N,
GOAL_GROUP, 4,
GOAL_FINISHMOVE,
GOAL_PUTOBJECT, 0, -1, -1, -1,
@ -2440,16 +2440,16 @@ static Sint16 table_goal_r_make1[] =
GOAL_GROUP, 2,
GOAL_USINEFREE, -1, -1,
GOAL_INTERRUPT, 0, // prioritaire
GOAL_ACTION, ACTION_R_CHARGE, DIRECT_O,
GOAL_ACTION, ACTION_R_CHARGE, DIRECT_O,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O,
GOAL_ACTION, ACTION_R_CHARGE, DIRECT_O,
GOAL_ACTION, ACTION_R_CHARGE, DIRECT_O,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O,
GOAL_ACTION, ACTION_R_CHARGE, DIRECT_O,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O,
GOAL_ACTION, ACTION_R_CHARGE, DIRECT_O,
GOAL_ACTION, ACTION_R_CHARGE, DIRECT_O,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O,
GOAL_ACTION, ACTION_R_LOAD, DIRECT_O,
GOAL_ACTION, ACTION_R_BUILD, DIRECT_O,
GOAL_TERM,
0
@ -2787,7 +2787,7 @@ static Sint16 table_goal_mjeep[] =
GOAL_TESTOBJECT, -1, 0, CHOBJECT, 118,
GOAL_INTERRUPT, 0, // prioritaire
GOAL_WORK, -1, 0,
GOAL_ACTION, ACTION_SAUTE1, DIRECT_S,
GOAL_ACTION, ACTION_JUMPJEEP, DIRECT_S,
GOAL_GROUP, 2,
GOAL_PUTOBJECT, -1, -1, -1, -1, // enlève la jeep
GOAL_VEHICULE, 2, // en jeep
@ -2817,7 +2817,7 @@ static Sint16 table_goal_djeep[] =
GOAL_PUTOBJECT, -1, -1, CHOBJECT, 118, // remet la jeep
GOAL_VEHICULE, 0, // à pied
GOAL_ACTUALISE,
GOAL_ACTION, ACTION_SAUTE1, DIRECT_N,
GOAL_ACTION, ACTION_JUMPJEEP, DIRECT_N,
GOAL_ACTION, ACTION_STOP, DIRECT_N,
GOAL_ACTION, ACTION_STOP, DIRECT_N,
GOAL_ACTION, ACTION_STOP, DIRECT_N,
@ -2845,7 +2845,7 @@ static Sint16 table_goal_marmure[] =
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_GROUP, 2,
GOAL_PUTOBJECT, -1, -1, -1, -1, // enlève l'armure
GOAL_ACTION, ACTION_ARMURECLOSE, DIRECT_E,
GOAL_ACTION, ACTION_ARMORCLOSE, DIRECT_E,
GOAL_VEHICULE, 3, // en armure
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_E,
@ -2882,7 +2882,7 @@ static Sint16 table_goal_darmure[] =
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_ACTION, ACTION_ARMUREOPEN, DIRECT_E,
GOAL_ACTION, ACTION_ARMOROPEN, DIRECT_E,
GOAL_GROUP, 3,
GOAL_WORK, -1, -1,
GOAL_PUTOBJECT, -1, -1, CHOBJECT, 16, // remet l'armure
@ -3190,27 +3190,27 @@ static Sint16 table_goal_e_rayon[] =
GOAL_GOHILI2, 0, 0, false,
GOAL_SOUND, SOUND_E_TOURNE,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_SKIPSKILL, 1, 7,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_DEBUT, DIRECT_E,
GOAL_ACTION, ACTION_E_BEGIN, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_ACTION, ACTION_E_RAYON, DIRECT_E,
GOAL_SOUND, SOUND_E_RAYON,
@ -3283,9 +3283,9 @@ static Sint16 table_goal_electro[] =
GOAL_ACTION, ACTION_ELECTRO, DIRECT_SE,
GOAL_TAKEOBJECT, -1, -1, -1, -1, // ne porte plus rien
GOAL_SOUND, SOUND_TCHAO,
GOAL_ACTION, ACTION_GRILLE1, DIRECT_SE,
GOAL_ACTION, ACTION_GRILLE2, DIRECT_SE,
GOAL_ACTION, ACTION_GRILLE3, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL1, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL2, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL3, DIRECT_SE,
GOAL_DELETE, // blupi meurt brutalement
GOAL_TERM,
0
@ -3300,9 +3300,9 @@ static Sint16 table_goal_electrom[] =
GOAL_MALADE, false,
GOAL_TAKEOBJECT, -1, -1, -1, -1, // ne porte plus rien
GOAL_SOUND, SOUND_TCHAO,
GOAL_ACTION, ACTION_GRILLE1, DIRECT_SE,
GOAL_ACTION, ACTION_GRILLE2, DIRECT_SE,
GOAL_ACTION, ACTION_GRILLE3, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL1, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL2, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL3, DIRECT_SE,
GOAL_DELETE, // blupi meurt brutalement
GOAL_TERM,
0
@ -3318,9 +3318,9 @@ static Sint16 table_goal_grille[] =
GOAL_MALADE, false,
GOAL_TAKEOBJECT, -1, -1, -1, -1, // ne porte plus rien
GOAL_SOUND, SOUND_BRULE,
GOAL_ACTION, ACTION_GRILLE1, DIRECT_SE,
GOAL_ACTION, ACTION_GRILLE2, DIRECT_SE,
GOAL_ACTION, ACTION_GRILLE3, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL1, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL2, DIRECT_SE,
GOAL_ACTION, ACTION_GRILL3, DIRECT_SE,
GOAL_DELETE, // blupi meurt brutalement
GOAL_TERM,
0
@ -3333,10 +3333,10 @@ static Sint16 table_goal_a_mort[] =
GOAL_INTERRUPT, 0, // prioritaire
GOAL_ACTION, ACTION_STOP, DIRECT_E,
GOAL_SOUND, SOUND_A_POISON,
GOAL_ACTION, ACTION_A_POISON, DIRECT_E,
GOAL_ACTION, ACTION_A_MORT1, DIRECT_E,
GOAL_ACTION, ACTION_A_MORT2, DIRECT_E,
GOAL_ACTION, ACTION_A_MORT3, DIRECT_E,
GOAL_ACTION, ACTION_S_POISON, DIRECT_E,
GOAL_ACTION, ACTION_S_DEAD1, DIRECT_E,
GOAL_ACTION, ACTION_S_DEAD2, DIRECT_E,
GOAL_ACTION, ACTION_S_DEAD3, DIRECT_E,
GOAL_DELETE, // l'araignée meurt brutalement
GOAL_TERM,
0

2
src/decmove.cxx
View File

@ -1293,7 +1293,7 @@ void CDecor::MoveStep (bool bFirst)
{
if (
m_blupi[rankBlupi].action == ACTION_STOP ||
m_blupi[rankBlupi].action == ACTION_STOPf)
m_blupi[rankBlupi].action == ACTION_STOPTIRED)
continue;
}

106
src/def.h
View File

@ -116,31 +116,31 @@
// Actions :
#define ACTION_STOP 0 // arrêt
#define ACTION_STOPf 1 // arrêt fatigué
#define ACTION_MARCHE 2 // marche
#define ACTION_MARCHEf 3 // marche fatigué
#define ACTION_BUILD 4 // construit
#define ACTION_STOP 0 // stop
#define ACTION_STOPTIRED 1 // stop tiredness
#define ACTION_WALK 2 // walk
#define ACTION_WALKTIRED 3 // walk tiredness
#define ACTION_BUILD 4 // build
#define ACTION_PIOCHE 5 // pioche
#define ACTION_ENERGY 6 // prend de l'énergie
#define ACTION_TAKE 8 // fait sauter un objet sur la tête (est)
#define ACTION_DEPOSE 9 // repose l'objet sur la tête (est)
#define ACTION_TAKE 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_BRULE 11 // blupi crame !
#define ACTION_TCHAO 12 // blupi disparait !
#define ACTION_MANGE 13 // blupi mange
#define ACTION_NAISSANCE 14 // naissance
#define ACTION_BURN 11 // blupi is burning !
#define ACTION_TCHAO 12 // blupi disappeard !
#define ACTION_EAT 13 // blupi eats
#define ACTION_BORN 14 // born
#define ACTION_SAUTE2 15 // saute par-dessus un obstacle
#define ACTION_SAUTE3 16 // saute par-dessus un obstacle
#define ACTION_SAUTE4 17 // saute par-dessus un obstacle
#define ACTION_SAUTE5 18 // saute par-dessus un obstacle
#define ACTION_PONT 19 // pousse un pont
#define ACTION_BRIDGE 19 // push a bridge
#define ACTION_MISC1 20 // divers 1 (hausse les épaules)
#define ACTION_MISC2 21 // divers 2 (grat-grat)
#define ACTION_MISC3 22 // divers 3 (yoyo)
#define ACTION_MISC1f 23 // divers 1 fatigué (bof-bof)
#define ACTION_GLISSE 24 // glisse en marchant
#define ACTION_BOIT 25 // blupi boit
#define ACTION_DRINK 25 // blupi is drinking
#define ACTION_LABO 26 // blupi travaille dans son laboratoire
#define ACTION_DYNAMITE 27 // blupi fait péter la dynamite
#define ACTION_DELAY 28 // blupi attend un frame
@ -149,14 +149,14 @@
#define ACTION_MECHE 31 // blupi se bouche les oreilles
#define ACTION_STOPb 32 // arrêt en bateau
#define ACTION_MARCHEb 33 // avance en bateau
#define ACTION_STOPj 34 // arrêt en jeep
#define ACTION_MARCHEj 35 // avance en jeep
#define ACTION_STOPJEEP 34 // stop when using a jeep
#define ACTION_WALKJEEP 35 // going in jeep
#define ACTION_ELECTRO 36 // blupi électrocuté
#define ACTION_GRILLE1 37 // blupi grille (phase 1)
#define ACTION_GRILLE2 38 // blupi grille (phase 2)
#define ACTION_GRILLE3 39 // blupi grille (phase 3)
#define ACTION_GRILL1 37 // blupi grills (phase 1)
#define ACTION_GRILL2 38 // blupi grills (phase 2)
#define ACTION_GRILL3 39 // blupi grills (phase 3)
#define ACTION_MISC4 40 // divers 4 (ferme les yeux)
#define ACTION_CONTENT 41 // blupi est content
#define ACTION_HAPPY 41 // blupi is happy
#define ACTION_ARROSE 42 // blupi arrose
#define ACTION_BECHE 43 // blupi bèche
#define ACTION_CUEILLE3 44 // blupi cueille des fleurs
@ -170,54 +170,54 @@
#define ACTION_TELEPORTE1 52 // téléporte
#define ACTION_TELEPORTE2 53 // téléporte
#define ACTION_TELEPORTE3 54 // téléporte
#define ACTION_STOPa 55 // arrêt armure
#define ACTION_MARCHEa 56 // marche armure
#define ACTION_ARMUREOPEN 57 // ouvre armure
#define ACTION_ARMURECLOSE 58 // ferme armure
#define ACTION_SAUTE1 59 // saute dans la jeep
#define ACTION_STOPARMOR 55 // stop armor
#define ACTION_WALKARMOR 56 // walk armor
#define ACTION_ARMOROPEN 57 // open armor
#define ACTION_ARMORCLOSE 58 // close armor
#define ACTION_JUMPJEEP 59 // jump in the jeep
#define ACTION_MISC6 60 // divers 6 (diabolo)
#define ACTION_A_STOP 100 // araignée: arrêt
#define ACTION_A_MARCHE 101 // araignée: marche
#define ACTION_A_SAUT 102 // araignée: saute
#define ACTION_A_GRILLE 103 // araignée: grille dans rayon
#define ACTION_A_POISON 105 // araignée: empoisonée
#define ACTION_A_MORT1 106 // araignée: meurt
#define ACTION_A_MORT2 107 // araignée: meurt
#define ACTION_A_MORT3 108 // araignée: meurt
#define ACTION_S_STOP 100 // spider: stop
#define ACTION_S_WALK 101 // spider: walk
#define ACTION_S_JUMP 102 // spider: jump
#define ACTION_S_GRILL 103 // spider: grill in rays
#define ACTION_S_POISON 105 // spider: poisoned
#define ACTION_S_DEAD1 106 // spider: dead
#define ACTION_S_DEAD2 107 // spider: dead
#define ACTION_S_DEAD3 108 // spider: dead
#define ACTION_V_STOP 200 // virus: arrêt
#define ACTION_V_MARCHE 201 // virus: marche
#define ACTION_V_GRILLE 202 // virus: grille dans rayon
#define ACTION_V_STOP 200 // virus: stop
#define ACTION_V_WALK 201 // virus: walk
#define ACTION_V_GRILL 202 // virus: grill in rays
#define ACTION_T_STOP 300 // tracks: arrêt
#define ACTION_T_MARCHE 301 // tracks: marche
#define ACTION_T_ECRASE 302 // tracks: écrase un objet
#define ACTION_T_STOP 300 // tracks: stop
#define ACTION_T_WALK 301 // tracks: walk
#define ACTION_T_CRUSHED 302 // tracks: crushed an object
#define ACTION_R_STOP 400 // robot: arrêt
#define ACTION_R_MARCHE 401 // robot: marche
#define ACTION_R_STOP 400 // robot: stop
#define ACTION_R_WALK 401 // robot: walk
#define ACTION_R_APLAT 402 // robot: applatit
#define ACTION_R_BUILD 403 // robot: construit
#define ACTION_R_DELAY 404 // robot: construit
#define ACTION_R_CHARGE 405 // robot: recharge
#define ACTION_R_ECRASE 406 // robot: écrase un objet
#define ACTION_R_LOAD 405 // robot: reload
#define ACTION_R_CRUSHED 406 // robot: crushed an object
#define ACTION_B_STOP 500 // bombe: arrêt
#define ACTION_B_MARCHE 501 // bombe: marche
#define ACTION_B_STOP 500 // bomb: stop
#define ACTION_B_WALK 501 // bomb: walk
#define ACTION_D_DELAY 600 // détonnateur: attend
#define ACTION_D_DELAY 600 // detonator: wait
#define ACTION_E_STOP 700 // électro: arrêt
#define ACTION_E_MARCHE 701 // électro: marche
#define ACTION_E_DEBUT 702 // électro: débute
#define ACTION_E_RAYON 703 // électro: rayonne
#define ACTION_E_STOP 700 // electro: stop
#define ACTION_E_WALK 701 // electro: walk
#define ACTION_E_BEGIN 702 // electro: begin
#define ACTION_E_RAYON 703 // electro: rayon
#define ACTION_D_STOP 800 // disciple: arrêt
#define ACTION_D_MARCHE 801 // disciple: marche
#define ACTION_D_BUILD 802 // disciple: construit
#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_TCHAO 805 // disciple: disparait !
#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
#define ACTION_D_MECHE 808 // disciple: se bouche les oreilles

4
src/obstacle.cxx
View File

@ -2344,7 +2344,7 @@ bool CDecor::SearchBestBase (
if (!bFree)
{
bFree = IsFreeDirect (cel, tryDirect, rank);
action = ACTION_MARCHE;
action = ACTION_WALK;
}
if (!bFree)
@ -2483,7 +2483,7 @@ bool CDecor::SearchBestPass (Sint32 rank, Sint32 & action)
{
m_blupi[rank].cel = iCel;
m_blupi[rank].sDirect = direct;
action = ACTION_MARCHE;
action = ACTION_WALK;
return true;
}
}

2
src/path.cxx
View File

@ -220,7 +220,7 @@ bool CDecor::CheminTestDirection (
{
// Peut-on marcher normalement ?
bFree = IsFreeDirect (cel, tryDirect, rank);
action = ACTION_MARCHE;
action = ACTION_WALK;
cout = 1; // coût minimal
}