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

Rename event with something less windows-like

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-08-07 18:33:26 +02:00
parent 6dcf31fae9
commit 1b4f3822fa
12 changed files with 1184 additions and 1184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/blupi.cxx
View File

@ -155,10 +155,10 @@ static void UpdateFrame (void)
rcRect.bottom = LYIMAGE; rcRect.bottom = LYIMAGE;
g_pPixmap->DrawImage (-1, CHBACK, rcRect); // draw the background g_pPixmap->DrawImage (-1, CHBACK, rcRect); // draw the background
if (phase == WM_PHASE_INTRO1) if (phase == EV_PHASE_INTRO1)
g_pEvent->IntroStep (); g_pEvent->IntroStep ();
if (phase == WM_PHASE_PLAY) if (phase == EV_PHASE_PLAY)
{ {
clip.left = POSDRAWX; clip.left = POSDRAWX;
clip.top = POSDRAWY + g_pDecor->GetInfoHeight (); clip.top = POSDRAWY + g_pDecor->GetInfoHeight ();
@ -189,7 +189,7 @@ static void UpdateFrame (void)
} }
} }
if (phase == WM_PHASE_BUILD) if (phase == EV_PHASE_BUILD)
{ {
clip.left = POSDRAWX; clip.left = POSDRAWX;
clip.top = POSDRAWY; clip.top = POSDRAWY;
@ -200,7 +200,7 @@ static void UpdateFrame (void)
g_pDecor->NextPhase (-1); // rebuild the map sometimes g_pDecor->NextPhase (-1); // rebuild the map sometimes
} }
if (phase == WM_PHASE_INIT) if (phase == EV_PHASE_INIT)
{ {
g_pEvent->DemoStep (); // start automatically (eventually) the demo g_pEvent->DemoStep (); // start automatically (eventually) the demo
} }
@ -210,23 +210,23 @@ static void UpdateFrame (void)
g_lastPhase = phase; g_lastPhase = phase;
if ( if (
phase == WM_PHASE_H0MOVIE || phase == WM_PHASE_H1MOVIE || phase == EV_PHASE_H0MOVIE || phase == EV_PHASE_H1MOVIE ||
phase == WM_PHASE_H2MOVIE || phase == WM_PHASE_PLAYMOVIE || phase == EV_PHASE_H2MOVIE || phase == EV_PHASE_PLAYMOVIE ||
phase == WM_PHASE_WINMOVIE) phase == EV_PHASE_WINMOVIE)
{ {
g_pEvent->MovieToStart (); // start a movie if necessary g_pEvent->MovieToStart (); // start a movie if necessary
} }
if (phase == WM_PHASE_INSERT) if (phase == EV_PHASE_INSERT)
g_pEvent->TryInsert (); g_pEvent->TryInsert ();
if (phase == WM_PHASE_PLAY) if (phase == EV_PHASE_PLAY)
{ {
term = g_pDecor->IsTerminated (); term = g_pDecor->IsTerminated ();
if (term == 1) if (term == 1)
g_pEvent->ChangePhase (WM_PHASE_LOST); // lost g_pEvent->ChangePhase (EV_PHASE_LOST); // lost
if (term == 2) if (term == 2)
g_pEvent->ChangePhase (WM_PHASE_WINMOVIE); // win g_pEvent->ChangePhase (EV_PHASE_WINMOVIE); // win
} }
} }
@ -337,7 +337,7 @@ static void HandleEvent (const SDL_Event & event)
{ {
switch (event.user.code) switch (event.user.code)
{ {
case WM_UPDATE: case EV_UPDATE:
if (!g_pEvent->IsMovie ()) // pas de film en cours ? if (!g_pEvent->IsMovie ()) // pas de film en cours ?
{ {
if (!g_pause) if (!g_pause)
@ -348,7 +348,7 @@ static void HandleEvent (const SDL_Event & event)
} }
break; break;
case WM_WARPMOUSE: case EV_WARPMOUSE:
{ {
const SDL_Point * coord = static_cast<SDL_Point *> (event.user.data1); const SDL_Point * coord = static_cast<SDL_Point *> (event.user.data1);
SDL_WarpMouseInWindow (g_window, coord->x, coord->y); SDL_WarpMouseInWindow (g_window, coord->x, coord->y);
@ -356,14 +356,14 @@ static void HandleEvent (const SDL_Event & event)
break; break;
} }
case WM_MUSIC_STOP: case EV_MUSIC_STOP:
if (g_pSound->IsStoppedOnDemand ()) if (g_pSound->IsStoppedOnDemand ())
break; break;
g_pSound->RestartMusic (); g_pSound->RestartMusic ();
break; break;
case WM_MOVIE_PLAY: case EV_MOVIE_PLAY:
if (!g_pMovie->Render ()) if (!g_pMovie->Render ())
g_pEvent->StopMovie (); g_pEvent->StopMovie ();
break; break;
@ -624,7 +624,7 @@ static bool DoInit (Sint32 argc, char * argv[])
g_pEvent->Create (g_pPixmap, g_pDecor, g_pSound, g_pMovie); g_pEvent->Create (g_pPixmap, g_pDecor, g_pSound, g_pMovie);
g_pEvent->SetFullScreen (g_bFullScreen); g_pEvent->SetFullScreen (g_bFullScreen);
g_pEvent->ChangePhase (WM_PHASE_INTRO1); g_pEvent->ChangePhase (EV_PHASE_INTRO1);
g_bTermInit = true; g_bTermInit = true;
return true; return true;
@ -648,7 +648,7 @@ int main (int argc, char * argv[])
SDL_TimerID updateTimer = SDL_AddTimer ( SDL_TimerID updateTimer = SDL_AddTimer (
g_timerInterval, g_timerInterval,
[](Uint32 interval, void * param) -> Uint32 { [](Uint32 interval, void * param) -> Uint32 {
CEvent::PushUserEvent (WM_UPDATE); CEvent::PushUserEvent (EV_UPDATE);
return interval; return interval;
}, },
nullptr); nullptr);

14
src/blupi.h
View File

@ -65,11 +65,11 @@ typedef Sint32 LPARAM;
#define VK_RIGHT 0x27 #define VK_RIGHT 0x27
#define VK_DOWN 0x28 #define VK_DOWN 0x28
#define WM_KEYDOWN 0x0100 #define EV_KEYDOWN 0x0100
#define WM_KEYUP 0x0101 #define EV_KEYUP 0x0101
#define WM_MOUSEMOVE 0x0200 #define EV_MOUSEMOVE 0x0200
#define WM_LBUTTONDOWN 0x0201 #define EV_LBUTTONDOWN 0x0201
#define WM_LBUTTONUP 0x0202 #define EV_LBUTTONUP 0x0202
#define WM_RBUTTONDOWN 0x0204 #define EV_RBUTTONDOWN 0x0204
#define WM_RBUTTONUP 0x0205 #define EV_RBUTTONUP 0x0205
// clang-format on // clang-format on

4
src/button.cxx
View File

@ -348,7 +348,7 @@ bool CButton::MouseDown (POINT pos)
m_mouseState = 1; m_mouseState = 1;
m_bMouseDown = true; m_bMouseDown = true;
CEvent::PushUserEvent (WM_UPDATE); CEvent::PushUserEvent (EV_UPDATE);
m_pSound->PlayImage (SOUND_CLICK, pos); m_pSound->PlayImage (SOUND_CLICK, pos);
return true; return true;
@ -391,7 +391,7 @@ bool CButton::MouseMove (POINT pos)
} }
if (iState != m_mouseState || iMenu != m_selMenu) if (iState != m_mouseState || iMenu != m_selMenu)
CEvent::PushUserEvent (WM_UPDATE); CEvent::PushUserEvent (EV_UPDATE);
return m_bMouseDown; return m_bMouseDown;
} }

200
src/decblupi.cxx
View File

@ -30,15 +30,15 @@
// Cette table donne l'action à effectuer pour un bouton // Cette table donne l'action à effectuer pour un bouton
// enfoncé. // enfoncé.
const Sint16 table_actions[] = { const Sint16 table_actions[] = {
WM_ACTION_GO, WM_ACTION_STOP, WM_ACTION_EAT, WM_ACTION_CARRY, EV_ACTION_GO, EV_ACTION_STOP, EV_ACTION_EAT, EV_ACTION_CARRY,
WM_ACTION_DROP, WM_ACTION_ABAT1, WM_ACTION_ROC1, WM_ACTION_CULTIVE, EV_ACTION_DROP, EV_ACTION_ABAT1, EV_ACTION_ROC1, EV_ACTION_CULTIVE,
WM_ACTION_BUILD1, WM_ACTION_BUILD2, WM_ACTION_BUILD3, WM_ACTION_BUILD4, EV_ACTION_BUILD1, EV_ACTION_BUILD2, EV_ACTION_BUILD3, EV_ACTION_BUILD4,
WM_ACTION_BUILD5, WM_ACTION_BUILD6, WM_ACTION_WALL, WM_ACTION_PALIS, EV_ACTION_BUILD5, EV_ACTION_BUILD6, EV_ACTION_WALL, EV_ACTION_PALIS,
WM_ACTION_ABAT1, WM_ACTION_ROC1, WM_ACTION_BRIDGEE, WM_ACTION_TOWER, EV_ACTION_ABAT1, EV_ACTION_ROC1, EV_ACTION_BRIDGEE, EV_ACTION_TOWER,
WM_ACTION_DRINK, WM_ACTION_LABO, WM_ACTION_FLOWER1, WM_ACTION_FLOWER1, EV_ACTION_DRINK, EV_ACTION_LABO, EV_ACTION_FLOWER1, EV_ACTION_FLOWER1,
WM_ACTION_DYNAMITE, WM_ACTION_BOATE, WM_ACTION_DJEEP, WM_ACTION_FLAG, EV_ACTION_DYNAMITE, EV_ACTION_BOATE, EV_ACTION_DJEEP, EV_ACTION_FLAG,
WM_ACTION_EXTRAIT, WM_ACTION_FABJEEP, WM_ACTION_FABMINE, WM_ACTION_FABDISC, EV_ACTION_EXTRAIT, EV_ACTION_FABJEEP, EV_ACTION_FABMINE, EV_ACTION_FABDISC,
WM_ACTION_REPEAT, WM_ACTION_DARMURE, WM_ACTION_FABARMURE, EV_ACTION_REPEAT, EV_ACTION_DARMURE, EV_ACTION_FABARMURE,
}; };
// Supprime tous les blupi. // Supprime tous les blupi.
@ -246,9 +246,9 @@ void CDecor::BlupiKill (Sint32 exRank, POINT cel, Sint32 type)
icon != 121 && icon != 122) // mine de fer ? icon != 121 && icon != 122) // mine de fer ?
{ {
if (m_blupi[rank].bMalade) if (m_blupi[rank].bMalade)
action = WM_ACTION_ELECTROm; action = EV_ACTION_ELECTROm;
else else
action = WM_ACTION_ELECTRO; action = EV_ACTION_ELECTRO;
GoalStart (rank, action, m_blupi[rank].cel); GoalStart (rank, action, m_blupi[rank].cel);
//? BlupiChangeAction(rank, ACTION_ELECTRO); //? BlupiChangeAction(rank, ACTION_ELECTRO);
} }
@ -1052,7 +1052,7 @@ bool CDecor::RepeatAdjust (
if ( if (
IsValid (test) && IsValid (test) &&
m_decor[test.x / 2][test.y / 2].floorIcon == 15 && // dalle grise ? m_decor[test.x / 2][test.y / 2].floorIcon == 15 && // dalle grise ?
CelOkForAction (test, WM_ACTION_DROP, rank) == 0) CelOkForAction (test, EV_ACTION_DROP, rank) == 0)
{ {
cel = test; cel = test;
cMem = test; cMem = test;
@ -1064,7 +1064,7 @@ bool CDecor::RepeatAdjust (
if (flags == 0) if (flags == 0)
{ {
if (CelOkForAction (cel, WM_ACTION_DROP, rank) == 0) if (CelOkForAction (cel, EV_ACTION_DROP, rank) == 0)
goto ok; goto ok;
} }
@ -1074,7 +1074,7 @@ bool CDecor::RepeatAdjust (
{ {
test.x = cel.x + table_mur[i * 2 + 0]; test.x = cel.x + table_mur[i * 2 + 0];
test.y = cel.y + table_mur[i * 2 + 1]; test.y = cel.y + table_mur[i * 2 + 1];
if (CelOkForAction (test, WM_ACTION_DROP, rank) == 0) if (CelOkForAction (test, EV_ACTION_DROP, rank) == 0)
{ {
cel = test; cel = test;
cMem = test; cMem = test;
@ -1287,25 +1287,25 @@ void CDecor::GoalAdjustCel (Sint32 rank, Sint32 & x, Sint32 & y)
{ {
if (x == -10 && y == -10) if (x == -10 && y == -10)
{ {
if (m_blupi[rank].goalAction == WM_ACTION_BRIDGEEL) if (m_blupi[rank].goalAction == EV_ACTION_BRIDGEEL)
{ {
x = m_blupi[rank].fix.x + m_blupi[rank].cLoop * 2; x = m_blupi[rank].fix.x + m_blupi[rank].cLoop * 2;
y = m_blupi[rank].fix.y; y = m_blupi[rank].fix.y;
return; return;
} }
if (m_blupi[rank].goalAction == WM_ACTION_BRIDGEOL) if (m_blupi[rank].goalAction == EV_ACTION_BRIDGEOL)
{ {
x = m_blupi[rank].fix.x - m_blupi[rank].cLoop * 2; x = m_blupi[rank].fix.x - m_blupi[rank].cLoop * 2;
y = m_blupi[rank].fix.y; y = m_blupi[rank].fix.y;
return; return;
} }
if (m_blupi[rank].goalAction == WM_ACTION_BRIDGESL) if (m_blupi[rank].goalAction == EV_ACTION_BRIDGESL)
{ {
x = m_blupi[rank].fix.x; x = m_blupi[rank].fix.x;
y = m_blupi[rank].fix.y + m_blupi[rank].cLoop * 2; y = m_blupi[rank].fix.y + m_blupi[rank].cLoop * 2;
return; return;
} }
if (m_blupi[rank].goalAction == WM_ACTION_BRIDGENL) if (m_blupi[rank].goalAction == EV_ACTION_BRIDGENL)
{ {
x = m_blupi[rank].fix.x; x = m_blupi[rank].fix.x;
y = m_blupi[rank].fix.y - m_blupi[rank].cLoop * 2; y = m_blupi[rank].fix.y - m_blupi[rank].cLoop * 2;
@ -1515,7 +1515,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
MAXENERGY); // crée un détonnateur MAXENERGY); // crée un détonnateur
if (rank >= 0) if (rank >= 0)
{ {
GoalStart (rank, WM_ACTION_T_DYNAMITE, cel); GoalStart (rank, EV_ACTION_T_DYNAMITE, cel);
m_blupi[rank].bCache = true; m_blupi[rank].bCache = true;
} }
} }
@ -1804,7 +1804,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
if (rank >= 0) if (rank >= 0)
{ {
m_blupi[rank].bCache = true; // invisible m_blupi[rank].bCache = true; // invisible
m_blupi[rank].goalAction = WM_ACTION_MINE2; m_blupi[rank].goalAction = EV_ACTION_MINE2;
m_blupi[rank].goalPhase = 0; m_blupi[rank].goalPhase = 0;
m_blupi[rank].goalCel.x = -1; m_blupi[rank].goalCel.x = -1;
m_blupi[rank].interrupt = 1; m_blupi[rank].interrupt = 1;
@ -1862,9 +1862,9 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
rank, m_blupi[rank].cel, action, 100, channel, first, last, first2, rank, m_blupi[rank].cel, action, 100, channel, first, last, first2,
last2, m_blupi[rank].goalHili, icon)) last2, m_blupi[rank].goalHili, icon))
goto term; goto term;
if (action == WM_ACTION_ABAT1 || action == WM_ACTION_ROC1) if (action == EV_ACTION_ABAT1 || action == EV_ACTION_ROC1)
{ {
action += icon - first; // WM_ACTION_ABAT1..6 action += icon - first; // EV_ACTION_ABAT1..6
} }
m_blupi[rank].goalAction = action; m_blupi[rank].goalAction = action;
m_blupi[rank].goalPhase = 0; m_blupi[rank].goalPhase = 0;
@ -1895,9 +1895,9 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
rank, m_blupi[rank].fix, action, 100, channel, first, last, first2, rank, m_blupi[rank].fix, action, 100, channel, first, last, first2,
last2, m_blupi[rank].goalHili, icon)) last2, m_blupi[rank].goalHili, icon))
goto term; goto term;
if (action == WM_ACTION_ABAT1 || action == WM_ACTION_ROC1) if (action == EV_ACTION_ABAT1 || action == EV_ACTION_ROC1)
{ {
action += icon - first; // WM_ACTION_ABAT1..6 action += icon - first; // EV_ACTION_ABAT1..6
} }
m_blupi[rank].goalAction = action; m_blupi[rank].goalAction = action;
m_blupi[rank].goalPhase = 0; m_blupi[rank].goalPhase = 0;
@ -1974,7 +1974,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
GetFloor (cMem, channel, icon); GetFloor (cMem, channel, icon);
PutFloor (cMem, -1, -1); PutFloor (cMem, -1, -1);
bOK = SearchOtherObject ( bOK = SearchOtherObject (
rank, m_blupi[rank].cel, WM_ACTION_GO, 1000, CHFLOOR, 80, 80, -1, -1, cel, rank, m_blupi[rank].cel, EV_ACTION_GO, 1000, CHFLOOR, 80, 80, -1, -1, cel,
i); i);
PutFloor (cMem, channel, icon); PutFloor (cMem, channel, icon);
if (!bOK) if (!bOK)
@ -2039,15 +2039,15 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
rank = m_blupiHere; rank = m_blupiHere;
if ( if (
m_blupi[rank].goalAction != WM_ACTION_GO && m_blupi[rank].goalAction != EV_ACTION_GO &&
m_blupi[rank].goalAction != WM_ACTION_ELECTRO && m_blupi[rank].goalAction != EV_ACTION_ELECTRO &&
m_blupi[rank].goalAction != WM_ACTION_ELECTROm) m_blupi[rank].goalAction != EV_ACTION_ELECTROm)
{ {
destCel.x = cel.x; destCel.x = cel.x;
destCel.y = cel.y - 1; destCel.y = cel.y - 1;
if (!IsBlupiHereEx (destCel, rank, false)) if (!IsBlupiHereEx (destCel, rank, false))
{ {
GoalStart (rank, WM_ACTION_GO, destCel); GoalStart (rank, EV_ACTION_GO, destCel);
return true; return true;
} }
@ -2055,7 +2055,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
destCel.y = cel.y; destCel.y = cel.y;
if (!IsBlupiHereEx (destCel, rank, false)) if (!IsBlupiHereEx (destCel, rank, false))
{ {
GoalStart (rank, WM_ACTION_GO, destCel); GoalStart (rank, EV_ACTION_GO, destCel);
return true; return true;
} }
@ -2063,7 +2063,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
destCel.y = cel.y + 1; destCel.y = cel.y + 1;
if (!IsBlupiHereEx (destCel, rank, false)) if (!IsBlupiHereEx (destCel, rank, false))
{ {
GoalStart (rank, WM_ACTION_GO, destCel); GoalStart (rank, EV_ACTION_GO, destCel);
return true; return true;
} }
@ -2071,7 +2071,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
destCel.y = cel.y - 1; destCel.y = cel.y - 1;
if (!IsBlupiHereEx (destCel, rank, false)) if (!IsBlupiHereEx (destCel, rank, false))
{ {
GoalStart (rank, WM_ACTION_GO, destCel); GoalStart (rank, EV_ACTION_GO, destCel);
return true; return true;
} }
@ -2079,16 +2079,16 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
destCel.y = cel.y + 1; destCel.y = cel.y + 1;
if (!IsBlupiHereEx (destCel, rank, false)) if (!IsBlupiHereEx (destCel, rank, false))
{ {
GoalStart (rank, WM_ACTION_GO, destCel); GoalStart (rank, EV_ACTION_GO, destCel);
return true; return true;
} }
if (m_blupi[rank].perso == 0) if (m_blupi[rank].perso == 0)
{ {
if (m_blupi[rank].bMalade) if (m_blupi[rank].bMalade)
action = WM_ACTION_ELECTROm; action = EV_ACTION_ELECTROm;
else else
action = WM_ACTION_ELECTRO; action = EV_ACTION_ELECTRO;
GoalStart (rank, action, m_blupi[rank].cel); GoalStart (rank, action, m_blupi[rank].cel);
return true; return true;
} }
@ -2111,7 +2111,7 @@ error:
if (IsBlupiHereEx (cel, rank, false)) // destination occupée ? if (IsBlupiHereEx (cel, rank, false)) // destination occupée ?
{ {
m_blupi[rank].repeatLevel = i; // on continue ... m_blupi[rank].repeatLevel = i; // on continue ...
GoalStart (rank, WM_ACTION_GO, m_blupi[rank].cel); // on attend ... GoalStart (rank, EV_ACTION_GO, m_blupi[rank].cel); // on attend ...
return true; return true;
} }
if (BlupiGoal (rank, button, cel, cMem)) if (BlupiGoal (rank, button, cel, cMem))
@ -2548,8 +2548,8 @@ bool CDecor::BlupiNextAction (Sint32 rank)
a = 1; a = 1;
min = 0; min = 0;
if ( if (
m_blupi[rank].goalAction == WM_ACTION_WALL || m_blupi[rank].goalAction == EV_ACTION_WALL ||
m_blupi[rank].goalAction == WM_ACTION_TOWER) m_blupi[rank].goalAction == EV_ACTION_TOWER)
{ {
a = 5; a = 5;
min = 1; min = 1;
@ -2640,10 +2640,10 @@ void CDecor::BlupiNextGoal (Sint32 rank)
{ {
if ( if (
m_blupi[rank].perso == 0 && m_blupi[rank].vehicule != 3 && // pas armure ? m_blupi[rank].perso == 0 && m_blupi[rank].vehicule != 3 && // pas armure ?
!m_bInvincible && m_blupi[rank].goalAction != WM_ACTION_GRILLE) !m_bInvincible && m_blupi[rank].goalAction != EV_ACTION_GRILLE)
{ {
BlupiDeselect (rank); BlupiDeselect (rank);
GoalStart (rank, WM_ACTION_GRILLE, m_blupi[rank].cel); GoalStart (rank, EV_ACTION_GRILLE, m_blupi[rank].cel);
goto goal; goto goal;
//? BlupiInitAction(rank, ACTION_BRULE); //? BlupiInitAction(rank, ACTION_BRULE);
//? goto init; //? goto init;
@ -2663,17 +2663,17 @@ void CDecor::BlupiNextGoal (Sint32 rank)
m_blupi[rank].vehicule != 1 && // pas en bateau ? m_blupi[rank].vehicule != 1 && // pas en bateau ?
m_blupi[rank].vehicule != 3 && // pas armure ? m_blupi[rank].vehicule != 3 && // pas armure ?
!m_blupi[rank].bMalade && // en bonne santé ? !m_blupi[rank].bMalade && // en bonne santé ?
m_blupi[rank].goalAction != WM_ACTION_GRILLE && m_blupi[rank].goalAction != EV_ACTION_GRILLE &&
m_blupi[rank].goalAction != WM_ACTION_ELECTRO && m_blupi[rank].goalAction != EV_ACTION_ELECTRO &&
m_blupi[rank].goalAction != WM_ACTION_ELECTROm && m_blupi[rank].goalAction != EV_ACTION_ELECTROm &&
m_blupi[rank].goalAction != WM_ACTION_BOATDE && m_blupi[rank].goalAction != EV_ACTION_BOATDE &&
m_blupi[rank].goalAction != WM_ACTION_BOATDS && m_blupi[rank].goalAction != EV_ACTION_BOATDS &&
m_blupi[rank].goalAction != WM_ACTION_BOATDO && m_blupi[rank].goalAction != EV_ACTION_BOATDO &&
m_blupi[rank].goalAction != WM_ACTION_BOATDN && m_blupi[rank].goalAction != EV_ACTION_BOATDN &&
m_blupi[rank].goalAction != WM_ACTION_BOATAE && m_blupi[rank].goalAction != EV_ACTION_BOATAE &&
m_blupi[rank].goalAction != WM_ACTION_BOATAS && m_blupi[rank].goalAction != EV_ACTION_BOATAS &&
m_blupi[rank].goalAction != WM_ACTION_BOATAO && m_blupi[rank].goalAction != EV_ACTION_BOATAO &&
m_blupi[rank].goalAction != WM_ACTION_BOATAN && !m_bInvincible && m_blupi[rank].goalAction != EV_ACTION_BOATAN && !m_bInvincible &&
IsVirusCel (m_blupi[rank].cel)) // blupi chope un virus ? IsVirusCel (m_blupi[rank].cel)) // blupi chope un virus ?
{ {
m_blupi[rank].bMalade = true; m_blupi[rank].bMalade = true;
@ -2685,7 +2685,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
if (m_blupi[rank].vehicule == 2) // en jeep ? if (m_blupi[rank].vehicule == 2) // en jeep ?
{ {
GoalStart (rank, WM_ACTION_DJEEP, m_blupi[rank].cel); GoalStart (rank, EV_ACTION_DJEEP, m_blupi[rank].cel);
goto goal; goto goal;
} }
} }
@ -2701,7 +2701,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
// Assigne un but s'il s'agit d'une araignée. // Assigne un but s'il s'agit d'une araignée.
if ( if (
m_blupi[rank].perso == 1 && // araignée ? m_blupi[rank].perso == 1 && // araignée ?
m_blupi[rank].goalAction != WM_ACTION_A_MORT) m_blupi[rank].goalAction != EV_ACTION_A_MORT)
{ {
cel = m_blupi[rank].cel; cel = m_blupi[rank].cel;
cel.x = (cel.x / 2) * 2; cel.x = (cel.x / 2) * 2;
@ -2730,7 +2730,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
{ {
PutObject (cel, -1, -1); // plus de poison PutObject (cel, -1, -1); // plus de poison
BlupiInitAction (rank, ACTION_STOP); BlupiInitAction (rank, ACTION_STOP);
GoalStart (rank, WM_ACTION_A_MORT, m_blupi[rank].cel); GoalStart (rank, EV_ACTION_A_MORT, m_blupi[rank].cel);
m_blupi[rank].goalCel = m_blupi[rank].cel; m_blupi[rank].goalCel = m_blupi[rank].cel;
goto goal; goto goal;
//? BlupiSound(rank, SOUND_A_POISON, pos); //? BlupiSound(rank, SOUND_A_POISON, pos);
@ -2811,7 +2811,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
// Assigne un but s'il s'agit d'un tracks. // Assigne un but s'il s'agit d'un tracks.
if ( if (
m_blupi[rank].perso == 3 && // tracks ? m_blupi[rank].perso == 3 && // tracks ?
m_blupi[rank].goalAction != WM_ACTION_T_DYNAMITE) m_blupi[rank].goalAction != EV_ACTION_T_DYNAMITE)
{ {
cel = m_blupi[rank].cel; cel = m_blupi[rank].cel;
if (cel.x % 2 != 0 && cel.y % 2 != 0) if (cel.x % 2 != 0 && cel.y % 2 != 0)
@ -2824,7 +2824,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
if (icon == 85) // dynamite ? if (icon == 85) // dynamite ?
{ {
BlupiInitAction (rank, ACTION_STOP); BlupiInitAction (rank, ACTION_STOP);
GoalStart (rank, WM_ACTION_T_DYNAMITE, cel); GoalStart (rank, EV_ACTION_T_DYNAMITE, cel);
goto goal; goto goal;
} }
if ( if (
@ -2891,7 +2891,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
// Assigne un but s'il s'agit d'un robot. // Assigne un but s'il s'agit d'un robot.
if ( if (
m_blupi[rank].perso == 4 && // robot ? m_blupi[rank].perso == 4 && // robot ?
m_blupi[rank].goalAction != WM_ACTION_T_DYNAMITE) m_blupi[rank].goalAction != EV_ACTION_T_DYNAMITE)
{ {
cel = m_blupi[rank].cel; cel = m_blupi[rank].cel;
if (cel.x % 2 != 0 && cel.y % 2 != 0) if (cel.x % 2 != 0 && cel.y % 2 != 0)
@ -2904,7 +2904,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
if (icon == 85) // dynamite ? if (icon == 85) // dynamite ?
{ {
BlupiInitAction (rank, ACTION_STOP); BlupiInitAction (rank, ACTION_STOP);
GoalStart (rank, WM_ACTION_T_DYNAMITE, cel); GoalStart (rank, EV_ACTION_T_DYNAMITE, cel);
goto goal; goto goal;
} }
if ( if (
@ -2952,7 +2952,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
// Assigne un but s'il s'agit d'une bombe. // Assigne un but s'il s'agit d'une bombe.
if ( if (
m_blupi[rank].perso == 5 && // bombe ? m_blupi[rank].perso == 5 && // bombe ?
m_blupi[rank].goalAction != WM_ACTION_T_DYNAMITE) m_blupi[rank].goalAction != EV_ACTION_T_DYNAMITE)
{ {
cel = m_blupi[rank].cel; cel = m_blupi[rank].cel;
if (cel.x % 2 != 0 && cel.y % 2 != 0) if (cel.x % 2 != 0 && cel.y % 2 != 0)
@ -2980,7 +2980,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
icon != 93) // pas piège ? icon != 93) // pas piège ?
{ {
BlupiInitAction (rank, ACTION_STOP); BlupiInitAction (rank, ACTION_STOP);
GoalStart (rank, WM_ACTION_T_DYNAMITE, m_blupi[rank].cel); GoalStart (rank, EV_ACTION_T_DYNAMITE, m_blupi[rank].cel);
goto goal; goto goal;
} }
} }
@ -3021,7 +3021,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
if (icon == -1) // sur un blupi ? if (icon == -1) // sur un blupi ?
{ {
BlupiInitAction (rank, ACTION_STOP); BlupiInitAction (rank, ACTION_STOP);
GoalStart (rank, WM_ACTION_E_RAYON, cel); GoalStart (rank, EV_ACTION_E_RAYON, cel);
m_blupi[rank].fix = cel; m_blupi[rank].fix = cel;
goto goal; goto goal;
} }
@ -3778,7 +3778,7 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
} }
action = table_actions[button]; action = table_actions[button];
if (action == WM_ACTION_STOP) if (action == EV_ACTION_STOP)
{ {
if (m_blupi[rank].goalAction != 0 && m_blupi[rank].interrupt <= 0) if (m_blupi[rank].goalAction != 0 && m_blupi[rank].interrupt <= 0)
{ {
@ -3802,11 +3802,11 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
return false; return false;
if ( if (
action == WM_ACTION_GO && m_blupi[rank].energy <= MAXENERGY / 4 && action == EV_ACTION_GO && m_blupi[rank].energy <= MAXENERGY / 4 &&
m_blupi[rank].takeChannel != -1) m_blupi[rank].takeChannel != -1)
return false; return false;
if (action == WM_ACTION_GO) if (action == EV_ACTION_GO)
{ {
GetObject (goalHili2, channel, icon); GetObject (goalHili2, channel, icon);
if ( if (
@ -3821,18 +3821,18 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
channel == CHOBJECT && icon == 118 && // jeep ? channel == CHOBJECT && icon == 118 && // jeep ?
goalHili.x % 2 == 1 && // sur la jeep ? goalHili.x % 2 == 1 && // sur la jeep ?
goalHili.y % 2 == 1) goalHili.y % 2 == 1)
action = WM_ACTION_MJEEP; action = EV_ACTION_MJEEP;
if ( if (
m_blupi[rank].perso != 8 && // pas disciple ? m_blupi[rank].perso != 8 && // pas disciple ?
m_blupi[rank].takeChannel == -1 && // ne porte rien ? m_blupi[rank].takeChannel == -1 && // ne porte rien ?
channel == CHOBJECT && icon == 16 && // armure ? channel == CHOBJECT && icon == 16 && // armure ?
goalHili.x % 2 == 1 && // sur l'armure ? goalHili.x % 2 == 1 && // sur l'armure ?
goalHili.y % 2 == 1) goalHili.y % 2 == 1)
action = WM_ACTION_MARMURE; action = EV_ACTION_MARMURE;
if ( if (
m_blupi[rank].perso != 8 && // pas disciple ? m_blupi[rank].perso != 8 && // pas disciple ?
channel == CHOBJECT && icon == 113) // maison ? channel == CHOBJECT && icon == 113) // maison ?
action = WM_ACTION_HOUSE; action = EV_ACTION_HOUSE;
GetFloor (goalHili2, channel, icon); GetFloor (goalHili2, channel, icon);
if ( if (
m_blupi[rank].perso == 0 && m_blupi[rank].vehicule == 0 && // à pied ? m_blupi[rank].perso == 0 && m_blupi[rank].vehicule == 0 && // à pied ?
@ -3840,52 +3840,52 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
channel == CHFLOOR && icon == 80) // téléporteur ? channel == CHFLOOR && icon == 80) // téléporteur ?
{ {
if (cel.x % 2 == 0 && cel.y % 2 == 0) if (cel.x % 2 == 0 && cel.y % 2 == 0)
action = WM_ACTION_TELEPORTE00; action = EV_ACTION_TELEPORTE00;
if (cel.x % 2 == 1 && cel.y % 2 == 0) if (cel.x % 2 == 1 && cel.y % 2 == 0)
action = WM_ACTION_TELEPORTE10; action = EV_ACTION_TELEPORTE10;
if (cel.x % 2 == 0 && cel.y % 2 == 1) if (cel.x % 2 == 0 && cel.y % 2 == 1)
action = WM_ACTION_TELEPORTE01; action = EV_ACTION_TELEPORTE01;
if (cel.x % 2 == 1 && cel.y % 2 == 1) if (cel.x % 2 == 1 && cel.y % 2 == 1)
action = WM_ACTION_TELEPORTE11; action = EV_ACTION_TELEPORTE11;
} }
IsFreeCelEmbarque (goalHili, rank, action, goal); IsFreeCelEmbarque (goalHili, rank, action, goal);
IsFreeCelDebarque (goalHili, rank, action, goal); IsFreeCelDebarque (goalHili, rank, action, goal);
} }
if (action == WM_ACTION_DROP && m_blupi[rank].energy <= MAXENERGY / 4) if (action == EV_ACTION_DROP && m_blupi[rank].energy <= MAXENERGY / 4)
{ {
// Energie juste pour déposer l'objet transporté. // Energie juste pour déposer l'objet transporté.
m_blupi[rank].energy = MAXENERGY / 4 + 20; m_blupi[rank].energy = MAXENERGY / 4 + 20;
} }
if (action == WM_ACTION_ABAT1) if (action == EV_ACTION_ABAT1)
{ {
GetObject (goalHili2, channel, icon); GetObject (goalHili2, channel, icon);
if (channel == CHOBJECT && icon >= 6 && icon <= 11) // arbre ? if (channel == CHOBJECT && icon >= 6 && icon <= 11) // arbre ?
{ {
action += icon - 6; // WM_ACTION_ABAT1..6 action += icon - 6; // EV_ACTION_ABAT1..6
} }
} }
if (action == WM_ACTION_ROC1) if (action == EV_ACTION_ROC1)
{ {
GetObject (goalHili2, channel, icon); GetObject (goalHili2, channel, icon);
if (channel == CHOBJECT && icon >= 37 && icon <= 43) // rochers ? if (channel == CHOBJECT && icon >= 37 && icon <= 43) // rochers ?
{ {
action += icon - 37; // WM_ACTION_ROC1..7 action += icon - 37; // EV_ACTION_ROC1..7
} }
} }
if (action == WM_ACTION_FLOWER1) if (action == EV_ACTION_FLOWER1)
{ {
GetObject (goalHili2, channel, icon); GetObject (goalHili2, channel, icon);
if (channel == CHOBJECT && icon == 83) // fleurs foncées ? if (channel == CHOBJECT && icon == 83) // fleurs foncées ?
action = WM_ACTION_FLOWER2; action = EV_ACTION_FLOWER2;
if (channel == CHOBJECT && icon == 94) // fleurs vertes ? if (channel == CHOBJECT && icon == 94) // fleurs vertes ?
action = WM_ACTION_FLOWER3; action = EV_ACTION_FLOWER3;
} }
if (action == WM_ACTION_BRIDGEE) if (action == EV_ACTION_BRIDGEE)
{ {
cel = goalHili2; cel = goalHili2;
test = goalHili2; test = goalHili2;
@ -3899,69 +3899,69 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
m_blupi[rank].fix = cel; m_blupi[rank].fix = cel;
if (test.x - cel.x < 0) if (test.x - cel.x < 0)
action = WM_ACTION_BRIDGEO; action = EV_ACTION_BRIDGEO;
if (test.y - cel.y > 0) if (test.y - cel.y > 0)
action = WM_ACTION_BRIDGES; action = EV_ACTION_BRIDGES;
if (test.y - cel.y < 0) if (test.y - cel.y < 0)
action = WM_ACTION_BRIDGEN; action = EV_ACTION_BRIDGEN;
} }
if (action == WM_ACTION_BOATE) if (action == EV_ACTION_BOATE)
{ {
if (!IsBuildBateau (goalHili2, direct)) if (!IsBuildBateau (goalHili2, direct))
return false; return false;
if (direct == DIRECT_S) if (direct == DIRECT_S)
action = WM_ACTION_BOATS; action = EV_ACTION_BOATS;
if (direct == DIRECT_O) if (direct == DIRECT_O)
action = WM_ACTION_BOATO; action = EV_ACTION_BOATO;
if (direct == DIRECT_N) if (direct == DIRECT_N)
action = WM_ACTION_BOATN; action = EV_ACTION_BOATN;
} }
if (action == WM_ACTION_CARRY) if (action == EV_ACTION_CARRY)
{ {
if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true)) if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true))
action = WM_ACTION_CARRY2; action = EV_ACTION_CARRY2;
} }
if (action == WM_ACTION_DROP) if (action == EV_ACTION_DROP)
{ {
GetFloor (goalHili2, channel, icon); GetFloor (goalHili2, channel, icon);
if ( if (
channel == CHFLOOR && icon == 52 && // nurserie ? channel == CHFLOOR && icon == 52 && // nurserie ?
m_blupi[rank].takeChannel == CHOBJECT && m_blupi[rank].takeChannel == CHOBJECT &&
m_blupi[rank].takeIcon == 63) // oeufs ? m_blupi[rank].takeIcon == 63) // oeufs ?
action = WM_ACTION_NEWBLUPI; action = EV_ACTION_NEWBLUPI;
if ( if (
!IsFreeCelDepose (GetCel (goalHili2, 0, 1), rank) || !IsFreeCelDepose (GetCel (goalHili2, 0, 1), rank) ||
IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true)) IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true))
action = WM_ACTION_DROP2; action = EV_ACTION_DROP2;
} }
if (action == WM_ACTION_EAT) if (action == EV_ACTION_EAT)
{ {
if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true)) if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true))
action = WM_ACTION_EAT2; action = EV_ACTION_EAT2;
} }
if (action == WM_ACTION_DRINK) if (action == EV_ACTION_DRINK)
{ {
if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true)) if (IsBlupiHereEx (GetCel (goalHili2, 0, 1), rank, true))
action = WM_ACTION_DRINK2; action = EV_ACTION_DRINK2;
} }
if (action == WM_ACTION_DYNAMITE) if (action == EV_ACTION_DYNAMITE)
{ {
GetObject (goalHili2, channel, icon); GetObject (goalHili2, channel, icon);
if (channel == CHOBJECT && icon == 125) // mine ? if (channel == CHOBJECT && icon == 125) // mine ?
action = WM_ACTION_MINE; action = EV_ACTION_MINE;
else else
{ {
if ( if (
m_blupi[rank].takeChannel == CHOBJECT && m_blupi[rank].takeChannel == CHOBJECT &&
m_blupi[rank].takeIcon == 85) // porte dynamite ? m_blupi[rank].takeIcon == 85) // porte dynamite ?
action = WM_ACTION_DYNAMITE2; action = EV_ACTION_DYNAMITE2;
} }
} }
@ -3970,7 +3970,7 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
m_blupi[rank].busyCount = 5; // 5 tentatives au maximum m_blupi[rank].busyCount = 5; // 5 tentatives au maximum
m_blupi[rank].busyDelay = 0; m_blupi[rank].busyDelay = 0;
if (action == WM_ACTION_REPEAT) if (action == EV_ACTION_REPEAT)
{ {
m_blupi[rank].repeatLevel = m_blupi[rank].repeatLevelHope; m_blupi[rank].repeatLevel = m_blupi[rank].repeatLevelHope;
m_blupi[rank].listCel[m_blupi[rank].repeatLevel] = goal; m_blupi[rank].listCel[m_blupi[rank].repeatLevel] = goal;

258
src/decgoal.cxx
View File

File diff suppressed because it is too large Load Diff

102
src/decor.cxx
View File

@ -1567,7 +1567,7 @@ Sint32 CDecor::CountFloor (Sint32 channel, Sint32 icon)
// action = 0 sélection jeu // action = 0 sélection jeu
// 1 construction d'une cellule 1x1 // 1 construction d'une cellule 1x1
// 2 construction d'une cellule 2x2 // 2 construction d'une cellule 2x2
// WM_ACTION* action // EV_ACTION* action
Errors CDecor::CelOkForAction ( Errors CDecor::CelOkForAction (
POINT cel, Sint32 action, Sint32 rank, Sint32 icons[4][4], POINT cel, Sint32 action, Sint32 rank, Sint32 icons[4][4],
@ -1591,10 +1591,10 @@ Errors CDecor::CelOkForAction (
celOutline2.x = -1; celOutline2.x = -1;
if ( if (
action == 2 || action == WM_ACTION_ABAT1 || action == WM_ACTION_ROC1 || action == 2 || action == EV_ACTION_ABAT1 || action == EV_ACTION_ROC1 ||
action == WM_ACTION_DROP || action == WM_ACTION_LABO || action == EV_ACTION_DROP || action == EV_ACTION_LABO ||
action == WM_ACTION_FLOWER1 || action == WM_ACTION_CULTIVE || action == EV_ACTION_FLOWER1 || action == EV_ACTION_CULTIVE ||
action == WM_ACTION_FLAG) action == EV_ACTION_FLAG)
{ {
cel.x = (cel.x / 2) * 2; cel.x = (cel.x / 2) * 2;
cel.y = (cel.y / 2) * 2; cel.y = (cel.y / 2) * 2;
@ -1640,24 +1640,24 @@ Errors CDecor::CelOkForAction (
icons[2][2] = ICON_HILI_BUILD; icons[2][2] = ICON_HILI_BUILD;
} }
if (action == WM_ACTION_STOP) if (action == EV_ACTION_STOP)
{ {
error = Errors::MISC; error = Errors::MISC;
if ( if (
m_blupi[rank].stop == 0 && m_blupi[rank].stop == 0 &&
(m_blupi[rank].goalAction == WM_ACTION_GO || (m_blupi[rank].goalAction == EV_ACTION_GO ||
(m_blupi[rank].goalAction >= WM_ACTION_ABAT1 && (m_blupi[rank].goalAction >= EV_ACTION_ABAT1 &&
m_blupi[rank].goalAction <= WM_ACTION_ABAT6) || m_blupi[rank].goalAction <= EV_ACTION_ABAT6) ||
(m_blupi[rank].goalAction >= WM_ACTION_ROC1 && (m_blupi[rank].goalAction >= EV_ACTION_ROC1 &&
m_blupi[rank].goalAction <= WM_ACTION_ROC7) || m_blupi[rank].goalAction <= EV_ACTION_ROC7) ||
m_blupi[rank].goalAction == WM_ACTION_CULTIVE || m_blupi[rank].goalAction == EV_ACTION_CULTIVE ||
m_blupi[rank].goalAction == WM_ACTION_CULTIVE2 || m_blupi[rank].goalAction == EV_ACTION_CULTIVE2 ||
m_blupi[rank].goalAction == WM_ACTION_FLAG || m_blupi[rank].goalAction == EV_ACTION_FLAG ||
m_blupi[rank].goalAction == WM_ACTION_FLAG2 || m_blupi[rank].goalAction == EV_ACTION_FLAG2 ||
m_blupi[rank].goalAction == WM_ACTION_FLAG3 || m_blupi[rank].goalAction == EV_ACTION_FLAG3 ||
m_blupi[rank].goalAction == WM_ACTION_FLOWER1 || m_blupi[rank].goalAction == EV_ACTION_FLOWER1 ||
m_blupi[rank].goalAction == WM_ACTION_FLOWER2 || m_blupi[rank].goalAction == EV_ACTION_FLOWER2 ||
m_blupi[rank].goalAction == WM_ACTION_FLOWER3)) m_blupi[rank].goalAction == EV_ACTION_FLOWER3))
error = Errors::NONE; error = Errors::NONE;
if ( if (
m_blupi[rank].stop == 0 && m_blupi[rank].goalAction != 0 && m_blupi[rank].stop == 0 && m_blupi[rank].goalAction != 0 &&
@ -1667,7 +1667,7 @@ Errors CDecor::CelOkForAction (
error = Errors::NONE; error = Errors::NONE;
} }
if (action == WM_ACTION_GO) if (action == EV_ACTION_GO)
{ {
if (m_decor[cel.x / 2][cel.y / 2].objectIcon == 113) // maison ? if (m_decor[cel.x / 2][cel.y / 2].objectIcon == 113) // maison ?
{ {
@ -1702,7 +1702,7 @@ Errors CDecor::CelOkForAction (
icons[1][1] = ICON_HILI_ERR; icons[1][1] = ICON_HILI_ERR;
} }
if (action == WM_ACTION_ABAT1) if (action == EV_ACTION_ABAT1)
{ {
GetObject (cel, channel, icon); GetObject (cel, channel, icon);
if ( if (
@ -1727,7 +1727,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_ROC1) if (action == EV_ACTION_ROC1)
{ {
GetObject (cel, channel, icon); GetObject (cel, channel, icon);
if ( if (
@ -1753,7 +1753,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action >= WM_ACTION_BUILD1 && action <= WM_ACTION_BUILD6) if (action >= EV_ACTION_BUILD1 && action <= EV_ACTION_BUILD6)
{ {
if (cel.x % 2 != 1 || cel.y % 2 != 1) if (cel.x % 2 != 1 || cel.y % 2 != 1)
{ {
@ -1771,9 +1771,9 @@ Errors CDecor::CelOkForAction (
} }
if ( if (
action == WM_ACTION_BUILD1 || // cabane ? action == EV_ACTION_BUILD1 || // cabane ?
action == WM_ACTION_BUILD2 || // couveuse ? action == EV_ACTION_BUILD2 || // couveuse ?
action == WM_ACTION_BUILD6) // téléporteur ? action == EV_ACTION_BUILD6) // téléporteur ?
{ {
GetFloor (cel, channel, icon); GetFloor (cel, channel, icon);
if ( if (
@ -1784,7 +1784,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_BUILD4) // mine ? if (action == EV_ACTION_BUILD4) // mine ?
{ {
GetFloor (cel, channel, icon); GetFloor (cel, channel, icon);
if (channel != CHFLOOR || icon != 71) // terre à fer ? if (channel != CHFLOOR || icon != 71) // terre à fer ?
@ -1794,13 +1794,13 @@ Errors CDecor::CelOkForAction (
} }
if ( if (
action == WM_ACTION_BUILD6 && // téléporteur ? action == EV_ACTION_BUILD6 && // téléporteur ?
CountFloor (CHFLOOR, 80) >= 2) // déjà 2 ? CountFloor (CHFLOOR, 80) >= 2) // déjà 2 ?
{ {
error = Errors::TELE2; // déjà 2 téléporteurs error = Errors::TELE2; // déjà 2 téléporteurs
} }
if (action == WM_ACTION_BUILD3 || action == WM_ACTION_BUILD5) if (action == EV_ACTION_BUILD3 || action == EV_ACTION_BUILD5)
start = 44; // pierres start = 44; // pierres
else else
start = 36; // planches start = 36; // planches
@ -1845,7 +1845,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_WALL) if (action == EV_ACTION_WALL)
{ {
if (cel.x % 2 != 1 || cel.y % 2 != 1) if (cel.x % 2 != 1 || cel.y % 2 != 1)
{ {
@ -1898,7 +1898,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_TOWER) if (action == EV_ACTION_TOWER)
{ {
bool bTour; bool bTour;
@ -1989,7 +1989,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_PALIS) if (action == EV_ACTION_PALIS)
{ {
if (cel.x % 2 != 1 || cel.y % 2 != 1) if (cel.x % 2 != 1 || cel.y % 2 != 1)
{ {
@ -2037,7 +2037,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_BRIDGEE) if (action == EV_ACTION_BRIDGEE)
{ {
POINT test; POINT test;
@ -2091,7 +2091,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_CARRY) if (action == EV_ACTION_CARRY)
{ {
if (cel.x % 2 != 1 || cel.y % 2 != 1) if (cel.x % 2 != 1 || cel.y % 2 != 1)
{ {
@ -2130,7 +2130,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_DROP) if (action == EV_ACTION_DROP)
{ {
if (!bTransport || bVehiculeA) if (!bTransport || bVehiculeA)
{ {
@ -2195,7 +2195,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_CULTIVE) if (action == EV_ACTION_CULTIVE)
{ {
if (!bStrong || bTransport || bVehicule) if (!bStrong || bTransport || bVehicule)
{ {
@ -2232,7 +2232,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_LABO) if (action == EV_ACTION_LABO)
{ {
if (!bStrong || !bTransport || bVehicule) if (!bStrong || !bTransport || bVehicule)
{ {
@ -2275,7 +2275,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_FLOWER1) if (action == EV_ACTION_FLOWER1)
{ {
GetObject (cel, channel, icon); GetObject (cel, channel, icon);
if ( if (
@ -2300,7 +2300,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_DYNAMITE) if (action == EV_ACTION_DYNAMITE)
{ {
if (cel.x % 2 != 1 || cel.y % 2 != 1) if (cel.x % 2 != 1 || cel.y % 2 != 1)
{ {
@ -2356,7 +2356,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_EAT) if (action == EV_ACTION_EAT)
{ {
if (cel.x % 2 != 1 || cel.y % 2 != 1) if (cel.x % 2 != 1 || cel.y % 2 != 1)
{ {
@ -2383,7 +2383,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_DRINK) if (action == EV_ACTION_DRINK)
{ {
if (cel.x % 2 != 1 || cel.y % 2 != 1) if (cel.x % 2 != 1 || cel.y % 2 != 1)
{ {
@ -2410,7 +2410,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_BOATE) if (action == EV_ACTION_BOATE)
{ {
POINT test; POINT test;
@ -2466,7 +2466,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_DJEEP) if (action == EV_ACTION_DJEEP)
{ {
cel.x = (cel.x / 2) * 2; cel.x = (cel.x / 2) * 2;
cel.y = (cel.y / 2) * 2; cel.y = (cel.y / 2) * 2;
@ -2498,7 +2498,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_DARMURE) if (action == EV_ACTION_DARMURE)
{ {
cel.x = (cel.x / 2) * 2; cel.x = (cel.x / 2) * 2;
cel.y = (cel.y / 2) * 2; cel.y = (cel.y / 2) * 2;
@ -2530,7 +2530,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_FLAG) if (action == EV_ACTION_FLAG)
{ {
if (!bStrong || bTransport || bVehicule) if (!bStrong || bTransport || bVehicule)
{ {
@ -2573,7 +2573,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_EXTRAIT) if (action == EV_ACTION_EXTRAIT)
{ {
if (!bStrong || bTransport || bVehicule) if (!bStrong || bTransport || bVehicule)
{ {
@ -2611,18 +2611,18 @@ Errors CDecor::CelOkForAction (
} }
if ( if (
action == WM_ACTION_FABJEEP || action == WM_ACTION_FABMINE || action == EV_ACTION_FABJEEP || action == EV_ACTION_FABMINE ||
action == WM_ACTION_FABARMURE) action == EV_ACTION_FABARMURE)
{ {
if (!bStrong || !bTransport || bVehicule) if (!bStrong || !bTransport || bVehicule)
{ {
error = Errors::MISC; // pas assez fort error = Errors::MISC; // pas assez fort
} }
if (action == WM_ACTION_FABJEEP && m_blupi[rank].perso == 8) // disciple ? if (action == EV_ACTION_FABJEEP && m_blupi[rank].perso == 8) // disciple ?
{ {
error = Errors::MISC; // impossible error = Errors::MISC; // impossible
} }
if (action == WM_ACTION_FABARMURE && m_blupi[rank].perso == 8) // disciple ? if (action == EV_ACTION_FABARMURE && m_blupi[rank].perso == 8) // disciple ?
{ {
error = Errors::MISC; // impossible error = Errors::MISC; // impossible
} }
@ -2660,7 +2660,7 @@ Errors CDecor::CelOkForAction (
} }
} }
if (action == WM_ACTION_FABDISC) if (action == EV_ACTION_FABDISC)
{ {
if (!bStrong || !bTransport || bVehicule) if (!bStrong || !bTransport || bVehicule)
{ {

424
src/def.h
View File

@ -393,227 +393,227 @@ enum MouseSprites {
}; };
// clang-format off // clang-format off
#define WM_USER 0x0400 #define EV_OFFSET 0x0400
#define WM_UPDATE (WM_USER+1) #define EV_UPDATE (EV_OFFSET+1)
#define WM_WARPMOUSE (WM_USER+2) #define EV_WARPMOUSE (EV_OFFSET+2)
#define WM_DECOR1 (WM_USER+20) #define EV_DECOR1 (EV_OFFSET+20)
#define WM_DECOR2 (WM_USER+21) #define EV_DECOR2 (EV_OFFSET+21)
#define WM_DECOR3 (WM_USER+22) #define EV_DECOR3 (EV_OFFSET+22)
#define WM_DECOR4 (WM_USER+23) #define EV_DECOR4 (EV_OFFSET+23)
#define WM_DECOR5 (WM_USER+24) #define EV_DECOR5 (EV_OFFSET+24)
#define WM_ACTION_GO (WM_USER+30) #define EV_ACTION_GO (EV_OFFSET+30)
#define WM_ACTION_ABAT1 (WM_USER+31) #define EV_ACTION_ABAT1 (EV_OFFSET+31)
#define WM_ACTION_ABAT2 (WM_USER+32) #define EV_ACTION_ABAT2 (EV_OFFSET+32)
#define WM_ACTION_ABAT3 (WM_USER+33) #define EV_ACTION_ABAT3 (EV_OFFSET+33)
#define WM_ACTION_ABAT4 (WM_USER+34) #define EV_ACTION_ABAT4 (EV_OFFSET+34)
#define WM_ACTION_ABAT5 (WM_USER+35) #define EV_ACTION_ABAT5 (EV_OFFSET+35)
#define WM_ACTION_ABAT6 (WM_USER+36) #define EV_ACTION_ABAT6 (EV_OFFSET+36)
#define WM_ACTION_BUILD1 (WM_USER+37) #define EV_ACTION_BUILD1 (EV_OFFSET+37)
#define WM_ACTION_BUILD2 (WM_USER+38) #define EV_ACTION_BUILD2 (EV_OFFSET+38)
#define WM_ACTION_BUILD3 (WM_USER+39) #define EV_ACTION_BUILD3 (EV_OFFSET+39)
#define WM_ACTION_BUILD4 (WM_USER+40) #define EV_ACTION_BUILD4 (EV_OFFSET+40)
#define WM_ACTION_BUILD5 (WM_USER+41) #define EV_ACTION_BUILD5 (EV_OFFSET+41)
#define WM_ACTION_BUILD6 (WM_USER+42) #define EV_ACTION_BUILD6 (EV_OFFSET+42)
#define WM_ACTION_STOP (WM_USER+43) #define EV_ACTION_STOP (EV_OFFSET+43)
#define WM_ACTION_CARRY (WM_USER+44) #define EV_ACTION_CARRY (EV_OFFSET+44)
#define WM_ACTION_DROP (WM_USER+45) #define EV_ACTION_DROP (EV_OFFSET+45)
#define WM_ACTION_ROC1 (WM_USER+46) #define EV_ACTION_ROC1 (EV_OFFSET+46)
#define WM_ACTION_ROC2 (WM_USER+47) #define EV_ACTION_ROC2 (EV_OFFSET+47)
#define WM_ACTION_ROC3 (WM_USER+48) #define EV_ACTION_ROC3 (EV_OFFSET+48)
#define WM_ACTION_ROC4 (WM_USER+49) #define EV_ACTION_ROC4 (EV_OFFSET+49)
#define WM_ACTION_ROC5 (WM_USER+50) #define EV_ACTION_ROC5 (EV_OFFSET+50)
#define WM_ACTION_ROC6 (WM_USER+51) #define EV_ACTION_ROC6 (EV_OFFSET+51)
#define WM_ACTION_ROC7 (WM_USER+52) #define EV_ACTION_ROC7 (EV_OFFSET+52)
#define WM_ACTION_WALL (WM_USER+53) #define EV_ACTION_WALL (EV_OFFSET+53)
#define WM_ACTION_CULTIVE (WM_USER+54) #define EV_ACTION_CULTIVE (EV_OFFSET+54)
#define WM_ACTION_CULTIVE2 (WM_USER+55) #define EV_ACTION_CULTIVE2 (EV_OFFSET+55)
#define WM_ACTION_EAT (WM_USER+56) #define EV_ACTION_EAT (EV_OFFSET+56)
#define WM_ACTION_MAKE (WM_USER+57) #define EV_ACTION_MAKE (EV_OFFSET+57)
#define WM_ACTION_BUILD (WM_USER+58) #define EV_ACTION_BUILD (EV_OFFSET+58)
#define WM_ACTION_PALIS (WM_USER+59) #define EV_ACTION_PALIS (EV_OFFSET+59)
#define WM_ACTION_NEWBLUPI (WM_USER+60) #define EV_ACTION_NEWBLUPI (EV_OFFSET+60)
#define WM_ACTION_BRIDGEE (WM_USER+61) #define EV_ACTION_BRIDGEE (EV_OFFSET+61)
#define WM_ACTION_BRIDGES (WM_USER+62) #define EV_ACTION_BRIDGES (EV_OFFSET+62)
#define WM_ACTION_BRIDGEO (WM_USER+63) #define EV_ACTION_BRIDGEO (EV_OFFSET+63)
#define WM_ACTION_BRIDGEN (WM_USER+64) #define EV_ACTION_BRIDGEN (EV_OFFSET+64)
#define WM_ACTION_BRIDGEEL (WM_USER+65) #define EV_ACTION_BRIDGEEL (EV_OFFSET+65)
#define WM_ACTION_BRIDGESL (WM_USER+66) #define EV_ACTION_BRIDGESL (EV_OFFSET+66)
#define WM_ACTION_BRIDGEOL (WM_USER+67) #define EV_ACTION_BRIDGEOL (EV_OFFSET+67)
#define WM_ACTION_BRIDGENL (WM_USER+68) #define EV_ACTION_BRIDGENL (EV_OFFSET+68)
#define WM_ACTION_TOWER (WM_USER+69) #define EV_ACTION_TOWER (EV_OFFSET+69)
#define WM_ACTION_CARRY2 (WM_USER+70) #define EV_ACTION_CARRY2 (EV_OFFSET+70)
#define WM_ACTION_DROP2 (WM_USER+71) #define EV_ACTION_DROP2 (EV_OFFSET+71)
#define WM_ACTION_EAT2 (WM_USER+72) #define EV_ACTION_EAT2 (EV_OFFSET+72)
#define WM_ACTION_DRINK (WM_USER+73) #define EV_ACTION_DRINK (EV_OFFSET+73)
#define WM_ACTION_DRINK2 (WM_USER+74) #define EV_ACTION_DRINK2 (EV_OFFSET+74)
#define WM_ACTION_LABO (WM_USER+75) #define EV_ACTION_LABO (EV_OFFSET+75)
#define WM_ACTION_FLOWER1 (WM_USER+76) #define EV_ACTION_FLOWER1 (EV_OFFSET+76)
#define WM_ACTION_FLOWER2 (WM_USER+77) #define EV_ACTION_FLOWER2 (EV_OFFSET+77)
#define WM_ACTION_DYNAMITE (WM_USER+78) #define EV_ACTION_DYNAMITE (EV_OFFSET+78)
#define WM_ACTION_DYNAMITE2 (WM_USER+79) #define EV_ACTION_DYNAMITE2 (EV_OFFSET+79)
#define WM_ACTION_T_DYNAMITE (WM_USER+80) #define EV_ACTION_T_DYNAMITE (EV_OFFSET+80)
#define WM_ACTION_FLOWER3 (WM_USER+81) #define EV_ACTION_FLOWER3 (EV_OFFSET+81)
#define WM_ACTION_R_BUILD1 (WM_USER+82) #define EV_ACTION_R_BUILD1 (EV_OFFSET+82)
#define WM_ACTION_R_BUILD2 (WM_USER+83) #define EV_ACTION_R_BUILD2 (EV_OFFSET+83)
#define WM_ACTION_R_BUILD3 (WM_USER+84) #define EV_ACTION_R_BUILD3 (EV_OFFSET+84)
#define WM_ACTION_R_BUILD4 (WM_USER+85) #define EV_ACTION_R_BUILD4 (EV_OFFSET+85)
#define WM_ACTION_R_MAKE1 (WM_USER+86) #define EV_ACTION_R_MAKE1 (EV_OFFSET+86)
#define WM_ACTION_R_MAKE2 (WM_USER+87) #define EV_ACTION_R_MAKE2 (EV_OFFSET+87)
#define WM_ACTION_R_MAKE3 (WM_USER+88) #define EV_ACTION_R_MAKE3 (EV_OFFSET+88)
#define WM_ACTION_R_MAKE4 (WM_USER+89) #define EV_ACTION_R_MAKE4 (EV_OFFSET+89)
#define WM_ACTION_R_BUILD5 (WM_USER+90) #define EV_ACTION_R_BUILD5 (EV_OFFSET+90)
#define WM_ACTION_R_MAKE5 (WM_USER+91) #define EV_ACTION_R_MAKE5 (EV_OFFSET+91)
#define WM_ACTION_BOATE (WM_USER+92) #define EV_ACTION_BOATE (EV_OFFSET+92)
#define WM_ACTION_BOATS (WM_USER+93) #define EV_ACTION_BOATS (EV_OFFSET+93)
#define WM_ACTION_BOATO (WM_USER+94) #define EV_ACTION_BOATO (EV_OFFSET+94)
#define WM_ACTION_BOATN (WM_USER+95) #define EV_ACTION_BOATN (EV_OFFSET+95)
#define WM_ACTION_BOATDE (WM_USER+96) #define EV_ACTION_BOATDE (EV_OFFSET+96)
#define WM_ACTION_BOATDS (WM_USER+97) #define EV_ACTION_BOATDS (EV_OFFSET+97)
#define WM_ACTION_BOATDO (WM_USER+98) #define EV_ACTION_BOATDO (EV_OFFSET+98)
#define WM_ACTION_BOATDN (WM_USER+99) #define EV_ACTION_BOATDN (EV_OFFSET+99)
#define WM_ACTION_BOATAE (WM_USER+100) #define EV_ACTION_BOATAE (EV_OFFSET+100)
#define WM_ACTION_BOATAS (WM_USER+101) #define EV_ACTION_BOATAS (EV_OFFSET+101)
#define WM_ACTION_BOATAO (WM_USER+102) #define EV_ACTION_BOATAO (EV_OFFSET+102)
#define WM_ACTION_BOATAN (WM_USER+103) #define EV_ACTION_BOATAN (EV_OFFSET+103)
#define WM_ACTION_MJEEP (WM_USER+104) #define EV_ACTION_MJEEP (EV_OFFSET+104)
#define WM_ACTION_DJEEP (WM_USER+105) #define EV_ACTION_DJEEP (EV_OFFSET+105)
#define WM_ACTION_FLAG (WM_USER+106) #define EV_ACTION_FLAG (EV_OFFSET+106)
#define WM_ACTION_FLAG2 (WM_USER+107) #define EV_ACTION_FLAG2 (EV_OFFSET+107)
#define WM_ACTION_FLAG3 (WM_USER+108) #define EV_ACTION_FLAG3 (EV_OFFSET+108)
#define WM_ACTION_EXTRAIT (WM_USER+109) #define EV_ACTION_EXTRAIT (EV_OFFSET+109)
#define WM_ACTION_FABJEEP (WM_USER+110) #define EV_ACTION_FABJEEP (EV_OFFSET+110)
#define WM_ACTION_FABMINE (WM_USER+111) #define EV_ACTION_FABMINE (EV_OFFSET+111)
#define WM_ACTION_MINE (WM_USER+112) #define EV_ACTION_MINE (EV_OFFSET+112)
#define WM_ACTION_MINE2 (WM_USER+113) #define EV_ACTION_MINE2 (EV_OFFSET+113)
#define WM_ACTION_R_BUILD6 (WM_USER+114) #define EV_ACTION_R_BUILD6 (EV_OFFSET+114)
#define WM_ACTION_R_MAKE6 (WM_USER+115) #define EV_ACTION_R_MAKE6 (EV_OFFSET+115)
#define WM_ACTION_E_RAYON (WM_USER+116) #define EV_ACTION_E_RAYON (EV_OFFSET+116)
#define WM_ACTION_ELECTRO (WM_USER+117) #define EV_ACTION_ELECTRO (EV_OFFSET+117)
#define WM_ACTION_ELECTROm (WM_USER+118) #define EV_ACTION_ELECTROm (EV_OFFSET+118)
#define WM_ACTION_GRILLE (WM_USER+119) #define EV_ACTION_GRILLE (EV_OFFSET+119)
#define WM_ACTION_HOUSE (WM_USER+120) #define EV_ACTION_HOUSE (EV_OFFSET+120)
#define WM_ACTION_FABDISC (WM_USER+121) #define EV_ACTION_FABDISC (EV_OFFSET+121)
#define WM_ACTION_A_MORT (WM_USER+122) #define EV_ACTION_A_MORT (EV_OFFSET+122)
#define WM_ACTION_REPEAT (WM_USER+123) #define EV_ACTION_REPEAT (EV_OFFSET+123)
#define WM_ACTION_TELEPORTE00 (WM_USER+124) #define EV_ACTION_TELEPORTE00 (EV_OFFSET+124)
#define WM_ACTION_TELEPORTE10 (WM_USER+125) #define EV_ACTION_TELEPORTE10 (EV_OFFSET+125)
#define WM_ACTION_TELEPORTE01 (WM_USER+126) #define EV_ACTION_TELEPORTE01 (EV_OFFSET+126)
#define WM_ACTION_TELEPORTE11 (WM_USER+127) #define EV_ACTION_TELEPORTE11 (EV_OFFSET+127)
#define WM_ACTION_FABARMURE (WM_USER+128) #define EV_ACTION_FABARMURE (EV_OFFSET+128)
#define WM_ACTION_MARMURE (WM_USER+129) #define EV_ACTION_MARMURE (EV_OFFSET+129)
#define WM_ACTION_DARMURE (WM_USER+130) #define EV_ACTION_DARMURE (EV_OFFSET+130)
#define WM_BUTTON0 (WM_USER+200) #define EV_BUTTON0 (EV_OFFSET+200)
#define WM_BUTTON1 (WM_USER+201) #define EV_BUTTON1 (EV_OFFSET+201)
#define WM_BUTTON2 (WM_USER+202) #define EV_BUTTON2 (EV_OFFSET+202)
#define WM_BUTTON3 (WM_USER+203) #define EV_BUTTON3 (EV_OFFSET+203)
#define WM_BUTTON4 (WM_USER+204) #define EV_BUTTON4 (EV_OFFSET+204)
#define WM_BUTTON5 (WM_USER+205) #define EV_BUTTON5 (EV_OFFSET+205)
#define WM_BUTTON6 (WM_USER+206) #define EV_BUTTON6 (EV_OFFSET+206)
#define WM_BUTTON7 (WM_USER+207) #define EV_BUTTON7 (EV_OFFSET+207)
#define WM_BUTTON8 (WM_USER+208) #define EV_BUTTON8 (EV_OFFSET+208)
#define WM_BUTTON9 (WM_USER+209) #define EV_BUTTON9 (EV_OFFSET+209)
#define WM_BUTTON10 (WM_USER+210) #define EV_BUTTON10 (EV_OFFSET+210)
#define WM_BUTTON11 (WM_USER+211) #define EV_BUTTON11 (EV_OFFSET+211)
#define WM_BUTTON12 (WM_USER+212) #define EV_BUTTON12 (EV_OFFSET+212)
#define WM_BUTTON13 (WM_USER+213) #define EV_BUTTON13 (EV_OFFSET+213)
#define WM_BUTTON14 (WM_USER+214) #define EV_BUTTON14 (EV_OFFSET+214)
#define WM_BUTTON15 (WM_USER+215) #define EV_BUTTON15 (EV_OFFSET+215)
#define WM_BUTTON16 (WM_USER+216) #define EV_BUTTON16 (EV_OFFSET+216)
#define WM_BUTTON17 (WM_USER+217) #define EV_BUTTON17 (EV_OFFSET+217)
#define WM_BUTTON18 (WM_USER+218) #define EV_BUTTON18 (EV_OFFSET+218)
#define WM_BUTTON19 (WM_USER+219) #define EV_BUTTON19 (EV_OFFSET+219)
#define WM_BUTTON20 (WM_USER+220) #define EV_BUTTON20 (EV_OFFSET+220)
#define WM_BUTTON21 (WM_USER+221) #define EV_BUTTON21 (EV_OFFSET+221)
#define WM_BUTTON22 (WM_USER+222) #define EV_BUTTON22 (EV_OFFSET+222)
#define WM_BUTTON23 (WM_USER+223) #define EV_BUTTON23 (EV_OFFSET+223)
#define WM_BUTTON24 (WM_USER+224) #define EV_BUTTON24 (EV_OFFSET+224)
#define WM_BUTTON25 (WM_USER+225) #define EV_BUTTON25 (EV_OFFSET+225)
#define WM_BUTTON26 (WM_USER+226) #define EV_BUTTON26 (EV_OFFSET+226)
#define WM_BUTTON27 (WM_USER+227) #define EV_BUTTON27 (EV_OFFSET+227)
#define WM_BUTTON28 (WM_USER+228) #define EV_BUTTON28 (EV_OFFSET+228)
#define WM_BUTTON29 (WM_USER+229) #define EV_BUTTON29 (EV_OFFSET+229)
#define WM_BUTTON30 (WM_USER+230) #define EV_BUTTON30 (EV_OFFSET+230)
#define WM_BUTTON31 (WM_USER+231) #define EV_BUTTON31 (EV_OFFSET+231)
#define WM_BUTTON32 (WM_USER+232) #define EV_BUTTON32 (EV_OFFSET+232)
#define WM_BUTTON33 (WM_USER+233) #define EV_BUTTON33 (EV_OFFSET+233)
#define WM_BUTTON34 (WM_USER+234) #define EV_BUTTON34 (EV_OFFSET+234)
#define WM_BUTTON35 (WM_USER+235) #define EV_BUTTON35 (EV_OFFSET+235)
#define WM_BUTTON36 (WM_USER+236) #define EV_BUTTON36 (EV_OFFSET+236)
#define WM_BUTTON37 (WM_USER+237) #define EV_BUTTON37 (EV_OFFSET+237)
#define WM_BUTTON38 (WM_USER+238) #define EV_BUTTON38 (EV_OFFSET+238)
#define WM_BUTTON39 (WM_USER+239) #define EV_BUTTON39 (EV_OFFSET+239)
#define WM_READ0 (WM_USER+300) #define EV_READ0 (EV_OFFSET+300)
#define WM_READ1 (WM_USER+301) #define EV_READ1 (EV_OFFSET+301)
#define WM_READ2 (WM_USER+302) #define EV_READ2 (EV_OFFSET+302)
#define WM_READ3 (WM_USER+303) #define EV_READ3 (EV_OFFSET+303)
#define WM_READ4 (WM_USER+304) #define EV_READ4 (EV_OFFSET+304)
#define WM_READ5 (WM_USER+305) #define EV_READ5 (EV_OFFSET+305)
#define WM_READ6 (WM_USER+306) #define EV_READ6 (EV_OFFSET+306)
#define WM_READ7 (WM_USER+307) #define EV_READ7 (EV_OFFSET+307)
#define WM_READ8 (WM_USER+308) #define EV_READ8 (EV_OFFSET+308)
#define WM_READ9 (WM_USER+309) #define EV_READ9 (EV_OFFSET+309)
#define WM_WRITE0 (WM_USER+310) #define EV_WRITE0 (EV_OFFSET+310)
#define WM_WRITE1 (WM_USER+311) #define EV_WRITE1 (EV_OFFSET+311)
#define WM_WRITE2 (WM_USER+312) #define EV_WRITE2 (EV_OFFSET+312)
#define WM_WRITE3 (WM_USER+313) #define EV_WRITE3 (EV_OFFSET+313)
#define WM_WRITE4 (WM_USER+314) #define EV_WRITE4 (EV_OFFSET+314)
#define WM_WRITE5 (WM_USER+315) #define EV_WRITE5 (EV_OFFSET+315)
#define WM_WRITE6 (WM_USER+316) #define EV_WRITE6 (EV_OFFSET+316)
#define WM_WRITE7 (WM_USER+317) #define EV_WRITE7 (EV_OFFSET+317)
#define WM_WRITE8 (WM_USER+318) #define EV_WRITE8 (EV_OFFSET+318)
#define WM_WRITE9 (WM_USER+319) #define EV_WRITE9 (EV_OFFSET+319)
#define WM_PHASE_INIT (WM_USER+500) #define EV_PHASE_INIT (EV_OFFSET+500)
#define WM_PHASE_PLAY (WM_USER+501) #define EV_PHASE_PLAY (EV_OFFSET+501)
#define WM_PHASE_BUILD (WM_USER+502) #define EV_PHASE_BUILD (EV_OFFSET+502)
#define WM_PHASE_READ (WM_USER+503) #define EV_PHASE_READ (EV_OFFSET+503)
#define WM_PHASE_WRITE (WM_USER+504) #define EV_PHASE_WRITE (EV_OFFSET+504)
#define WM_PHASE_INFO (WM_USER+505) #define EV_PHASE_INFO (EV_OFFSET+505)
#define WM_PHASE_BUTTON (WM_USER+506) #define EV_PHASE_BUTTON (EV_OFFSET+506)
#define WM_PHASE_TERM (WM_USER+507) #define EV_PHASE_TERM (EV_OFFSET+507)
#define WM_PHASE_WIN (WM_USER+508) #define EV_PHASE_WIN (EV_OFFSET+508)
#define WM_PHASE_LOST (WM_USER+509) #define EV_PHASE_LOST (EV_OFFSET+509)
#define WM_PHASE_STOP (WM_USER+510) #define EV_PHASE_STOP (EV_OFFSET+510)
#define WM_PHASE_SETUP (WM_USER+511) #define EV_PHASE_SETUP (EV_OFFSET+511)
#define WM_PHASE_MUSIC (WM_USER+512) #define EV_PHASE_MUSIC (EV_OFFSET+512)
#define WM_PHASE_PLAYMOVIE (WM_USER+513) #define EV_PHASE_PLAYMOVIE (EV_OFFSET+513)
#define WM_PHASE_WINMOVIE (WM_USER+514) #define EV_PHASE_WINMOVIE (EV_OFFSET+514)
#define WM_PHASE_SCHOOL (WM_USER+515) #define EV_PHASE_SCHOOL (EV_OFFSET+515)
#define WM_PHASE_MISSION (WM_USER+516) #define EV_PHASE_MISSION (EV_OFFSET+516)
#define WM_PHASE_LASTWIN (WM_USER+517) #define EV_PHASE_LASTWIN (EV_OFFSET+517)
#define WM_PHASE_WRITEp (WM_USER+518) #define EV_PHASE_WRITEp (EV_OFFSET+518)
#define WM_PHASE_SETUPp (WM_USER+519) #define EV_PHASE_SETUPp (EV_OFFSET+519)
#define WM_PHASE_REGION (WM_USER+520) #define EV_PHASE_REGION (EV_OFFSET+520)
#define WM_PHASE_INSERT (WM_USER+521) #define EV_PHASE_INSERT (EV_OFFSET+521)
#define WM_PHASE_HISTORY0 (WM_USER+522) #define EV_PHASE_HISTORY0 (EV_OFFSET+522)
#define WM_PHASE_HISTORY1 (WM_USER+523) #define EV_PHASE_HISTORY1 (EV_OFFSET+523)
#define WM_PHASE_HELP (WM_USER+524) #define EV_PHASE_HELP (EV_OFFSET+524)
#define WM_PHASE_H0MOVIE (WM_USER+525) #define EV_PHASE_H0MOVIE (EV_OFFSET+525)
#define WM_PHASE_H1MOVIE (WM_USER+526) #define EV_PHASE_H1MOVIE (EV_OFFSET+526)
#define WM_PHASE_H2MOVIE (WM_USER+527) #define EV_PHASE_H2MOVIE (EV_OFFSET+527)
#define WM_PHASE_TESTCD (WM_USER+528) #define EV_PHASE_TESTCD (EV_OFFSET+528)
#define WM_PHASE_MANUEL (WM_USER+529) #define EV_PHASE_MANUEL (EV_OFFSET+529)
#define WM_PHASE_PRIVATE (WM_USER+530) #define EV_PHASE_PRIVATE (EV_OFFSET+530)
#define WM_PHASE_UNDO (WM_USER+531) #define EV_PHASE_UNDO (EV_OFFSET+531)
#define WM_PHASE_BYE (WM_USER+532) #define EV_PHASE_BYE (EV_OFFSET+532)
#define WM_PHASE_SKILL1 (WM_USER+533) #define EV_PHASE_SKILL1 (EV_OFFSET+533)
#define WM_PHASE_SKILL2 (WM_USER+534) #define EV_PHASE_SKILL2 (EV_OFFSET+534)
#define WM_PHASE_DEMO (WM_USER+535) #define EV_PHASE_DEMO (EV_OFFSET+535)
#define WM_PHASE_INTRO1 (WM_USER+536) #define EV_PHASE_INTRO1 (EV_OFFSET+536)
#define WM_PHASE_SETTINGS (WM_USER+537) #define EV_PHASE_SETTINGS (EV_OFFSET+537)
#define WM_MUSIC_STOP (WM_USER+550) #define EV_MUSIC_STOP (EV_OFFSET+550)
#define WM_PREV (WM_USER+600) #define EV_PREV (EV_OFFSET+600)
#define WM_NEXT (WM_USER+601) #define EV_NEXT (EV_OFFSET+601)
#define WM_MOVIE (WM_USER+602) #define EV_MOVIE (EV_OFFSET+602)
#define WM_MOVIE_PLAY (WM_USER+603) #define EV_MOVIE_PLAY (EV_OFFSET+603)
// clang-format on // clang-format on
// Conditions pour gagner. // Conditions pour gagner.

1252
src/event.cxx
View File

File diff suppressed because it is too large Load Diff

2
src/menu.cxx
View File

@ -490,5 +490,5 @@ bool CMenu::MouseUp (POINT pos)
void CMenu::Message () void CMenu::Message ()
{ {
if (m_selRank != -1) if (m_selRank != -1)
CEvent::PushUserEvent (WM_BUTTON0 + m_selRank); CEvent::PushUserEvent (EV_BUTTON0 + m_selRank);
} }

4
src/movie.cxx
View File

@ -205,7 +205,7 @@ bool CMovie::Play (RECT rect, const std::string & pFilename)
return false; return false;
playMovie (); playMovie ();
CEvent::PushUserEvent (WM_MOVIE_PLAY); CEvent::PushUserEvent (EV_MOVIE_PLAY);
return true; return true;
} }
@ -280,6 +280,6 @@ bool CMovie::Render ()
SDL_RenderCopy (g_renderer, m_videoTex, nullptr, nullptr); SDL_RenderCopy (g_renderer, m_videoTex, nullptr, nullptr);
SDL_RenderPresent (g_renderer); SDL_RenderPresent (g_renderer);
CEvent::PushUserEvent (WM_MOVIE_PLAY); CEvent::PushUserEvent (EV_MOVIE_PLAY);
return true; return true;
} }

72
src/obstacle.cxx
View File

@ -1934,7 +1934,7 @@ bool CDecor::IsFreeCelEmbarque (
if (bOK) if (bOK)
{ {
limit = GetCel (cel, -2, 0); limit = GetCel (cel, -2, 0);
action = WM_ACTION_BOATDE; action = EV_ACTION_BOATDE;
return true; return true;
} }
} }
@ -1948,7 +1948,7 @@ bool CDecor::IsFreeCelEmbarque (
if (bOK) if (bOK)
{ {
limit = GetCel (cel, 0, -2); limit = GetCel (cel, 0, -2);
action = WM_ACTION_BOATDS; action = EV_ACTION_BOATDS;
return true; return true;
} }
} }
@ -1962,7 +1962,7 @@ bool CDecor::IsFreeCelEmbarque (
if (bOK) if (bOK)
{ {
limit = GetCel (cel, +1, 0); limit = GetCel (cel, +1, 0);
action = WM_ACTION_BOATDO; action = EV_ACTION_BOATDO;
return true; return true;
} }
} }
@ -1976,7 +1976,7 @@ bool CDecor::IsFreeCelEmbarque (
if (bOK) if (bOK)
{ {
limit = GetCel (cel, 0, +1); limit = GetCel (cel, 0, +1);
action = WM_ACTION_BOATDN; action = EV_ACTION_BOATDN;
return true; return true;
} }
} }
@ -2013,7 +2013,7 @@ bool CDecor::IsFreeCelDebarque (
cel.x % 2 == 1 && cel.y % 2 == 1) cel.x % 2 == 1 && cel.y % 2 == 1)
{ {
limit = GetCel (cel, +3, 0); limit = GetCel (cel, +3, 0);
action = WM_ACTION_BOATAE; action = EV_ACTION_BOATAE;
return true; return true;
} }
@ -2025,7 +2025,7 @@ bool CDecor::IsFreeCelDebarque (
cel.x % 2 == 1 && cel.y % 2 == 1) cel.x % 2 == 1 && cel.y % 2 == 1)
{ {
limit = GetCel (cel, 0, +3); limit = GetCel (cel, 0, +3);
action = WM_ACTION_BOATAS; action = EV_ACTION_BOATAS;
return true; return true;
} }
@ -2037,7 +2037,7 @@ bool CDecor::IsFreeCelDebarque (
cel.x % 2 == 0 && cel.y % 2 == 1) cel.x % 2 == 0 && cel.y % 2 == 1)
{ {
limit = GetCel (cel, -2, 0); limit = GetCel (cel, -2, 0);
action = WM_ACTION_BOATAO; action = EV_ACTION_BOATAO;
return true; return true;
} }
@ -2049,7 +2049,7 @@ bool CDecor::IsFreeCelDebarque (
cel.x % 2 == 1 && cel.y % 2 == 0) cel.x % 2 == 1 && cel.y % 2 == 0)
{ {
limit = GetCel (cel, 0, -2); limit = GetCel (cel, 0, -2);
action = WM_ACTION_BOATAN; action = EV_ACTION_BOATAN;
return true; return true;
} }
@ -2626,14 +2626,14 @@ bool CDecor::SearchOtherObject (
continue; continue;
if ( if (
action == WM_ACTION_ABAT1 || action == WM_ACTION_BUILD1 || action == EV_ACTION_ABAT1 || action == EV_ACTION_BUILD1 ||
action == WM_ACTION_BUILD2 || action == WM_ACTION_BUILD3 || action == EV_ACTION_BUILD2 || action == EV_ACTION_BUILD3 ||
action == WM_ACTION_BUILD4 || action == WM_ACTION_BUILD5 || action == EV_ACTION_BUILD4 || action == EV_ACTION_BUILD5 ||
action == WM_ACTION_BUILD6 || action == WM_ACTION_ROC1 || action == EV_ACTION_BUILD6 || action == EV_ACTION_ROC1 ||
action == WM_ACTION_WALL || action == WM_ACTION_BRIDGEE || action == EV_ACTION_WALL || action == EV_ACTION_BRIDGEE ||
action == WM_ACTION_TOWER || action == WM_ACTION_BOATE || action == EV_ACTION_TOWER || action == EV_ACTION_BOATE ||
action == WM_ACTION_CULTIVE2 || action == WM_ACTION_FLAG2 || action == EV_ACTION_CULTIVE2 || action == EV_ACTION_FLAG2 ||
action == WM_ACTION_DROP) action == EV_ACTION_DROP)
{ {
if (!IsWorkableObject (cel, rank)) if (!IsWorkableObject (cel, rank))
continue; continue;
@ -2976,9 +2976,9 @@ bool CDecor::SearchRobotObject (
if (m_term.bHachRobot) // robot sur dalles hachurées ? if (m_term.bHachRobot) // robot sur dalles hachurées ?
{ {
foundAction = WM_ACTION_GO; foundAction = EV_ACTION_GO;
return SearchOtherObject ( return SearchOtherObject (
rank, initCel, WM_ACTION_GO, 200, CHFLOOR, 17, 17, -1, -1, foundCel, rank, initCel, EV_ACTION_GO, 200, CHFLOOR, 17, 17, -1, -1, foundCel,
foundIcon); foundIcon);
} }
@ -3074,17 +3074,17 @@ bool CDecor::SearchRobotObject (
foundCel = initCel; foundCel = initCel;
build: build:
if (index == 0) if (index == 0)
foundAction = WM_ACTION_R_BUILD1; // recharge foundAction = EV_ACTION_R_BUILD1; // recharge
if (index == 1) if (index == 1)
foundAction = WM_ACTION_R_BUILD4; // tracks foundAction = EV_ACTION_R_BUILD4; // tracks
if (index == 2) if (index == 2)
foundAction = WM_ACTION_R_BUILD2; // araignée foundAction = EV_ACTION_R_BUILD2; // araignée
if (index == 3) if (index == 3)
foundAction = WM_ACTION_R_BUILD3; // virus foundAction = EV_ACTION_R_BUILD3; // virus
if (index == 4) if (index == 4)
foundAction = WM_ACTION_R_BUILD5; // bombe foundAction = EV_ACTION_R_BUILD5; // bombe
if (index == 5) if (index == 5)
foundAction = WM_ACTION_R_BUILD6; // électro foundAction = EV_ACTION_R_BUILD6; // électro
return true; return true;
} }
// Cherche un emplacement libre. // Cherche un emplacement libre.
@ -3196,17 +3196,17 @@ bool CDecor::SearchRobotObject (
if (min < distMax) if (min < distMax)
{ {
if (index == 0) if (index == 0)
foundAction = WM_ACTION_R_MAKE1; // recharge foundAction = EV_ACTION_R_MAKE1; // recharge
if (index == 1) if (index == 1)
foundAction = WM_ACTION_R_MAKE4; // tracks foundAction = EV_ACTION_R_MAKE4; // tracks
if (index == 2) if (index == 2)
foundAction = WM_ACTION_R_MAKE2; // araignée foundAction = EV_ACTION_R_MAKE2; // araignée
if (index == 3) if (index == 3)
foundAction = WM_ACTION_R_MAKE3; // virus foundAction = EV_ACTION_R_MAKE3; // virus
if (index == 4) if (index == 4)
foundAction = WM_ACTION_R_MAKE5; // bombe foundAction = EV_ACTION_R_MAKE5; // bombe
if (index == 5) if (index == 5)
foundAction = WM_ACTION_R_MAKE6; // électro foundAction = EV_ACTION_R_MAKE6; // électro
return true; return true;
} }
@ -3242,15 +3242,15 @@ bool CDecor::SearchRobotObject (
if (min < distMax) if (min < distMax)
{ {
if (foundIcon == 100) if (foundIcon == 100)
foundAction = WM_ACTION_R_MAKE2; // araignée foundAction = EV_ACTION_R_MAKE2; // araignée
if (foundIcon == 102) if (foundIcon == 102)
foundAction = WM_ACTION_R_MAKE3; // virus foundAction = EV_ACTION_R_MAKE3; // virus
if (foundIcon == 104) if (foundIcon == 104)
foundAction = WM_ACTION_R_MAKE4; // tracks foundAction = EV_ACTION_R_MAKE4; // tracks
if (foundIcon == 115) if (foundIcon == 115)
foundAction = WM_ACTION_R_MAKE5; // bombe foundAction = EV_ACTION_R_MAKE5; // bombe
if (foundIcon == 17) if (foundIcon == 17)
foundAction = WM_ACTION_R_MAKE6; // électro foundAction = EV_ACTION_R_MAKE6; // électro
return true; return true;
} }
@ -3440,7 +3440,7 @@ bool CDecor::SearchElectroObject (
{ {
if ( if (
m_blupi[r].bExist && m_blupi[r].perso == 0 && // blupi ? m_blupi[r].bExist && m_blupi[r].perso == 0 && // blupi ?
m_blupi[r].goalAction != WM_ACTION_ELECTRO) m_blupi[r].goalAction != EV_ACTION_ELECTRO)
{ {
//? if ( BlupiIsGoalUsed(m_blupi[r].cel) ) continue; //? if ( BlupiIsGoalUsed(m_blupi[r].cel) ) continue;

2
src/sound.cxx
View File

@ -92,7 +92,7 @@ bool CSound::Create ()
Mix_AllocateChannels (MAXSOUND); Mix_AllocateChannels (MAXSOUND);
Mix_HookMusicFinished ([]() { CEvent::PushUserEvent (WM_MUSIC_STOP); }); Mix_HookMusicFinished ([]() { CEvent::PushUserEvent (EV_MUSIC_STOP); });
return true; return true;
} }