diff --git a/src/blupi.cxx b/src/blupi.cxx
index 92943b7..40907c6 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -155,10 +155,10 @@ static void UpdateFrame (void)
   rcRect.bottom = LYIMAGE;
   g_pPixmap->DrawImage (-1, CHBACK, rcRect); // draw the background
 
-  if (phase == WM_PHASE_INTRO1)
+  if (phase == EV_PHASE_INTRO1)
     g_pEvent->IntroStep ();
 
-  if (phase == WM_PHASE_PLAY)
+  if (phase == EV_PHASE_PLAY)
   {
     clip.left   = POSDRAWX;
     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.top    = POSDRAWY;
@@ -200,7 +200,7 @@ static void UpdateFrame (void)
     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
   }
@@ -210,23 +210,23 @@ static void UpdateFrame (void)
   g_lastPhase = phase;
 
   if (
-    phase == WM_PHASE_H0MOVIE || phase == WM_PHASE_H1MOVIE ||
-    phase == WM_PHASE_H2MOVIE || phase == WM_PHASE_PLAYMOVIE ||
-    phase == WM_PHASE_WINMOVIE)
+    phase == EV_PHASE_H0MOVIE || phase == EV_PHASE_H1MOVIE ||
+    phase == EV_PHASE_H2MOVIE || phase == EV_PHASE_PLAYMOVIE ||
+    phase == EV_PHASE_WINMOVIE)
   {
     g_pEvent->MovieToStart (); // start a movie if necessary
   }
 
-  if (phase == WM_PHASE_INSERT)
+  if (phase == EV_PHASE_INSERT)
     g_pEvent->TryInsert ();
 
-  if (phase == WM_PHASE_PLAY)
+  if (phase == EV_PHASE_PLAY)
   {
     term = g_pDecor->IsTerminated ();
     if (term == 1)
-      g_pEvent->ChangePhase (WM_PHASE_LOST); // lost
+      g_pEvent->ChangePhase (EV_PHASE_LOST); // lost
     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)
     {
-    case WM_UPDATE:
+    case EV_UPDATE:
       if (!g_pEvent->IsMovie ()) // pas de film en cours ?
       {
         if (!g_pause)
@@ -348,7 +348,7 @@ static void HandleEvent (const SDL_Event & event)
       }
       break;
 
-    case WM_WARPMOUSE:
+    case EV_WARPMOUSE:
     {
       const SDL_Point * coord = static_cast<SDL_Point *> (event.user.data1);
       SDL_WarpMouseInWindow (g_window, coord->x, coord->y);
@@ -356,14 +356,14 @@ static void HandleEvent (const SDL_Event & event)
       break;
     }
 
-    case WM_MUSIC_STOP:
+    case EV_MUSIC_STOP:
       if (g_pSound->IsStoppedOnDemand ())
         break;
 
       g_pSound->RestartMusic ();
       break;
 
-    case WM_MOVIE_PLAY:
+    case EV_MOVIE_PLAY:
       if (!g_pMovie->Render ())
         g_pEvent->StopMovie ();
       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->SetFullScreen (g_bFullScreen);
-  g_pEvent->ChangePhase (WM_PHASE_INTRO1);
+  g_pEvent->ChangePhase (EV_PHASE_INTRO1);
 
   g_bTermInit = true;
   return true;
@@ -648,7 +648,7 @@ int main (int argc, char * argv[])
   SDL_TimerID updateTimer = SDL_AddTimer (
     g_timerInterval,
     [](Uint32 interval, void * param) -> Uint32 {
-      CEvent::PushUserEvent (WM_UPDATE);
+      CEvent::PushUserEvent (EV_UPDATE);
       return interval;
     },
     nullptr);
diff --git a/src/blupi.h b/src/blupi.h
index 98be183..96c89c4 100644
--- a/src/blupi.h
+++ b/src/blupi.h
@@ -65,11 +65,11 @@ typedef Sint32 LPARAM;
 #define VK_RIGHT 0x27
 #define VK_DOWN  0x28
 
-#define WM_KEYDOWN     0x0100
-#define WM_KEYUP       0x0101
-#define WM_MOUSEMOVE   0x0200
-#define WM_LBUTTONDOWN 0x0201
-#define WM_LBUTTONUP   0x0202
-#define WM_RBUTTONDOWN 0x0204
-#define WM_RBUTTONUP   0x0205
+#define EV_KEYDOWN     0x0100
+#define EV_KEYUP       0x0101
+#define EV_MOUSEMOVE   0x0200
+#define EV_LBUTTONDOWN 0x0201
+#define EV_LBUTTONUP   0x0202
+#define EV_RBUTTONDOWN 0x0204
+#define EV_RBUTTONUP   0x0205
 // clang-format on
diff --git a/src/button.cxx b/src/button.cxx
index 8dcfe07..a35395e 100644
--- a/src/button.cxx
+++ b/src/button.cxx
@@ -348,7 +348,7 @@ bool CButton::MouseDown (POINT pos)
   m_mouseState = 1;
   m_bMouseDown = true;
 
-  CEvent::PushUserEvent (WM_UPDATE);
+  CEvent::PushUserEvent (EV_UPDATE);
 
   m_pSound->PlayImage (SOUND_CLICK, pos);
   return true;
@@ -391,7 +391,7 @@ bool CButton::MouseMove (POINT pos)
   }
 
   if (iState != m_mouseState || iMenu != m_selMenu)
-    CEvent::PushUserEvent (WM_UPDATE);
+    CEvent::PushUserEvent (EV_UPDATE);
 
   return m_bMouseDown;
 }
diff --git a/src/decblupi.cxx b/src/decblupi.cxx
index 7307be3..6da30e1 100644
--- a/src/decblupi.cxx
+++ b/src/decblupi.cxx
@@ -30,15 +30,15 @@
 // Cette table donne l'action à effectuer pour un bouton
 // enfoncé.
 const Sint16 table_actions[] = {
-  WM_ACTION_GO,       WM_ACTION_STOP,    WM_ACTION_EAT,       WM_ACTION_CARRY,
-  WM_ACTION_DROP,     WM_ACTION_ABAT1,   WM_ACTION_ROC1,      WM_ACTION_CULTIVE,
-  WM_ACTION_BUILD1,   WM_ACTION_BUILD2,  WM_ACTION_BUILD3,    WM_ACTION_BUILD4,
-  WM_ACTION_BUILD5,   WM_ACTION_BUILD6,  WM_ACTION_WALL,      WM_ACTION_PALIS,
-  WM_ACTION_ABAT1,    WM_ACTION_ROC1,    WM_ACTION_BRIDGEE,   WM_ACTION_TOWER,
-  WM_ACTION_DRINK,    WM_ACTION_LABO,    WM_ACTION_FLOWER1,   WM_ACTION_FLOWER1,
-  WM_ACTION_DYNAMITE, WM_ACTION_BOATE,   WM_ACTION_DJEEP,     WM_ACTION_FLAG,
-  WM_ACTION_EXTRAIT,  WM_ACTION_FABJEEP, WM_ACTION_FABMINE,   WM_ACTION_FABDISC,
-  WM_ACTION_REPEAT,   WM_ACTION_DARMURE, WM_ACTION_FABARMURE,
+  EV_ACTION_GO,       EV_ACTION_STOP,    EV_ACTION_EAT,       EV_ACTION_CARRY,
+  EV_ACTION_DROP,     EV_ACTION_ABAT1,   EV_ACTION_ROC1,      EV_ACTION_CULTIVE,
+  EV_ACTION_BUILD1,   EV_ACTION_BUILD2,  EV_ACTION_BUILD3,    EV_ACTION_BUILD4,
+  EV_ACTION_BUILD5,   EV_ACTION_BUILD6,  EV_ACTION_WALL,      EV_ACTION_PALIS,
+  EV_ACTION_ABAT1,    EV_ACTION_ROC1,    EV_ACTION_BRIDGEE,   EV_ACTION_TOWER,
+  EV_ACTION_DRINK,    EV_ACTION_LABO,    EV_ACTION_FLOWER1,   EV_ACTION_FLOWER1,
+  EV_ACTION_DYNAMITE, EV_ACTION_BOATE,   EV_ACTION_DJEEP,     EV_ACTION_FLAG,
+  EV_ACTION_EXTRAIT,  EV_ACTION_FABJEEP, EV_ACTION_FABMINE,   EV_ACTION_FABDISC,
+  EV_ACTION_REPEAT,   EV_ACTION_DARMURE, EV_ACTION_FABARMURE,
 };
 
 // Supprime tous les blupi.
@@ -246,9 +246,9 @@ void CDecor::BlupiKill (Sint32 exRank, POINT cel, Sint32 type)
           icon != 121 && icon != 122)   // mine de fer ?
         {
           if (m_blupi[rank].bMalade)
-            action = WM_ACTION_ELECTROm;
+            action = EV_ACTION_ELECTROm;
           else
-            action = WM_ACTION_ELECTRO;
+            action = EV_ACTION_ELECTRO;
           GoalStart (rank, action, m_blupi[rank].cel);
           //?                 BlupiChangeAction(rank, ACTION_ELECTRO);
         }
@@ -1052,7 +1052,7 @@ bool CDecor::RepeatAdjust (
         if (
           IsValid (test) &&
           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;
           cMem = test;
@@ -1064,7 +1064,7 @@ bool CDecor::RepeatAdjust (
 
     if (flags == 0)
     {
-      if (CelOkForAction (cel, WM_ACTION_DROP, rank) == 0)
+      if (CelOkForAction (cel, EV_ACTION_DROP, rank) == 0)
         goto ok;
     }
 
@@ -1074,7 +1074,7 @@ bool CDecor::RepeatAdjust (
       {
         test.x = cel.x + table_mur[i * 2 + 0];
         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;
           cMem = test;
@@ -1287,25 +1287,25 @@ void CDecor::GoalAdjustCel (Sint32 rank, Sint32 & x, Sint32 & y)
 {
   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;
       y = m_blupi[rank].fix.y;
       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;
       y = m_blupi[rank].fix.y;
       return;
     }
-    if (m_blupi[rank].goalAction == WM_ACTION_BRIDGESL)
+    if (m_blupi[rank].goalAction == EV_ACTION_BRIDGESL)
     {
       x = m_blupi[rank].fix.x;
       y = m_blupi[rank].fix.y + m_blupi[rank].cLoop * 2;
       return;
     }
-    if (m_blupi[rank].goalAction == WM_ACTION_BRIDGENL)
+    if (m_blupi[rank].goalAction == EV_ACTION_BRIDGENL)
     {
       x = m_blupi[rank].fix.x;
       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
       if (rank >= 0)
       {
-        GoalStart (rank, WM_ACTION_T_DYNAMITE, cel);
+        GoalStart (rank, EV_ACTION_T_DYNAMITE, cel);
         m_blupi[rank].bCache = true;
       }
     }
@@ -1804,7 +1804,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
     if (rank >= 0)
     {
       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].goalCel.x  = -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,
           last2, m_blupi[rank].goalHili, icon))
       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].goalPhase  = 0;
@@ -1895,9 +1895,9 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
           rank, m_blupi[rank].fix, action, 100, channel, first, last, first2,
           last2, m_blupi[rank].goalHili, icon))
       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].goalPhase  = 0;
@@ -1974,7 +1974,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
     GetFloor (cMem, channel, icon);
     PutFloor (cMem, -1, -1);
     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);
     PutFloor (cMem, channel, icon);
     if (!bOK)
@@ -2039,15 +2039,15 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
 
       rank = m_blupiHere;
       if (
-        m_blupi[rank].goalAction != WM_ACTION_GO &&
-        m_blupi[rank].goalAction != WM_ACTION_ELECTRO &&
-        m_blupi[rank].goalAction != WM_ACTION_ELECTROm)
+        m_blupi[rank].goalAction != EV_ACTION_GO &&
+        m_blupi[rank].goalAction != EV_ACTION_ELECTRO &&
+        m_blupi[rank].goalAction != EV_ACTION_ELECTROm)
       {
         destCel.x = cel.x;
         destCel.y = cel.y - 1;
         if (!IsBlupiHereEx (destCel, rank, false))
         {
-          GoalStart (rank, WM_ACTION_GO, destCel);
+          GoalStart (rank, EV_ACTION_GO, destCel);
           return true;
         }
 
@@ -2055,7 +2055,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
         destCel.y = cel.y;
         if (!IsBlupiHereEx (destCel, rank, false))
         {
-          GoalStart (rank, WM_ACTION_GO, destCel);
+          GoalStart (rank, EV_ACTION_GO, destCel);
           return true;
         }
 
@@ -2063,7 +2063,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
         destCel.y = cel.y + 1;
         if (!IsBlupiHereEx (destCel, rank, false))
         {
-          GoalStart (rank, WM_ACTION_GO, destCel);
+          GoalStart (rank, EV_ACTION_GO, destCel);
           return true;
         }
 
@@ -2071,7 +2071,7 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
         destCel.y = cel.y - 1;
         if (!IsBlupiHereEx (destCel, rank, false))
         {
-          GoalStart (rank, WM_ACTION_GO, destCel);
+          GoalStart (rank, EV_ACTION_GO, destCel);
           return true;
         }
 
@@ -2079,16 +2079,16 @@ bool CDecor::GoalNextOp (Sint32 rank, Sint16 * pTable)
         destCel.y = cel.y + 1;
         if (!IsBlupiHereEx (destCel, rank, false))
         {
-          GoalStart (rank, WM_ACTION_GO, destCel);
+          GoalStart (rank, EV_ACTION_GO, destCel);
           return true;
         }
 
         if (m_blupi[rank].perso == 0)
         {
           if (m_blupi[rank].bMalade)
-            action = WM_ACTION_ELECTROm;
+            action = EV_ACTION_ELECTROm;
           else
-            action = WM_ACTION_ELECTRO;
+            action = EV_ACTION_ELECTRO;
           GoalStart (rank, action, m_blupi[rank].cel);
           return true;
         }
@@ -2111,7 +2111,7 @@ error:
       if (IsBlupiHereEx (cel, rank, false)) // destination occupée ?
       {
         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;
       }
       if (BlupiGoal (rank, button, cel, cMem))
@@ -2548,8 +2548,8 @@ bool CDecor::BlupiNextAction (Sint32 rank)
         a = 1;
       min = 0;
       if (
-        m_blupi[rank].goalAction == WM_ACTION_WALL ||
-        m_blupi[rank].goalAction == WM_ACTION_TOWER)
+        m_blupi[rank].goalAction == EV_ACTION_WALL ||
+        m_blupi[rank].goalAction == EV_ACTION_TOWER)
       {
         a   = 5;
         min = 1;
@@ -2640,10 +2640,10 @@ void CDecor::BlupiNextGoal (Sint32 rank)
   {
     if (
       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);
-      GoalStart (rank, WM_ACTION_GRILLE, m_blupi[rank].cel);
+      GoalStart (rank, EV_ACTION_GRILLE, m_blupi[rank].cel);
       goto goal;
       //?         BlupiInitAction(rank, ACTION_BRULE);
       //?         goto init;
@@ -2663,17 +2663,17 @@ void CDecor::BlupiNextGoal (Sint32 rank)
     m_blupi[rank].vehicule != 1 && // pas en bateau ?
     m_blupi[rank].vehicule != 3 && // pas armure ?
     !m_blupi[rank].bMalade &&      // en bonne santé ?
-    m_blupi[rank].goalAction != WM_ACTION_GRILLE &&
-    m_blupi[rank].goalAction != WM_ACTION_ELECTRO &&
-    m_blupi[rank].goalAction != WM_ACTION_ELECTROm &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATDE &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATDS &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATDO &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATDN &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATAE &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATAS &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATAO &&
-    m_blupi[rank].goalAction != WM_ACTION_BOATAN && !m_bInvincible &&
+    m_blupi[rank].goalAction != EV_ACTION_GRILLE &&
+    m_blupi[rank].goalAction != EV_ACTION_ELECTRO &&
+    m_blupi[rank].goalAction != EV_ACTION_ELECTROm &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATDE &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATDS &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATDO &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATDN &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATAE &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATAS &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATAO &&
+    m_blupi[rank].goalAction != EV_ACTION_BOATAN && !m_bInvincible &&
     IsVirusCel (m_blupi[rank].cel)) // blupi chope un virus ?
   {
     m_blupi[rank].bMalade = true;
@@ -2685,7 +2685,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
 
     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;
     }
   }
@@ -2701,7 +2701,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
   // Assigne un but s'il s'agit d'une araignée.
   if (
     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.x = (cel.x / 2) * 2;
@@ -2730,7 +2730,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
       {
         PutObject (cel, -1, -1); // plus de poison
         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;
         goto goal;
         //?             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.
   if (
     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;
     if (cel.x % 2 != 0 && cel.y % 2 != 0)
@@ -2824,7 +2824,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
         if (icon == 85) // dynamite ?
         {
           BlupiInitAction (rank, ACTION_STOP);
-          GoalStart (rank, WM_ACTION_T_DYNAMITE, cel);
+          GoalStart (rank, EV_ACTION_T_DYNAMITE, cel);
           goto goal;
         }
         if (
@@ -2891,7 +2891,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
   // Assigne un but s'il s'agit d'un robot.
   if (
     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;
     if (cel.x % 2 != 0 && cel.y % 2 != 0)
@@ -2904,7 +2904,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
         if (icon == 85) // dynamite ?
         {
           BlupiInitAction (rank, ACTION_STOP);
-          GoalStart (rank, WM_ACTION_T_DYNAMITE, cel);
+          GoalStart (rank, EV_ACTION_T_DYNAMITE, cel);
           goto goal;
         }
         if (
@@ -2952,7 +2952,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
   // Assigne un but s'il s'agit d'une bombe.
   if (
     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;
     if (cel.x % 2 != 0 && cel.y % 2 != 0)
@@ -2980,7 +2980,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
         icon != 93)             // pas piège ?
       {
         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;
       }
     }
@@ -3021,7 +3021,7 @@ void CDecor::BlupiNextGoal (Sint32 rank)
       if (icon == -1) // sur un blupi ?
       {
         BlupiInitAction (rank, ACTION_STOP);
-        GoalStart (rank, WM_ACTION_E_RAYON, cel);
+        GoalStart (rank, EV_ACTION_E_RAYON, cel);
         m_blupi[rank].fix = cel;
         goto goal;
       }
@@ -3778,7 +3778,7 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
   }
   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)
     {
@@ -3802,11 +3802,11 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
     return false;
 
   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)
     return false;
 
-  if (action == WM_ACTION_GO)
+  if (action == EV_ACTION_GO)
   {
     GetObject (goalHili2, channel, icon);
     if (
@@ -3821,18 +3821,18 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
       channel == CHOBJECT && icon == 118 && // jeep ?
       goalHili.x % 2 == 1 &&                // sur la jeep ?
       goalHili.y % 2 == 1)
-      action = WM_ACTION_MJEEP;
+      action = EV_ACTION_MJEEP;
     if (
       m_blupi[rank].perso != 8 &&          // pas disciple ?
       m_blupi[rank].takeChannel == -1 &&   // ne porte rien ?
       channel == CHOBJECT && icon == 16 && // armure ?
       goalHili.x % 2 == 1 &&               // sur l'armure ?
       goalHili.y % 2 == 1)
-      action = WM_ACTION_MARMURE;
+      action = EV_ACTION_MARMURE;
     if (
       m_blupi[rank].perso != 8 &&         // pas disciple ?
       channel == CHOBJECT && icon == 113) // maison ?
-      action = WM_ACTION_HOUSE;
+      action = EV_ACTION_HOUSE;
     GetFloor (goalHili2, channel, icon);
     if (
       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 ?
     {
       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)
-        action = WM_ACTION_TELEPORTE10;
+        action = EV_ACTION_TELEPORTE10;
       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)
-        action = WM_ACTION_TELEPORTE11;
+        action = EV_ACTION_TELEPORTE11;
     }
     IsFreeCelEmbarque (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é.
     m_blupi[rank].energy = MAXENERGY / 4 + 20;
   }
 
-  if (action == WM_ACTION_ABAT1)
+  if (action == EV_ACTION_ABAT1)
   {
     GetObject (goalHili2, channel, icon);
     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);
     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);
     if (channel == CHOBJECT && icon == 83) // fleurs foncées ?
-      action = WM_ACTION_FLOWER2;
+      action = EV_ACTION_FLOWER2;
     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;
     test = goalHili2;
@@ -3899,69 +3899,69 @@ bool CDecor::BlupiGoal (Sint32 rank, Sint32 button, POINT cel, POINT cMem)
     m_blupi[rank].fix   = cel;
 
     if (test.x - cel.x < 0)
-      action = WM_ACTION_BRIDGEO;
+      action = EV_ACTION_BRIDGEO;
     if (test.y - cel.y > 0)
-      action = WM_ACTION_BRIDGES;
+      action = EV_ACTION_BRIDGES;
     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))
       return false;
 
     if (direct == DIRECT_S)
-      action = WM_ACTION_BOATS;
+      action = EV_ACTION_BOATS;
     if (direct == DIRECT_O)
-      action = WM_ACTION_BOATO;
+      action = EV_ACTION_BOATO;
     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))
-      action = WM_ACTION_CARRY2;
+      action = EV_ACTION_CARRY2;
   }
 
-  if (action == WM_ACTION_DROP)
+  if (action == EV_ACTION_DROP)
   {
     GetFloor (goalHili2, channel, icon);
     if (
       channel == CHFLOOR && icon == 52 && // nurserie ?
       m_blupi[rank].takeChannel == CHOBJECT &&
       m_blupi[rank].takeIcon == 63) // oeufs ?
-      action = WM_ACTION_NEWBLUPI;
+      action = EV_ACTION_NEWBLUPI;
     if (
       !IsFreeCelDepose (GetCel (goalHili2, 0, 1), rank) ||
       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))
-      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))
-      action = WM_ACTION_DRINK2;
+      action = EV_ACTION_DRINK2;
   }
 
-  if (action == WM_ACTION_DYNAMITE)
+  if (action == EV_ACTION_DYNAMITE)
   {
     GetObject (goalHili2, channel, icon);
     if (channel == CHOBJECT && icon == 125) // mine ?
-      action = WM_ACTION_MINE;
+      action = EV_ACTION_MINE;
     else
     {
       if (
         m_blupi[rank].takeChannel == CHOBJECT &&
         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].busyDelay = 0;
 
-  if (action == WM_ACTION_REPEAT)
+  if (action == EV_ACTION_REPEAT)
   {
     m_blupi[rank].repeatLevel = m_blupi[rank].repeatLevelHope;
     m_blupi[rank].listCel[m_blupi[rank].repeatLevel] = goal;
diff --git a/src/decgoal.cxx b/src/decgoal.cxx
index b75fd52..77e23a2 100644
--- a/src/decgoal.cxx
+++ b/src/decgoal.cxx
@@ -80,7 +80,7 @@ Sint16 table_goal_nbop[] =
 // Va, mon petit.
 static Sint16 table_goal_go[] =
 {
-    WM_ACTION_GO,
+    EV_ACTION_GO,
     GOAL_GOHILI,        0, 0, false,
     GOAL_TERM,
     0
@@ -89,7 +89,7 @@ static Sint16 table_goal_go[] =
 // Blupi va dans sa maison.
 static Sint16 table_goal_maison[] =
 {
-    WM_ACTION_HOUSE,
+    EV_ACTION_HOUSE,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_ACTION,        ACTION_CONTENT, DIRECT_E,
@@ -100,7 +100,7 @@ static Sint16 table_goal_maison[] =
 // Blupi bucheron.
 static Sint16 table_goal_abat1[] =
 {
-    WM_ACTION_ABAT1,
+    EV_ACTION_ABAT1,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -129,14 +129,14 @@ static Sint16 table_goal_abat1[] =
     GOAL_ACTION,        ACTION_BUILDBREF, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_ACTION,        ACTION_SCIE, DIRECT_S,
-    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, WM_ACTION_ABAT1,
+    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_abat2[] =
 {
-    WM_ACTION_ABAT2,
+    EV_ACTION_ABAT2,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -165,14 +165,14 @@ static Sint16 table_goal_abat2[] =
     GOAL_ACTION,        ACTION_BUILDBREF, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_ACTION,        ACTION_SCIE, DIRECT_S,
-    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, WM_ACTION_ABAT1,
+    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_abat3[] =
 {
-    WM_ACTION_ABAT3,
+    EV_ACTION_ABAT3,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -201,14 +201,14 @@ static Sint16 table_goal_abat3[] =
     GOAL_ACTION,        ACTION_BUILDBREF, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_ACTION,        ACTION_SCIE, DIRECT_S,
-    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, WM_ACTION_ABAT1,
+    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_abat4[] =
 {
-    WM_ACTION_ABAT4,
+    EV_ACTION_ABAT4,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, 0, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -236,14 +236,14 @@ static Sint16 table_goal_abat4[] =
     GOAL_ACTION,        ACTION_BUILDBREF, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_ACTION,        ACTION_SCIE, DIRECT_S,
-    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, WM_ACTION_ABAT1,
+    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_abat5[] =
 {
-    WM_ACTION_ABAT5,
+    EV_ACTION_ABAT5,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, 0, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -271,14 +271,14 @@ static Sint16 table_goal_abat5[] =
     GOAL_ACTION,        ACTION_BUILDBREF, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_ACTION,        ACTION_SCIE, DIRECT_S,
-    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, WM_ACTION_ABAT1,
+    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_abat6[] =
 {
-    WM_ACTION_ABAT6,
+    EV_ACTION_ABAT6,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, 0, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -306,7 +306,7 @@ static Sint16 table_goal_abat6[] =
     GOAL_ACTION,        ACTION_BUILDBREF, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_ACTION,        ACTION_SCIE, DIRECT_S,
-    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, WM_ACTION_ABAT1,
+    GOAL_OTHER,         CHOBJECT, 6, 11, -1, -1, EV_ACTION_ABAT1,
     GOAL_TERM,
     0
 };
@@ -314,7 +314,7 @@ static Sint16 table_goal_abat6[] =
 // Blupi tailleur de pierre.
 static Sint16 table_goal_roc1[] =
 {
-    WM_ACTION_ROC1,
+    EV_ACTION_ROC1,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -371,14 +371,14 @@ static Sint16 table_goal_roc1[] =
     GOAL_ACTION,        ACTION_PIOCHEPIERRE, DIRECT_E,
 
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, WM_ACTION_ROC1,
+    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, EV_ACTION_ROC1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_roc2[] =
 {
-    WM_ACTION_ROC2,
+    EV_ACTION_ROC2,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -428,14 +428,14 @@ static Sint16 table_goal_roc2[] =
     GOAL_ACTION,        ACTION_PIOCHEPIERRE, DIRECT_E,
 
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, WM_ACTION_ROC1,
+    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, EV_ACTION_ROC1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_roc3[] =
 {
-    WM_ACTION_ROC3,
+    EV_ACTION_ROC3,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -478,14 +478,14 @@ static Sint16 table_goal_roc3[] =
     GOAL_ACTION,        ACTION_PIOCHEPIERRE, DIRECT_E,
 
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, WM_ACTION_ROC1,
+    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, EV_ACTION_ROC1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_roc4[] =
 {
-    WM_ACTION_ROC4,
+    EV_ACTION_ROC4,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -521,14 +521,14 @@ static Sint16 table_goal_roc4[] =
     GOAL_ACTION,        ACTION_PIOCHEPIERRE, DIRECT_E,
 
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, WM_ACTION_ROC1,
+    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, EV_ACTION_ROC1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_roc5[] =
 {
-    WM_ACTION_ROC5,
+    EV_ACTION_ROC5,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -557,14 +557,14 @@ static Sint16 table_goal_roc5[] =
     GOAL_ACTION,        ACTION_PIOCHEPIERRE, DIRECT_E,
 
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, WM_ACTION_ROC1,
+    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, EV_ACTION_ROC1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_roc6[] =
 {
-    WM_ACTION_ROC6,
+    EV_ACTION_ROC6,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -586,14 +586,14 @@ static Sint16 table_goal_roc6[] =
     GOAL_ACTION,        ACTION_PIOCHEPIERRE, DIRECT_E,
 
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, WM_ACTION_ROC1,
+    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, EV_ACTION_ROC1,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_roc7[] =
 {
-    WM_ACTION_ROC7,
+    EV_ACTION_ROC7,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, true,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -608,7 +608,7 @@ static Sint16 table_goal_roc7[] =
     GOAL_ACTION,        ACTION_PIOCHEPIERRE, DIRECT_E,
 
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, WM_ACTION_ROC1,
+    GOAL_OTHER,         CHOBJECT, 37, 43, -1, -1, EV_ACTION_ROC1,
     GOAL_TERM,
     0
 };
@@ -616,7 +616,7 @@ static Sint16 table_goal_roc7[] =
 // Construction d'une cabane.
 static Sint16 table_goal_build1[] =
 {
-    WM_ACTION_BUILD1,
+    EV_ACTION_BUILD1,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -666,7 +666,7 @@ static Sint16 table_goal_build1[] =
 // Construction d'une nurserie.
 static Sint16 table_goal_build2[] =
 {
-    WM_ACTION_BUILD2,
+    EV_ACTION_BUILD2,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -700,7 +700,7 @@ static Sint16 table_goal_build2[] =
 // Construction d'un laboratoire.
 static Sint16 table_goal_build3[] =
 {
-    WM_ACTION_BUILD3,
+    EV_ACTION_BUILD3,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -738,7 +738,7 @@ static Sint16 table_goal_build3[] =
 // Construction d'une mine.
 static Sint16 table_goal_build4[] =
 {
-    WM_ACTION_BUILD4,
+    EV_ACTION_BUILD4,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -778,7 +778,7 @@ static Sint16 table_goal_build4[] =
 // Construction d'une usine.
 static Sint16 table_goal_build5[] =
 {
-    WM_ACTION_BUILD5,
+    EV_ACTION_BUILD5,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -816,7 +816,7 @@ static Sint16 table_goal_build5[] =
 // Construction d'un téléporteur.
 static Sint16 table_goal_build6[] =
 {
-    WM_ACTION_BUILD6,
+    EV_ACTION_BUILD6,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -852,7 +852,7 @@ static Sint16 table_goal_build6[] =
 // Construction d'un mur.
 static Sint16 table_goal_mur[] =
 {
-    WM_ACTION_WALL,
+    EV_ACTION_WALL,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -896,7 +896,7 @@ static Sint16 table_goal_mur[] =
 // Construction d'une tour.
 static Sint16 table_goal_tour[] =
 {
-    WM_ACTION_TOWER,
+    EV_ACTION_TOWER,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -932,7 +932,7 @@ static Sint16 table_goal_tour[] =
 // Construction d'une palissade.
 static Sint16 table_goal_palis[] =
 {
-    WM_ACTION_PALIS,
+    EV_ACTION_PALIS,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -957,7 +957,7 @@ static Sint16 table_goal_palis[] =
 // Transporte (est).
 static Sint16 table_goal_carry[] =
 {
-    WM_ACTION_CARRY,
+    EV_ACTION_CARRY,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -976,7 +976,7 @@ static Sint16 table_goal_carry[] =
 // Transporte (sud).
 static Sint16 table_goal_carry2[] =
 {
-    WM_ACTION_CARRY2,
+    EV_ACTION_CARRY2,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -995,7 +995,7 @@ static Sint16 table_goal_carry2[] =
 // Repose (est).
 static Sint16 table_goal_depose[] =
 {
-    WM_ACTION_DROP,
+    EV_ACTION_DROP,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_GROUP,         6,
@@ -1015,7 +1015,7 @@ static Sint16 table_goal_depose[] =
 // Repose (sud).
 static Sint16 table_goal_depose2[] =
 {
-    WM_ACTION_DROP2,
+    EV_ACTION_DROP2,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_S,
     GOAL_GROUP,         6,
@@ -1035,7 +1035,7 @@ static Sint16 table_goal_depose2[] =
 // Repose des oeufs sur la nurserie.
 static Sint16 table_goal_newblupi[] =
 {
-    WM_ACTION_NEWBLUPI,
+    EV_ACTION_NEWBLUPI,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_GROUP,         5,
@@ -1072,21 +1072,21 @@ static Sint16 table_goal_newblupi[] =
 // Cultive des tomates.
 static Sint16 table_goal_cultive[] =
 {
-    WM_ACTION_CULTIVE,
+    EV_ACTION_CULTIVE,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +2, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_FIX,           -2, 0,
     GOAL_REPEAT,        true,
-    GOAL_OTHERFIX,      CHFLOOR, 1, 1, 19, 32, WM_ACTION_CULTIVE2,
+    GOAL_OTHERFIX,      CHFLOOR, 1, 1, 19, 32, EV_ACTION_CULTIVE2,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_cultive2[] =
 {
-    WM_ACTION_CULTIVE2,
+    EV_ACTION_CULTIVE2,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1127,7 +1127,7 @@ static Sint16 table_goal_cultive2[] =
     GOAL_BUILDFLOOR,    0, -1, CHFLOOR, 1, CHMASK1, 0, 16, 1, 1 * 100, // herbe
     GOAL_FINISHMOVE,
 
-    GOAL_OTHERFIX,      CHFLOOR, 1, 1, 19, 32, WM_ACTION_CULTIVE2,
+    GOAL_OTHERFIX,      CHFLOOR, 1, 1, 19, 32, EV_ACTION_CULTIVE2,
     GOAL_TERM,
     0
 };
@@ -1135,7 +1135,7 @@ static Sint16 table_goal_cultive2[] =
 // Bouffe des tomates (est).
 static Sint16 table_goal_mange[] =
 {
-    WM_ACTION_EAT,
+    EV_ACTION_EAT,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_GROUP,         4,
@@ -1158,7 +1158,7 @@ static Sint16 table_goal_mange[] =
 // Bouffe des tomates (sud).
 static Sint16 table_goal_mange2[] =
 {
-    WM_ACTION_EAT2,
+    EV_ACTION_EAT2,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_S,
     GOAL_GROUP,         4,
@@ -1181,7 +1181,7 @@ static Sint16 table_goal_mange2[] =
 // Boit à la bouteille (est).
 static Sint16 table_goal_boit[] =
 {
-    WM_ACTION_DRINK,
+    EV_ACTION_DRINK,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_GROUP,         5,
@@ -1200,7 +1200,7 @@ static Sint16 table_goal_boit[] =
 // Boit à la bouteille (sud).
 static Sint16 table_goal_boit2[] =
 {
-    WM_ACTION_DRINK2,
+    EV_ACTION_DRINK2,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_S,
     GOAL_GROUP,         5,
@@ -1219,7 +1219,7 @@ static Sint16 table_goal_boit2[] =
 // Cueille des fleurs.
 static Sint16 table_goal_fleur1[] =
 {
-    WM_ACTION_FLOWER1,
+    EV_ACTION_FLOWER1,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, true,
     GOAL_GROUP,         4,
@@ -1239,7 +1239,7 @@ static Sint16 table_goal_fleur1[] =
     GOAL_ACTION,        ACTION_CUEILLE1, DIRECT_S,
     GOAL_ACTION,        ACTION_CUEILLE1, DIRECT_S,
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 81, 81, -1, -1, WM_ACTION_FLOWER1,
+    GOAL_OTHER,         CHOBJECT, 81, 81, -1, -1, EV_ACTION_FLOWER1,
     GOAL_TERM,
     0
 };
@@ -1247,7 +1247,7 @@ static Sint16 table_goal_fleur1[] =
 // Cueille des fleurs.
 static Sint16 table_goal_fleur2[] =
 {
-    WM_ACTION_FLOWER2,
+    EV_ACTION_FLOWER2,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, true,
     GOAL_GROUP,         4,
@@ -1267,7 +1267,7 @@ static Sint16 table_goal_fleur2[] =
     GOAL_ACTION,        ACTION_CUEILLE2, DIRECT_S,
     GOAL_ACTION,        ACTION_CUEILLE2, DIRECT_S,
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 83, 83, -1, -1, WM_ACTION_FLOWER2,
+    GOAL_OTHER,         CHOBJECT, 83, 83, -1, -1, EV_ACTION_FLOWER2,
     GOAL_TERM,
     0
 };
@@ -1275,7 +1275,7 @@ static Sint16 table_goal_fleur2[] =
 // Cueille des fleurs.
 static Sint16 table_goal_fleur3[] =
 {
-    WM_ACTION_FLOWER3,
+    EV_ACTION_FLOWER3,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, true,
     GOAL_GROUP,         4,
@@ -1295,7 +1295,7 @@ static Sint16 table_goal_fleur3[] =
     GOAL_ACTION,        ACTION_CUEILLE3, DIRECT_S,
     GOAL_ACTION,        ACTION_CUEILLE3, DIRECT_S,
     GOAL_FINISHMOVE,
-    GOAL_OTHER,         CHOBJECT, 94, 94, -1, -1, WM_ACTION_FLOWER3,
+    GOAL_OTHER,         CHOBJECT, 94, 94, -1, -1, EV_ACTION_FLOWER3,
     GOAL_TERM,
     0
 };
@@ -1303,7 +1303,7 @@ static Sint16 table_goal_fleur3[] =
 // Transforme des fleurs.
 static Sint16 table_goal_labo[] =
 {
-    WM_ACTION_LABO,
+    EV_ACTION_LABO,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1345,7 +1345,7 @@ static Sint16 table_goal_labo[] =
 // Blupi fait péter la dynamite.
 static Sint16 table_goal_dynamite[] =
 {
-    WM_ACTION_DYNAMITE,
+    EV_ACTION_DYNAMITE,
     //?     GOAL_ENERGY,        MAXENERGY/4,
     GOAL_GOHILI2,       0, +1, false,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -1395,7 +1395,7 @@ static Sint16 table_goal_dynamite[] =
 // Blupi fait péter la dynamite très fort.
 static Sint16 table_goal_dynamite2[] =
 {
-    WM_ACTION_DYNAMITE2,
+    EV_ACTION_DYNAMITE2,
     //?     GOAL_ENERGY,        MAXENERGY/4,
     GOAL_GOHILI2,       0, +1, false,
     //?     GOAL_ENERGY,        MAXENERGY/4,
@@ -1508,7 +1508,7 @@ static Sint16 table_goal_dynamite2[] =
 // Tracks fait péter la dynamite.
 static Sint16 table_goal_t_dynamite[] =
 {
-    WM_ACTION_T_DYNAMITE,
+    EV_ACTION_T_DYNAMITE,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_SOUND,         SOUND_DYNAMITE,
     GOAL_GROUP,         6,
@@ -1551,7 +1551,7 @@ static Sint16 table_goal_t_dynamite[] =
 // Blupi amorce une mine.
 static Sint16 table_goal_mine[] =
 {
-    WM_ACTION_MINE,
+    EV_ACTION_MINE,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1570,7 +1570,7 @@ static Sint16 table_goal_mine[] =
 // Détonnateur de mine créé par GOAL_AMORCE (blupi invisible).
 static Sint16 table_goal_mine2[] =
 {
-    WM_ACTION_MINE2,
+    EV_ACTION_MINE2,
     GOAL_PUTOBJECT,     -1, -1, CHOBJECT, 127,
     GOAL_BUILDOBJECT,   -1, -1, -1, MOVEICONNB + 10, -1, -1, 100, 1, -1 * 100,
     GOAL_SOUND,         SOUND_CLICK,
@@ -1713,7 +1713,7 @@ static Sint16 table_goal_mine2[] =
 // Construit un pont en direction de l'est.
 static Sint16 table_goal_ponte[] =
 {
-    WM_ACTION_BRIDGEE,
+    EV_ACTION_BRIDGEE,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1727,14 +1727,14 @@ static Sint16 table_goal_ponte[] =
     GOAL_ACTION,        ACTION_BUILD, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_GOBLUPI,       +1, 0, true,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGEEL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGEEL,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_pontel[] =
 {
-    WM_ACTION_BRIDGEEL,
+    EV_ACTION_BRIDGEEL,
     GOAL_GROUP,         3,
     GOAL_INTERRUPT,    0,  // prioritaire
     GOAL_BUILDOBJECT,  -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100,
@@ -1745,7 +1745,7 @@ static Sint16 table_goal_pontel[] =
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
     GOAL_NEXTLOOP,
     GOAL_PUTOBJECT,    -10, -10, CHOBJECT, 72,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGEEL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGEEL,
 
     GOAL_GROUP,         3,
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
@@ -1760,7 +1760,7 @@ static Sint16 table_goal_pontel[] =
 // Construit un pont en direction de l'ouest.
 static Sint16 table_goal_ponto[] =
 {
-    WM_ACTION_BRIDGEO,
+    EV_ACTION_BRIDGEO,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1773,14 +1773,14 @@ static Sint16 table_goal_ponto[] =
     GOAL_GOBLUPI,       -1, +1, true,
     GOAL_ACTION,        ACTION_BUILD, DIRECT_S,
     GOAL_FINISHMOVE,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGEOL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGEOL,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_pontol[] =
 {
-    WM_ACTION_BRIDGEOL,
+    EV_ACTION_BRIDGEOL,
     GOAL_GROUP,         3,
     GOAL_INTERRUPT,    0,  // prioritaire
     GOAL_BUILDOBJECT,  -10, -10, CHOBJECT, 72, -1, -1, DIMOBJY, 1, -1 * 100,
@@ -1791,7 +1791,7 @@ static Sint16 table_goal_pontol[] =
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
     GOAL_NEXTLOOP,
     GOAL_PUTOBJECT,    -10, -10, CHOBJECT, 72,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGEOL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGEOL,
 
     GOAL_GROUP,         3,
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
@@ -1806,7 +1806,7 @@ static Sint16 table_goal_pontol[] =
 // Construit un pont en direction du sud.
 static Sint16 table_goal_ponts[] =
 {
-    WM_ACTION_BRIDGES,
+    EV_ACTION_BRIDGES,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1819,14 +1819,14 @@ static Sint16 table_goal_ponts[] =
     GOAL_ACTION,        ACTION_BUILD, DIRECT_S,
     GOAL_FINISHMOVE,
     GOAL_GOBLUPI,       0, +1, true,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGESL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGESL,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_pontsl[] =
 {
-    WM_ACTION_BRIDGESL,
+    EV_ACTION_BRIDGESL,
     GOAL_GROUP,         3,
     GOAL_INTERRUPT,    0,  // prioritaire
     GOAL_BUILDOBJECT,  -10, -10, CHOBJECT, 73, -1, -1, DIMOBJY, 1, -1 * 100,
@@ -1837,7 +1837,7 @@ static Sint16 table_goal_pontsl[] =
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
     GOAL_NEXTLOOP,
     GOAL_PUTOBJECT,    -10, -10, CHOBJECT, 73,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGESL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGESL,
 
     GOAL_GROUP,         3,
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
@@ -1852,7 +1852,7 @@ static Sint16 table_goal_pontsl[] =
 // Construit un pont en direction du nord.
 static Sint16 table_goal_pontn[] =
 {
-    WM_ACTION_BRIDGEN,
+    EV_ACTION_BRIDGEN,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1864,14 +1864,14 @@ static Sint16 table_goal_pontn[] =
     GOAL_ACTION,        ACTION_SCIE, DIRECT_S,
     GOAL_ACTION,        ACTION_BUILD, DIRECT_S,
     GOAL_FINISHMOVE,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGENL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGENL,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_pontnl[] =
 {
-    WM_ACTION_BRIDGENL,
+    EV_ACTION_BRIDGENL,
     GOAL_GROUP,         3,
     GOAL_INTERRUPT,    0,  // prioritaire
     GOAL_BUILDOBJECT,  -10, -10, CHOBJECT, 73, -1, -1, DIMOBJY, 1, -1 * 100,
@@ -1882,7 +1882,7 @@ static Sint16 table_goal_pontnl[] =
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
     GOAL_NEXTLOOP,
     GOAL_PUTOBJECT,    -10, -10, CHOBJECT, 73,
-    GOAL_OTHERLOOP,     WM_ACTION_BRIDGENL,
+    GOAL_OTHERLOOP,     EV_ACTION_BRIDGENL,
 
     GOAL_GROUP,         3,
     GOAL_PUTOBJECT,    -10, -10, -1, -1,
@@ -1897,7 +1897,7 @@ static Sint16 table_goal_pontnl[] =
 // Construit un bateau.
 static Sint16 table_goal_bateaue[] =
 {
-    WM_ACTION_BOATE,
+    EV_ACTION_BOATE,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1930,7 +1930,7 @@ static Sint16 table_goal_bateaue[] =
 
 static Sint16 table_goal_bateaus[] =
 {
-    WM_ACTION_BOATS,
+    EV_ACTION_BOATS,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1962,7 +1962,7 @@ static Sint16 table_goal_bateaus[] =
 
 static Sint16 table_goal_bateauo[] =
 {
-    WM_ACTION_BOATO,
+    EV_ACTION_BOATO,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -1995,7 +1995,7 @@ static Sint16 table_goal_bateauo[] =
 
 static Sint16 table_goal_bateaun[] =
 {
-    WM_ACTION_BOATN,
+    EV_ACTION_BOATN,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -2028,7 +2028,7 @@ static Sint16 table_goal_bateaun[] =
 // Départ en bateau.
 static Sint16 table_goal_bateaude[] =
 {
-    WM_ACTION_BOATDE,
+    EV_ACTION_BOATDE,
     GOAL_ISNOMALADE,
     GOAL_GOHILI2,       +1, +1, true,
     GOAL_ISNOMALADE,
@@ -2052,7 +2052,7 @@ static Sint16 table_goal_bateaude[] =
 
 static Sint16 table_goal_bateauds[] =
 {
-    WM_ACTION_BOATDS,
+    EV_ACTION_BOATDS,
     GOAL_ISNOMALADE,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ISNOMALADE,
@@ -2075,7 +2075,7 @@ static Sint16 table_goal_bateauds[] =
 
 static Sint16 table_goal_bateaudo[] =
 {
-    WM_ACTION_BOATDO,
+    EV_ACTION_BOATDO,
     GOAL_ISNOMALADE,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ISNOMALADE,
@@ -2098,7 +2098,7 @@ static Sint16 table_goal_bateaudo[] =
 
 static Sint16 table_goal_bateaudn[] =
 {
-    WM_ACTION_BOATDN,
+    EV_ACTION_BOATDN,
     GOAL_ISNOMALADE,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ISNOMALADE,
@@ -2122,7 +2122,7 @@ static Sint16 table_goal_bateaudn[] =
 // Arrivée en bateau.
 static Sint16 table_goal_bateauae[] =
 {
-    WM_ACTION_BOATAE,
+    EV_ACTION_BOATAE,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_GROUP,         4,
     GOAL_IFDEBARQUE,   -3, 0,
@@ -2149,7 +2149,7 @@ static Sint16 table_goal_bateauae[] =
 
 static Sint16 table_goal_bateauas[] =
 {
-    WM_ACTION_BOATAS,
+    EV_ACTION_BOATAS,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_GROUP,         4,
     GOAL_IFDEBARQUE,   0, -3,
@@ -2168,7 +2168,7 @@ static Sint16 table_goal_bateauas[] =
 
 static Sint16 table_goal_bateauao[] =
 {
-    WM_ACTION_BOATAO,
+    EV_ACTION_BOATAO,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_GROUP,         4,
     GOAL_IFDEBARQUE,   +2, 0,
@@ -2187,7 +2187,7 @@ static Sint16 table_goal_bateauao[] =
 
 static Sint16 table_goal_bateauan[] =
 {
-    WM_ACTION_BOATAN,
+    EV_ACTION_BOATAN,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_GROUP,         4,
     GOAL_IFDEBARQUE,   0, +2,
@@ -2207,7 +2207,7 @@ static Sint16 table_goal_bateauan[] =
 // Le robot construit une station de recharge.
 static Sint16 table_goal_r_build1[] =
 {
-    WM_ACTION_R_BUILD1,
+    EV_ACTION_R_BUILD1,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         3,
     GOAL_USINEBUILD,   -1, -1,
@@ -2245,7 +2245,7 @@ static Sint16 table_goal_r_build1[] =
 // Le robot construit une usine à araignées.
 static Sint16 table_goal_r_build2[] =
 {
-    WM_ACTION_R_BUILD2,
+    EV_ACTION_R_BUILD2,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         3,
     GOAL_USINEBUILD,   -1, -1,
@@ -2283,7 +2283,7 @@ static Sint16 table_goal_r_build2[] =
 // Le robot construit une usine à virus.
 static Sint16 table_goal_r_build3[] =
 {
-    WM_ACTION_R_BUILD3,
+    EV_ACTION_R_BUILD3,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         3,
     GOAL_USINEBUILD,   -1, -1,
@@ -2321,7 +2321,7 @@ static Sint16 table_goal_r_build3[] =
 // Le robot construit une usine à tracks.
 static Sint16 table_goal_r_build4[] =
 {
-    WM_ACTION_R_BUILD4,
+    EV_ACTION_R_BUILD4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         3,
     GOAL_USINEBUILD,   -1, -1,
@@ -2359,7 +2359,7 @@ static Sint16 table_goal_r_build4[] =
 // Le robot construit une usine à bombe.
 static Sint16 table_goal_r_build5[] =
 {
-    WM_ACTION_R_BUILD5,
+    EV_ACTION_R_BUILD5,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         3,
     GOAL_USINEBUILD,   -1, -1,
@@ -2397,7 +2397,7 @@ static Sint16 table_goal_r_build5[] =
 // Le robot construit une usine à électro.
 static Sint16 table_goal_r_build6[] =
 {
-    WM_ACTION_R_BUILD6,
+    EV_ACTION_R_BUILD6,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         3,
     GOAL_USINEBUILD,   -1, -1,
@@ -2435,7 +2435,7 @@ static Sint16 table_goal_r_build6[] =
 // Le robot se recharge.
 static Sint16 table_goal_r_make1[] =
 {
-    WM_ACTION_R_MAKE1,
+    EV_ACTION_R_MAKE1,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         2,
     GOAL_USINEFREE,    -1, -1,
@@ -2458,7 +2458,7 @@ static Sint16 table_goal_r_make1[] =
 // Le robot construit une araignée.
 static Sint16 table_goal_r_make2[] =
 {
-    WM_ACTION_R_MAKE2,
+    EV_ACTION_R_MAKE2,
     GOAL_GOHILI2,       +2, +1, false,
     GOAL_GROUP,         2,
     GOAL_USINEFREE,    -2, -1,
@@ -2523,7 +2523,7 @@ static Sint16 table_goal_r_make2[] =
 // Le robot construit un virus.
 static Sint16 table_goal_r_make3[] =
 {
-    WM_ACTION_R_MAKE3,
+    EV_ACTION_R_MAKE3,
     GOAL_GOHILI2,       +2, +1, false,
     GOAL_GROUP,         2,
     GOAL_USINEFREE,    -2, -1,
@@ -2587,7 +2587,7 @@ static Sint16 table_goal_r_make3[] =
 // Le robot construit un tracks.
 static Sint16 table_goal_r_make4[] =
 {
-    WM_ACTION_R_MAKE4,
+    EV_ACTION_R_MAKE4,
     GOAL_GOHILI2,       +2, +1, false,
     GOAL_GROUP,         2,
     GOAL_USINEFREE,    -2, -1,
@@ -2651,7 +2651,7 @@ static Sint16 table_goal_r_make4[] =
 // Le robot construit une bombe.
 static Sint16 table_goal_r_make5[] =
 {
-    WM_ACTION_R_MAKE5,
+    EV_ACTION_R_MAKE5,
     GOAL_GOHILI2,       +2, +1, false,
     GOAL_GROUP,         2,
     GOAL_USINEFREE,    -2, -1,
@@ -2715,7 +2715,7 @@ static Sint16 table_goal_r_make5[] =
 // Le robot construit un électro.
 static Sint16 table_goal_r_make6[] =
 {
-    WM_ACTION_R_MAKE6,
+    EV_ACTION_R_MAKE6,
     GOAL_GOHILI2,       +2, +1, false,
     GOAL_GROUP,         2,
     GOAL_USINEFREE,    -2, -1,
@@ -2779,7 +2779,7 @@ static Sint16 table_goal_r_make6[] =
 // Blupi monte dans une jeep.
 static Sint16 table_goal_mjeep[] =
 {
-    WM_ACTION_MJEEP,
+    EV_ACTION_MJEEP,
     GOAL_ISNOMALADE,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ISNOMALADE,
@@ -2803,7 +2803,7 @@ static Sint16 table_goal_mjeep[] =
 // Blupi descend de la jeep.
 static Sint16 table_goal_djeep[] =
 {
-    WM_ACTION_DJEEP,
+    EV_ACTION_DJEEP,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
@@ -2830,7 +2830,7 @@ static Sint16 table_goal_djeep[] =
 // Blupi monte dans une armure.
 static Sint16 table_goal_marmure[] =
 {
-    WM_ACTION_MARMURE,
+    EV_ACTION_MARMURE,
     GOAL_ISNOMALADE,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_ISNOMALADE,
@@ -2873,7 +2873,7 @@ static Sint16 table_goal_marmure[] =
 // Blupi descend de l'armure.
 static Sint16 table_goal_darmure[] =
 {
-    WM_ACTION_DARMURE,
+    EV_ACTION_DARMURE,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_INTERRUPT,     0,  // prioritaire
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
@@ -2895,21 +2895,21 @@ static Sint16 table_goal_darmure[] =
 // Blupi cherche où planter des drapeaux.
 static Sint16 table_goal_drapeau[] =
 {
-    WM_ACTION_FLAG,
+    EV_ACTION_FLAG,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_FIX,           0, -1,
     GOAL_REPEAT,        true,
-    GOAL_OTHERFIX,      CHFLOOR, 33, 48, 71, 71, WM_ACTION_FLAG2,
+    GOAL_OTHERFIX,      CHFLOOR, 33, 48, 71, 71, EV_ACTION_FLAG2,
     GOAL_TERM,
     0
 };
 
 static Sint16 table_goal_drapeau2[] =
 {
-    WM_ACTION_FLAG2,
+    EV_ACTION_FLAG2,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -2920,10 +2920,10 @@ static Sint16 table_goal_drapeau2[] =
     GOAL_ACTION,        ACTION_BUILD, DIRECT_S,
     GOAL_GOBLUPI,       +1, -1, true,
     GOAL_ACTION,        ACTION_BUILD, DIRECT_S,
-    GOAL_FLOORJUMP,     CHFLOOR, 71, WM_ACTION_FLAG3,
+    GOAL_FLOORJUMP,     CHFLOOR, 71, EV_ACTION_FLAG3,
     GOAL_ADDDRAPEAU,    -1, 0,
 
-    GOAL_OTHERFIX,      CHFLOOR, 33, 48, 71, 71, WM_ACTION_FLAG2,
+    GOAL_OTHERFIX,      CHFLOOR, 33, 48, 71, 71, EV_ACTION_FLAG2,
     GOAL_TERM,
     0
 };
@@ -2931,7 +2931,7 @@ static Sint16 table_goal_drapeau2[] =
 // Plante un drapeau.
 static Sint16 table_goal_drapeau3[] =
 {
-    WM_ACTION_FLAG3,
+    EV_ACTION_FLAG3,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -2946,7 +2946,7 @@ static Sint16 table_goal_drapeau3[] =
     GOAL_ADDDRAPEAU,    -1, 0,
     GOAL_FINISHMOVE,
 
-    //?     GOAL_OTHERFIX,      CHFLOOR,33,48,71,71, WM_ACTION_FLAG2,
+    //?     GOAL_OTHERFIX,      CHFLOOR,33,48,71,71, EV_ACTION_FLAG2,
     GOAL_TERM,
     0
 };
@@ -2954,7 +2954,7 @@ static Sint16 table_goal_drapeau3[] =
 // Blupi extrait du fer.
 static Sint16 table_goal_extrait[] =
 {
-    WM_ACTION_EXTRAIT,
+    EV_ACTION_EXTRAIT,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -3001,7 +3001,7 @@ static Sint16 table_goal_extrait[] =
 // Blupi fabrique une jeep.
 static Sint16 table_goal_fabjeep[] =
 {
-    WM_ACTION_FABJEEP,
+    EV_ACTION_FABJEEP,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -3044,7 +3044,7 @@ static Sint16 table_goal_fabjeep[] =
 // Blupi fabrique une armure.
 static Sint16 table_goal_fabarmure[] =
 {
-    WM_ACTION_FABARMURE,
+    EV_ACTION_FABARMURE,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -3087,7 +3087,7 @@ static Sint16 table_goal_fabarmure[] =
 // Blupi fabrique une mine.
 static Sint16 table_goal_fabmine[] =
 {
-    WM_ACTION_FABMINE,
+    EV_ACTION_FABMINE,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -3134,7 +3134,7 @@ static Sint16 table_goal_fabmine[] =
 // Blupi fabrique un disciple.
 static Sint16 table_goal_fabdisc[] =
 {
-    WM_ACTION_FABDISC,
+    EV_ACTION_FABDISC,
     GOAL_ENERGY,        MAXENERGY / 4,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_ENERGY,        MAXENERGY / 4,
@@ -3186,7 +3186,7 @@ static Sint16 table_goal_fabdisc[] =
 // L'électro va sur un blupi puis lance ses rayons.
 static Sint16 table_goal_e_rayon[] =
 {
-    WM_ACTION_E_RAYON,
+    EV_ACTION_E_RAYON,
     GOAL_GOHILI2,       0, 0, false,
     GOAL_SOUND,         SOUND_E_TOURNE,
     GOAL_ACTION,        ACTION_E_RAYON, DIRECT_E,
@@ -3276,7 +3276,7 @@ static Sint16 table_goal_e_rayon[] =
 // Blupi s'électrocute.
 static Sint16 table_goal_electro[] =
 {
-    WM_ACTION_ELECTRO,
+    EV_ACTION_ELECTRO,
     GOAL_INTERRUPT, 0,  // prioritaire
     GOAL_ACTION,        ACTION_STOP, DIRECT_SE,
     GOAL_MALADE,        false,
@@ -3293,7 +3293,7 @@ static Sint16 table_goal_electro[] =
 
 static Sint16 table_goal_electrom[] =
 {
-    WM_ACTION_ELECTROm,
+    EV_ACTION_ELECTROm,
     GOAL_INTERRUPT, 0,  // prioritaire
     GOAL_ACTION,        ACTION_STOP, DIRECT_SE,
     GOAL_GROUP,         3,
@@ -3311,7 +3311,7 @@ static Sint16 table_goal_electrom[] =
 // Blupi grille.
 static Sint16 table_goal_grille[] =
 {
-    WM_ACTION_GRILLE,
+    EV_ACTION_GRILLE,
     GOAL_INTERRUPT, 0,  // prioritaire
     GOAL_ACTION,        ACTION_STOP, DIRECT_SE,
     GOAL_GROUP,         3,
@@ -3329,7 +3329,7 @@ static Sint16 table_goal_grille[] =
 // L'araignée meurt.
 static Sint16 table_goal_a_mort[] =
 {
-    WM_ACTION_A_MORT,
+    EV_ACTION_A_MORT,
     GOAL_INTERRUPT, 0,  // prioritaire
     GOAL_ACTION,        ACTION_STOP, DIRECT_E,
     GOAL_SOUND,         SOUND_A_POISON,
@@ -3345,7 +3345,7 @@ static Sint16 table_goal_a_mort[] =
 // Blupi se prépare à répéter une liste.
 static Sint16 table_goal_repeat[] =
 {
-    WM_ACTION_REPEAT,
+    EV_ACTION_REPEAT,
     GOAL_TERM,
     0
 };
@@ -3353,7 +3353,7 @@ static Sint16 table_goal_repeat[] =
 // Blupi se téléporte d'un endroit à un autre.
 static Sint16 table_goal_teleporte00[] =
 {
-    WM_ACTION_TELEPORTE00,
+    EV_ACTION_TELEPORTE00,
     GOAL_GOHILI2,       0, 0, false,
     GOAL_GROUP,         4,
     GOAL_INTERRUPT,    0,  // prioritaire
@@ -3376,7 +3376,7 @@ static Sint16 table_goal_teleporte00[] =
 
 static Sint16 table_goal_teleporte10[] =
 {
-    WM_ACTION_TELEPORTE10,
+    EV_ACTION_TELEPORTE10,
     GOAL_GOHILI2,       +1, 0, false,
     GOAL_GROUP,         4,
     GOAL_INTERRUPT,    0,  // prioritaire
@@ -3399,7 +3399,7 @@ static Sint16 table_goal_teleporte10[] =
 
 static Sint16 table_goal_teleporte01[] =
 {
-    WM_ACTION_TELEPORTE01,
+    EV_ACTION_TELEPORTE01,
     GOAL_GOHILI2,       0, +1, false,
     GOAL_GROUP,         4,
     GOAL_INTERRUPT,    0,  // prioritaire
@@ -3422,7 +3422,7 @@ static Sint16 table_goal_teleporte01[] =
 
 static Sint16 table_goal_teleporte11[] =
 {
-    WM_ACTION_TELEPORTE11,
+    EV_ACTION_TELEPORTE11,
     GOAL_GOHILI2,       +1, +1, false,
     GOAL_GROUP,         4,
     GOAL_INTERRUPT,    0,  // prioritaire
@@ -3558,7 +3558,7 @@ Sint16 * GetTableGoal (Sint32 action)
   {
     if (**ppTable == action)
     {
-      return *ppTable + 1; // après WM_ACTION_*
+      return *ppTable + 1; // après EV_ACTION_*
     }
 
     ppTable++;
diff --git a/src/decor.cxx b/src/decor.cxx
index adbd2db..6cab49e 100644
--- a/src/decor.cxx
+++ b/src/decor.cxx
@@ -1567,7 +1567,7 @@ Sint32 CDecor::CountFloor (Sint32 channel, Sint32 icon)
 //  action = 0          sélection jeu
 //           1          construction d'une cellule 1x1
 //           2          construction d'une cellule 2x2
-//           WM_ACTION* action
+//           EV_ACTION* action
 
 Errors CDecor::CelOkForAction (
   POINT cel, Sint32 action, Sint32 rank, Sint32 icons[4][4],
@@ -1591,10 +1591,10 @@ Errors CDecor::CelOkForAction (
   celOutline2.x = -1;
 
   if (
-    action == 2 || action == WM_ACTION_ABAT1 || action == WM_ACTION_ROC1 ||
-    action == WM_ACTION_DROP || action == WM_ACTION_LABO ||
-    action == WM_ACTION_FLOWER1 || action == WM_ACTION_CULTIVE ||
-    action == WM_ACTION_FLAG)
+    action == 2 || action == EV_ACTION_ABAT1 || action == EV_ACTION_ROC1 ||
+    action == EV_ACTION_DROP || action == EV_ACTION_LABO ||
+    action == EV_ACTION_FLOWER1 || action == EV_ACTION_CULTIVE ||
+    action == EV_ACTION_FLAG)
   {
     cel.x = (cel.x / 2) * 2;
     cel.y = (cel.y / 2) * 2;
@@ -1640,24 +1640,24 @@ Errors CDecor::CelOkForAction (
     icons[2][2] = ICON_HILI_BUILD;
   }
 
-  if (action == WM_ACTION_STOP)
+  if (action == EV_ACTION_STOP)
   {
     error = Errors::MISC;
     if (
       m_blupi[rank].stop == 0 &&
-      (m_blupi[rank].goalAction == WM_ACTION_GO ||
-       (m_blupi[rank].goalAction >= WM_ACTION_ABAT1 &&
-        m_blupi[rank].goalAction <= WM_ACTION_ABAT6) ||
-       (m_blupi[rank].goalAction >= WM_ACTION_ROC1 &&
-        m_blupi[rank].goalAction <= WM_ACTION_ROC7) ||
-       m_blupi[rank].goalAction == WM_ACTION_CULTIVE ||
-       m_blupi[rank].goalAction == WM_ACTION_CULTIVE2 ||
-       m_blupi[rank].goalAction == WM_ACTION_FLAG ||
-       m_blupi[rank].goalAction == WM_ACTION_FLAG2 ||
-       m_blupi[rank].goalAction == WM_ACTION_FLAG3 ||
-       m_blupi[rank].goalAction == WM_ACTION_FLOWER1 ||
-       m_blupi[rank].goalAction == WM_ACTION_FLOWER2 ||
-       m_blupi[rank].goalAction == WM_ACTION_FLOWER3))
+      (m_blupi[rank].goalAction == EV_ACTION_GO ||
+       (m_blupi[rank].goalAction >= EV_ACTION_ABAT1 &&
+        m_blupi[rank].goalAction <= EV_ACTION_ABAT6) ||
+       (m_blupi[rank].goalAction >= EV_ACTION_ROC1 &&
+        m_blupi[rank].goalAction <= EV_ACTION_ROC7) ||
+       m_blupi[rank].goalAction == EV_ACTION_CULTIVE ||
+       m_blupi[rank].goalAction == EV_ACTION_CULTIVE2 ||
+       m_blupi[rank].goalAction == EV_ACTION_FLAG ||
+       m_blupi[rank].goalAction == EV_ACTION_FLAG2 ||
+       m_blupi[rank].goalAction == EV_ACTION_FLAG3 ||
+       m_blupi[rank].goalAction == EV_ACTION_FLOWER1 ||
+       m_blupi[rank].goalAction == EV_ACTION_FLOWER2 ||
+       m_blupi[rank].goalAction == EV_ACTION_FLOWER3))
       error = Errors::NONE;
     if (
       m_blupi[rank].stop == 0 && m_blupi[rank].goalAction != 0 &&
@@ -1667,7 +1667,7 @@ Errors CDecor::CelOkForAction (
       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 ?
     {
@@ -1702,7 +1702,7 @@ Errors CDecor::CelOkForAction (
       icons[1][1] = ICON_HILI_ERR;
   }
 
-  if (action == WM_ACTION_ABAT1)
+  if (action == EV_ACTION_ABAT1)
   {
     GetObject (cel, channel, icon);
     if (
@@ -1727,7 +1727,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_ROC1)
+  if (action == EV_ACTION_ROC1)
   {
     GetObject (cel, channel, icon);
     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)
     {
@@ -1771,9 +1771,9 @@ Errors CDecor::CelOkForAction (
       }
 
       if (
-        action == WM_ACTION_BUILD1 || // cabane ?
-        action == WM_ACTION_BUILD2 || // couveuse ?
-        action == WM_ACTION_BUILD6)   // téléporteur ?
+        action == EV_ACTION_BUILD1 || // cabane ?
+        action == EV_ACTION_BUILD2 || // couveuse ?
+        action == EV_ACTION_BUILD6)   // téléporteur ?
       {
         GetFloor (cel, channel, icon);
         if (
@@ -1784,7 +1784,7 @@ Errors CDecor::CelOkForAction (
         }
       }
 
-      if (action == WM_ACTION_BUILD4) // mine ?
+      if (action == EV_ACTION_BUILD4) // mine ?
       {
         GetFloor (cel, channel, icon);
         if (channel != CHFLOOR || icon != 71) // terre à fer ?
@@ -1794,13 +1794,13 @@ Errors CDecor::CelOkForAction (
       }
 
       if (
-        action == WM_ACTION_BUILD6 &&  // téléporteur ?
+        action == EV_ACTION_BUILD6 &&  // téléporteur ?
         CountFloor (CHFLOOR, 80) >= 2) // déjà 2 ?
       {
         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
       else
         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)
     {
@@ -1898,7 +1898,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_TOWER)
+  if (action == EV_ACTION_TOWER)
   {
     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)
     {
@@ -2037,7 +2037,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_BRIDGEE)
+  if (action == EV_ACTION_BRIDGEE)
   {
     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)
     {
@@ -2130,7 +2130,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_DROP)
+  if (action == EV_ACTION_DROP)
   {
     if (!bTransport || bVehiculeA)
     {
@@ -2195,7 +2195,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_CULTIVE)
+  if (action == EV_ACTION_CULTIVE)
   {
     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)
     {
@@ -2275,7 +2275,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_FLOWER1)
+  if (action == EV_ACTION_FLOWER1)
   {
     GetObject (cel, channel, icon);
     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)
     {
@@ -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)
     {
@@ -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)
     {
@@ -2410,7 +2410,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_BOATE)
+  if (action == EV_ACTION_BOATE)
   {
     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.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.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)
     {
@@ -2573,7 +2573,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_EXTRAIT)
+  if (action == EV_ACTION_EXTRAIT)
   {
     if (!bStrong || bTransport || bVehicule)
     {
@@ -2611,18 +2611,18 @@ Errors CDecor::CelOkForAction (
   }
 
   if (
-    action == WM_ACTION_FABJEEP || action == WM_ACTION_FABMINE ||
-    action == WM_ACTION_FABARMURE)
+    action == EV_ACTION_FABJEEP || action == EV_ACTION_FABMINE ||
+    action == EV_ACTION_FABARMURE)
   {
     if (!bStrong || !bTransport || bVehicule)
     {
       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
     }
-    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
     }
@@ -2660,7 +2660,7 @@ Errors CDecor::CelOkForAction (
     }
   }
 
-  if (action == WM_ACTION_FABDISC)
+  if (action == EV_ACTION_FABDISC)
   {
     if (!bStrong || !bTransport || bVehicule)
     {
diff --git a/src/def.h b/src/def.h
index 121c262..314cd25 100644
--- a/src/def.h
+++ b/src/def.h
@@ -393,227 +393,227 @@ enum MouseSprites {
 };
 
 // clang-format off
-#define WM_USER                 0x0400
+#define EV_OFFSET                 0x0400
 
-#define WM_UPDATE               (WM_USER+1)
-#define WM_WARPMOUSE            (WM_USER+2)
+#define EV_UPDATE               (EV_OFFSET+1)
+#define EV_WARPMOUSE            (EV_OFFSET+2)
 
-#define WM_DECOR1               (WM_USER+20)
-#define WM_DECOR2               (WM_USER+21)
-#define WM_DECOR3               (WM_USER+22)
-#define WM_DECOR4               (WM_USER+23)
-#define WM_DECOR5               (WM_USER+24)
+#define EV_DECOR1               (EV_OFFSET+20)
+#define EV_DECOR2               (EV_OFFSET+21)
+#define EV_DECOR3               (EV_OFFSET+22)
+#define EV_DECOR4               (EV_OFFSET+23)
+#define EV_DECOR5               (EV_OFFSET+24)
 
-#define WM_ACTION_GO            (WM_USER+30)
-#define WM_ACTION_ABAT1         (WM_USER+31)
-#define WM_ACTION_ABAT2         (WM_USER+32)
-#define WM_ACTION_ABAT3         (WM_USER+33)
-#define WM_ACTION_ABAT4         (WM_USER+34)
-#define WM_ACTION_ABAT5         (WM_USER+35)
-#define WM_ACTION_ABAT6         (WM_USER+36)
-#define WM_ACTION_BUILD1        (WM_USER+37)
-#define WM_ACTION_BUILD2        (WM_USER+38)
-#define WM_ACTION_BUILD3        (WM_USER+39)
-#define WM_ACTION_BUILD4        (WM_USER+40)
-#define WM_ACTION_BUILD5        (WM_USER+41)
-#define WM_ACTION_BUILD6        (WM_USER+42)
-#define WM_ACTION_STOP          (WM_USER+43)
-#define WM_ACTION_CARRY         (WM_USER+44)
-#define WM_ACTION_DROP          (WM_USER+45)
-#define WM_ACTION_ROC1          (WM_USER+46)
-#define WM_ACTION_ROC2          (WM_USER+47)
-#define WM_ACTION_ROC3          (WM_USER+48)
-#define WM_ACTION_ROC4          (WM_USER+49)
-#define WM_ACTION_ROC5          (WM_USER+50)
-#define WM_ACTION_ROC6          (WM_USER+51)
-#define WM_ACTION_ROC7          (WM_USER+52)
-#define WM_ACTION_WALL          (WM_USER+53)
-#define WM_ACTION_CULTIVE       (WM_USER+54)
-#define WM_ACTION_CULTIVE2      (WM_USER+55)
-#define WM_ACTION_EAT           (WM_USER+56)
-#define WM_ACTION_MAKE          (WM_USER+57)
-#define WM_ACTION_BUILD         (WM_USER+58)
-#define WM_ACTION_PALIS         (WM_USER+59)
-#define WM_ACTION_NEWBLUPI      (WM_USER+60)
-#define WM_ACTION_BRIDGEE       (WM_USER+61)
-#define WM_ACTION_BRIDGES       (WM_USER+62)
-#define WM_ACTION_BRIDGEO       (WM_USER+63)
-#define WM_ACTION_BRIDGEN       (WM_USER+64)
-#define WM_ACTION_BRIDGEEL      (WM_USER+65)
-#define WM_ACTION_BRIDGESL      (WM_USER+66)
-#define WM_ACTION_BRIDGEOL      (WM_USER+67)
-#define WM_ACTION_BRIDGENL      (WM_USER+68)
-#define WM_ACTION_TOWER         (WM_USER+69)
-#define WM_ACTION_CARRY2        (WM_USER+70)
-#define WM_ACTION_DROP2         (WM_USER+71)
-#define WM_ACTION_EAT2          (WM_USER+72)
-#define WM_ACTION_DRINK         (WM_USER+73)
-#define WM_ACTION_DRINK2        (WM_USER+74)
-#define WM_ACTION_LABO          (WM_USER+75)
-#define WM_ACTION_FLOWER1       (WM_USER+76)
-#define WM_ACTION_FLOWER2       (WM_USER+77)
-#define WM_ACTION_DYNAMITE      (WM_USER+78)
-#define WM_ACTION_DYNAMITE2     (WM_USER+79)
-#define WM_ACTION_T_DYNAMITE    (WM_USER+80)
-#define WM_ACTION_FLOWER3        (WM_USER+81)
-#define WM_ACTION_R_BUILD1      (WM_USER+82)
-#define WM_ACTION_R_BUILD2      (WM_USER+83)
-#define WM_ACTION_R_BUILD3      (WM_USER+84)
-#define WM_ACTION_R_BUILD4      (WM_USER+85)
-#define WM_ACTION_R_MAKE1       (WM_USER+86)
-#define WM_ACTION_R_MAKE2       (WM_USER+87)
-#define WM_ACTION_R_MAKE3       (WM_USER+88)
-#define WM_ACTION_R_MAKE4       (WM_USER+89)
-#define WM_ACTION_R_BUILD5      (WM_USER+90)
-#define WM_ACTION_R_MAKE5       (WM_USER+91)
-#define WM_ACTION_BOATE         (WM_USER+92)
-#define WM_ACTION_BOATS         (WM_USER+93)
-#define WM_ACTION_BOATO         (WM_USER+94)
-#define WM_ACTION_BOATN         (WM_USER+95)
-#define WM_ACTION_BOATDE        (WM_USER+96)
-#define WM_ACTION_BOATDS        (WM_USER+97)
-#define WM_ACTION_BOATDO        (WM_USER+98)
-#define WM_ACTION_BOATDN        (WM_USER+99)
-#define WM_ACTION_BOATAE        (WM_USER+100)
-#define WM_ACTION_BOATAS        (WM_USER+101)
-#define WM_ACTION_BOATAO        (WM_USER+102)
-#define WM_ACTION_BOATAN        (WM_USER+103)
-#define WM_ACTION_MJEEP         (WM_USER+104)
-#define WM_ACTION_DJEEP         (WM_USER+105)
-#define WM_ACTION_FLAG          (WM_USER+106)
-#define WM_ACTION_FLAG2         (WM_USER+107)
-#define WM_ACTION_FLAG3         (WM_USER+108)
-#define WM_ACTION_EXTRAIT       (WM_USER+109)
-#define WM_ACTION_FABJEEP       (WM_USER+110)
-#define WM_ACTION_FABMINE       (WM_USER+111)
-#define WM_ACTION_MINE          (WM_USER+112)
-#define WM_ACTION_MINE2         (WM_USER+113)
-#define WM_ACTION_R_BUILD6      (WM_USER+114)
-#define WM_ACTION_R_MAKE6       (WM_USER+115)
-#define WM_ACTION_E_RAYON       (WM_USER+116)
-#define WM_ACTION_ELECTRO       (WM_USER+117)
-#define WM_ACTION_ELECTROm      (WM_USER+118)
-#define WM_ACTION_GRILLE        (WM_USER+119)
-#define WM_ACTION_HOUSE         (WM_USER+120)
-#define WM_ACTION_FABDISC       (WM_USER+121)
-#define WM_ACTION_A_MORT        (WM_USER+122)
-#define WM_ACTION_REPEAT        (WM_USER+123)
-#define WM_ACTION_TELEPORTE00   (WM_USER+124)
-#define WM_ACTION_TELEPORTE10   (WM_USER+125)
-#define WM_ACTION_TELEPORTE01   (WM_USER+126)
-#define WM_ACTION_TELEPORTE11   (WM_USER+127)
-#define WM_ACTION_FABARMURE     (WM_USER+128)
-#define WM_ACTION_MARMURE       (WM_USER+129)
-#define WM_ACTION_DARMURE       (WM_USER+130)
+#define EV_ACTION_GO            (EV_OFFSET+30)
+#define EV_ACTION_ABAT1         (EV_OFFSET+31)
+#define EV_ACTION_ABAT2         (EV_OFFSET+32)
+#define EV_ACTION_ABAT3         (EV_OFFSET+33)
+#define EV_ACTION_ABAT4         (EV_OFFSET+34)
+#define EV_ACTION_ABAT5         (EV_OFFSET+35)
+#define EV_ACTION_ABAT6         (EV_OFFSET+36)
+#define EV_ACTION_BUILD1        (EV_OFFSET+37)
+#define EV_ACTION_BUILD2        (EV_OFFSET+38)
+#define EV_ACTION_BUILD3        (EV_OFFSET+39)
+#define EV_ACTION_BUILD4        (EV_OFFSET+40)
+#define EV_ACTION_BUILD5        (EV_OFFSET+41)
+#define EV_ACTION_BUILD6        (EV_OFFSET+42)
+#define EV_ACTION_STOP          (EV_OFFSET+43)
+#define EV_ACTION_CARRY         (EV_OFFSET+44)
+#define EV_ACTION_DROP          (EV_OFFSET+45)
+#define EV_ACTION_ROC1          (EV_OFFSET+46)
+#define EV_ACTION_ROC2          (EV_OFFSET+47)
+#define EV_ACTION_ROC3          (EV_OFFSET+48)
+#define EV_ACTION_ROC4          (EV_OFFSET+49)
+#define EV_ACTION_ROC5          (EV_OFFSET+50)
+#define EV_ACTION_ROC6          (EV_OFFSET+51)
+#define EV_ACTION_ROC7          (EV_OFFSET+52)
+#define EV_ACTION_WALL          (EV_OFFSET+53)
+#define EV_ACTION_CULTIVE       (EV_OFFSET+54)
+#define EV_ACTION_CULTIVE2      (EV_OFFSET+55)
+#define EV_ACTION_EAT           (EV_OFFSET+56)
+#define EV_ACTION_MAKE          (EV_OFFSET+57)
+#define EV_ACTION_BUILD         (EV_OFFSET+58)
+#define EV_ACTION_PALIS         (EV_OFFSET+59)
+#define EV_ACTION_NEWBLUPI      (EV_OFFSET+60)
+#define EV_ACTION_BRIDGEE       (EV_OFFSET+61)
+#define EV_ACTION_BRIDGES       (EV_OFFSET+62)
+#define EV_ACTION_BRIDGEO       (EV_OFFSET+63)
+#define EV_ACTION_BRIDGEN       (EV_OFFSET+64)
+#define EV_ACTION_BRIDGEEL      (EV_OFFSET+65)
+#define EV_ACTION_BRIDGESL      (EV_OFFSET+66)
+#define EV_ACTION_BRIDGEOL      (EV_OFFSET+67)
+#define EV_ACTION_BRIDGENL      (EV_OFFSET+68)
+#define EV_ACTION_TOWER         (EV_OFFSET+69)
+#define EV_ACTION_CARRY2        (EV_OFFSET+70)
+#define EV_ACTION_DROP2         (EV_OFFSET+71)
+#define EV_ACTION_EAT2          (EV_OFFSET+72)
+#define EV_ACTION_DRINK         (EV_OFFSET+73)
+#define EV_ACTION_DRINK2        (EV_OFFSET+74)
+#define EV_ACTION_LABO          (EV_OFFSET+75)
+#define EV_ACTION_FLOWER1       (EV_OFFSET+76)
+#define EV_ACTION_FLOWER2       (EV_OFFSET+77)
+#define EV_ACTION_DYNAMITE      (EV_OFFSET+78)
+#define EV_ACTION_DYNAMITE2     (EV_OFFSET+79)
+#define EV_ACTION_T_DYNAMITE    (EV_OFFSET+80)
+#define EV_ACTION_FLOWER3       (EV_OFFSET+81)
+#define EV_ACTION_R_BUILD1      (EV_OFFSET+82)
+#define EV_ACTION_R_BUILD2      (EV_OFFSET+83)
+#define EV_ACTION_R_BUILD3      (EV_OFFSET+84)
+#define EV_ACTION_R_BUILD4      (EV_OFFSET+85)
+#define EV_ACTION_R_MAKE1       (EV_OFFSET+86)
+#define EV_ACTION_R_MAKE2       (EV_OFFSET+87)
+#define EV_ACTION_R_MAKE3       (EV_OFFSET+88)
+#define EV_ACTION_R_MAKE4       (EV_OFFSET+89)
+#define EV_ACTION_R_BUILD5      (EV_OFFSET+90)
+#define EV_ACTION_R_MAKE5       (EV_OFFSET+91)
+#define EV_ACTION_BOATE         (EV_OFFSET+92)
+#define EV_ACTION_BOATS         (EV_OFFSET+93)
+#define EV_ACTION_BOATO         (EV_OFFSET+94)
+#define EV_ACTION_BOATN         (EV_OFFSET+95)
+#define EV_ACTION_BOATDE        (EV_OFFSET+96)
+#define EV_ACTION_BOATDS        (EV_OFFSET+97)
+#define EV_ACTION_BOATDO        (EV_OFFSET+98)
+#define EV_ACTION_BOATDN        (EV_OFFSET+99)
+#define EV_ACTION_BOATAE        (EV_OFFSET+100)
+#define EV_ACTION_BOATAS        (EV_OFFSET+101)
+#define EV_ACTION_BOATAO        (EV_OFFSET+102)
+#define EV_ACTION_BOATAN        (EV_OFFSET+103)
+#define EV_ACTION_MJEEP         (EV_OFFSET+104)
+#define EV_ACTION_DJEEP         (EV_OFFSET+105)
+#define EV_ACTION_FLAG          (EV_OFFSET+106)
+#define EV_ACTION_FLAG2         (EV_OFFSET+107)
+#define EV_ACTION_FLAG3         (EV_OFFSET+108)
+#define EV_ACTION_EXTRAIT       (EV_OFFSET+109)
+#define EV_ACTION_FABJEEP       (EV_OFFSET+110)
+#define EV_ACTION_FABMINE       (EV_OFFSET+111)
+#define EV_ACTION_MINE          (EV_OFFSET+112)
+#define EV_ACTION_MINE2         (EV_OFFSET+113)
+#define EV_ACTION_R_BUILD6      (EV_OFFSET+114)
+#define EV_ACTION_R_MAKE6       (EV_OFFSET+115)
+#define EV_ACTION_E_RAYON       (EV_OFFSET+116)
+#define EV_ACTION_ELECTRO       (EV_OFFSET+117)
+#define EV_ACTION_ELECTROm      (EV_OFFSET+118)
+#define EV_ACTION_GRILLE        (EV_OFFSET+119)
+#define EV_ACTION_HOUSE         (EV_OFFSET+120)
+#define EV_ACTION_FABDISC       (EV_OFFSET+121)
+#define EV_ACTION_A_MORT        (EV_OFFSET+122)
+#define EV_ACTION_REPEAT        (EV_OFFSET+123)
+#define EV_ACTION_TELEPORTE00   (EV_OFFSET+124)
+#define EV_ACTION_TELEPORTE10   (EV_OFFSET+125)
+#define EV_ACTION_TELEPORTE01   (EV_OFFSET+126)
+#define EV_ACTION_TELEPORTE11   (EV_OFFSET+127)
+#define EV_ACTION_FABARMURE     (EV_OFFSET+128)
+#define EV_ACTION_MARMURE       (EV_OFFSET+129)
+#define EV_ACTION_DARMURE       (EV_OFFSET+130)
 
-#define WM_BUTTON0              (WM_USER+200)
-#define WM_BUTTON1              (WM_USER+201)
-#define WM_BUTTON2              (WM_USER+202)
-#define WM_BUTTON3              (WM_USER+203)
-#define WM_BUTTON4              (WM_USER+204)
-#define WM_BUTTON5              (WM_USER+205)
-#define WM_BUTTON6              (WM_USER+206)
-#define WM_BUTTON7              (WM_USER+207)
-#define WM_BUTTON8              (WM_USER+208)
-#define WM_BUTTON9              (WM_USER+209)
-#define WM_BUTTON10             (WM_USER+210)
-#define WM_BUTTON11             (WM_USER+211)
-#define WM_BUTTON12             (WM_USER+212)
-#define WM_BUTTON13             (WM_USER+213)
-#define WM_BUTTON14             (WM_USER+214)
-#define WM_BUTTON15             (WM_USER+215)
-#define WM_BUTTON16             (WM_USER+216)
-#define WM_BUTTON17             (WM_USER+217)
-#define WM_BUTTON18             (WM_USER+218)
-#define WM_BUTTON19             (WM_USER+219)
-#define WM_BUTTON20             (WM_USER+220)
-#define WM_BUTTON21             (WM_USER+221)
-#define WM_BUTTON22             (WM_USER+222)
-#define WM_BUTTON23             (WM_USER+223)
-#define WM_BUTTON24             (WM_USER+224)
-#define WM_BUTTON25             (WM_USER+225)
-#define WM_BUTTON26             (WM_USER+226)
-#define WM_BUTTON27             (WM_USER+227)
-#define WM_BUTTON28             (WM_USER+228)
-#define WM_BUTTON29             (WM_USER+229)
-#define WM_BUTTON30             (WM_USER+230)
-#define WM_BUTTON31             (WM_USER+231)
-#define WM_BUTTON32             (WM_USER+232)
-#define WM_BUTTON33             (WM_USER+233)
-#define WM_BUTTON34             (WM_USER+234)
-#define WM_BUTTON35             (WM_USER+235)
-#define WM_BUTTON36             (WM_USER+236)
-#define WM_BUTTON37             (WM_USER+237)
-#define WM_BUTTON38             (WM_USER+238)
-#define WM_BUTTON39             (WM_USER+239)
+#define EV_BUTTON0              (EV_OFFSET+200)
+#define EV_BUTTON1              (EV_OFFSET+201)
+#define EV_BUTTON2              (EV_OFFSET+202)
+#define EV_BUTTON3              (EV_OFFSET+203)
+#define EV_BUTTON4              (EV_OFFSET+204)
+#define EV_BUTTON5              (EV_OFFSET+205)
+#define EV_BUTTON6              (EV_OFFSET+206)
+#define EV_BUTTON7              (EV_OFFSET+207)
+#define EV_BUTTON8              (EV_OFFSET+208)
+#define EV_BUTTON9              (EV_OFFSET+209)
+#define EV_BUTTON10             (EV_OFFSET+210)
+#define EV_BUTTON11             (EV_OFFSET+211)
+#define EV_BUTTON12             (EV_OFFSET+212)
+#define EV_BUTTON13             (EV_OFFSET+213)
+#define EV_BUTTON14             (EV_OFFSET+214)
+#define EV_BUTTON15             (EV_OFFSET+215)
+#define EV_BUTTON16             (EV_OFFSET+216)
+#define EV_BUTTON17             (EV_OFFSET+217)
+#define EV_BUTTON18             (EV_OFFSET+218)
+#define EV_BUTTON19             (EV_OFFSET+219)
+#define EV_BUTTON20             (EV_OFFSET+220)
+#define EV_BUTTON21             (EV_OFFSET+221)
+#define EV_BUTTON22             (EV_OFFSET+222)
+#define EV_BUTTON23             (EV_OFFSET+223)
+#define EV_BUTTON24             (EV_OFFSET+224)
+#define EV_BUTTON25             (EV_OFFSET+225)
+#define EV_BUTTON26             (EV_OFFSET+226)
+#define EV_BUTTON27             (EV_OFFSET+227)
+#define EV_BUTTON28             (EV_OFFSET+228)
+#define EV_BUTTON29             (EV_OFFSET+229)
+#define EV_BUTTON30             (EV_OFFSET+230)
+#define EV_BUTTON31             (EV_OFFSET+231)
+#define EV_BUTTON32             (EV_OFFSET+232)
+#define EV_BUTTON33             (EV_OFFSET+233)
+#define EV_BUTTON34             (EV_OFFSET+234)
+#define EV_BUTTON35             (EV_OFFSET+235)
+#define EV_BUTTON36             (EV_OFFSET+236)
+#define EV_BUTTON37             (EV_OFFSET+237)
+#define EV_BUTTON38             (EV_OFFSET+238)
+#define EV_BUTTON39             (EV_OFFSET+239)
 
-#define WM_READ0                (WM_USER+300)
-#define WM_READ1                (WM_USER+301)
-#define WM_READ2                (WM_USER+302)
-#define WM_READ3                (WM_USER+303)
-#define WM_READ4                (WM_USER+304)
-#define WM_READ5                (WM_USER+305)
-#define WM_READ6                (WM_USER+306)
-#define WM_READ7                (WM_USER+307)
-#define WM_READ8                (WM_USER+308)
-#define WM_READ9                (WM_USER+309)
+#define EV_READ0                (EV_OFFSET+300)
+#define EV_READ1                (EV_OFFSET+301)
+#define EV_READ2                (EV_OFFSET+302)
+#define EV_READ3                (EV_OFFSET+303)
+#define EV_READ4                (EV_OFFSET+304)
+#define EV_READ5                (EV_OFFSET+305)
+#define EV_READ6                (EV_OFFSET+306)
+#define EV_READ7                (EV_OFFSET+307)
+#define EV_READ8                (EV_OFFSET+308)
+#define EV_READ9                (EV_OFFSET+309)
 
-#define WM_WRITE0               (WM_USER+310)
-#define WM_WRITE1               (WM_USER+311)
-#define WM_WRITE2               (WM_USER+312)
-#define WM_WRITE3               (WM_USER+313)
-#define WM_WRITE4               (WM_USER+314)
-#define WM_WRITE5               (WM_USER+315)
-#define WM_WRITE6               (WM_USER+316)
-#define WM_WRITE7               (WM_USER+317)
-#define WM_WRITE8               (WM_USER+318)
-#define WM_WRITE9               (WM_USER+319)
+#define EV_WRITE0               (EV_OFFSET+310)
+#define EV_WRITE1               (EV_OFFSET+311)
+#define EV_WRITE2               (EV_OFFSET+312)
+#define EV_WRITE3               (EV_OFFSET+313)
+#define EV_WRITE4               (EV_OFFSET+314)
+#define EV_WRITE5               (EV_OFFSET+315)
+#define EV_WRITE6               (EV_OFFSET+316)
+#define EV_WRITE7               (EV_OFFSET+317)
+#define EV_WRITE8               (EV_OFFSET+318)
+#define EV_WRITE9               (EV_OFFSET+319)
 
-#define WM_PHASE_INIT           (WM_USER+500)
-#define WM_PHASE_PLAY           (WM_USER+501)
-#define WM_PHASE_BUILD          (WM_USER+502)
-#define WM_PHASE_READ           (WM_USER+503)
-#define WM_PHASE_WRITE          (WM_USER+504)
-#define WM_PHASE_INFO           (WM_USER+505)
-#define WM_PHASE_BUTTON         (WM_USER+506)
-#define WM_PHASE_TERM           (WM_USER+507)
-#define WM_PHASE_WIN            (WM_USER+508)
-#define WM_PHASE_LOST           (WM_USER+509)
-#define WM_PHASE_STOP           (WM_USER+510)
-#define WM_PHASE_SETUP          (WM_USER+511)
-#define WM_PHASE_MUSIC          (WM_USER+512)
-#define WM_PHASE_PLAYMOVIE      (WM_USER+513)
-#define WM_PHASE_WINMOVIE       (WM_USER+514)
-#define WM_PHASE_SCHOOL         (WM_USER+515)
-#define WM_PHASE_MISSION        (WM_USER+516)
-#define WM_PHASE_LASTWIN        (WM_USER+517)
-#define WM_PHASE_WRITEp         (WM_USER+518)
-#define WM_PHASE_SETUPp         (WM_USER+519)
-#define WM_PHASE_REGION         (WM_USER+520)
-#define WM_PHASE_INSERT         (WM_USER+521)
-#define WM_PHASE_HISTORY0       (WM_USER+522)
-#define WM_PHASE_HISTORY1       (WM_USER+523)
-#define WM_PHASE_HELP           (WM_USER+524)
-#define WM_PHASE_H0MOVIE        (WM_USER+525)
-#define WM_PHASE_H1MOVIE        (WM_USER+526)
-#define WM_PHASE_H2MOVIE        (WM_USER+527)
-#define WM_PHASE_TESTCD         (WM_USER+528)
-#define WM_PHASE_MANUEL         (WM_USER+529)
-#define WM_PHASE_PRIVATE        (WM_USER+530)
-#define WM_PHASE_UNDO           (WM_USER+531)
-#define WM_PHASE_BYE            (WM_USER+532)
-#define WM_PHASE_SKILL1         (WM_USER+533)
-#define WM_PHASE_SKILL2         (WM_USER+534)
-#define WM_PHASE_DEMO           (WM_USER+535)
-#define WM_PHASE_INTRO1         (WM_USER+536)
-#define WM_PHASE_SETTINGS       (WM_USER+537)
+#define EV_PHASE_INIT           (EV_OFFSET+500)
+#define EV_PHASE_PLAY           (EV_OFFSET+501)
+#define EV_PHASE_BUILD          (EV_OFFSET+502)
+#define EV_PHASE_READ           (EV_OFFSET+503)
+#define EV_PHASE_WRITE          (EV_OFFSET+504)
+#define EV_PHASE_INFO           (EV_OFFSET+505)
+#define EV_PHASE_BUTTON         (EV_OFFSET+506)
+#define EV_PHASE_TERM           (EV_OFFSET+507)
+#define EV_PHASE_WIN            (EV_OFFSET+508)
+#define EV_PHASE_LOST           (EV_OFFSET+509)
+#define EV_PHASE_STOP           (EV_OFFSET+510)
+#define EV_PHASE_SETUP          (EV_OFFSET+511)
+#define EV_PHASE_MUSIC          (EV_OFFSET+512)
+#define EV_PHASE_PLAYMOVIE      (EV_OFFSET+513)
+#define EV_PHASE_WINMOVIE       (EV_OFFSET+514)
+#define EV_PHASE_SCHOOL         (EV_OFFSET+515)
+#define EV_PHASE_MISSION        (EV_OFFSET+516)
+#define EV_PHASE_LASTWIN        (EV_OFFSET+517)
+#define EV_PHASE_WRITEp         (EV_OFFSET+518)
+#define EV_PHASE_SETUPp         (EV_OFFSET+519)
+#define EV_PHASE_REGION         (EV_OFFSET+520)
+#define EV_PHASE_INSERT         (EV_OFFSET+521)
+#define EV_PHASE_HISTORY0       (EV_OFFSET+522)
+#define EV_PHASE_HISTORY1       (EV_OFFSET+523)
+#define EV_PHASE_HELP           (EV_OFFSET+524)
+#define EV_PHASE_H0MOVIE        (EV_OFFSET+525)
+#define EV_PHASE_H1MOVIE        (EV_OFFSET+526)
+#define EV_PHASE_H2MOVIE        (EV_OFFSET+527)
+#define EV_PHASE_TESTCD         (EV_OFFSET+528)
+#define EV_PHASE_MANUEL         (EV_OFFSET+529)
+#define EV_PHASE_PRIVATE        (EV_OFFSET+530)
+#define EV_PHASE_UNDO           (EV_OFFSET+531)
+#define EV_PHASE_BYE            (EV_OFFSET+532)
+#define EV_PHASE_SKILL1         (EV_OFFSET+533)
+#define EV_PHASE_SKILL2         (EV_OFFSET+534)
+#define EV_PHASE_DEMO           (EV_OFFSET+535)
+#define EV_PHASE_INTRO1         (EV_OFFSET+536)
+#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 WM_NEXT                 (WM_USER+601)
-#define WM_MOVIE                (WM_USER+602)
-#define WM_MOVIE_PLAY           (WM_USER+603)
+#define EV_PREV                 (EV_OFFSET+600)
+#define EV_NEXT                 (EV_OFFSET+601)
+#define EV_MOVIE                (EV_OFFSET+602)
+#define EV_MOVIE_PLAY           (EV_OFFSET+603)
 // clang-format on
 
 // Conditions pour gagner.
diff --git a/src/event.cxx b/src/event.cxx
index 0d6eb1d..11fabf5 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -89,7 +89,7 @@ static char cheat_code[9][20] = {
 static Phase table[] =
 {
     {
-        WM_PHASE_TESTCD,
+        EV_PHASE_TESTCD,
         "image/init.png",
         false,
         {
@@ -100,7 +100,7 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_INTRO1,
+        EV_PHASE_INTRO1,
         "image/intro1.png",
         false,
         {
@@ -111,42 +111,42 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_INIT,
+        EV_PHASE_INIT,
         "image/init.png",
         false,
         {
             {
-                WM_PHASE_DEMO,
+                EV_PHASE_DEMO,
                 0, {1, 108},
                 16, 424 - 60 - 42 * 4 - 18,
                 { translate ("Demo") },
             },
             {
-                WM_PHASE_SCHOOL,
+                EV_PHASE_SCHOOL,
                 0, {1, 79},
                 16, 424 - 60 - 42 * 3,
                 { translate ("Training") },
             },
             {
-                WM_PHASE_MISSION,
+                EV_PHASE_MISSION,
                 0, {1, 80},
                 16, 424 - 60 - 42 * 2,
                 { translate ("Missions") },
             },
             {
-                WM_PHASE_PRIVATE,
+                EV_PHASE_PRIVATE,
                 0, {1, 49},
                 16, 424 - 60 - 42 * 1,
                 { translate ("Construction") },
             },
             {
-                WM_PHASE_SETTINGS,
+                EV_PHASE_SETTINGS,
                 0, {1, 47},
                 16, 424 - 60 - 42 * 0,
                 { translate ("Global settings") }
             },
             {
-                WM_PHASE_BYE,
+                EV_PHASE_BYE,
                 0, {1, 36},
                 16, 424,
                 { translate ("Quit Planet Blupi") },
@@ -158,18 +158,18 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_HISTORY0,
+        EV_PHASE_HISTORY0,
         "image/history0.png",
         true,
         {
             {
-                WM_PHASE_INIT,
+                EV_PHASE_INIT,
                 0, {1, 50},
                 42 + 42 * 0, 433,
                 { translate ("Previous page") },
             },
             {
-                WM_PHASE_H1MOVIE,
+                EV_PHASE_H1MOVIE,
                 0, {1, 51},
                 558 - 42 * 0, 433,
                 { translate ("Next page") },
@@ -181,18 +181,18 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_HISTORY1,
+        EV_PHASE_HISTORY1,
         "image/history1.png",
         true,
         {
             {
-                WM_PHASE_HISTORY0,
+                EV_PHASE_HISTORY0,
                 0, {1, 50},
                 42 + 42 * 0, 433,
                 { translate ("Previous page") },
             },
             {
-                WM_PHASE_H2MOVIE,
+                EV_PHASE_H2MOVIE,
                 0, {1, 51},
                 558 - 42 * 0, 433,
                 { translate ("Next page") },
@@ -204,60 +204,60 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_INFO,
+        EV_PHASE_INFO,
         "image/info%.3d.png",
         false,
         {
             {
-                WM_PREV,
+                EV_PREV,
                 0, {1, 50},
                 558 - 42 * 2, 433,
                 { translate ("Previous game") },
             },
             {
-                WM_PHASE_PLAYMOVIE,
+                EV_PHASE_PLAYMOVIE,
                 0, {1, 48},
                 558 - 42 * 1, 433,
                 { translate ("Play this game") },
             },
             {
-                WM_NEXT,
+                EV_NEXT,
                 0, {1, 51},
                 558 - 42 * 0, 433,
                 { translate ("Next game") },
             },
             {
-                WM_PHASE_READ,
+                EV_PHASE_READ,
                 0, {1, 52},
                 42 + 42 * 4, 433,
                 { translate ("Open another game") },
             },
             {
-                WM_PHASE_SETUP,
+                EV_PHASE_SETUP,
                 0, {1, 47},
                 42 + 42 * 7, 433,
                 { translate ("Settings") },
             },
             {
-                WM_PHASE_BUILD,
+                EV_PHASE_BUILD,
                 0, {1, 49},
                 42 + 42 * 8, 433,
                 { translate ("Construct this game") },
             },
             {
-                WM_PHASE_SKILL1,
+                EV_PHASE_SKILL1,
                 0, {1, 94},
                 150, 230,
                 { translate ("Skill level") },
             },
             {
-                WM_PHASE_SKILL2,
+                EV_PHASE_SKILL2,
                 0, {1, 95},
                 150, 230 + 42,
                 { translate ("Skill level") },
             },
             {
-                WM_PHASE_INIT,
+                EV_PHASE_INIT,
                 0, {1, 40},
                 42 + 42 * 0, 433,
                 { translate ("Finish") },
@@ -269,24 +269,24 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_PLAY,
+        EV_PHASE_PLAY,
         "image/play.png",
         false,
         {
             {
-                WM_PHASE_STOP,
+                EV_PHASE_STOP,
                 0, {1, 40},
                 10 + 42 * 0, 422,
                 {},
             },
             {
-                WM_PHASE_SETUPp,
+                EV_PHASE_SETUPp,
                 0, {1, 47},
                 10 + 42 * 1, 422,
                 {},
             },
             {
-                WM_PHASE_WRITEp,
+                EV_PHASE_WRITEp,
                 0, {1, 53},
                 10 + 42 * 2, 422,
                 {},
@@ -298,42 +298,42 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_STOP,
+        EV_PHASE_STOP,
         "image/stop%.3d.png",
         false,
         {
             {
-                WM_PHASE_PLAY,
+                EV_PHASE_PLAY,
                 0, {1, 77},
                 558 - 42 * 1, 433,
                 { translate ("Continue this game") },
             },
             {
-                WM_PHASE_READ,
+                EV_PHASE_READ,
                 0, {1, 52},
                 42 + 42 * 4, 433,
                 { translate ("Open another game") },
             },
             {
-                WM_PHASE_WRITE,
+                EV_PHASE_WRITE,
                 0, {1, 53},
                 42 + 42 * 5, 433,
                 { translate ("Save this game") },
             },
             {
-                WM_PHASE_SETUP,
+                EV_PHASE_SETUP,
                 0, {1, 47},
                 42 + 42 * 7, 433,
                 { translate ("Settings") },
             },
             {
-                WM_PHASE_INFO,
+                EV_PHASE_INFO,
                 0, {1, 78},
                 42 + 42 * 0, 433,
                 { translate ("Quit this game") },
             },
             {
-                WM_PHASE_HELP,
+                EV_PHASE_HELP,
                 0, {1, 86},
                 42 + 42 * 9, 433,
                 { translate ("Help") },
@@ -345,36 +345,36 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_HELP,
+        EV_PHASE_HELP,
         "image/help.png",
         true,
         {
             {
-                WM_PHASE_PLAY,
+                EV_PHASE_PLAY,
                 0, {1, 77},
                 558 - 42 * 1, 433,
                 { translate ("Continue this game") },
             },
             {
-                WM_PHASE_READ,
+                EV_PHASE_READ,
                 0, {1, 52},
                 42 + 42 * 4, 433,
                 { translate ("Open another game") },
             },
             {
-                WM_PHASE_WRITE,
+                EV_PHASE_WRITE,
                 0, {1, 53},
                 42 + 42 * 5, 433,
                 { translate ("Save this game") },
             },
             {
-                WM_PHASE_SETUP,
+                EV_PHASE_SETUP,
                 0, {1, 47},
                 42 + 42 * 7, 433,
                 { translate ("Settings") },
             },
             {
-                WM_PHASE_STOP,
+                EV_PHASE_STOP,
                 0, {1, 50},
                 42 + 42 * 0, 433,
                 { translate ("Previous page") },
@@ -386,72 +386,72 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_SETUP,
+        EV_PHASE_SETUP,
         "image/setup01.png",
         false,
         {
             {
-                WM_BUTTON1,
+                EV_BUTTON1,
                 0, {1, 50},
                 54, 330,
                 { translate ("Slower") },
             },
             {
-                WM_BUTTON2,
+                EV_BUTTON2,
                 0, {1, 51},
                 54 + 40, 330,
                 { translate ("Faster") },
             },
             {
-                WM_BUTTON3,
+                EV_BUTTON3,
                 0, {1, 50},
                 284, 330,
                 { translate ("Reduce volume") },
             },
             {
-                WM_BUTTON4,
+                EV_BUTTON4,
                 0, {1, 51},
                 284 + 40, 330,
                 { translate ("Increase volume") },
             },
             {
-                WM_BUTTON5,
+                EV_BUTTON5,
                 0, {1, 50},
                 399, 330,
                 { translate ("Reduce volume") },
             },
             {
-                WM_BUTTON6,
+                EV_BUTTON6,
                 0, {1, 51},
                 399 + 40, 330,
                 { translate ("Increase volume") },
             },
             {
-                WM_BUTTON7,
+                EV_BUTTON7,
                 0, {1, 50},
                 514, 330,
                 { translate ("No video") },
             },
             {
-                WM_BUTTON8,
+                EV_BUTTON8,
                 0, {1, 51},
                 514 + 40, 330,
                 { translate ("Show videos") },
             },
             {
-                WM_BUTTON9,
+                EV_BUTTON9,
                 0, {1, 50},
                 169, 330,
                 { translate ("Slower") },
             },
             {
-                WM_BUTTON10,
+                EV_BUTTON10,
                 0, {1, 51},
                 169 + 40, 330,
                 { translate ("Faster") },
             },
             {
-                WM_PHASE_STOP,
+                EV_PHASE_STOP,
                 0, {1, 40},
                 11, 424,
                 { translate ("Finish") },
@@ -463,72 +463,72 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_SETUPp,
+        EV_PHASE_SETUPp,
         "image/setup01.png",
         false,
         {
             {
-                WM_BUTTON1,
+                EV_BUTTON1,
                 0, {1, 50},
                 54, 330,
                 { translate ("Slower") },
             },
             {
-                WM_BUTTON2,
+                EV_BUTTON2,
                 0, {1, 51},
                 54 + 40, 330,
                 { translate ("Faster") },
             },
             {
-                WM_BUTTON3,
+                EV_BUTTON3,
                 0, {1, 50},
                 284, 330,
                 { translate ("Reduce volume") },
             },
             {
-                WM_BUTTON4,
+                EV_BUTTON4,
                 0, {1, 51},
                 284 + 40, 330,
                 { translate ("Increase volume") },
             },
             {
-                WM_BUTTON5,
+                EV_BUTTON5,
                 0, {1, 50},
                 399, 330,
                 { translate ("Reduce volume") },
             },
             {
-                WM_BUTTON6,
+                EV_BUTTON6,
                 0, {1, 51},
                 399 + 40, 330,
                 { translate ("Increase volume") },
             },
             {
-                WM_BUTTON7,
+                EV_BUTTON7,
                 0, {1, 50},
                 514, 330,
                 { translate ("No video") },
             },
             {
-                WM_BUTTON8,
+                EV_BUTTON8,
                 0, {1, 51},
                 514 + 40, 330,
                 { translate ("Show videos") },
             },
             {
-                WM_BUTTON9,
+                EV_BUTTON9,
                 0, {1, 50},
                 169, 330,
                 { translate ("Slower") },
             },
             {
-                WM_BUTTON10,
+                EV_BUTTON10,
                 0, {1, 51},
                 169 + 40, 330,
                 { translate ("Faster") },
             },
             {
-                WM_PHASE_PLAY,
+                EV_PHASE_PLAY,
                 0, {1, 77},
                 11, 424,
                 { translate ("Continue this game") },
@@ -540,72 +540,72 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_READ,
+        EV_PHASE_READ,
         "image/read.png",
         false,
         {
             {
-                WM_READ0,
+                EV_READ0,
                 0, {0},
                 420, 30 + 42 * 0,
                 {},
             },
             {
-                WM_READ1,
+                EV_READ1,
                 0, {0},
                 420, 30 + 42 * 1,
                 {},
             },
             {
-                WM_READ2,
+                EV_READ2,
                 0, {0},
                 420, 30 + 42 * 2,
                 {},
             },
             {
-                WM_READ3,
+                EV_READ3,
                 0, {0},
                 420, 30 + 42 * 3,
                 {},
             },
             {
-                WM_READ4,
+                EV_READ4,
                 0, {0},
                 420, 30 + 42 * 4,
                 {},
             },
             {
-                WM_READ5,
+                EV_READ5,
                 0, {0},
                 420, 30 + 42 * 5,
                 {},
             },
             {
-                WM_READ6,
+                EV_READ6,
                 0, {0},
                 420, 30 + 42 * 6,
                 {},
             },
             {
-                WM_READ7,
+                EV_READ7,
                 0, {0},
                 420, 30 + 42 * 7,
                 {},
             },
             {
-                WM_READ8,
+                EV_READ8,
                 0, {0},
                 420, 30 + 42 * 8,
                 {},
             },
             {
-                WM_READ9,
+                EV_READ9,
                 0, {0},
                 420, 30 + 42 * 9,
                 {},
             },
             {
-                WM_PHASE_STOP,
+                EV_PHASE_STOP,
                 0, {1, 40},
                 16, 424,
                 { translate ("Finish") },
@@ -617,72 +617,72 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_WRITE,
+        EV_PHASE_WRITE,
         "image/write.png",
         false,
         {
             {
-                WM_WRITE0,
+                EV_WRITE0,
                 0, {0},
                 420, 30 + 42 * 0,
                 {},
             },
             {
-                WM_WRITE1,
+                EV_WRITE1,
                 0, {0},
                 420, 30 + 42 * 1,
                 {},
             },
             {
-                WM_WRITE2,
+                EV_WRITE2,
                 0, {0},
                 420, 30 + 42 * 2,
                 {},
             },
             {
-                WM_WRITE3,
+                EV_WRITE3,
                 0, {0},
                 420, 30 + 42 * 3,
                 {},
             },
             {
-                WM_WRITE4,
+                EV_WRITE4,
                 0, {0},
                 420, 30 + 42 * 4,
                 {},
             },
             {
-                WM_WRITE5,
+                EV_WRITE5,
                 0, {0},
                 420, 30 + 42 * 5,
                 {},
             },
             {
-                WM_WRITE6,
+                EV_WRITE6,
                 0, {0},
                 420, 30 + 42 * 6,
                 {},
             },
             {
-                WM_WRITE7,
+                EV_WRITE7,
                 0, {0},
                 420, 30 + 42 * 7,
                 {},
             },
             {
-                WM_WRITE8,
+                EV_WRITE8,
                 0, {0},
                 420, 30 + 42 * 8,
                 {},
             },
             {
-                WM_WRITE9,
+                EV_WRITE9,
                 0, {0},
                 420, 30 + 42 * 9,
                 {},
             },
             {
-                WM_PHASE_STOP,
+                EV_PHASE_STOP,
                 0, {1, 40},
                 16, 424,
                 { translate ("Finish") },
@@ -694,72 +694,72 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_WRITEp,
+        EV_PHASE_WRITEp,
         "image/write.png",
         false,
         {
             {
-                WM_WRITE0,
+                EV_WRITE0,
                 0, {0},
                 420, 30 + 42 * 0,
                 {},
             },
             {
-                WM_WRITE1,
+                EV_WRITE1,
                 0, {0},
                 420, 30 + 42 * 1,
                 {},
             },
             {
-                WM_WRITE2,
+                EV_WRITE2,
                 0, {0},
                 420, 30 + 42 * 2,
                 {},
             },
             {
-                WM_WRITE3,
+                EV_WRITE3,
                 0, {0},
                 420, 30 + 42 * 3,
                 {},
             },
             {
-                WM_WRITE4,
+                EV_WRITE4,
                 0, {0},
                 420, 30 + 42 * 4,
                 {},
             },
             {
-                WM_WRITE5,
+                EV_WRITE5,
                 0, {0},
                 420, 30 + 42 * 5,
                 {},
             },
             {
-                WM_WRITE6,
+                EV_WRITE6,
                 0, {0},
                 420, 30 + 42 * 6,
                 {},
             },
             {
-                WM_WRITE7,
+                EV_WRITE7,
                 0, {0},
                 420, 30 + 42 * 7,
                 {},
             },
             {
-                WM_WRITE8,
+                EV_WRITE8,
                 0, {0},
                 420, 30 + 42 * 8,
                 {},
             },
             {
-                WM_WRITE9,
+                EV_WRITE9,
                 0, {0},
                 420, 30 + 42 * 9,
                 {},
             },
             {
-                WM_PHASE_PLAY,
+                EV_PHASE_PLAY,
                 0, {1, 77},
                 16, 424,
                 { translate ("Continue this game") },
@@ -771,12 +771,12 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_LOST,
+        EV_PHASE_LOST,
         "image/lost.png",
         true,
         {
             {
-                WM_PHASE_INFO,
+                EV_PHASE_INFO,
                 0, {1, 50},
                 9, 431,
                 { translate ("Restart this game") },
@@ -788,12 +788,12 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_WIN,
+        EV_PHASE_WIN,
         "image/win.png",
         true,
         {
             {
-                WM_NEXT,
+                EV_NEXT,
                 0, {1, 51},
                 9, 431,
                 { translate ("Next game") },
@@ -805,12 +805,12 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_LASTWIN,
+        EV_PHASE_LASTWIN,
         "image/last%.3d.png",
         true,
         {
             {
-                WM_PHASE_INIT,
+                EV_PHASE_INIT,
                 0, {1, 51},
                 9, 431,
                 { translate ("Next game") },
@@ -822,12 +822,12 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_BUILD,
+        EV_PHASE_BUILD,
         "image/build.png",
         true,
         {
             {
-                WM_DECOR1,      // pose des sols
+                EV_DECOR1,      // pose des sols
                 0, {6, 0, 1, 2, 3, 4, 25},
                 11 + 42 * 2, 190 + 42 * 0,
                 {
@@ -840,7 +840,7 @@ static Phase table[] =
                 },
             },
             {
-                WM_DECOR2,      // pose des plantes
+                EV_DECOR2,      // pose des plantes
                 0, {4, 6, 7, 8, 11},
                 11 + 42 * 2, 190 + 42 * 1,
                 {
@@ -851,7 +851,7 @@ static Phase table[] =
                 },
             },
             {
-                WM_DECOR3,      // pose des batiments
+                EV_DECOR3,      // pose des batiments
                 0, {11, 18, 81, 33, 61, 82, 93, 20, 21, 22, 57, 58},
                 11 + 42 * 2, 190 + 42 * 2,
                 {
@@ -869,7 +869,7 @@ static Phase table[] =
                 },
             },
             {
-                WM_DECOR4,      // pose des blupi
+                EV_DECOR4,      // pose des blupi
                 0, {10, 12, 13, 14, 85, 15, 16, 17, 38, 75, 56},
                 11 + 42 * 2, 190 + 42 * 3,
                 {
@@ -886,7 +886,7 @@ static Phase table[] =
                 },
             },
             {
-                WM_DECOR5,      // pose les catastrophes
+                EV_DECOR5,      // pose les catastrophes
                 0, {2, 36, 37},
                 11 + 42 * 2, 190 + 42 * 4,
                 {
@@ -895,37 +895,37 @@ static Phase table[] =
                 },
             },
             {
-                WM_PHASE_REGION,
+                EV_PHASE_REGION,
                 0, {1, 5},
                 11 + 42 * 0, 190 + 42 * 1,
                 { translate ("Scenery choice") },
             },
             {
-                WM_PHASE_MUSIC,
+                EV_PHASE_MUSIC,
                 0, {1, 44},
                 11 + 42 * 0, 190 + 42 * 2,
                 { translate ("Music choice") },
             },
             {
-                WM_PHASE_BUTTON,
+                EV_PHASE_BUTTON,
                 0, {1, 46},
                 11 + 42 * 0, 190 + 42 * 3,
                 { translate ("Available buttons") },
             },
             {
-                WM_PHASE_TERM,
+                EV_PHASE_TERM,
                 0, {1, 45},
                 11 + 42 * 0, 190 + 42 * 4,
                 { translate ("Ending conditions") },
             },
             {
-                WM_PHASE_INFO,
+                EV_PHASE_INFO,
                 0, {1, 40},
                 11 + 42 * 0, 424,
                 { translate ("Quit construction") },
             },
             {
-                WM_PHASE_UNDO,
+                EV_PHASE_UNDO,
                 0, {1, 87},
                 11 + 42 * 2, 424,
                 { translate ("Cancel last operation") },
@@ -937,215 +937,215 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_BUTTON,
+        EV_PHASE_BUTTON,
         "image/button.png",
         true,
         {
             {
-                WM_BUTTON1,     // stop
+                EV_BUTTON1,     // stop
                 0, {1, 40},
                 170 + 42 * 0, 30 + 52 * 0,
                 { translate ("Stop") },
             },
             {
-                WM_BUTTON0,     // go
+                EV_BUTTON0,     // go
                 0, {1, 24},
                 170 + 42 * 1, 30 + 52 * 0,
                 { translate ("Go") },
             },
             {
-                WM_BUTTON3,     // carry
+                EV_BUTTON3,     // carry
                 0, {1, 30},
                 170 + 42 * 3, 30 + 52 * 0,
                 { translate ("Take") },
             },
             {
-                WM_BUTTON4,     // depose
+                EV_BUTTON4,     // depose
                 0, {1, 31},
                 170 + 42 * 4, 30 + 52 * 0,
                 { translate ("Drop") },
             },
             {
-                WM_BUTTON32,    // répète
+                EV_BUTTON32,    // répète
                 0, {1, 100},
                 170 + 42 * 6, 30 + 52 * 0,
                 { translate ("Repeat") },
             },
 
             {
-                WM_BUTTON5,     // abat
+                EV_BUTTON5,     // abat
                 0, {1, 22},
                 170 + 42 * 0, 30 + 52 * 1,
                 { translate ("Cut down a tree") },
             },
             {
-                WM_BUTTON16,    // abat n
+                EV_BUTTON16,    // abat n
                 0, {1, 42},
                 170 + 42 * 1, 30 + 52 * 1,
                 { translate ("Cut down trees") },
             },
             {
-                WM_BUTTON6,     // roc
+                EV_BUTTON6,     // roc
                 0, {1, 27},
                 170 + 42 * 3, 30 + 52 * 1,
                 { translate ("Carve a rock") },
             },
             {
-                WM_BUTTON17,    // roc n
+                EV_BUTTON17,    // roc n
                 0, {1, 43},
                 170 + 42 * 4, 30 + 52 * 1,
                 { translate ("Carve rocks") },
             },
             {
-                WM_BUTTON22,    // fleurs
+                EV_BUTTON22,    // fleurs
                 0, {1, 54},
                 170 + 42 * 6, 30 + 52 * 1,
                 { translate ("Make bunch of flowers") },
             },
             {
-                WM_BUTTON23,    // fleurs n
+                EV_BUTTON23,    // fleurs n
                 0, {1, 55},
                 170 + 42 * 7, 30 + 52 * 1,
                 { translate ("Make bunches of flowers") },
             },
 
             {
-                WM_BUTTON9,     // build2 (couveuse)
+                EV_BUTTON9,     // build2 (couveuse)
                 0, {1, 25},
                 170 + 42 * 0, 30 + 52 * 2,
                 { translate ("Incubator") },
             },
             {
-                WM_BUTTON15,    // palis
+                EV_BUTTON15,    // palis
                 0, {1, 26},
                 170 + 42 * 1, 30 + 52 * 2,
                 { translate ("Palisade") },
             },
             {
-                WM_BUTTON18,    // pont
+                EV_BUTTON18,    // pont
                 0, {1, 23},
                 170 + 42 * 2, 30 + 52 * 2,
                 { translate ("Bridge") },
             },
             {
-                WM_BUTTON25,    // bateau
+                EV_BUTTON25,    // bateau
                 0, {1, 58},
                 170 + 42 * 3, 30 + 52 * 2,
                 { translate ("Boat") },
             },
             {
-                WM_BUTTON13,    // build6 (téléporteur)
+                EV_BUTTON13,    // build6 (téléporteur)
                 0, {1, 101},
                 170 + 42 * 4, 30 + 52 * 2,
                 { translate ("Teleporter") },
             },
             {
-                WM_BUTTON14,    // mur
+                EV_BUTTON14,    // mur
                 0, {1, 20},
                 170 + 42 * 6, 30 + 52 * 2,
                 { translate ("Wall") },
             },
             {
-                WM_BUTTON19,    // tour
+                EV_BUTTON19,    // tour
                 0, {1, 33},
                 170 + 42 * 7, 30 + 52 * 2,
                 { translate ("Protection tower") },
             },
 
             {
-                WM_BUTTON8,     // build1 (cabane)
+                EV_BUTTON8,     // build1 (cabane)
                 0, {1, 19},
                 170 + 42 * 0, 30 + 52 * 3,
                 { translate ("Garden shed") },
             },
             {
-                WM_BUTTON7,     // cultive
+                EV_BUTTON7,     // cultive
                 0, {1, 28},
                 170 + 42 * 1, 30 + 52 * 3,
                 { translate ("Grow tomatoes") },
             },
             {
-                WM_BUTTON2,     // mange
+                EV_BUTTON2,     // mange
                 0, {1, 32},
                 170 + 42 * 2, 30 + 52 * 3,
                 { translate ("Eat") },
             },
 
             {
-                WM_BUTTON10,    // build3 (laboratoire)
+                EV_BUTTON10,    // build3 (laboratoire)
                 0, {1, 35},
                 170 + 42 * 0, 30 + 52 * 4,
                 { translate ("Laboratory") },
             },
             {
-                WM_BUTTON21,    // laboratoire
+                EV_BUTTON21,    // laboratoire
                 0, {1, 39},
                 170 + 42 * 1, 30 + 52 * 4,
                 { translate ("Transform") },
             },
             {
-                WM_BUTTON20,    // boit
+                EV_BUTTON20,    // boit
                 0, {1, 34},
                 170 + 42 * 2, 30 + 52 * 4,
                 { translate ("Drink") },
             },
             {
-                WM_BUTTON24,    // dynamite
+                EV_BUTTON24,    // dynamite
                 0, {1, 41},
                 170 + 42 * 3, 30 + 52 * 4,
                 { translate ("Blow up") },
             },
 
             {
-                WM_BUTTON27,    // drapeau
+                EV_BUTTON27,    // drapeau
                 0, {1, 64},
                 170 + 42 * 0, 30 + 52 * 5,
                 { translate ("Prospect for iron") },
             },
             {
-                WM_BUTTON11,    // build4 (mine)
+                EV_BUTTON11,    // build4 (mine)
                 0, {1, 61},
                 170 + 42 * 1, 30 + 52 * 5,
                 { translate ("Mine") },
             },
             {
-                WM_BUTTON28,    // extrait
+                EV_BUTTON28,    // extrait
                 0, {1, 62},
                 170 + 42 * 2, 30 + 52 * 5,
                 { translate ("Extract iron") },
             },
             {
-                WM_BUTTON12,    // build5 (usine)
+                EV_BUTTON12,    // build5 (usine)
                 0, {1, 59},
                 170 + 42 * 4, 30 + 52 * 5,
                 { translate ("Workshop") },
             },
             {
-                WM_BUTTON29,    // fabrique jeep
+                EV_BUTTON29,    // fabrique jeep
                 0, {1, 65},
                 170 + 42 * 5, 30 + 52 * 5,
                 { translate ("Make a Jeep") },
             },
             {
-                WM_BUTTON30,    // fabrique mine
+                EV_BUTTON30,    // fabrique mine
                 0, {1, 63},
                 170 + 42 * 6, 30 + 52 * 5,
                 { translate ("Make a time bomb") },
             },
             {
-                WM_BUTTON34,    // fabrique armure
+                EV_BUTTON34,    // fabrique armure
                 0, {1, 106},
                 170 + 42 * 7, 30 + 52 * 5,
                 { translate ("Make armour") },
             },
             {
-                WM_BUTTON31,    // fabrique disciple
+                EV_BUTTON31,    // fabrique disciple
                 0, {1, 83},
                 170 + 42 * 8, 30 + 52 * 5,
                 { translate ("Make a helper robot") },
             },
             {
-                WM_PHASE_BUILD,
+                EV_PHASE_BUILD,
                 0, {1, 50},
                 11, 424,
                 { translate ("Finish") },
@@ -1157,84 +1157,84 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_TERM,
+        EV_PHASE_TERM,
         "image/term.png",
         true,
         {
             {
-                WM_BUTTON8,     // home blupi
+                EV_BUTTON8,     // home blupi
                 0, {1, 81},
                 170 + 42 * 0, 30 + 42 * 0,
                 { translate ("Blupi in house") },
             },
             {
-                WM_BUTTON9,     // kill robots
+                EV_BUTTON9,     // kill robots
                 0, {1, 57},
                 170 + 42 * 1, 30 + 42 * 0,
                 { translate ("No more enemies") },
             },
             {
-                WM_BUTTON3,     // stop fire
+                EV_BUTTON3,     // stop fire
                 0, {1, 37},
                 170 + 42 * 2, 30 + 42 * 0,
                 { translate ("Fire out") },
             },
             {
-                WM_BUTTON1,     // hach blupi
+                EV_BUTTON1,     // hach blupi
                 0, {1, 14},
                 170 + 42 * 0, 30 + 42 * 2,
                 { translate ("Blupi on striped paving stones") },
             },
             {
-                WM_BUTTON2,     // hach planche
+                EV_BUTTON2,     // hach planche
                 0, {1, 22},
                 170 + 42 * 1, 30 + 42 * 2,
                 { translate ("Planks on striped paving stones") },
             },
             {
-                WM_BUTTON10,    // hach tomate
+                EV_BUTTON10,    // hach tomate
                 0, {1, 28},
                 170 + 42 * 2, 30 + 42 * 2,
                 { translate ("Tomatoes on striped paving stones") },
             },
             {
-                WM_BUTTON11,    // hach métal
+                EV_BUTTON11,    // hach métal
                 0, {1, 84},
                 170 + 42 * 3, 30 + 42 * 2,
                 { translate ("Platinium on striped paving stones") },
             },
             {
-                WM_BUTTON12,    // hach robot
+                EV_BUTTON12,    // hach robot
                 0, {1, 94},
                 170 + 42 * 4, 30 + 42 * 2,
                 { translate ("Robot on striped paving stones") },
             },
             {
-                WM_BUTTON4,     // - min blupi
+                EV_BUTTON4,     // - min blupi
                 0, {1, 50},
                 170 + 42 * 0, 30 + 42 * 4,
                 { "(-)" },
             },
             {
-                WM_BUTTON5,     // + min blupi
+                EV_BUTTON5,     // + min blupi
                 0, {1, 51},
                 170 + 42 * 1, 30 + 42 * 4,
                 { "(+)" },
             },
             {
-                WM_BUTTON6,     // - max blupi
+                EV_BUTTON6,     // - max blupi
                 0, {1, 50},
                 170 + 42 * 0, 30 + 42 * 5,
                 { "(-)" },
             },
             {
-                WM_BUTTON7,     // + max blupi
+                EV_BUTTON7,     // + max blupi
                 0, {1, 51},
                 170 + 42 * 1, 30 + 42 * 5,
                 { "(+)" },
             },
             {
-                WM_PHASE_BUILD,
+                EV_PHASE_BUILD,
                 0, {1, 50},
                 11, 424,
                 { translate ("Finish") },
@@ -1246,72 +1246,72 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_MUSIC,
+        EV_PHASE_MUSIC,
         "image/music.png",
         true,
         {
             {
-                WM_BUTTON1,
+                EV_BUTTON1,
                 0, {1, 40},
                 170 + 42 * 0, 30 + 42 * 0,
                 { translate ("No music") },
             },
             {
-                WM_BUTTON2,
+                EV_BUTTON2,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 1,
                 { translate ("Music number 1") },
             },
             {
-                WM_BUTTON3,
+                EV_BUTTON3,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 2,
                 { translate ("Music number 2") },
             },
             {
-                WM_BUTTON4,
+                EV_BUTTON4,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 3,
                 { translate ("Music number 3") },
             },
             {
-                WM_BUTTON5,
+                EV_BUTTON5,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 4,
                 { translate ("Music number 4") },
             },
             {
-                WM_BUTTON6,
+                EV_BUTTON6,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 5,
                 { translate ("Music number 5") },
             },
             {
-                WM_BUTTON7,
+                EV_BUTTON7,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 6,
                 { translate ("Music number 6") },
             },
             {
-                WM_BUTTON8,
+                EV_BUTTON8,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 7,
                 { translate ("Music number 7") },
             },
             {
-                WM_BUTTON9,
+                EV_BUTTON9,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 8,
                 { translate ("Music number 8") },
             },
             {
-                WM_BUTTON10,
+                EV_BUTTON10,
                 0, {1, 44},
                 170 + 42 * 0, 30 + 42 * 9,
                 { translate ("Music number 9") },
             },
             {
-                WM_PHASE_BUILD,
+                EV_PHASE_BUILD,
                 0, {1, 50},
                 11, 424,
                 { translate ("Finish") },
@@ -1323,36 +1323,36 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_REGION,
+        EV_PHASE_REGION,
         "image/region.png",
         true,
         {
             {
-                WM_BUTTON1,     // normal
+                EV_BUTTON1,     // normal
                 0, {0},
                 220, 60,
                 { translate ("Prairie") },
             },
             {
-                WM_BUTTON4,     // sapins
+                EV_BUTTON4,     // sapins
                 0, {0},
                 220, 170,
                 { translate ("Forest") },
             },
             {
-                WM_BUTTON2,     // palmiers
+                EV_BUTTON2,     // palmiers
                 0, {0},
                 220, 280,
                 { translate ("Desert") },
             },
             {
-                WM_BUTTON3,     // hivers
+                EV_BUTTON3,     // hivers
                 0, {0},
                 220, 390,
                 { translate ("Forest under snow") },
             },
             {
-                WM_PHASE_BUILD,
+                EV_PHASE_BUILD,
                 0, {1, 50},
                 11, 424,
                 { translate ("Finish") },
@@ -1364,7 +1364,7 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_PLAYMOVIE,
+        EV_PHASE_PLAYMOVIE,
         "image/movie.png",
         false,
         {
@@ -1375,7 +1375,7 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_WINMOVIE,
+        EV_PHASE_WINMOVIE,
         "image/movie.png",
         false,
         {
@@ -1386,7 +1386,7 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_H0MOVIE,
+        EV_PHASE_H0MOVIE,
         "image/movie.png",
         false,
         {
@@ -1397,7 +1397,7 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_H1MOVIE,
+        EV_PHASE_H1MOVIE,
         "image/movie.png",
         false,
         {
@@ -1408,7 +1408,7 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_H2MOVIE,
+        EV_PHASE_H2MOVIE,
         "image/movie.png",
         false,
         {
@@ -1419,7 +1419,7 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_BYE,
+        EV_PHASE_BYE,
         "image/bye.png",
         false,
         {
@@ -1430,12 +1430,12 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_INSERT,
+        EV_PHASE_INSERT,
         "image/insert.png",
         false,
         {
             {
-                WM_PHASE_INIT,
+                EV_PHASE_INIT,
                 0, {1, 40},
                 16, 424,
                 { translate ("Quit Planet Blupi") },
@@ -1447,48 +1447,48 @@ static Phase table[] =
     },
 
     {
-        WM_PHASE_SETTINGS,
+        EV_PHASE_SETTINGS,
         "image/setup00.png",
         false,
         {
             {
-                WM_BUTTON1,
+                EV_BUTTON1,
                 0, {1, 50},
                 54, 330,
                 { translate ("Previous language") },
             },
             {
-                WM_BUTTON2,
+                EV_BUTTON2,
                 0, {1, 51},
                 54 + 40, 330,
                 { translate ("Next language") },
             },
             {
-                WM_BUTTON3,
+                EV_BUTTON3,
                 0, {1, 50},
                 169, 330,
                 { translate ("Fullscreen") },
             },
             {
-                WM_BUTTON4,
+                EV_BUTTON4,
                 0, {1, 51},
                 169 + 40, 330,
                 { translate ("Windowed") },
             },
             {
-                WM_BUTTON5,
+                EV_BUTTON5,
                 0, {1, 50},
                 284, 330,
                 { translate ("Reduce window size") },
             },
             {
-                WM_BUTTON6,
+                EV_BUTTON6,
                 0, {1, 51},
                 284 + 40, 330,
                 { translate ("Increase window size") },
             },
             {
-                WM_PHASE_INIT,
+                EV_PHASE_INIT,
                 0, {1, 40},
                 42 + 42 * 0, 433,
                 { translate ("Finish") },
@@ -1640,12 +1640,12 @@ void CEvent::SetFullScreen (bool bFullScreen)
   /* Force this update before otherwise the coordinates retrieved with
    * the Warp SDL function are corresponding to the previous size.
    */
-  CEvent::PushUserEvent (WM_UPDATE);
+  CEvent::PushUserEvent (EV_UPDATE);
 
   auto coord = new SDL_Point; // Released by the event handler.
   coord->x   = x;
   coord->y   = y;
-  CEvent::PushUserEvent (WM_WARPMOUSE, coord);
+  CEvent::PushUserEvent (EV_WARPMOUSE, coord);
 }
 
 /**
@@ -1670,12 +1670,12 @@ void CEvent::SetWindowSize (Uint8 prevScale, Uint8 newScale)
   /* Force this update before otherwise the coordinates retrieved with
    * the Warp SDL function are corresponding to the previous size.
    */
-  CEvent::PushUserEvent (WM_UPDATE);
+  CEvent::PushUserEvent (EV_UPDATE);
 
   auto coord = new SDL_Point; // Released by the event handler.
   coord->x   = newScale < prevScale ? x / prevScale : x * newScale;
   coord->y   = newScale < prevScale ? y / prevScale : x * newScale;
-  CEvent::PushUserEvent (WM_WARPMOUSE, coord);
+  CEvent::PushUserEvent (EV_WARPMOUSE, coord);
 }
 
 Uint8 CEvent::GetWindowScale ()
@@ -1830,12 +1830,12 @@ bool CEvent::CreateButtons ()
 
     if (m_bPrivate)
     {
-      if (message == WM_PHASE_SKILL1)
+      if (message == EV_PHASE_SKILL1)
       {
         pos.x = 117;
         pos.y = 115;
       }
-      if (message == WM_PHASE_SKILL2)
+      if (message == EV_PHASE_SKILL2)
       {
         pos.x = 117;
         pos.y = 115 + 42;
@@ -1910,9 +1910,9 @@ bool CEvent::DrawButtons ()
   //?
 
   if (
-    (m_phase == WM_PHASE_PLAY && m_bChangeCheat) ||
-    (m_phase != WM_PHASE_PLAY && m_phase != WM_PHASE_INSERT &&
-     m_phase != WM_PHASE_INTRO1 && m_phase != WM_PHASE_BYE))
+    (m_phase == EV_PHASE_PLAY && m_bChangeCheat) ||
+    (m_phase != EV_PHASE_PLAY && m_phase != EV_PHASE_INSERT &&
+     m_phase != EV_PHASE_INTRO1 && m_phase != EV_PHASE_BYE))
   {
     m_bChangeCheat = false;
 
@@ -1937,7 +1937,7 @@ bool CEvent::DrawButtons ()
     DrawText (m_pPixmap, pos, text, FONTLITTLE);
   }
 
-  if (m_phase == WM_PHASE_INIT)
+  if (m_phase == EV_PHASE_INIT)
   {
     pos.x = 570;
     pos.y = 465;
@@ -1947,68 +1947,68 @@ bool CEvent::DrawButtons ()
     DrawText (m_pPixmap, pos, res, FONTLITTLE);
   }
 
-  if (m_phase == WM_PHASE_SETUP || m_phase == WM_PHASE_SETUPp)
+  if (m_phase == EV_PHASE_SETUP || m_phase == EV_PHASE_SETUPp)
   {
     bEnable = true;
     if (m_speed == 1)
       bEnable = false;
-    SetEnable (WM_BUTTON1, bEnable);
+    SetEnable (EV_BUTTON1, bEnable);
     bEnable = true;
     if (m_speed >= (m_bSpeed ? 8 : 2))
       bEnable = false;
-    SetEnable (WM_BUTTON2, bEnable);
+    SetEnable (EV_BUTTON2, bEnable);
 
     volume  = m_pSound->GetAudioVolume ();
     bEnable = true;
     if (volume == 0)
       bEnable = false;
-    SetEnable (WM_BUTTON3, bEnable);
+    SetEnable (EV_BUTTON3, bEnable);
     bEnable = true;
     if (volume >= MAXVOLUME)
       bEnable = false;
-    SetEnable (WM_BUTTON4, bEnable);
+    SetEnable (EV_BUTTON4, bEnable);
 
     volume  = m_pSound->GetMidiVolume ();
     bEnable = true;
     if (volume == 0)
       bEnable = false;
-    SetEnable (WM_BUTTON5, bEnable);
+    SetEnable (EV_BUTTON5, bEnable);
     bEnable = true;
     if (volume >= MAXVOLUME)
       bEnable = false;
-    SetEnable (WM_BUTTON6, bEnable);
+    SetEnable (EV_BUTTON6, bEnable);
 
     if (m_pMovie->GetEnable ())
     {
-      SetEnable (WM_BUTTON7, m_bMovie);
-      SetEnable (WM_BUTTON8, !m_bMovie);
+      SetEnable (EV_BUTTON7, m_bMovie);
+      SetEnable (EV_BUTTON8, !m_bMovie);
     }
     else
     {
-      SetEnable (WM_BUTTON7, false);
-      SetEnable (WM_BUTTON8, false);
+      SetEnable (EV_BUTTON7, false);
+      SetEnable (EV_BUTTON8, false);
     }
 
     bEnable = true;
     if (m_scrollSpeed == 0)
       bEnable = false;
-    SetEnable (WM_BUTTON9, bEnable);
+    SetEnable (EV_BUTTON9, bEnable);
     bEnable = true;
     if (m_scrollSpeed >= 3)
       bEnable = false;
-    SetEnable (WM_BUTTON10, bEnable);
+    SetEnable (EV_BUTTON10, bEnable);
   }
 
-  if (m_phase == WM_PHASE_SETTINGS)
+  if (m_phase == EV_PHASE_SETTINGS)
   {
-    SetEnable (WM_BUTTON1, m_Lang != m_Languages.begin ());
-    SetEnable (WM_BUTTON2, m_Lang != m_Languages.end () - 1);
+    SetEnable (EV_BUTTON1, m_Lang != m_Languages.begin ());
+    SetEnable (EV_BUTTON2, m_Lang != m_Languages.end () - 1);
 
-    SetEnable (WM_BUTTON3, !m_bFullScreen);
-    SetEnable (WM_BUTTON4, m_bFullScreen);
+    SetEnable (EV_BUTTON3, !m_bFullScreen);
+    SetEnable (EV_BUTTON4, m_bFullScreen);
 
-    SetEnable (WM_BUTTON5, !m_bFullScreen && m_WindowScale > 1);
-    SetEnable (WM_BUTTON6, !m_bFullScreen && m_WindowScale < 2);
+    SetEnable (EV_BUTTON5, !m_bFullScreen && m_WindowScale > 1);
+    SetEnable (EV_BUTTON6, !m_bFullScreen && m_WindowScale < 2);
   }
 
   assert (m_index >= 0);
@@ -2021,7 +2021,7 @@ bool CEvent::DrawButtons ()
     ++i;
   }
 
-  if (m_phase == WM_PHASE_PLAY)
+  if (m_phase == EV_PHASE_PLAY)
   {
     // Dessine les jauges.
     m_pDecor->GetLevelJauge (levels, types);
@@ -2143,10 +2143,10 @@ bool CEvent::DrawButtons ()
 
   // Dessine les noms des fichiers.
   if (
-    m_phase == WM_PHASE_READ || m_phase == WM_PHASE_WRITE ||
-    m_phase == WM_PHASE_WRITEp)
+    m_phase == EV_PHASE_READ || m_phase == EV_PHASE_WRITE ||
+    m_phase == EV_PHASE_WRITEp)
   {
-    if (m_phase == WM_PHASE_READ)
+    if (m_phase == EV_PHASE_READ)
       snprintf (res, sizeof (res), "%s", gettext ("Open another game"));
     else
       snprintf (res, sizeof (res), "%s", gettext ("Save this game"));
@@ -2191,7 +2191,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Dessine les réglages pour la fin de la partie.
-  if (m_phase == WM_PHASE_TERM)
+  if (m_phase == EV_PHASE_TERM)
   {
     Term * pTerm = m_pDecor->GetTerminated ();
 
@@ -2213,19 +2213,19 @@ bool CEvent::DrawButtons ()
   }
 
   // Dessine les textes pour les choix des boutons.
-  if (m_phase == WM_PHASE_BUTTON)
+  if (m_phase == EV_PHASE_BUTTON)
     DrawTextCenter (gettext ("Available buttons"), (10 + 134) / 2, 20);
 
   // Dessine les textes pour le choix des musiques.
-  if (m_phase == WM_PHASE_MUSIC)
+  if (m_phase == EV_PHASE_MUSIC)
     DrawTextCenter (gettext ("Music choice"), (10 + 134) / 2, 20);
 
   // Dessine les textes pour le choix de la région.
-  if (m_phase == WM_PHASE_REGION)
+  if (m_phase == EV_PHASE_REGION)
     DrawTextCenter (gettext ("Scenery choice"), (10 + 134) / 2, 20);
 
   // Ajoute "Mission numéro".
-  if (m_phase == WM_PHASE_INFO)
+  if (m_phase == EV_PHASE_INFO)
   {
     if (m_bSchool)
       snprintf (res, sizeof (res), "%s", gettext ("Training number"));
@@ -2248,7 +2248,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Ajoute le texte "Partie interrompue".
-  if (m_phase == WM_PHASE_STOP)
+  if (m_phase == EV_PHASE_STOP)
   {
     char * text = gettext ("Game paused");
     lg          = GetTextWidth (text);
@@ -2264,7 +2264,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Ajoute le texte "Informations complémentaires".
-  if (m_phase == WM_PHASE_HELP)
+  if (m_phase == EV_PHASE_HELP)
   {
     char * text = gettext ("Help number");
     lg          = GetTextWidth (text);
@@ -2281,8 +2281,8 @@ bool CEvent::DrawButtons ()
 
   // Ajoute le numéro du monde.
   if (
-    m_phase == WM_PHASE_INFO || m_phase == WM_PHASE_STOP ||
-    m_phase == WM_PHASE_HELP)
+    m_phase == EV_PHASE_INFO || m_phase == EV_PHASE_STOP ||
+    m_phase == EV_PHASE_HELP)
   {
     if (m_bSchool)
       world = m_exercice;
@@ -2304,7 +2304,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Affiche facile/difficile.
-  if (m_phase == WM_PHASE_INFO)
+  if (m_phase == EV_PHASE_INFO)
   {
     if (!m_bSchool)
     {
@@ -2342,9 +2342,9 @@ bool CEvent::DrawButtons ()
 
   // Affiche le libellé de l'énigme.
   if (
-    m_phase == WM_PHASE_INFO || m_phase == WM_PHASE_STOP ||
-    m_phase == WM_PHASE_HELP || m_phase == WM_PHASE_HISTORY0 ||
-    m_phase == WM_PHASE_HISTORY1)
+    m_phase == EV_PHASE_INFO || m_phase == EV_PHASE_STOP ||
+    m_phase == EV_PHASE_HELP || m_phase == EV_PHASE_HISTORY0 ||
+    m_phase == EV_PHASE_HISTORY1)
   {
     pos.x = 355;
     pos.y = 70;
@@ -2363,7 +2363,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Affiche le texte lorsque c'est raté.
-  if (m_phase == WM_PHASE_LOST)
+  if (m_phase == EV_PHASE_LOST)
   {
     static char * list[] = {
       gettext ("You have failed, try again..."),
@@ -2379,7 +2379,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Affiche le texte lorsque c'est réussi.
-  if (m_phase == WM_PHASE_WIN)
+  if (m_phase == EV_PHASE_WIN)
   {
     static char * list[] = {
       gettext ("Well done !"),     gettext ("Yes, great ..."),
@@ -2393,7 +2393,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Affiche le texte lorsque c'est fini.
-  if (m_phase == WM_PHASE_LASTWIN)
+  if (m_phase == EV_PHASE_LASTWIN)
   {
     char * text;
     if (m_bSchool)
@@ -2410,7 +2410,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Dessine les réglages.
-  if (m_phase == WM_PHASE_SETUP || m_phase == WM_PHASE_SETUPp)
+  if (m_phase == EV_PHASE_SETUP || m_phase == EV_PHASE_SETUPp)
   {
     DrawTextCenter (gettext ("Global game\nspeed"), 54 + 40, 80);
     DrawTextCenter (gettext ("Scroll speed\nwith mouse"), 169 + 40, 80);
@@ -2455,7 +2455,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Draw the settings
-  if (m_phase == WM_PHASE_SETTINGS)
+  if (m_phase == EV_PHASE_SETTINGS)
   {
     DrawTextCenter (gettext ("Language interface\nand sounds"), 54 + 40, 80);
     DrawTextCenter (gettext ("Select the\nwindow mode"), 169 + 40, 80);
@@ -2495,7 +2495,7 @@ bool CEvent::DrawButtons ()
   }
 
   // Affiche le texte de fin de la version demo.
-  if (m_phase == WM_PHASE_BYE)
+  if (m_phase == EV_PHASE_BYE)
   {
     char * text;
 
@@ -2531,13 +2531,13 @@ bool CEvent::DrawButtons ()
   }
 
   // Affiche le texte lorsqu'il faut insérer le CD-Rom.
-  if (m_phase == WM_PHASE_INSERT)
+  if (m_phase == EV_PHASE_INSERT)
     DrawTextCenter (
       gettext ("Insert CD-Rom Planet Blupi and wait a few seconds..."),
       LXIMAGE / 2, 20);
 
-  if (m_phase == WM_PHASE_BUILD)
-    SetEnable (WM_PHASE_UNDO, m_pDecor->IsUndo ());
+  if (m_phase == EV_PHASE_BUILD)
+    SetEnable (EV_PHASE_UNDO, m_pDecor->IsUndo ());
 
   // Dessine les tool tips (info bulle).
   if (m_textToolTips[0] != 0)
@@ -2555,7 +2555,7 @@ MouseSprites CEvent::MousePosToSprite (POINT pos)
 
   sprite = SPRITE_POINTER;
 
-  if (m_phase == WM_PHASE_PLAY || m_phase == WM_PHASE_BUILD)
+  if (m_phase == EV_PHASE_PLAY || m_phase == EV_PHASE_BUILD)
   {
     if (
       pos.x >= POSMAPX && pos.x <= POSMAPX + DIMMAPX && pos.y >= POSMAPY &&
@@ -2594,9 +2594,9 @@ MouseSprites CEvent::MousePosToSprite (POINT pos)
         sprite = SPRITE_ARROWDR;
     }
   }
-  else if (m_phase == WM_PHASE_INTRO1)
+  else if (m_phase == EV_PHASE_INTRO1)
     sprite = SPRITE_POINTER;
-  else if (m_phase == WM_PHASE_BYE)
+  else if (m_phase == EV_PHASE_BYE)
     sprite = SPRITE_POINTER;
   else
   {
@@ -2690,7 +2690,7 @@ bool CEvent::EventButtons (const SDL_Event & event, POINT pos)
     return false;
   };
 
-  if (m_phase == WM_PHASE_PLAY)
+  if (m_phase == EV_PHASE_PLAY)
   {
     const auto spotted = progress (m_jauges[0], gettext ("Blupi's energy"));
     if (!spotted)
@@ -2722,7 +2722,7 @@ bool CEvent::EventButtons (const SDL_Event & event, POINT pos)
     }
   }
 
-  if (m_phase == WM_PHASE_PLAY)
+  if (m_phase == EV_PHASE_PLAY)
   {
     m_bHiliInfoButton = false;
     if (
@@ -2783,7 +2783,7 @@ bool CEvent::EventButtons (const SDL_Event & event, POINT pos)
     }
   }
 
-  if (m_phase == WM_PHASE_BUILD)
+  if (m_phase == EV_PHASE_BUILD)
   {
     if (
       event.type == SDL_MOUSEBUTTONDOWN &&
@@ -2810,7 +2810,7 @@ bool CEvent::EventButtons (const SDL_Event & event, POINT pos)
     i++;
   }
 
-  if (m_phase == WM_PHASE_PLAY)
+  if (m_phase == EV_PHASE_PLAY)
   {
     if (m_menu.TreatEvent (event))
       return true;
@@ -2917,10 +2917,10 @@ bool CEvent::ChangePhase (Uint32 phase)
   Term *      pTerm;
 
   if (
-    phase != WM_PHASE_SETUPp && phase != WM_PHASE_WRITEp &&
-    phase != WM_PHASE_PLAY)
+    phase != EV_PHASE_SETUPp && phase != EV_PHASE_WRITEp &&
+    phase != EV_PHASE_PLAY)
     m_pSound->StopMusic ();
-  if (phase == WM_PHASE_SETUPp && m_bPause)
+  if (phase == EV_PHASE_SETUPp && m_bPause)
     m_pSound->StopMusic ();
 
   m_textToolTips[0] = 0;
@@ -2936,19 +2936,19 @@ bool CEvent::ChangePhase (Uint32 phase)
   m_bHiliInfoButton = false;
   m_bHiliHelpButton = false;
 
-  if (phase == WM_PHASE_INTRO1)
+  if (phase == EV_PHASE_INTRO1)
     m_introTime = 0;
 
-  if (phase == WM_PHASE_INIT)
+  if (phase == EV_PHASE_INIT)
     m_demoTime = 0;
   if (
-    phase == WM_PHASE_PLAY && !m_bDemoPlay &&
+    phase == EV_PHASE_PLAY && !m_bDemoPlay &&
     GetPhysicalWorld () >= 150 && // mission spéciale démo ?
     GetPhysicalWorld () < 200)
   {
     DemoRecStart (); // début enregistrement
   }
-  if (phase != WM_PHASE_PLAY)
+  if (phase != EV_PHASE_PLAY)
   {
     DemoRecStop (); // stoppe l'enregistrement d'une démo
   }
@@ -2968,7 +2968,7 @@ bool CEvent::ChangePhase (Uint32 phase)
     m_bBuildModify = false;
   }
 
-  if (m_phase == WM_PHASE_BUILD && phase == WM_PHASE_INFO) // quitte
+  if (m_phase == EV_PHASE_BUILD && phase == EV_PHASE_INFO) // quitte
                                                            // construction ?
   {
     m_pDecor->Write (
@@ -2976,7 +2976,7 @@ bool CEvent::ChangePhase (Uint32 phase)
   }
 
   // FIXME: pause is better if the game is not stop but just interrupted
-  if (m_phase == WM_PHASE_PLAY && m_phase != phase)
+  if (m_phase == EV_PHASE_PLAY && m_phase != phase)
     m_pSound->StopAllSounds (false);
 
   m_phase = phase; // change de phase
@@ -2994,12 +2994,12 @@ bool CEvent::ChangePhase (Uint32 phase)
     WaitMouse (false); // enlève le sablier
     m_tryInsertCount = 40;
     m_tryPhase       = m_phase;
-    return ChangePhase (WM_PHASE_INSERT); // insérez le CD-Rom ...
+    return ChangePhase (EV_PHASE_INSERT); // insérez le CD-Rom ...
   }
 
   if (
-    m_phase == WM_PHASE_READ || m_phase == WM_PHASE_WRITE ||
-    m_phase == WM_PHASE_WRITEp)
+    m_phase == EV_PHASE_READ || m_phase == EV_PHASE_WRITE ||
+    m_phase == EV_PHASE_WRITEp)
   {
     for (i = 0; i < 10; i++)
     {
@@ -3014,8 +3014,8 @@ bool CEvent::ChangePhase (Uint32 phase)
   }
 
   if (
-    m_phase == WM_PHASE_INFO || m_phase == WM_PHASE_HISTORY0 ||
-    m_phase == WM_PHASE_HISTORY1)
+    m_phase == EV_PHASE_INFO || m_phase == EV_PHASE_HISTORY0 ||
+    m_phase == EV_PHASE_HISTORY1)
   {
     if (
       !m_pDecor->Read (
@@ -3025,7 +3025,7 @@ bool CEvent::ChangePhase (Uint32 phase)
     {
       m_tryInsertCount = 40;
       m_tryPhase       = m_phase;
-      return ChangePhase (WM_PHASE_INSERT); // insérez le CD-Rom ...
+      return ChangePhase (EV_PHASE_INSERT); // insérez le CD-Rom ...
     }
     m_pDecor->SetTime (0);
     m_pDecor->SetTotalTime (0);
@@ -3034,24 +3034,24 @@ bool CEvent::ChangePhase (Uint32 phase)
   }
 
   if (
-    m_phase == WM_PHASE_INFO || m_phase == WM_PHASE_STOP ||
-    m_phase == WM_PHASE_HELP || m_phase == WM_PHASE_HISTORY0 ||
-    m_phase == WM_PHASE_HISTORY1)
+    m_phase == EV_PHASE_INFO || m_phase == EV_PHASE_STOP ||
+    m_phase == EV_PHASE_HELP || m_phase == EV_PHASE_HISTORY0 ||
+    m_phase == EV_PHASE_HISTORY1)
   {
     if (m_bPrivate)
       PrivateLibelle ();
-    else if (m_phase == WM_PHASE_INFO || m_phase == WM_PHASE_STOP)
+    else if (m_phase == EV_PHASE_INFO || m_phase == EV_PHASE_STOP)
     {
       if (m_bSchool)
         ReadLibelle (GetWorld (), m_bSchool, false);
       else
         ReadLibelle (GetWorld () + 2, m_bSchool, false);
     }
-    else if (m_phase == WM_PHASE_HELP)
+    else if (m_phase == EV_PHASE_HELP)
       ReadLibelle (GetWorld (), false, true);
     else
     {
-      if (m_phase == WM_PHASE_HISTORY0)
+      if (m_phase == EV_PHASE_HISTORY0)
         world = 0;
       else
         world = 1;
@@ -3059,17 +3059,17 @@ bool CEvent::ChangePhase (Uint32 phase)
     }
   }
 
-  if (m_phase == WM_PHASE_TESTCD)
+  if (m_phase == EV_PHASE_TESTCD)
   {
     if (m_pDecor->Read (0, false, world, time, total)) // lit un monde
     {
-      return ChangePhase (WM_PHASE_INIT); // ok
+      return ChangePhase (EV_PHASE_INIT); // ok
     }
     else
     {
       m_tryInsertCount = 40;
       m_tryPhase       = m_phase;
-      return ChangePhase (WM_PHASE_INSERT); // insérez le CD-Rom ...
+      return ChangePhase (EV_PHASE_INSERT); // insérez le CD-Rom ...
     }
   }
 
@@ -3082,7 +3082,7 @@ bool CEvent::ChangePhase (Uint32 phase)
   m_pDecor->BlupiSetArrow (0, false); // enlève toutes les flèches
   m_pDecor->ResetHili ();             // enlève les mises en évidence
 
-  if (m_phase == WM_PHASE_PLAY)
+  if (m_phase == EV_PHASE_PLAY)
   {
     m_pDecor->LoadImages ();
     m_pDecor->SetBuild (false);
@@ -3093,15 +3093,15 @@ bool CEvent::ChangePhase (Uint32 phase)
     m_bChangeCheat = true; // affiche les cheat-codes
   }
 
-  if (m_phase == WM_PHASE_BUILD)
+  if (m_phase == EV_PHASE_BUILD)
   {
     m_bBuildModify = true;
-    SetState (WM_DECOR1, 1);
-    SetMenu (WM_DECOR1, 0); // herbe
-    SetMenu (WM_DECOR2, 2); // arbre
-    SetMenu (WM_DECOR3, 1); // maison
-    SetMenu (WM_DECOR4, 2); // blupi fort
-    SetMenu (WM_DECOR5, 1); // feu
+    SetState (EV_DECOR1, 1);
+    SetMenu (EV_DECOR1, 0); // herbe
+    SetMenu (EV_DECOR2, 2); // arbre
+    SetMenu (EV_DECOR3, 1); // maison
+    SetMenu (EV_DECOR4, 2); // blupi fort
+    SetMenu (EV_DECOR5, 1); // feu
     m_pDecor->LoadImages ();
     m_pDecor->SetBuild (true);
     m_pDecor->EnableFog (false);
@@ -3109,12 +3109,12 @@ bool CEvent::ChangePhase (Uint32 phase)
     m_pDecor->NextPhase (0); // refait la carte tout de suite
   }
 
-  if (m_phase == WM_PHASE_INFO)
+  if (m_phase == EV_PHASE_INFO)
   {
     bEnable = true;
     if (GetWorld () == 0)
       bEnable = false;
-    SetEnable (WM_PREV, bEnable);
+    SetEnable (EV_PREV, bEnable);
 
     bEnable = true;
     if (m_bAllMissions)
@@ -3135,76 +3135,76 @@ bool CEvent::ChangePhase (Uint32 phase)
 
     if (m_bPrivate)
       bEnable = GetWorld () < 20 - 1;
-    SetEnable (WM_NEXT, bEnable);
+    SetEnable (EV_NEXT, bEnable);
 
     bHide = true;
     if (m_bAccessBuild || m_bPrivate)
       bHide = false;
-    SetHide (WM_PHASE_BUILD, bHide);
+    SetHide (EV_PHASE_BUILD, bHide);
 
     if (m_bSchool)
     {
-      SetHide (WM_PHASE_SKILL1, true);
-      SetHide (WM_PHASE_SKILL2, true);
+      SetHide (EV_PHASE_SKILL1, true);
+      SetHide (EV_PHASE_SKILL2, true);
     }
     else
     {
-      SetState (WM_PHASE_SKILL1, m_pDecor->GetSkill () == 0 ? 1 : 0);
-      SetState (WM_PHASE_SKILL2, m_pDecor->GetSkill () == 1 ? 1 : 0);
+      SetState (EV_PHASE_SKILL1, m_pDecor->GetSkill () == 0 ? 1 : 0);
+      SetState (EV_PHASE_SKILL2, m_pDecor->GetSkill () == 1 ? 1 : 0);
     }
   }
 
-  if (m_phase == WM_PHASE_STOP)
-    SetHide (WM_PHASE_HELP, IsHelpHide ());
+  if (m_phase == EV_PHASE_STOP)
+    SetHide (EV_PHASE_HELP, IsHelpHide ());
 
-  if (m_phase == WM_PHASE_READ)
+  if (m_phase == EV_PHASE_READ)
   {
     for (i = 0; i < 10; i++)
     {
       if (m_fileWorld[i] == -1)
-        SetEnable (WM_READ0 + i, false);
+        SetEnable (EV_READ0 + i, false);
     }
   }
 
-  if (m_phase == WM_PHASE_BUTTON)
+  if (m_phase == EV_PHASE_BUTTON)
   {
     pButtonExist = m_pDecor->GetButtonExist ();
 
     for (i = 0; i < MAXBUTTON; i++)
-      SetState (WM_BUTTON0 + i, pButtonExist[i]);
+      SetState (EV_BUTTON0 + i, pButtonExist[i]);
   }
 
-  if (m_phase == WM_PHASE_TERM)
+  if (m_phase == EV_PHASE_TERM)
   {
     pTerm = m_pDecor->GetTerminated ();
 
-    SetState (WM_BUTTON1, pTerm->bHachBlupi ? 1 : 0);
-    SetState (WM_BUTTON2, pTerm->bHachPlanche ? 1 : 0);
-    SetState (WM_BUTTON3, pTerm->bStopFire ? 1 : 0);
-    SetState (WM_BUTTON8, pTerm->bHomeBlupi ? 1 : 0);
-    SetState (WM_BUTTON9, pTerm->bKillRobots ? 1 : 0);
-    SetState (WM_BUTTON10, pTerm->bHachTomate ? 1 : 0);
-    SetState (WM_BUTTON11, pTerm->bHachMetal ? 1 : 0);
-    SetState (WM_BUTTON12, pTerm->bHachRobot ? 1 : 0);
+    SetState (EV_BUTTON1, pTerm->bHachBlupi ? 1 : 0);
+    SetState (EV_BUTTON2, pTerm->bHachPlanche ? 1 : 0);
+    SetState (EV_BUTTON3, pTerm->bStopFire ? 1 : 0);
+    SetState (EV_BUTTON8, pTerm->bHomeBlupi ? 1 : 0);
+    SetState (EV_BUTTON9, pTerm->bKillRobots ? 1 : 0);
+    SetState (EV_BUTTON10, pTerm->bHachTomate ? 1 : 0);
+    SetState (EV_BUTTON11, pTerm->bHachMetal ? 1 : 0);
+    SetState (EV_BUTTON12, pTerm->bHachRobot ? 1 : 0);
   }
 
-  if (m_phase == WM_PHASE_MUSIC)
+  if (m_phase == EV_PHASE_MUSIC)
   {
     music = m_pDecor->GetMusic ();
 
     for (i = 0; i < 10; i++)
-      SetState (WM_BUTTON1 + i, music == i ? 1 : 0);
+      SetState (EV_BUTTON1 + i, music == i ? 1 : 0);
   }
 
-  if (m_phase == WM_PHASE_REGION)
+  if (m_phase == EV_PHASE_REGION)
   {
     music = m_pDecor->GetRegion ();
 
     for (i = 0; i < 4; i++)
-      SetState (WM_BUTTON1 + i, music == i ? 1 : 0);
+      SetState (EV_BUTTON1 + i, music == i ? 1 : 0);
   }
 
-  if (m_phase == WM_PHASE_PLAY || m_phase == WM_PHASE_MUSIC)
+  if (m_phase == EV_PHASE_PLAY || m_phase == EV_PHASE_MUSIC)
   {
     if (m_pSound->IsPlayingMusic ())
     {
@@ -3222,40 +3222,40 @@ bool CEvent::ChangePhase (Uint32 phase)
     }
   }
 
-  if (phase == WM_PHASE_H0MOVIE)
+  if (phase == EV_PHASE_H0MOVIE)
   {
     m_movieToStart    = "movie/history0.mkv";
-    m_phaseAfterMovie = WM_PHASE_HISTORY0;
+    m_phaseAfterMovie = EV_PHASE_HISTORY0;
   }
 
-  if (phase == WM_PHASE_H1MOVIE)
+  if (phase == EV_PHASE_H1MOVIE)
   {
     m_movieToStart    = "movie/history1.mkv";
-    m_phaseAfterMovie = WM_PHASE_HISTORY1;
+    m_phaseAfterMovie = EV_PHASE_HISTORY1;
   }
 
-  if (phase == WM_PHASE_H2MOVIE)
+  if (phase == EV_PHASE_H2MOVIE)
   {
     m_movieToStart    = "movie/history2.mkv";
-    m_phaseAfterMovie = WM_PHASE_INFO;
+    m_phaseAfterMovie = EV_PHASE_INFO;
   }
 
-  if (phase == WM_PHASE_PLAYMOVIE)
+  if (phase == EV_PHASE_PLAYMOVIE)
   {
     m_movieToStart = string_format ("movie/play%.3d.mkv", GetPhysicalWorld ());
-    m_phaseAfterMovie = WM_PHASE_PLAY;
+    m_phaseAfterMovie = EV_PHASE_PLAY;
   }
 
-  if (phase == WM_PHASE_WINMOVIE)
+  if (phase == EV_PHASE_WINMOVIE)
   {
     m_movieToStart = string_format ("movie/win%.3d.mkv", GetPhysicalWorld ());
-    m_phaseAfterMovie = WM_PHASE_WIN;
+    m_phaseAfterMovie = EV_PHASE_WIN;
 
     if (
       !m_bPrivate &&
       m_pDecor->FileExist (GetPhysicalWorld (), false, world, time, total) &&
       !m_pDecor->FileExist (GetPhysicalWorld () + 1, false, world, time, total))
-      m_phaseAfterMovie = WM_PHASE_LASTWIN;
+      m_phaseAfterMovie = EV_PHASE_LASTWIN;
   }
 
   WaitMouse (false); // enlève le sablier
@@ -3304,7 +3304,7 @@ void CEvent::DecorShift (Sint32 dx, Sint32 dy)
 {
   POINT coin;
 
-  if (m_phase != WM_PHASE_PLAY && m_phase != WM_PHASE_BUILD)
+  if (m_phase != EV_PHASE_PLAY && m_phase != EV_PHASE_BUILD)
     return;
 
   coin = m_pDecor->GetCoin ();
@@ -3330,7 +3330,7 @@ void CEvent::DecorAutoShift ()
 
   max = 4 - m_scrollSpeed; // max <- 3..1
 
-  if (m_phase == WM_PHASE_PLAY || m_phase == WM_PHASE_BUILD)
+  if (m_phase == EV_PHASE_PLAY || m_phase == EV_PHASE_BUILD)
   {
     if (m_shiftPhase == 0) // début du shift ?
     {
@@ -3609,7 +3609,7 @@ void CEvent::SetLanguage ()
 }
 
 // Clic dans un bouton.
-// Message = WM_BUTTON0..WM_BUTTON39
+// Message = EV_BUTTON0..EV_BUTTON39
 
 void CEvent::ChangeButtons (Sint32 message)
 {
@@ -3617,13 +3617,13 @@ void CEvent::ChangeButtons (Sint32 message)
   char * pButtonExist;
   Term * pTerm;
 
-  if (m_phase == WM_PHASE_PLAY)
+  if (m_phase == EV_PHASE_PLAY)
   {
-    button = m_menuButtons[message - WM_BUTTON0];
+    button = m_menuButtons[message - EV_BUTTON0];
     m_pDecor->BlupiGoal (m_menuCel, button);
   }
 
-  if (m_phase == WM_PHASE_BUTTON)
+  if (m_phase == EV_PHASE_BUTTON)
   {
     pButtonExist = m_pDecor->GetButtonExist ();
 
@@ -3634,20 +3634,20 @@ void CEvent::ChangeButtons (Sint32 message)
       state = 0;
     SetState (message, state); // pressé <-> relâché
 
-    pButtonExist[message - WM_BUTTON0] = state;
+    pButtonExist[message - EV_BUTTON0] = state;
     pButtonExist[BUTTON_DJEEP]         = true;
     pButtonExist[BUTTON_DARMURE]       = true;
   }
 
-  if (m_phase == WM_PHASE_TERM)
+  if (m_phase == EV_PHASE_TERM)
   {
     pTerm = m_pDecor->GetTerminated ();
 
     if (
-      message == WM_BUTTON1 || message == WM_BUTTON2 || message == WM_BUTTON3 ||
-      message == WM_BUTTON8 || message == WM_BUTTON9 ||
-      message == WM_BUTTON10 || message == WM_BUTTON11 ||
-      message == WM_BUTTON12)
+      message == EV_BUTTON1 || message == EV_BUTTON2 || message == EV_BUTTON3 ||
+      message == EV_BUTTON8 || message == EV_BUTTON9 ||
+      message == EV_BUTTON10 || message == EV_BUTTON11 ||
+      message == EV_BUTTON12)
     {
       state = GetState (message);
       if (state == 0)
@@ -3656,67 +3656,67 @@ void CEvent::ChangeButtons (Sint32 message)
         state = 0;
       SetState (message, state); // pressé <-> relâché
 
-      if (message == WM_BUTTON1)
+      if (message == EV_BUTTON1)
         pTerm->bHachBlupi = state;
-      if (message == WM_BUTTON2)
+      if (message == EV_BUTTON2)
         pTerm->bHachPlanche = state;
-      if (message == WM_BUTTON3)
+      if (message == EV_BUTTON3)
         pTerm->bStopFire = state;
-      if (message == WM_BUTTON8)
+      if (message == EV_BUTTON8)
         pTerm->bHomeBlupi = state;
-      if (message == WM_BUTTON9)
+      if (message == EV_BUTTON9)
         pTerm->bKillRobots = state;
-      if (message == WM_BUTTON10)
+      if (message == EV_BUTTON10)
         pTerm->bHachTomate = state;
-      if (message == WM_BUTTON11)
+      if (message == EV_BUTTON11)
         pTerm->bHachMetal = state;
-      if (message == WM_BUTTON12)
+      if (message == EV_BUTTON12)
         pTerm->bHachRobot = state;
     }
 
-    if (message == WM_BUTTON4)
+    if (message == EV_BUTTON4)
     {
       if (pTerm->nbMinBlupi > 1)
         pTerm->nbMinBlupi--;
     }
-    if (message == WM_BUTTON5)
+    if (message == EV_BUTTON5)
     {
       if (pTerm->nbMinBlupi < 100)
         pTerm->nbMinBlupi++;
     }
 
-    if (message == WM_BUTTON6)
+    if (message == EV_BUTTON6)
     {
       if (pTerm->nbMaxBlupi > 1)
         pTerm->nbMaxBlupi--;
     }
-    if (message == WM_BUTTON7)
+    if (message == EV_BUTTON7)
     {
       if (pTerm->nbMaxBlupi < 100)
         pTerm->nbMaxBlupi++;
     }
   }
 
-  if (m_phase == WM_PHASE_MUSIC)
+  if (m_phase == EV_PHASE_MUSIC)
   {
-    m_pDecor->SetMusic (message - WM_BUTTON1);
+    m_pDecor->SetMusic (message - EV_BUTTON1);
     ChangePhase (m_phase);
   }
 
-  if (m_phase == WM_PHASE_REGION)
+  if (m_phase == EV_PHASE_REGION)
   {
-    m_pDecor->SetRegion (message - WM_BUTTON1);
-    ChangePhase (WM_PHASE_BUILD);
+    m_pDecor->SetRegion (message - EV_BUTTON1);
+    ChangePhase (EV_PHASE_BUILD);
   }
 
-  if (m_phase == WM_PHASE_SETUP || m_phase == WM_PHASE_SETUPp)
+  if (m_phase == EV_PHASE_SETUP || m_phase == EV_PHASE_SETUPp)
   {
-    if (message == WM_BUTTON1)
+    if (message == EV_BUTTON1)
     {
       if (m_speed > 1)
         m_speed = m_speed >> 1;
     }
-    if (message == WM_BUTTON2)
+    if (message == EV_BUTTON2)
     {
       if (m_bSpeed)
         max = 8;
@@ -3726,20 +3726,20 @@ void CEvent::ChangeButtons (Sint32 message)
         m_speed = m_speed << 1;
     }
 
-    if (message == WM_BUTTON3)
+    if (message == EV_BUTTON3)
     {
       volume = m_pSound->GetAudioVolume ();
       if (volume > 0)
         m_pSound->SetAudioVolume (volume - 1);
     }
-    if (message == WM_BUTTON4)
+    if (message == EV_BUTTON4)
     {
       volume = m_pSound->GetAudioVolume ();
       if (volume < MAXVOLUME)
         m_pSound->SetAudioVolume (volume + 1);
     }
 
-    if (message == WM_BUTTON5)
+    if (message == EV_BUTTON5)
     {
       volume = m_pSound->GetMidiVolume ();
       if (volume > 0)
@@ -3748,7 +3748,7 @@ void CEvent::ChangeButtons (Sint32 message)
         m_pSound->AdaptVolumeMusic ();
       }
     }
-    if (message == WM_BUTTON6)
+    if (message == EV_BUTTON6)
     {
       volume = m_pSound->GetMidiVolume ();
       if (volume < MAXVOLUME)
@@ -3758,44 +3758,44 @@ void CEvent::ChangeButtons (Sint32 message)
       }
     }
 
-    if (message == WM_BUTTON7)
+    if (message == EV_BUTTON7)
       m_bMovie = false;
-    if (message == WM_BUTTON8)
+    if (message == EV_BUTTON8)
       m_bMovie = true;
 
-    if (message == WM_BUTTON9)
+    if (message == EV_BUTTON9)
     {
       if (m_scrollSpeed > 0)
         m_scrollSpeed--;
     }
-    if (message == WM_BUTTON10)
+    if (message == EV_BUTTON10)
     {
       if (m_scrollSpeed < 3)
         m_scrollSpeed++;
     }
   }
 
-  if (m_phase == WM_PHASE_SETTINGS)
+  if (m_phase == EV_PHASE_SETTINGS)
   {
     switch (message)
     {
-    case WM_BUTTON1:
+    case EV_BUTTON1:
       if (m_Lang != m_Languages.begin ())
         --m_Lang;
       SetLanguage ();
       break;
-    case WM_BUTTON2:
+    case EV_BUTTON2:
       if (m_Lang != m_Languages.end () - 1)
         ++m_Lang;
       SetLanguage ();
       break;
-    case WM_BUTTON3:
+    case EV_BUTTON3:
       SetFullScreen (true);
       break;
-    case WM_BUTTON4:
+    case EV_BUTTON4:
       SetFullScreen (false);
       break;
-    case WM_BUTTON5:
+    case EV_BUTTON5:
     {
       auto scale = m_WindowScale;
       if (m_WindowScale > 1)
@@ -3803,7 +3803,7 @@ void CEvent::ChangeButtons (Sint32 message)
       SetWindowSize (scale, m_WindowScale);
       break;
     }
-    case WM_BUTTON6:
+    case EV_BUTTON6:
     {
       auto scale = m_WindowScale;
       if (m_WindowScale < 2)
@@ -3940,10 +3940,10 @@ bool CEvent::BuildDown (POINT pos, Uint16 mod, bool bMix)
     m_pDecor->UndoCopy (); // copie le décor pour undo év.
   }
 
-  if (GetState (WM_DECOR1) == 1) // pose d'un sol
+  if (GetState (EV_DECOR1) == 1) // pose d'un sol
   {
     cel  = m_pDecor->ConvPosToCel2 (pos);
-    menu = GetMenu (WM_DECOR1);
+    menu = GetMenu (EV_DECOR1);
 
     if (!m_pDecor->GetFloor (cel, channel, icon))
       return false;
@@ -3974,10 +3974,10 @@ bool CEvent::BuildDown (POINT pos, Uint16 mod, bool bMix)
     }
   }
 
-  if (GetState (WM_DECOR2) == 1) // pose d'un objet
+  if (GetState (EV_DECOR2) == 1) // pose d'un objet
   {
     cel  = m_pDecor->ConvPosToCel2 (pos);
-    menu = GetMenu (WM_DECOR2);
+    menu = GetMenu (EV_DECOR2);
 
     if (!m_pDecor->GetObject (cel, channel, icon))
       return false;
@@ -4005,10 +4005,10 @@ bool CEvent::BuildDown (POINT pos, Uint16 mod, bool bMix)
     }
   }
 
-  if (GetState (WM_DECOR3) == 1) // pose d'un batiment
+  if (GetState (EV_DECOR3) == 1) // pose d'un batiment
   {
     cel  = m_pDecor->ConvPosToCel2 (pos);
-    menu = GetMenu (WM_DECOR3);
+    menu = GetMenu (EV_DECOR3);
 
     if (!m_pDecor->GetObject (cel, channel, icon))
       return false;
@@ -4036,10 +4036,10 @@ bool CEvent::BuildDown (POINT pos, Uint16 mod, bool bMix)
     }
   }
 
-  if (GetState (WM_DECOR4) == 1) // pose d'un blupi
+  if (GetState (EV_DECOR4) == 1) // pose d'un blupi
   {
     cel  = m_pDecor->ConvPosToCel (pos);
-    menu = GetMenu (WM_DECOR4);
+    menu = GetMenu (EV_DECOR4);
 
     if (menu == 0) // supprime ?
       m_pDecor->BlupiDelete (cel);
@@ -4063,10 +4063,10 @@ bool CEvent::BuildDown (POINT pos, Uint16 mod, bool bMix)
       m_pDecor->BlupiCreate (cel, ACTION_STOP, DIRECT_S, 4, MAXENERGY);
   }
 
-  if (GetState (WM_DECOR5) == 1) // pose d'une cata
+  if (GetState (EV_DECOR5) == 1) // pose d'une cata
   {
     cel  = m_pDecor->ConvPosToCel2 (pos);
-    menu = GetMenu (WM_DECOR5);
+    menu = GetMenu (EV_DECOR5);
 
     if (menu == 0) // supprime ?
       m_pDecor->SetFire (cel, false);
@@ -4087,7 +4087,7 @@ bool CEvent::BuildMove (POINT pos, Uint16 mod, const SDL_Event & event)
                                                          // ?
     BuildDown (pos, mod, false);
 
-  if (GetState (WM_DECOR4) == 1) // pose d'un blupi
+  if (GetState (EV_DECOR4) == 1) // pose d'un blupi
     m_pDecor->CelHili (pos, 1);
   else
     m_pDecor->CelHili (pos, 2);
@@ -4144,7 +4144,7 @@ void CEvent::Read (Sint32 message)
 {
   Sint32 world, time, total;
 
-  m_pDecor->Read (message - WM_READ0, true, world, time, total);
+  m_pDecor->Read (message - EV_READ0, true, world, time, total);
   m_pDecor->SetTime (time);
   m_pDecor->SetTotalTime (total);
 
@@ -4177,7 +4177,7 @@ void CEvent::Write (Sint32 message)
   time  = m_pDecor->GetTime ();
   total = m_pDecor->GetTotalTime ();
 
-  m_pDecor->Write (message - WM_WRITE0, true, GetPhysicalWorld (), time, total);
+  m_pDecor->Write (message - EV_WRITE0, true, GetPhysicalWorld (), time, total);
 }
 
 // Initialise le libellé d'une mission privée.
@@ -4560,7 +4560,7 @@ bool CEvent::DemoPlayStart ()
     DemoPlayStop ();
     return false;
   }
-  ChangePhase (WM_PHASE_PLAY);
+  ChangePhase (EV_PHASE_PLAY);
   InitRandom ();
   m_pDecor->SetTime (0);
   m_speed = 1;
@@ -4581,7 +4581,7 @@ void CEvent::DemoPlayStop ()
   m_bDemoRec  = false;
   m_demoTime  = 0;
 
-  ChangePhase (WM_PHASE_INIT);
+  ChangePhase (EV_PHASE_INIT);
 }
 
 void CEvent::WinToSDLEvent (
@@ -4640,34 +4640,34 @@ void CEvent::WinToSDLEvent (
   {
     switch (msg)
     {
-    case WM_KEYUP:
-    case WM_KEYDOWN:
-      event.type       = msg == WM_KEYDOWN ? SDL_KEYDOWN : SDL_KEYUP;
+    case EV_KEYUP:
+    case EV_KEYDOWN:
+      event.type       = msg == EV_KEYDOWN ? SDL_KEYDOWN : SDL_KEYUP;
       event.key.keysym = keycodes.at (wParam);
       // TODO: lParam
       break;
 
-    case WM_LBUTTONUP:
-    case WM_LBUTTONDOWN:
+    case EV_LBUTTONUP:
+    case EV_LBUTTONDOWN:
       event.type =
-        msg == WM_LBUTTONDOWN ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
+        msg == EV_LBUTTONDOWN ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
       event.button.button = SDL_BUTTON_LEFT;
       // TODO: wParam CTRL or SHIFT
       event.button.x = GET_X_LPARAM (lParam);
       event.button.y = GET_Y_LPARAM (lParam);
       break;
 
-    case WM_RBUTTONUP:
-    case WM_RBUTTONDOWN:
+    case EV_RBUTTONUP:
+    case EV_RBUTTONDOWN:
       event.type =
-        msg == WM_RBUTTONDOWN ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
+        msg == EV_RBUTTONDOWN ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
       event.button.button = SDL_BUTTON_RIGHT;
       // TODO: wParam CTRL or SHIFT
       event.button.x = GET_X_LPARAM (lParam);
       event.button.y = GET_Y_LPARAM (lParam);
       break;
 
-    case WM_MOUSEMOVE:
+    case EV_MOUSEMOVE:
       event.type = SDL_MOUSEMOTION;
       // TODO: wParam CTRL or SHIFT
       event.motion.x = GET_X_LPARAM (lParam);
@@ -4690,7 +4690,7 @@ void CEvent::DemoStep ()
   WPARAM wParam;
   LPARAM lParam;
 
-  if (m_phase == WM_PHASE_INIT)
+  if (m_phase == EV_PHASE_INIT)
   {
     if (m_demoTime > DEF_TIME_DEMO) // ~30 secondes écoulées ?
     {
@@ -4714,7 +4714,7 @@ void CEvent::DemoStep ()
       lParam  = m_pDemoBuffer[m_demoIndex].lParam;
       m_demoIndex++;
 
-      if (message == WM_MOUSEMOVE)
+      if (message == EV_MOUSEMOVE)
       {
         POINT pos = ConvLongToPos (lParam);
         SDL_WarpMouseInWindow (
@@ -4747,13 +4747,13 @@ void CEvent::DemoRecEvent (Uint32 message, WPARAM wParam, LPARAM lParam)
 {
   if (
     m_bDemoRec && m_pDemoBuffer != nullptr &&
-    (message == WM_KEYDOWN || message == WM_KEYUP ||
-     message == WM_LBUTTONDOWN || message == WM_RBUTTONDOWN ||
-     message == WM_MOUSEMOVE || message == WM_LBUTTONUP ||
-     message == WM_RBUTTONUP))
+    (message == EV_KEYDOWN || message == EV_KEYUP ||
+     message == EV_LBUTTONDOWN || message == EV_RBUTTONDOWN ||
+     message == EV_MOUSEMOVE || message == EV_LBUTTONUP ||
+     message == EV_RBUTTONUP))
   {
     if (
-      m_demoIndex > 0 && message == WM_MOUSEMOVE &&
+      m_demoIndex > 0 && message == EV_MOUSEMOVE &&
       m_pDemoBuffer[m_demoIndex - 1].time == m_demoTime &&
       m_pDemoBuffer[m_demoIndex - 1].message == message)
     {
@@ -4841,7 +4841,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
           if (cheat_code[m_rankCheat][m_posCheat] == 0)
           {
             bEnable = true;
-            if (m_phase == WM_PHASE_PLAY)
+            if (m_phase == EV_PHASE_PLAY)
             {
               if (m_rankCheat == 0) // vision ?
                 m_pDecor->EnableFog (false);
@@ -4892,7 +4892,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
               m_bChangeCheat = true;
             }
 
-            if (m_phase != WM_PHASE_PLAY)
+            if (m_phase != EV_PHASE_PLAY)
               ChangePhase (m_phase);
 
             pos.x = LXIMAGE / 2;
@@ -4912,13 +4912,13 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
     m_rankCheat = -1;
     m_posCheat  = 0;
 
-    if (m_phase == WM_PHASE_INTRO1)
+    if (m_phase == EV_PHASE_INTRO1)
     {
-      ChangePhase (WM_PHASE_INIT);
+      ChangePhase (EV_PHASE_INIT);
       return true;
     }
 
-    if (m_phase == WM_PHASE_BYE)
+    if (m_phase == EV_PHASE_BYE)
     {
       SDL_Event ev;
       ev.type = SDL_QUIT;
@@ -4940,39 +4940,39 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
 
       switch (m_phase)
       {
-      case WM_PHASE_PLAY:
-      case WM_PHASE_SETUP:
-      case WM_PHASE_SETUPp:
-      case WM_PHASE_READ:
-      case WM_PHASE_WRITE:
-      case WM_PHASE_WRITEp:
-      case WM_PHASE_HELP:
-        ChangePhase (WM_PHASE_STOP);
+      case EV_PHASE_PLAY:
+      case EV_PHASE_SETUP:
+      case EV_PHASE_SETUPp:
+      case EV_PHASE_READ:
+      case EV_PHASE_WRITE:
+      case EV_PHASE_WRITEp:
+      case EV_PHASE_HELP:
+        ChangePhase (EV_PHASE_STOP);
         return true;
 
-      case WM_PHASE_STOP:
-      case WM_PHASE_LOST:
-      case WM_PHASE_BUILD:
-        ChangePhase (WM_PHASE_INFO);
+      case EV_PHASE_STOP:
+      case EV_PHASE_LOST:
+      case EV_PHASE_BUILD:
+        ChangePhase (EV_PHASE_INFO);
         return true;
 
-      case WM_PHASE_INFO:
-      case WM_PHASE_SETTINGS:
-        ChangePhase (WM_PHASE_INIT);
+      case EV_PHASE_INFO:
+      case EV_PHASE_SETTINGS:
+        ChangePhase (EV_PHASE_INIT);
         return true;
 
-      case WM_PHASE_BUTTON:
-      case WM_PHASE_TERM:
-      case WM_PHASE_MUSIC:
-      case WM_PHASE_REGION:
-        ChangePhase (WM_PHASE_BUILD);
+      case EV_PHASE_BUTTON:
+      case EV_PHASE_TERM:
+      case EV_PHASE_MUSIC:
+      case EV_PHASE_REGION:
+        ChangePhase (EV_PHASE_BUILD);
         return true;
 
-      case WM_PHASE_INIT:
-        ChangePhase (WM_PHASE_BYE);
+      case EV_PHASE_INIT:
+        ChangePhase (EV_PHASE_BYE);
         return true;
 
-      case WM_PHASE_BYE:
+      case EV_PHASE_BYE:
       {
         SDL_Event ev;
         ev.type = SDL_QUIT;
@@ -4984,36 +4984,36 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
     case SDLK_RETURN:
       switch (m_phase)
       {
-      case WM_PHASE_SETTINGS:
-        ChangePhase (WM_PHASE_INIT);
+      case EV_PHASE_SETTINGS:
+        ChangePhase (EV_PHASE_INIT);
         return true;
 
-      case WM_PHASE_PLAY:
-      case WM_PHASE_READ:
-      case WM_PHASE_WRITE:
-      case WM_PHASE_SETUP:
-        ChangePhase (WM_PHASE_STOP);
+      case EV_PHASE_PLAY:
+      case EV_PHASE_READ:
+      case EV_PHASE_WRITE:
+      case EV_PHASE_SETUP:
+        ChangePhase (EV_PHASE_STOP);
         return true;
 
-      case WM_PHASE_INIT:
-      case WM_PHASE_LOST:
-      case WM_PHASE_BUILD:
-        ChangePhase (WM_PHASE_INFO);
+      case EV_PHASE_INIT:
+      case EV_PHASE_LOST:
+      case EV_PHASE_BUILD:
+        ChangePhase (EV_PHASE_INFO);
         return true;
 
-      case WM_PHASE_INFO:
-      case WM_PHASE_STOP:
-      case WM_PHASE_HELP:
-      case WM_PHASE_SETUPp:
-      case WM_PHASE_WRITEp:
-        ChangePhase (WM_PHASE_PLAY);
+      case EV_PHASE_INFO:
+      case EV_PHASE_STOP:
+      case EV_PHASE_HELP:
+      case EV_PHASE_SETUPp:
+      case EV_PHASE_WRITEp:
+        ChangePhase (EV_PHASE_PLAY);
         return true;
 
-      case WM_PHASE_BUTTON:
-      case WM_PHASE_TERM:
-      case WM_PHASE_MUSIC:
-      case WM_PHASE_REGION:
-        ChangePhase (WM_PHASE_BUILD);
+      case EV_PHASE_BUTTON:
+      case EV_PHASE_TERM:
+      case EV_PHASE_MUSIC:
+      case EV_PHASE_REGION:
+        ChangePhase (EV_PHASE_BUILD);
         return true;
       }
 
@@ -5057,7 +5057,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
       return true;
     case SDLK_PAUSE:
       m_bPause = !m_bPause;
-      if (m_phase == WM_PHASE_PLAY)
+      if (m_phase == EV_PHASE_PLAY)
       {
         if (m_bPause)
           m_pSound->SuspendMusic ();
@@ -5074,7 +5074,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
     case SDLK_LCTRL:
     case SDLK_RCTRL:
       m_keymod |= KMOD_CTRL;
-      if (m_phase == WM_PHASE_BUILD)
+      if (m_phase == EV_PHASE_BUILD)
       {
         m_bFillMouse = true;
         MouseSprite (GetMousePos ());
@@ -5083,7 +5083,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
         m_bFillMouse = false;
       return true;
     case SDLK_F1:
-      if (m_phase == WM_PHASE_PLAY)
+      if (m_phase == EV_PHASE_PLAY)
       {
         // Montre ou cache les infos tout en haut.
         if (m_pDecor->GetInfoMode ())
@@ -5097,19 +5097,19 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
       }
       return true;
     case SDLK_F8:
-      if (m_phase == WM_PHASE_PLAY)
+      if (m_phase == EV_PHASE_PLAY)
         m_pDecor->MemoPos (0, !!(m_keymod & KMOD_CTRL));
       return true;
     case SDLK_F10:
-      if (m_phase == WM_PHASE_PLAY)
+      if (m_phase == EV_PHASE_PLAY)
         m_pDecor->MemoPos (1, !!(m_keymod & KMOD_CTRL));
       return true;
     case SDLK_F11:
-      if (m_phase == WM_PHASE_PLAY)
+      if (m_phase == EV_PHASE_PLAY)
         m_pDecor->MemoPos (2, !!(m_keymod & KMOD_CTRL));
       return true;
     case SDLK_F12:
-      if (m_phase == WM_PHASE_PLAY)
+      if (m_phase == EV_PHASE_PLAY)
         m_pDecor->MemoPos (3, !!(m_keymod & KMOD_CTRL));
       return true;
     }
@@ -5145,12 +5145,12 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
     //?         DecorAutoShift(pos);
     if (EventButtons (event, pos))
       return true;
-    if (m_phase == WM_PHASE_BUILD)
+    if (m_phase == EV_PHASE_BUILD)
     {
       if (BuildDown (pos, m_keymod))
         return true;
     }
-    if (m_phase == WM_PHASE_PLAY)
+    if (m_phase == EV_PHASE_PLAY)
     {
       if (PlayDown (pos, event))
         return true;
@@ -5166,12 +5166,12 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
     MouseSprite (pos);
     if (EventButtons (event, pos))
       return true;
-    if (m_phase == WM_PHASE_BUILD)
+    if (m_phase == EV_PHASE_BUILD)
     {
       if (BuildMove (pos, m_keymod, event))
         return true;
     }
-    if (m_phase == WM_PHASE_PLAY)
+    if (m_phase == EV_PHASE_PLAY)
     {
       if (PlayMove (pos))
         return true;
@@ -5189,14 +5189,14 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
 
     if (EventButtons (event, pos))
       return true;
-    if (m_phase == WM_PHASE_BUILD)
+    if (m_phase == EV_PHASE_BUILD)
       return true;
-    if (m_phase == WM_PHASE_PLAY)
+    if (m_phase == EV_PHASE_PLAY)
     {
       if (PlayUp (pos))
         return true;
     }
-    if (m_phase == WM_PHASE_BYE)
+    if (m_phase == EV_PHASE_BYE)
     {
       SDL_Event ev;
       ev.type = SDL_QUIT;
@@ -5207,74 +5207,74 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
   case SDL_USEREVENT:
     switch (event.user.code)
     {
-    case WM_PHASE_DEMO:
+    case EV_PHASE_DEMO:
       m_demoNumber = 0;
       DemoPlayStart ();
       break;
 
-    case WM_PHASE_SCHOOL:
+    case EV_PHASE_SCHOOL:
       m_bSchool  = true;
       m_bPrivate = false;
-      if (ChangePhase (WM_PHASE_INFO))
+      if (ChangePhase (EV_PHASE_INFO))
         return true;
       break;
 
-    case WM_PHASE_MISSION:
+    case EV_PHASE_MISSION:
       m_bSchool  = false;
       m_bPrivate = false;
       if (m_mission == 0) // première mission ?
       {
-        if (ChangePhase (WM_PHASE_H0MOVIE))
+        if (ChangePhase (EV_PHASE_H0MOVIE))
           return true;
       }
       else
       {
-        if (ChangePhase (WM_PHASE_INFO))
+        if (ChangePhase (EV_PHASE_INFO))
           return true;
       }
       break;
 
-    case WM_PHASE_PRIVATE:
+    case EV_PHASE_PRIVATE:
       m_bSchool  = false;
       m_bPrivate = true;
-      if (ChangePhase (WM_PHASE_INFO))
+      if (ChangePhase (EV_PHASE_INFO))
         return true;
       break;
 
-    case WM_PHASE_INTRO1:
-    case WM_PHASE_INIT:
-    case WM_PHASE_HISTORY0:
-    case WM_PHASE_HISTORY1:
-    case WM_PHASE_INFO:
-    case WM_PHASE_PLAY:
-    case WM_PHASE_READ:
-    case WM_PHASE_WRITE:
-    case WM_PHASE_WRITEp:
-    case WM_PHASE_BUILD:
-    case WM_PHASE_BUTTON:
-    case WM_PHASE_TERM:
-    case WM_PHASE_STOP:
-    case WM_PHASE_HELP:
-    case WM_PHASE_MUSIC:
-    case WM_PHASE_REGION:
-    case WM_PHASE_SETTINGS:
-    case WM_PHASE_SETUP:
-    case WM_PHASE_SETUPp:
-    case WM_PHASE_PLAYMOVIE:
-    case WM_PHASE_H0MOVIE:
-    case WM_PHASE_H1MOVIE:
-    case WM_PHASE_H2MOVIE:
-    case WM_PHASE_WINMOVIE:
-    case WM_PHASE_BYE:
+    case EV_PHASE_INTRO1:
+    case EV_PHASE_INIT:
+    case EV_PHASE_HISTORY0:
+    case EV_PHASE_HISTORY1:
+    case EV_PHASE_INFO:
+    case EV_PHASE_PLAY:
+    case EV_PHASE_READ:
+    case EV_PHASE_WRITE:
+    case EV_PHASE_WRITEp:
+    case EV_PHASE_BUILD:
+    case EV_PHASE_BUTTON:
+    case EV_PHASE_TERM:
+    case EV_PHASE_STOP:
+    case EV_PHASE_HELP:
+    case EV_PHASE_MUSIC:
+    case EV_PHASE_REGION:
+    case EV_PHASE_SETTINGS:
+    case EV_PHASE_SETUP:
+    case EV_PHASE_SETUPp:
+    case EV_PHASE_PLAYMOVIE:
+    case EV_PHASE_H0MOVIE:
+    case EV_PHASE_H1MOVIE:
+    case EV_PHASE_H2MOVIE:
+    case EV_PHASE_WINMOVIE:
+    case EV_PHASE_BYE:
       if (ChangePhase (event.user.code))
         return true;
       break;
 
-    case WM_PHASE_UNDO:
+    case EV_PHASE_UNDO:
       m_pDecor->UndoBack (); // revient en arrière
       break;
 
-    case WM_PREV:
+    case EV_PREV:
       m_pDecor->SetInvincible (false);
       m_pDecor->SetSuper (false);
       if (m_bPrivate)
@@ -5282,7 +5282,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
         if (m_private > 0)
         {
           m_private--;
-          if (ChangePhase (WM_PHASE_INFO))
+          if (ChangePhase (EV_PHASE_INFO))
             return true;
         }
       }
@@ -5291,7 +5291,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
         if (m_exercice > 0)
         {
           m_exercice--;
-          if (ChangePhase (WM_PHASE_INFO))
+          if (ChangePhase (EV_PHASE_INFO))
             return true;
         }
       }
@@ -5300,13 +5300,13 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
         if (m_mission > 0)
         {
           m_mission--;
-          if (ChangePhase (WM_PHASE_INFO))
+          if (ChangePhase (EV_PHASE_INFO))
             return true;
         }
       }
       break;
 
-    case WM_NEXT:
+    case EV_NEXT:
       m_pDecor->SetInvincible (false);
       m_pDecor->SetSuper (false);
       if (m_bPrivate)
@@ -5314,7 +5314,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
         if (m_private < 20 - 1)
         {
           m_private++;
-          if (ChangePhase (WM_PHASE_INFO))
+          if (ChangePhase (EV_PHASE_INFO))
             return true;
         }
       }
@@ -5323,7 +5323,7 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
         if (m_exercice < 99)
         {
           m_exercice++;
-          if (ChangePhase (WM_PHASE_INFO))
+          if (ChangePhase (EV_PHASE_INFO))
             return true;
         }
       }
@@ -5334,144 +5334,144 @@ bool CEvent::TreatEventBase (const SDL_Event & event)
           m_mission++;
           if (m_maxMission < m_mission)
             m_maxMission = m_mission;
-          if (ChangePhase (WM_PHASE_INFO))
+          if (ChangePhase (EV_PHASE_INFO))
             return true;
         }
       }
       break;
 
-    case WM_DECOR1:
-      SetState (WM_DECOR1, 1);
-      SetState (WM_DECOR2, 0);
-      SetState (WM_DECOR3, 0);
-      SetState (WM_DECOR4, 0);
-      SetState (WM_DECOR5, 0);
+    case EV_DECOR1:
+      SetState (EV_DECOR1, 1);
+      SetState (EV_DECOR2, 0);
+      SetState (EV_DECOR3, 0);
+      SetState (EV_DECOR4, 0);
+      SetState (EV_DECOR5, 0);
       break;
 
-    case WM_DECOR2:
-      SetState (WM_DECOR1, 0);
-      SetState (WM_DECOR2, 1);
-      SetState (WM_DECOR3, 0);
-      SetState (WM_DECOR4, 0);
-      SetState (WM_DECOR5, 0);
+    case EV_DECOR2:
+      SetState (EV_DECOR1, 0);
+      SetState (EV_DECOR2, 1);
+      SetState (EV_DECOR3, 0);
+      SetState (EV_DECOR4, 0);
+      SetState (EV_DECOR5, 0);
       break;
 
-    case WM_DECOR3:
-      SetState (WM_DECOR1, 0);
-      SetState (WM_DECOR2, 0);
-      SetState (WM_DECOR3, 1);
-      SetState (WM_DECOR4, 0);
-      SetState (WM_DECOR5, 0);
+    case EV_DECOR3:
+      SetState (EV_DECOR1, 0);
+      SetState (EV_DECOR2, 0);
+      SetState (EV_DECOR3, 1);
+      SetState (EV_DECOR4, 0);
+      SetState (EV_DECOR5, 0);
       break;
 
-    case WM_DECOR4:
-      SetState (WM_DECOR1, 0);
-      SetState (WM_DECOR2, 0);
-      SetState (WM_DECOR3, 0);
-      SetState (WM_DECOR4, 1);
-      SetState (WM_DECOR5, 0);
+    case EV_DECOR4:
+      SetState (EV_DECOR1, 0);
+      SetState (EV_DECOR2, 0);
+      SetState (EV_DECOR3, 0);
+      SetState (EV_DECOR4, 1);
+      SetState (EV_DECOR5, 0);
       break;
 
-    case WM_DECOR5:
-      SetState (WM_DECOR1, 0);
-      SetState (WM_DECOR2, 0);
-      SetState (WM_DECOR3, 0);
-      SetState (WM_DECOR4, 0);
-      SetState (WM_DECOR5, 1);
+    case EV_DECOR5:
+      SetState (EV_DECOR1, 0);
+      SetState (EV_DECOR2, 0);
+      SetState (EV_DECOR3, 0);
+      SetState (EV_DECOR4, 0);
+      SetState (EV_DECOR5, 1);
       break;
 
-    case WM_PHASE_SKILL1:
+    case EV_PHASE_SKILL1:
       m_pDecor->SetSkill (0);
-      SetState (WM_PHASE_SKILL1, true);
-      SetState (WM_PHASE_SKILL2, false);
+      SetState (EV_PHASE_SKILL1, true);
+      SetState (EV_PHASE_SKILL2, false);
       break;
-    case WM_PHASE_SKILL2:
+    case EV_PHASE_SKILL2:
       m_pDecor->SetSkill (1);
-      SetState (WM_PHASE_SKILL1, false);
-      SetState (WM_PHASE_SKILL2, true);
+      SetState (EV_PHASE_SKILL1, false);
+      SetState (EV_PHASE_SKILL2, true);
       break;
 
-    case WM_BUTTON0:
-    case WM_BUTTON1:
-    case WM_BUTTON2:
-    case WM_BUTTON3:
-    case WM_BUTTON4:
-    case WM_BUTTON5:
-    case WM_BUTTON6:
-    case WM_BUTTON7:
-    case WM_BUTTON8:
-    case WM_BUTTON9:
-    case WM_BUTTON10:
-    case WM_BUTTON11:
-    case WM_BUTTON12:
-    case WM_BUTTON13:
-    case WM_BUTTON14:
-    case WM_BUTTON15:
-    case WM_BUTTON16:
-    case WM_BUTTON17:
-    case WM_BUTTON18:
-    case WM_BUTTON19:
-    case WM_BUTTON20:
-    case WM_BUTTON21:
-    case WM_BUTTON22:
-    case WM_BUTTON23:
-    case WM_BUTTON24:
-    case WM_BUTTON25:
-    case WM_BUTTON26:
-    case WM_BUTTON27:
-    case WM_BUTTON28:
-    case WM_BUTTON29:
-    case WM_BUTTON30:
-    case WM_BUTTON31:
-    case WM_BUTTON32:
-    case WM_BUTTON33:
-    case WM_BUTTON34:
-    case WM_BUTTON35:
-    case WM_BUTTON36:
-    case WM_BUTTON37:
-    case WM_BUTTON38:
-    case WM_BUTTON39:
+    case EV_BUTTON0:
+    case EV_BUTTON1:
+    case EV_BUTTON2:
+    case EV_BUTTON3:
+    case EV_BUTTON4:
+    case EV_BUTTON5:
+    case EV_BUTTON6:
+    case EV_BUTTON7:
+    case EV_BUTTON8:
+    case EV_BUTTON9:
+    case EV_BUTTON10:
+    case EV_BUTTON11:
+    case EV_BUTTON12:
+    case EV_BUTTON13:
+    case EV_BUTTON14:
+    case EV_BUTTON15:
+    case EV_BUTTON16:
+    case EV_BUTTON17:
+    case EV_BUTTON18:
+    case EV_BUTTON19:
+    case EV_BUTTON20:
+    case EV_BUTTON21:
+    case EV_BUTTON22:
+    case EV_BUTTON23:
+    case EV_BUTTON24:
+    case EV_BUTTON25:
+    case EV_BUTTON26:
+    case EV_BUTTON27:
+    case EV_BUTTON28:
+    case EV_BUTTON29:
+    case EV_BUTTON30:
+    case EV_BUTTON31:
+    case EV_BUTTON32:
+    case EV_BUTTON33:
+    case EV_BUTTON34:
+    case EV_BUTTON35:
+    case EV_BUTTON36:
+    case EV_BUTTON37:
+    case EV_BUTTON38:
+    case EV_BUTTON39:
       ChangeButtons (event.user.code);
       break;
 
-    case WM_READ0:
-    case WM_READ1:
-    case WM_READ2:
-    case WM_READ3:
-    case WM_READ4:
-    case WM_READ5:
-    case WM_READ6:
-    case WM_READ7:
-    case WM_READ8:
-    case WM_READ9:
+    case EV_READ0:
+    case EV_READ1:
+    case EV_READ2:
+    case EV_READ3:
+    case EV_READ4:
+    case EV_READ5:
+    case EV_READ6:
+    case EV_READ7:
+    case EV_READ8:
+    case EV_READ9:
       Read (event.user.code);
-      ChangePhase (WM_PHASE_PLAY); // joue
+      ChangePhase (EV_PHASE_PLAY); // joue
       break;
 
-    case WM_WRITE0:
-    case WM_WRITE1:
-    case WM_WRITE2:
-    case WM_WRITE3:
-    case WM_WRITE4:
-    case WM_WRITE5:
-    case WM_WRITE6:
-    case WM_WRITE7:
-    case WM_WRITE8:
-    case WM_WRITE9:
+    case EV_WRITE0:
+    case EV_WRITE1:
+    case EV_WRITE2:
+    case EV_WRITE3:
+    case EV_WRITE4:
+    case EV_WRITE5:
+    case EV_WRITE6:
+    case EV_WRITE7:
+    case EV_WRITE8:
+    case EV_WRITE9:
       Write (event.user.code);
-      if (m_phase == WM_PHASE_WRITEp)
+      if (m_phase == EV_PHASE_WRITEp)
       {
-        ChangePhase (WM_PHASE_PLAY); // joue
+        ChangePhase (EV_PHASE_PLAY); // joue
       }
       else
       {
-        ChangePhase (WM_PHASE_STOP); // pause
+        ChangePhase (EV_PHASE_STOP); // pause
       }
       break;
 
-    case WM_MOVIE:
+    case EV_MOVIE:
       StartMovie ("movie/essai.avi");
-      ChangePhase (WM_PHASE_INIT);
+      ChangePhase (EV_PHASE_INIT);
       break;
     }
   }
@@ -5487,9 +5487,9 @@ void CEvent::IntroStep ()
 
   if (m_introTime > 20 * 1)
   {
-    if (m_phase == WM_PHASE_INTRO1)
+    if (m_phase == EV_PHASE_INTRO1)
     {
-      ChangePhase (WM_PHASE_INIT);
+      ChangePhase (EV_PHASE_INIT);
       return;
     }
   }
diff --git a/src/menu.cxx b/src/menu.cxx
index 22e8091..b6ac68b 100644
--- a/src/menu.cxx
+++ b/src/menu.cxx
@@ -490,5 +490,5 @@ bool CMenu::MouseUp (POINT pos)
 void CMenu::Message ()
 {
   if (m_selRank != -1)
-    CEvent::PushUserEvent (WM_BUTTON0 + m_selRank);
+    CEvent::PushUserEvent (EV_BUTTON0 + m_selRank);
 }
diff --git a/src/movie.cxx b/src/movie.cxx
index ac80a99..7aa86ae 100644
--- a/src/movie.cxx
+++ b/src/movie.cxx
@@ -205,7 +205,7 @@ bool CMovie::Play (RECT rect, const std::string & pFilename)
     return false;
 
   playMovie ();
-  CEvent::PushUserEvent (WM_MOVIE_PLAY);
+  CEvent::PushUserEvent (EV_MOVIE_PLAY);
 
   return true;
 }
@@ -280,6 +280,6 @@ bool CMovie::Render ()
   SDL_RenderCopy (g_renderer, m_videoTex, nullptr, nullptr);
 
   SDL_RenderPresent (g_renderer);
-  CEvent::PushUserEvent (WM_MOVIE_PLAY);
+  CEvent::PushUserEvent (EV_MOVIE_PLAY);
   return true;
 }
diff --git a/src/obstacle.cxx b/src/obstacle.cxx
index c2b76b3..245c897 100644
--- a/src/obstacle.cxx
+++ b/src/obstacle.cxx
@@ -1934,7 +1934,7 @@ bool CDecor::IsFreeCelEmbarque (
     if (bOK)
     {
       limit  = GetCel (cel, -2, 0);
-      action = WM_ACTION_BOATDE;
+      action = EV_ACTION_BOATDE;
       return true;
     }
   }
@@ -1948,7 +1948,7 @@ bool CDecor::IsFreeCelEmbarque (
     if (bOK)
     {
       limit  = GetCel (cel, 0, -2);
-      action = WM_ACTION_BOATDS;
+      action = EV_ACTION_BOATDS;
       return true;
     }
   }
@@ -1962,7 +1962,7 @@ bool CDecor::IsFreeCelEmbarque (
     if (bOK)
     {
       limit  = GetCel (cel, +1, 0);
-      action = WM_ACTION_BOATDO;
+      action = EV_ACTION_BOATDO;
       return true;
     }
   }
@@ -1976,7 +1976,7 @@ bool CDecor::IsFreeCelEmbarque (
     if (bOK)
     {
       limit  = GetCel (cel, 0, +1);
-      action = WM_ACTION_BOATDN;
+      action = EV_ACTION_BOATDN;
       return true;
     }
   }
@@ -2013,7 +2013,7 @@ bool CDecor::IsFreeCelDebarque (
     cel.x % 2 == 1 && cel.y % 2 == 1)
   {
     limit  = GetCel (cel, +3, 0);
-    action = WM_ACTION_BOATAE;
+    action = EV_ACTION_BOATAE;
     return true;
   }
 
@@ -2025,7 +2025,7 @@ bool CDecor::IsFreeCelDebarque (
     cel.x % 2 == 1 && cel.y % 2 == 1)
   {
     limit  = GetCel (cel, 0, +3);
-    action = WM_ACTION_BOATAS;
+    action = EV_ACTION_BOATAS;
     return true;
   }
 
@@ -2037,7 +2037,7 @@ bool CDecor::IsFreeCelDebarque (
     cel.x % 2 == 0 && cel.y % 2 == 1)
   {
     limit  = GetCel (cel, -2, 0);
-    action = WM_ACTION_BOATAO;
+    action = EV_ACTION_BOATAO;
     return true;
   }
 
@@ -2049,7 +2049,7 @@ bool CDecor::IsFreeCelDebarque (
     cel.x % 2 == 1 && cel.y % 2 == 0)
   {
     limit  = GetCel (cel, 0, -2);
-    action = WM_ACTION_BOATAN;
+    action = EV_ACTION_BOATAN;
     return true;
   }
 
@@ -2626,14 +2626,14 @@ bool CDecor::SearchOtherObject (
           continue;
 
         if (
-          action == WM_ACTION_ABAT1 || action == WM_ACTION_BUILD1 ||
-          action == WM_ACTION_BUILD2 || action == WM_ACTION_BUILD3 ||
-          action == WM_ACTION_BUILD4 || action == WM_ACTION_BUILD5 ||
-          action == WM_ACTION_BUILD6 || action == WM_ACTION_ROC1 ||
-          action == WM_ACTION_WALL || action == WM_ACTION_BRIDGEE ||
-          action == WM_ACTION_TOWER || action == WM_ACTION_BOATE ||
-          action == WM_ACTION_CULTIVE2 || action == WM_ACTION_FLAG2 ||
-          action == WM_ACTION_DROP)
+          action == EV_ACTION_ABAT1 || action == EV_ACTION_BUILD1 ||
+          action == EV_ACTION_BUILD2 || action == EV_ACTION_BUILD3 ||
+          action == EV_ACTION_BUILD4 || action == EV_ACTION_BUILD5 ||
+          action == EV_ACTION_BUILD6 || action == EV_ACTION_ROC1 ||
+          action == EV_ACTION_WALL || action == EV_ACTION_BRIDGEE ||
+          action == EV_ACTION_TOWER || action == EV_ACTION_BOATE ||
+          action == EV_ACTION_CULTIVE2 || action == EV_ACTION_FLAG2 ||
+          action == EV_ACTION_DROP)
         {
           if (!IsWorkableObject (cel, rank))
             continue;
@@ -2976,9 +2976,9 @@ bool CDecor::SearchRobotObject (
 
   if (m_term.bHachRobot) // robot sur dalles hachurées ?
   {
-    foundAction = WM_ACTION_GO;
+    foundAction = EV_ACTION_GO;
     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);
   }
 
@@ -3074,17 +3074,17 @@ bool CDecor::SearchRobotObject (
       foundCel = initCel;
     build:
       if (index == 0)
-        foundAction = WM_ACTION_R_BUILD1; // recharge
+        foundAction = EV_ACTION_R_BUILD1; // recharge
       if (index == 1)
-        foundAction = WM_ACTION_R_BUILD4; // tracks
+        foundAction = EV_ACTION_R_BUILD4; // tracks
       if (index == 2)
-        foundAction = WM_ACTION_R_BUILD2; // araignée
+        foundAction = EV_ACTION_R_BUILD2; // araignée
       if (index == 3)
-        foundAction = WM_ACTION_R_BUILD3; // virus
+        foundAction = EV_ACTION_R_BUILD3; // virus
       if (index == 4)
-        foundAction = WM_ACTION_R_BUILD5; // bombe
+        foundAction = EV_ACTION_R_BUILD5; // bombe
       if (index == 5)
-        foundAction = WM_ACTION_R_BUILD6; // électro
+        foundAction = EV_ACTION_R_BUILD6; // électro
       return true;
     }
     // Cherche un emplacement libre.
@@ -3196,17 +3196,17 @@ bool CDecor::SearchRobotObject (
   if (min < distMax)
   {
     if (index == 0)
-      foundAction = WM_ACTION_R_MAKE1; // recharge
+      foundAction = EV_ACTION_R_MAKE1; // recharge
     if (index == 1)
-      foundAction = WM_ACTION_R_MAKE4; // tracks
+      foundAction = EV_ACTION_R_MAKE4; // tracks
     if (index == 2)
-      foundAction = WM_ACTION_R_MAKE2; // araignée
+      foundAction = EV_ACTION_R_MAKE2; // araignée
     if (index == 3)
-      foundAction = WM_ACTION_R_MAKE3; // virus
+      foundAction = EV_ACTION_R_MAKE3; // virus
     if (index == 4)
-      foundAction = WM_ACTION_R_MAKE5; // bombe
+      foundAction = EV_ACTION_R_MAKE5; // bombe
     if (index == 5)
-      foundAction = WM_ACTION_R_MAKE6; // électro
+      foundAction = EV_ACTION_R_MAKE6; // électro
     return true;
   }
 
@@ -3242,15 +3242,15 @@ bool CDecor::SearchRobotObject (
   if (min < distMax)
   {
     if (foundIcon == 100)
-      foundAction = WM_ACTION_R_MAKE2; // araignée
+      foundAction = EV_ACTION_R_MAKE2; // araignée
     if (foundIcon == 102)
-      foundAction = WM_ACTION_R_MAKE3; // virus
+      foundAction = EV_ACTION_R_MAKE3; // virus
     if (foundIcon == 104)
-      foundAction = WM_ACTION_R_MAKE4; // tracks
+      foundAction = EV_ACTION_R_MAKE4; // tracks
     if (foundIcon == 115)
-      foundAction = WM_ACTION_R_MAKE5; // bombe
+      foundAction = EV_ACTION_R_MAKE5; // bombe
     if (foundIcon == 17)
-      foundAction = WM_ACTION_R_MAKE6; // électro
+      foundAction = EV_ACTION_R_MAKE6; // électro
     return true;
   }
 
@@ -3440,7 +3440,7 @@ bool CDecor::SearchElectroObject (
   {
     if (
       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;
 
diff --git a/src/sound.cxx b/src/sound.cxx
index daa896b..c0164a1 100644
--- a/src/sound.cxx
+++ b/src/sound.cxx
@@ -92,7 +92,7 @@ bool CSound::Create ()
 
   Mix_AllocateChannels (MAXSOUND);
 
-  Mix_HookMusicFinished ([]() { CEvent::PushUserEvent (WM_MUSIC_STOP); });
+  Mix_HookMusicFinished ([]() { CEvent::PushUserEvent (EV_MUSIC_STOP); });
 
   return true;
 }