From 70a8bda9e47dd072f2c1bd9892198dfcdcd37f51 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Thu, 10 Aug 2017 22:29:48 +0200 Subject: [PATCH] Cosmetic: rename more def --- src/action.cxx | 34 +++++++-------- src/decblupi.cxx | 92 ++++++++++++++++++++-------------------- src/decgoal.cxx | 108 +++++++++++++++++++++++------------------------ src/decor.cxx | 30 ++++++------- src/def.h | 44 +++++++++---------- src/event.cxx | 4 +- 6 files changed, 156 insertions(+), 156 deletions(-) diff --git a/src/action.cxx b/src/action.cxx index e43b0c3..1e21ede 100644 --- a/src/action.cxx +++ b/src/action.cxx @@ -433,7 +433,7 @@ static const DescAction action_table[] = {1, 1, 0, 0, 0}, // ne }, { 15, SOUND_HOP, -1, -1, -1, - SOUND_SAUT, -1, -1, -1, -1, -1, -1, -1, -1, -1, + SOUND_JUMP, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_COUPTOC }, }, @@ -489,7 +489,7 @@ static const DescAction action_table[] = {1, 1, 0, 0, 0}, // ne }, { 15, SOUND_HOP, -1, -1, -1, - SOUND_SAUT, -1, -1, -1, -1, -1, -1, -1, -1, -1, + SOUND_JUMP, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_COUPTOC }, }, @@ -549,7 +549,7 @@ static const DescAction action_table[] = {1, 1, 0, 0, 0}, // ne }, { 20, SOUND_HOP, -1, -1, -1, - SOUND_SAUT, -1, -1, -1, -1, -1, -1, + SOUND_JUMP, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_COUPTOC }, @@ -622,7 +622,7 @@ static const DescAction action_table[] = {1, 1, 0, 0, 0}, // ne }, { 25, SOUND_HOP, -1, -1, -1, - SOUND_SAUT, -1, -1, -1, -1, -1, -1, + SOUND_JUMP, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_COUPTOC @@ -704,7 +704,7 @@ static const DescAction action_table[] = {1, 1, 0, 0, 0}, // ne }, { 30, SOUND_HOP, -1, -1, -1, - SOUND_SAUT, -1, -1, -1, -1, -1, -1, + SOUND_JUMP, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_COUPTOC @@ -1234,7 +1234,7 @@ static const DescAction action_table[] = {1, 1, 0, 0, 0}, }, { 2 + 6 + 15, SOUND_HOP, -1, -1, -1, -1, -1, -1, -1, - SOUND_SAUT, -1, -1, -1, -1, -1, -1, -1, -1, + SOUND_JUMP, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_COUPTOC, -1, -1, -1, -1, -1 }, }, @@ -1305,9 +1305,9 @@ static const DescAction action_table[] = { {60, 1, 0, 0, 0}, }, - { 30, SOUND_BRULE, -1, -1, -1, -1, -1, -1, -1, -1, -1, - SOUND_BRULE, -1, -1, -1, -1, -1, -1, -1, -1, -1, - SOUND_BRULE, -1, -1, -1, -1, -1, -1, -1, -1, -1 + { 30, SOUND_BURN, -1, -1, -1, -1, -1, -1, -1, -1, -1, + SOUND_BURN, -1, -1, -1, -1, -1, -1, -1, -1, -1, + SOUND_BURN, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, }, { @@ -1432,9 +1432,9 @@ static const DescAction action_table[] = 0, 0, 0 }, }, - { 20 + 9, SOUND_NAISSANCE, -1, -1, -1, -1, -1, -1, -1, -1, -1, + { 20 + 9, SOUND_BORN, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - SOUND_NAISSANCE, -1, -1, -1, -1, -1, -1, -1, + SOUND_BORN, -1, -1, -1, -1, -1, -1, -1, SOUND_COUPTOC }, }, @@ -2030,7 +2030,7 @@ static const DescAction action_table[] = +600, 0, +2, +600, 0, +8, +600, 0, +10, +600, 0, +10, +600, 0, +10 }, }, - {10, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_A_SAUT}, + {10, -1, -1, -1, -1, -1, -1, -1, -1, -1, SOUND_S_JUMP}, }, { ACTION_S_GRILL, @@ -2217,7 +2217,7 @@ static const DescAction action_table[] = {10, 1, +300, -150, 0}, // n {15, 1, +400, 0, 0}, // ne }, - {5, SOUND_T_MOTEUR, -1, -1, -1, -1}, + {5, SOUND_T_ENGINE, -1, -1, -1, -1}, }, { ACTION_T_CRUSHED, @@ -2350,7 +2350,7 @@ static const DescAction action_table[] = }, #endif }, - { 20, -1, -1, SOUND_R_MOTEUR, -1, -1, -1, -1, -1, -1, -1, + { 20, -1, -1, SOUND_R_ENGINE, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, }, @@ -2597,9 +2597,9 @@ static const DescAction action_table[] = }, #endif }, - { 30, -1, -1, SOUND_B_SAUT, -1, -1, -1, -1, -1, -1, -1, - -1, -1, SOUND_B_SAUT, -1, -1, -1, -1, -1, -1, -1, - -1, -1, SOUND_B_SAUT, -1, -1, -1, -1, -1, -1, -1 + { 30, -1, -1, SOUND_B_JUMP, -1, -1, -1, -1, -1, -1, -1, + -1, -1, SOUND_B_JUMP, -1, -1, -1, -1, -1, -1, -1, + -1, -1, SOUND_B_JUMP, -1, -1, -1, -1, -1, -1, -1 }, }, diff --git a/src/decblupi.cxx b/src/decblupi.cxx index 3f6421e..c698bc2 100644 --- a/src/decblupi.cxx +++ b/src/decblupi.cxx @@ -426,8 +426,8 @@ void CDecor::BlupiSound (Sint32 rank, Sint32 sound, POINT pos, bool bStop) if (rank != -1 && m_blupi[rank].perso == 8) // disciple ? { if ( - sound == SOUND_HOP || sound == SOUND_BRULE || sound == SOUND_TCHAO || - sound == SOUND_FLEUR || sound == SOUND_ARROSE) + sound == SOUND_HOP || sound == SOUND_BURN || sound == SOUND_TCHAO || + sound == SOUND_FLOWER || sound == SOUND_ARROSE) newSound = -1; else newSound = sound; @@ -465,7 +465,7 @@ void CDecor::BlupiSound (Sint32 rank, Sint32 sound, POINT pos, bool bStop) // Sons associés à des actions. // clang-format off static const Sint16 tableSound[] = { - ACTION_BURN, SOUND_BRULE, + ACTION_BURN, SOUND_BURN, ACTION_TCHAO, SOUND_TCHAO, ACTION_EAT, SOUND_EAT, ACTION_DRINK, SOUND_DRINK, @@ -786,7 +786,7 @@ Sint32 CDecor::ListGetParam (Sint32 rank, Sint32 button, POINT cel) { Sint32 icon; - if (button == BUTTON_CARRY || button == BUTTON_FLEUR) + if (button == BUTTON_CARRY || button == BUTTON_FLOWER) return m_decor[cel.x / 2][cel.y / 2].objectIcon; if (button == BUTTON_DEPOSE) @@ -814,7 +814,7 @@ bool CDecor::ListPut (Sint32 rank, Sint32 button, POINT cel, POINT cMem) return true; // Mémorise "mange" seulement après un "cultive". - if (button == BUTTON_MANGE && m_blupi[rank].listButton[0] != BUTTON_CULTIVE) + if (button == BUTTON_EAT && m_blupi[rank].listButton[0] != BUTTON_CULTIVE) return true; // Si prend/dépose à la suite au même endroit, @@ -892,10 +892,10 @@ Sint32 CDecor::ListSearch ( static Sint32 table_series[] = { 0, // errors - 2, BUTTON_CULTIVE, BUTTON_MANGE, + 2, BUTTON_CULTIVE, BUTTON_EAT, 1, // errors - 4, BUTTON_FLEUR, BUTTON_CARRY, BUTTON_LABO, BUTTON_DEPOSE, + 4, BUTTON_FLOWER, BUTTON_CARRY, BUTTON_LABO, BUTTON_DEPOSE, 2, // errors 3, BUTTON_CARRY, BUTTON_LABO, BUTTON_DEPOSE, @@ -907,7 +907,7 @@ Sint32 CDecor::ListSearch ( 3, BUTTON_EXTRAIT, BUTTON_FABJEEP, BUTTON_DJEEP, 5, // errors - 3, BUTTON_EXTRAIT, BUTTON_FABARMURE, BUTTON_DARMURE, + 3, BUTTON_EXTRAIT, BUTTON_MAKEARMOR, BUTTON_DARMOR, 6, // errors 4, BUTTON_ABAT, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_PALIS, @@ -916,16 +916,16 @@ Sint32 CDecor::ListSearch ( 3, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_PALIS, 8, // errors - 4, BUTTON_ABAT, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_PONT, + 4, BUTTON_ABAT, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_BRIDGE, 9, // errors - 3, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_PONT, + 3, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_BRIDGE, 10, // errors - 4, BUTTON_ABAT, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_BATEAU, + 4, BUTTON_ABAT, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_BOAT, 11, // errors - 3, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_BATEAU, + 3, BUTTON_CARRY, BUTTON_DEPOSE, BUTTON_BOAT, -1, }; @@ -991,7 +991,7 @@ bool CDecor::RepeatAdjust ( CHOBJECT, 37, 43, - BUTTON_MANGE, + BUTTON_EAT, CHOBJECT, 60, 60, @@ -999,7 +999,7 @@ bool CDecor::RepeatAdjust ( CHOBJECT, 36, 36, - BUTTON_BATEAU, + BUTTON_BOAT, CHOBJECT, 36, 36, @@ -1011,7 +1011,7 @@ bool CDecor::RepeatAdjust ( -1, -1, -1, - BUTTON_DARMURE, + BUTTON_DARMOR, -1, -1, -1, @@ -1088,7 +1088,7 @@ bool CDecor::RepeatAdjust ( if ( button == BUTTON_DEPOSE && // dépose pour un bateau ? - list > 0 && m_blupi[rank].listButton[list - 1] == BUTTON_BATEAU) + list > 0 && m_blupi[rank].listButton[list - 1] == BUTTON_BOAT) { if (SearchOtherBateau (rank, cel, 100, test, icon)) { @@ -1120,7 +1120,7 @@ bool CDecor::RepeatAdjust ( i += 4; } - if (button == BUTTON_CARRY || button == BUTTON_FLEUR) + if (button == BUTTON_CARRY || button == BUTTON_FLOWER) { channel = CHOBJECT; icon1 = param; @@ -2752,7 +2752,7 @@ void CDecor::BlupiNextGoal (Sint32 rank) if (channel == CHOBJECT && icon == 60) // tomates ? { PutObject (cel, -1, -1); // plus de tomates - BlupiSound (rank, SOUND_A_HIHI, pos); + BlupiSound (rank, SOUND_S_HIHI, pos); } if (channel == CHOBJECT && icon == 92) // poison ? { @@ -2767,7 +2767,7 @@ void CDecor::BlupiNextGoal (Sint32 rank) } if (channel == CHOBJECT && icon == 93) // piège ? { - BlupiSound (rank, SOUND_PIEGE, pos); + BlupiSound (rank, SOUND_TRAP, pos); PutObject (cel, CHOBJECT, 96); // araignée piégée BlupiDelete (rank); // supprime araignée return; @@ -2864,7 +2864,7 @@ void CDecor::BlupiNextGoal (Sint32 rank) } if (icon == 93) // piège ? { - BlupiSound (rank, SOUND_PIEGE, pos); + BlupiSound (rank, SOUND_TRAP, pos); PutObject (cel, CHOBJECT, 97); // tracks piégé BlupiDelete (rank); // supprime tracks return; @@ -2944,7 +2944,7 @@ void CDecor::BlupiNextGoal (Sint32 rank) } if (icon == 93) // piège ? { - BlupiSound (rank, SOUND_PIEGE, pos); + BlupiSound (rank, SOUND_TRAP, pos); PutObject (cel, CHOBJECT, 98); // robot piégé BlupiDelete (rank); // supprime robot return; @@ -2990,7 +2990,7 @@ void CDecor::BlupiNextGoal (Sint32 rank) GetObject (cel, channel, icon); if (channel == CHOBJECT && icon == 93) // piège ? { - BlupiSound (rank, SOUND_PIEGE, pos); + BlupiSound (rank, SOUND_TRAP, pos); PutObject (cel, CHOBJECT, 114); // bombe piégée BlupiDelete (rank); // supprime bombe return; @@ -3034,7 +3034,7 @@ void CDecor::BlupiNextGoal (Sint32 rank) GetObject (cel, channel, icon); if (channel == CHOBJECT && icon == 93) // piège ? { - BlupiSound (rank, SOUND_PIEGE, pos); + BlupiSound (rank, SOUND_TRAP, pos); PutObject (cel, CHOBJECT, 19); // électro piégée BlupiDelete (rank); // supprime électro return; @@ -3691,7 +3691,7 @@ Sint32 CDecor::GetDefButton (POINT cel) if (icon == 44) button = BUTTON_CARRY; // pierres if (icon == 60) - button = BUTTON_MANGE; // tomates + button = BUTTON_EAT; // tomates if (icon == 63) button = BUTTON_CARRY; // oeufs if (icon == 80) @@ -3738,7 +3738,7 @@ Sint32 CDecor::GetDefButton (POINT cel) button == BUTTON_CULTIVE)) return -1; - if (m_blupi[rank].energy > (MAXENERGY / 4) * 3 && button == BUTTON_MANGE) + if (m_blupi[rank].energy > (MAXENERGY / 4) * 3 && button == BUTTON_EAT) button = BUTTON_CARRY; if (m_buttonExist[button] == 0) // bouton existe ? @@ -3799,9 +3799,9 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem) button = BUTTON_ROC; bRepeat = true; } - if (button == BUTTON_FLEURn) + if (button == BUTTON_FLOWERn) { - button = BUTTON_FLEUR; + button = BUTTON_FLOWER; bRepeat = true; } action = table_actions[button]; @@ -4293,9 +4293,9 @@ void CDecor::BlupiGetButtons ( 0, BUTTON_DJEEP, 0, - BUTTON_DARMURE, + BUTTON_DARMOR, 0, - BUTTON_MANGE, + BUTTON_EAT, 0, BUTTON_BOIT, 0, @@ -4315,13 +4315,13 @@ void CDecor::BlupiGetButtons ( 0, BUTTON_CULTIVE, 0, - BUTTON_FLEUR, + BUTTON_FLOWER, 0, - BUTTON_FLEURn, + BUTTON_FLOWERn, 0, BUTTON_DYNAMITE, 0, - BUTTON_DRAPEAU, + BUTTON_FLAG, 0, BUTTON_EXTRAIT, 0, @@ -4331,7 +4331,7 @@ void CDecor::BlupiGetButtons ( 0, BUTTON_FABDISC, 0, - BUTTON_FABARMURE, + BUTTON_MAKEARMOR, 0, BUTTON_BUILD1, 36, // si planches (cabane) @@ -4341,9 +4341,9 @@ void CDecor::BlupiGetButtons ( 36, // si planches (mine) BUTTON_PALIS, 36, // si planches - BUTTON_PONT, + BUTTON_BRIDGE, 36, // si planches - BUTTON_BATEAU, + BUTTON_BOAT, 36, // si planches BUTTON_BUILD6, 36, // si planches (téléporteur) @@ -4351,9 +4351,9 @@ void CDecor::BlupiGetButtons ( 44, // si pierres (laboratoire) BUTTON_BUILD5, 44, // si pierres (usine) - BUTTON_MUR, + BUTTON_WALL, 44, // si pierres - BUTTON_TOUR, + BUTTON_TOWER, 44, // si pierres BUTTON_STOP, 0, @@ -4561,7 +4561,7 @@ Sint32 CDecor::IsTerminated () if (m_term.bHachBlupi) { if (m_winLastHachBlupi < m_nbStatHachBlupi) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); m_winLastHachBlupi = m_nbStatHachBlupi; if (m_nbStatHachBlupi < m_nbStatHach * 4) @@ -4571,7 +4571,7 @@ Sint32 CDecor::IsTerminated () if (m_term.bHachPlanche) { if (m_winLastHachPlanche < m_nbStatHachPlanche) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); m_winLastHachPlanche = m_nbStatHachPlanche; if (m_nbStatHachPlanche < m_nbStatHach) @@ -4581,7 +4581,7 @@ Sint32 CDecor::IsTerminated () if (m_term.bHachTomate) { if (m_winLastHachTomate < m_nbStatHachTomate) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); m_winLastHachTomate = m_nbStatHachTomate; if (m_nbStatHachTomate < m_nbStatHach) @@ -4591,7 +4591,7 @@ Sint32 CDecor::IsTerminated () if (m_term.bHachMetal) { if (m_winLastHachMetal < m_nbStatHachMetal) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); m_winLastHachMetal = m_nbStatHachMetal; if (m_nbStatHachMetal < m_nbStatHach) @@ -4608,7 +4608,7 @@ Sint32 CDecor::IsTerminated () m_winLastRobots = m_nbStatRobots; if (m_winLastHachRobot < m_nbStatHachRobot) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); m_winLastHachRobot = m_nbStatHachRobot; if (m_nbStatHachRobot < m_nbStatHach) @@ -4618,7 +4618,7 @@ Sint32 CDecor::IsTerminated () if (m_term.bHomeBlupi) { if (m_winLastHomeBlupi < m_nbStatHomeBlupi) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); m_winLastHomeBlupi = m_nbStatHomeBlupi; if (m_nbStatHomeBlupi < m_nbStatHome) @@ -4628,7 +4628,7 @@ Sint32 CDecor::IsTerminated () if (m_term.bKillRobots) { if (m_winLastRobots > m_nbStatRobots) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); m_winLastRobots = m_nbStatRobots; if (m_nbStatRobots > 0) @@ -4644,12 +4644,12 @@ delay: if (out == 1) // perdu ? { if (!m_pSound->PlayImage (SOUND_LOST, pos)) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); } else { if (!m_pSound->PlayImage (SOUND_WIN, pos)) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); } return out; // perdu/gagné diff --git a/src/decgoal.cxx b/src/decgoal.cxx index a136287..b0d23c2 100644 --- a/src/decgoal.cxx +++ b/src/decgoal.cxx @@ -1227,15 +1227,15 @@ static Sint16 table_goal_fleur1[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 82, -1, -1, DIMOBJY + 20, 1, -1 * 100, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE1, DIRECT_E, GOAL_ACTION, ACTION_CUEILLE1, DIRECT_S, GOAL_GOBLUPI, 0, -1, true, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE1, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE1, DIRECT_E, GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE1, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE1, DIRECT_S, GOAL_FINISHMOVE, @@ -1255,15 +1255,15 @@ static Sint16 table_goal_fleur2[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 84, -1, -1, DIMOBJY + 20, 1, -1 * 100, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE2, DIRECT_E, GOAL_ACTION, ACTION_CUEILLE2, DIRECT_S, GOAL_GOBLUPI, 0, -1, true, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE2, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE2, DIRECT_E, GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE2, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE2, DIRECT_S, GOAL_FINISHMOVE, @@ -1283,15 +1283,15 @@ static Sint16 table_goal_fleur3[] = GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, 0, -1, GOAL_BUILDOBJECT, 0, -1, CHOBJECT, 95, -1, -1, DIMOBJY + 20, 1, -1 * 100, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE3, DIRECT_E, GOAL_ACTION, ACTION_CUEILLE3, DIRECT_S, GOAL_GOBLUPI, 0, -1, true, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE3, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE3, DIRECT_E, GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_FLEUR, + GOAL_SOUND, SOUND_FLOWER, GOAL_ACTION, ACTION_CUEILLE3, DIRECT_S, GOAL_ACTION, ACTION_CUEILLE3, DIRECT_S, GOAL_FINISHMOVE, @@ -1308,7 +1308,7 @@ static Sint16 table_goal_labo[] = GOAL_GOHILI2, +1, +1, false, GOAL_ENERGY, MAXENERGY / 4, GOAL_ACTION, ACTION_STOP, DIRECT_N, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 6, GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, -1, @@ -1320,7 +1320,7 @@ static Sint16 table_goal_labo[] = GOAL_ACTION, ACTION_STOP, DIRECT_O, GOAL_SOUND, SOUND_LABO, GOAL_ACTION, ACTION_LABO, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 4, GOAL_LABO, GOAL_FINISHMOVE, @@ -2463,7 +2463,7 @@ static Sint16 table_goal_r_make2[] = GOAL_GROUP, 2, GOAL_USINEFREE, -2, -1, GOAL_INTERRUPT, 0, // prioritaire - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 101, // ouvre la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, @@ -2471,7 +2471,7 @@ static Sint16 table_goal_r_make2[] = GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_GOBLUPI, -1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 100, // ferme la porte GOAL_CACHE, true, false, @@ -2492,25 +2492,25 @@ static Sint16 table_goal_r_make2[] = GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 2, 0, GOAL_WAITFREE, 3, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_FINISHMOVE, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 101, // ouvre la porte GOAL_NEWPERSO, +1, 0, 1, // araignée (qui sortira) GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 100, // ferme la porte GOAL_GOBLUPI, +1, 0, true, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 1, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_CACHE, false, false, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 101, // ouvre la porte GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 100, // ferme la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_N, GOAL_ACTION, ACTION_R_STOP, DIRECT_N, @@ -2528,7 +2528,7 @@ static Sint16 table_goal_r_make3[] = GOAL_GROUP, 2, GOAL_USINEFREE, -2, -1, GOAL_INTERRUPT, 0, // prioritaire - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 103, // ouvre la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, @@ -2536,7 +2536,7 @@ static Sint16 table_goal_r_make3[] = GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_GOBLUPI, -1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 102, // ferme la porte GOAL_CACHE, true, false, @@ -2557,24 +2557,24 @@ static Sint16 table_goal_r_make3[] = GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 2, 0, GOAL_WAITFREE, 3, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_FINISHMOVE, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 103, // ouvre la porte GOAL_NEWPERSO, +1, 0, 2, // virus (qui sortira) GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 102, // ferme la porte GOAL_GOBLUPI, +1, 0, true, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 1, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_CACHE, false, false, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 103, // ouvre la porte GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 102, // ferme la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_N, GOAL_ACTION, ACTION_R_STOP, DIRECT_N, @@ -2592,7 +2592,7 @@ static Sint16 table_goal_r_make4[] = GOAL_GROUP, 2, GOAL_USINEFREE, -2, -1, GOAL_INTERRUPT, 0, // prioritaire - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 105, // ouvre la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, @@ -2600,7 +2600,7 @@ static Sint16 table_goal_r_make4[] = GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_GOBLUPI, -1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 104, // ferme la porte GOAL_CACHE, true, false, @@ -2621,24 +2621,24 @@ static Sint16 table_goal_r_make4[] = GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 2, 0, GOAL_WAITFREE, 3, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_FINISHMOVE, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 105, // ouvre la porte GOAL_NEWPERSO, +1, 0, 3, // tracks (qui sortira) GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 104, // ferme la porte GOAL_GOBLUPI, +1, 0, true, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 1, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_CACHE, false, false, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 105, // ouvre la porte GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 104, // ferme la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_N, GOAL_ACTION, ACTION_R_STOP, DIRECT_N, @@ -2656,7 +2656,7 @@ static Sint16 table_goal_r_make5[] = GOAL_GROUP, 2, GOAL_USINEFREE, -2, -1, GOAL_INTERRUPT, 0, // prioritaire - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 116, // ouvre la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, @@ -2664,7 +2664,7 @@ static Sint16 table_goal_r_make5[] = GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_GOBLUPI, -1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 115, // ferme la porte GOAL_CACHE, true, false, @@ -2685,24 +2685,24 @@ static Sint16 table_goal_r_make5[] = GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 2, 0, GOAL_WAITFREE, 3, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_FINISHMOVE, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 116, // ouvre la porte GOAL_NEWPERSO, +1, 0, 5, // bombe (qui sortira) GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 115, // ferme la porte GOAL_GOBLUPI, +1, 0, true, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 1, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_CACHE, false, false, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 116, // ouvre la porte GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 115, // ferme la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_N, GOAL_ACTION, ACTION_R_STOP, DIRECT_N, @@ -2720,7 +2720,7 @@ static Sint16 table_goal_r_make6[] = GOAL_GROUP, 2, GOAL_USINEFREE, -2, -1, GOAL_INTERRUPT, 0, // prioritaire - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 18, // ouvre la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, @@ -2728,7 +2728,7 @@ static Sint16 table_goal_r_make6[] = GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_ACTION, ACTION_R_STOP, DIRECT_O, GOAL_GOBLUPI, -1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 17, // ferme la porte GOAL_CACHE, true, false, @@ -2749,24 +2749,24 @@ static Sint16 table_goal_r_make6[] = GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 2, 0, GOAL_WAITFREE, 3, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_FINISHMOVE, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 18, // ouvre la porte GOAL_NEWPERSO, +1, 0, 7, // électro (qui sortira) GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 17, // ferme la porte GOAL_GOBLUPI, +1, 0, true, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_WAITFREE, 1, 0, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_CACHE, false, false, GOAL_PUTOBJECT, -1, -1, CHOBJECT, 18, // ouvre la porte GOAL_GOBLUPI, +1, 0, true, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, -2, -1, CHOBJECT, 17, // ferme la porte GOAL_ACTION, ACTION_R_STOP, DIRECT_N, GOAL_ACTION, ACTION_R_STOP, DIRECT_N, @@ -2959,7 +2959,7 @@ static Sint16 table_goal_extrait[] = GOAL_GOHILI2, +1, +1, false, GOAL_ENERGY, MAXENERGY / 4, GOAL_ACTION, ACTION_STOP, DIRECT_N, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 6, GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, -1, @@ -2976,7 +2976,7 @@ static Sint16 table_goal_extrait[] = GOAL_ADDMOVES, -1, -1, 11, // secoue GOAL_SOUND, SOUND_MINE, GOAL_ACTION, ACTION_LABO, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 4, GOAL_TAKEOBJECT, -1, -1, CHOBJECT, 123, // porte du fer GOAL_FINISHMOVE, @@ -3006,7 +3006,7 @@ static Sint16 table_goal_fabjeep[] = GOAL_GOHILI2, +1, +1, false, GOAL_ENERGY, MAXENERGY / 4, GOAL_ACTION, ACTION_STOP, DIRECT_N, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 6, GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, -1, @@ -3023,7 +3023,7 @@ static Sint16 table_goal_fabjeep[] = GOAL_ADDMOVES, -1, -1, 12, // secoue GOAL_SOUND, SOUND_USINE, GOAL_ACTION, ACTION_LABO, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 5, GOAL_TAKEOBJECT, -1, -1, -1, -1, // ne porte plus rien GOAL_VEHICULE, 2, // en jeep @@ -3049,7 +3049,7 @@ static Sint16 table_goal_fabarmure[] = GOAL_GOHILI2, +1, +1, false, GOAL_ENERGY, MAXENERGY / 4, GOAL_ACTION, ACTION_STOP, DIRECT_N, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 6, GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, -1, @@ -3066,7 +3066,7 @@ static Sint16 table_goal_fabarmure[] = GOAL_ADDMOVES, -1, -1, 12, // secoue GOAL_SOUND, SOUND_USINE, GOAL_ACTION, ACTION_LABO, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 5, GOAL_TAKEOBJECT, -1, -1, -1, -1, // ne porte plus rien GOAL_VEHICULE, 3, // en armure @@ -3092,7 +3092,7 @@ static Sint16 table_goal_fabmine[] = GOAL_GOHILI2, +1, +1, false, GOAL_ENERGY, MAXENERGY / 4, GOAL_ACTION, ACTION_STOP, DIRECT_N, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 6, GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, -1, @@ -3109,7 +3109,7 @@ static Sint16 table_goal_fabmine[] = GOAL_ADDMOVES, -1, -1, 12, // secoue GOAL_SOUND, SOUND_USINE, GOAL_ACTION, ACTION_LABO, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 4, GOAL_TAKEOBJECT, -1, -1, CHOBJECT, 125, // porte une mine GOAL_FINISHMOVE, @@ -3139,7 +3139,7 @@ static Sint16 table_goal_fabdisc[] = GOAL_GOHILI2, +1, +1, false, GOAL_ENERGY, MAXENERGY / 4, GOAL_ACTION, ACTION_STOP, DIRECT_N, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 4, GOAL_INTERRUPT, 0, // prioritaire GOAL_WORK, -1, -1, @@ -3158,18 +3158,18 @@ static Sint16 table_goal_fabdisc[] = GOAL_ADDMOVES, 0, -1, 12, // secoue GOAL_SOUND, SOUND_USINE, GOAL_ACTION, ACTION_LABO, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 2, GOAL_FINISHMOVE, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 120, // ouvre la porte GOAL_NEWPERSO, +1, 0, 8, // disciple (qui sortira) GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_PUTOBJECT, 0, -1, CHOBJECT, 119, // ferme la porte GOAL_GOBLUPI, +1, 0, true, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, GOAL_ACTION, ACTION_R_DELAY, DIRECT_E, - GOAL_SOUND, SOUND_PORTE, + GOAL_SOUND, SOUND_DOOR, GOAL_GROUP, 3, GOAL_TAKEOBJECT, -1, -1, -1, -1, // ne porte plus rien GOAL_CACHE, false, false, @@ -3317,7 +3317,7 @@ static Sint16 table_goal_grille[] = GOAL_GROUP, 3, GOAL_MALADE, false, GOAL_TAKEOBJECT, -1, -1, -1, -1, // ne porte plus rien - GOAL_SOUND, SOUND_BRULE, + GOAL_SOUND, SOUND_BURN, GOAL_ACTION, ACTION_GRILL1, DIRECT_SE, GOAL_ACTION, ACTION_GRILL2, DIRECT_SE, GOAL_ACTION, ACTION_GRILL3, DIRECT_SE, diff --git a/src/decor.cxx b/src/decor.cxx index 51a8ccd..1323ffa 100644 --- a/src/decor.cxx +++ b/src/decor.cxx @@ -2860,15 +2860,15 @@ void CDecor::CelHiliButton (POINT cel, Sint32 button) if ( button == BUTTON_ABAT || button == BUTTON_ABATn || button == BUTTON_ROC || - button == BUTTON_ROCn || button == BUTTON_MUR || button == BUTTON_TOUR || - button == BUTTON_PALIS || button == BUTTON_PONT || + button == BUTTON_ROCn || button == BUTTON_WALL || button == BUTTON_TOWER || + button == BUTTON_PALIS || button == BUTTON_BRIDGE || button == BUTTON_CULTIVE || button == BUTTON_DEPOSE || - button == BUTTON_LABO || button == BUTTON_FLEUR || - button == BUTTON_FLEURn || button == BUTTON_DYNAMITE || - button == BUTTON_BATEAU || button == BUTTON_DJEEP || - button == BUTTON_DARMURE || button == BUTTON_DRAPEAU || + button == BUTTON_LABO || button == BUTTON_FLOWER || + button == BUTTON_FLOWERn || button == BUTTON_DYNAMITE || + button == BUTTON_BOAT || button == BUTTON_DJEEP || + button == BUTTON_DARMOR || button == BUTTON_FLAG || button == BUTTON_EXTRAIT || button == BUTTON_FABJEEP || - button == BUTTON_FABARMURE || button == BUTTON_FABMINE || + button == BUTTON_MAKEARMOR || button == BUTTON_FABMINE || button == BUTTON_FABDISC || (button >= BUTTON_BUILD1 && button <= BUTTON_BUILD6)) { @@ -2903,15 +2903,15 @@ void CDecor::CelHiliRepeat (Sint32 list) button = m_blupi[rank].listButton[i]; if ( button == BUTTON_ABAT || button == BUTTON_ABATn || button == BUTTON_ROC || - button == BUTTON_ROCn || button == BUTTON_MUR || button == BUTTON_TOUR || - button == BUTTON_PALIS || button == BUTTON_PONT || + button == BUTTON_ROCn || button == BUTTON_WALL || button == BUTTON_TOWER || + button == BUTTON_PALIS || button == BUTTON_BRIDGE || button == BUTTON_CULTIVE || button == BUTTON_DEPOSE || - button == BUTTON_LABO || button == BUTTON_FLEUR || - button == BUTTON_FLEURn || button == BUTTON_DYNAMITE || - button == BUTTON_BATEAU || button == BUTTON_DJEEP || - button == BUTTON_DARMURE || button == BUTTON_DRAPEAU || + button == BUTTON_LABO || button == BUTTON_FLOWER || + button == BUTTON_FLOWERn || button == BUTTON_DYNAMITE || + button == BUTTON_BOAT || button == BUTTON_DJEEP || + button == BUTTON_DARMOR || button == BUTTON_FLAG || button == BUTTON_EXTRAIT || button == BUTTON_FABJEEP || - button == BUTTON_FABARMURE || button == BUTTON_FABMINE || + button == BUTTON_MAKEARMOR || button == BUTTON_FABMINE || button == BUTTON_FABDISC || (button >= BUTTON_BUILD1 && button <= BUTTON_BUILD6)) { @@ -3270,7 +3270,7 @@ void CDecor::MemoPos (Sint32 rank, bool bRecord) m_pSound->PlayImage (SOUND_BOING, pos); else { - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); SetCoin (m_memoPos[rank], false); } } diff --git a/src/def.h b/src/def.h index ddba262..e604340 100644 --- a/src/def.h +++ b/src/def.h @@ -240,18 +240,18 @@ #define SOUND_TERM3 10 #define SOUND_COUPTERRE 11 #define SOUND_COUPTOC 12 -#define SOUND_SAUT 13 +#define SOUND_JUMP 13 #define SOUND_HOP 14 #define SOUND_SAW 15 #define SOUND_FIRE 16 -#define SOUND_BRULE 17 +#define SOUND_BURN 17 #define SOUND_TCHAO 18 #define SOUND_EAT 19 -#define SOUND_NAISSANCE 20 -#define SOUND_A_SAUT 21 -#define SOUND_A_HIHI 22 +#define SOUND_BORN 20 +#define SOUND_S_JUMP 21 +#define SOUND_S_HIHI 22 #define SOUND_PLOUF 23 -#define SOUND_BUT 24 +#define SOUND_GOAL 24 #define SOUND_RAYON1 25 #define SOUND_RAYON2 26 #define SOUND_VIRUS 27 @@ -259,18 +259,18 @@ #define SOUND_DRINK 29 #define SOUND_LABO 30 #define SOUND_DYNAMITE 31 -#define SOUND_PORTE 32 -#define SOUND_FLEUR 33 -#define SOUND_T_MOTEUR 34 +#define SOUND_DOOR 32 +#define SOUND_FLOWER 33 +#define SOUND_T_ENGINE 34 #define SOUND_T_ECRASE 35 -#define SOUND_PIEGE 36 +#define SOUND_TRAP 36 #define SOUND_AIE 37 #define SOUND_A_POISON 38 -#define SOUND_R_MOTEUR 39 +#define SOUND_R_ENGINE 39 #define SOUND_R_APLAT 40 #define SOUND_R_ROTATE 41 #define SOUND_R_LOAD 42 -#define SOUND_B_SAUT 43 +#define SOUND_B_JUMP 43 #define SOUND_BOAT 44 #define SOUND_JEEP 45 #define SOUND_MINE 46 @@ -320,7 +320,7 @@ #define BUTTON_GO 0 #define BUTTON_STOP 1 -#define BUTTON_MANGE 2 +#define BUTTON_EAT 2 #define BUTTON_CARRY 3 #define BUTTON_DEPOSE 4 #define BUTTON_ABAT 5 @@ -332,27 +332,27 @@ #define BUTTON_BUILD4 11 #define BUTTON_BUILD5 12 #define BUTTON_BUILD6 13 -#define BUTTON_MUR 14 +#define BUTTON_WALL 14 #define BUTTON_PALIS 15 #define BUTTON_ABATn 16 #define BUTTON_ROCn 17 -#define BUTTON_PONT 18 -#define BUTTON_TOUR 19 +#define BUTTON_BRIDGE 18 +#define BUTTON_TOWER 19 #define BUTTON_BOIT 20 #define BUTTON_LABO 21 -#define BUTTON_FLEUR 22 -#define BUTTON_FLEURn 23 +#define BUTTON_FLOWER 22 +#define BUTTON_FLOWERn 23 #define BUTTON_DYNAMITE 24 -#define BUTTON_BATEAU 25 +#define BUTTON_BOAT 25 #define BUTTON_DJEEP 26 -#define BUTTON_DRAPEAU 27 +#define BUTTON_FLAG 27 #define BUTTON_EXTRAIT 28 #define BUTTON_FABJEEP 29 #define BUTTON_FABMINE 30 #define BUTTON_FABDISC 31 #define BUTTON_REPEAT 32 -#define BUTTON_DARMURE 33 -#define BUTTON_FABARMURE 34 +#define BUTTON_DARMOR 33 +#define BUTTON_MAKEARMOR 34 // clang-format on // Erreurs : diff --git a/src/event.cxx b/src/event.cxx index 11fabf5..2decb06 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -3636,7 +3636,7 @@ void CEvent::ChangeButtons (Sint32 message) pButtonExist[message - EV_BUTTON0] = state; pButtonExist[BUTTON_DJEEP] = true; - pButtonExist[BUTTON_DARMURE] = true; + pButtonExist[BUTTON_DARMOR] = true; } if (m_phase == EV_PHASE_TERM) @@ -4898,7 +4898,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event) pos.x = LXIMAGE / 2; pos.y = LYIMAGE / 2; if (bEnable) - m_pSound->PlayImage (SOUND_BUT, pos); + m_pSound->PlayImage (SOUND_GOAL, pos); else m_pSound->PlayImage (SOUND_BOING, pos);