From 45df02106dbd63e30d0c154d0a85a98dda35180f Mon Sep 17 00:00:00 2001
From: jummy <jimmyk3.14159@gmail.com>
Date: Wed, 12 Jun 2024 22:36:20 -0500
Subject: [PATCH] guh

---
 .gitignore                      |    1 +
 Speedy Eggbert 2 Source.vcxproj |   10 +-
 _fixup.h                        |   10 +
 blupi.cpp                       |  243 ++++---
 button.cpp                      |   60 +-
 button.h                        |    4 +-
 ddutil.cpp                      |    2 +-
 decor.cpp                       | 1068 +++++++++++++++++--------------
 decor.h                         | 1034 +++++++++---------------------
 def.h                           |  588 ++++++++---------
 jauge.h                         |    3 +-
 pixmap.cpp                      |  126 ++--
 pixmap.h                        |  144 ++---
 13 files changed, 1549 insertions(+), 1744 deletions(-)
 create mode 100644 _fixup.h

diff --git a/.gitignore b/.gitignore
index e915029..772bac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 ################################################################################
 
 /.vs
+planetblupi.*
\ No newline at end of file
diff --git a/Speedy Eggbert 2 Source.vcxproj b/Speedy Eggbert 2 Source.vcxproj
index 6705f02..00d18a0 100644
--- a/Speedy Eggbert 2 Source.vcxproj	
+++ b/Speedy Eggbert 2 Source.vcxproj	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -42,7 +42,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -104,10 +104,14 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -127,7 +131,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="action.h" />
     <ClInclude Include="button.h" />
     <ClInclude Include="ddraw.h" />
     <ClInclude Include="ddutil.h" />
@@ -136,7 +139,6 @@
     <ClInclude Include="dplay.h" />
     <ClInclude Include="dsound.h" />
     <ClInclude Include="event.h" />
-    <ClInclude Include="fifo.h" />
     <ClInclude Include="decmove.h" />
     <ClInclude Include="jauge.h" />
     <ClInclude Include="menu.h" />
diff --git a/_fixup.h b/_fixup.h
new file mode 100644
index 0000000..5c870dd
--- /dev/null
+++ b/_fixup.h
@@ -0,0 +1,10 @@
+#pragma once
+
+/* To maintain compatibility with the modern Win32 API, some overlapping
+ * function names need to be cleared up.  This file is fabricated,
+ * and not present in the original Speedy Blupi source code.
+ */
+
+#ifdef GetObjectA
+	#undef GetObject
+#endif
\ No newline at end of file
diff --git a/blupi.cpp b/blupi.cpp
index 93c60a3..3203604 100644
--- a/blupi.cpp
+++ b/blupi.cpp
@@ -25,19 +25,22 @@
 // Define Globals
 
 #define NAME        "Blupi"
-#define TITLE       "Eggbert"
-
+#ifdef _EGAMES
+	#define TITLE       "Eggbert"
+#else
+	#define TITLE		"Blupi"
+#endif
 
 // Variables Globals
 
-HWND		g_hWnd;					// handle � la fen�tre
+HWND		g_hWnd;					// handle à la fenêtre
 CEvent*		g_pEvent  = NULL;
 CPixmap*	g_pPixmap = NULL;		// pixmap principal
 CSound*		g_pSound  = NULL;		// sound principal
 CMovie*		g_pMovie  = NULL;		// movie principal
 CDecor*		g_pDecor  = NULL;
 CNetwork*   g_pNetwork;
-char		g_CDPath[MAX_PATH];		// chemin d'acc�s au CD-Rom
+char		g_CDPath[MAX_PATH];		// chemin d'accès au CD-Rom
 BOOL		g_bFullScreen = FALSE;	// FALSE si mode de test
 int			g_speedRate = 1;
 int			g_timerInterval = 50;	// inverval = 50ms
@@ -47,7 +50,7 @@ BOOL 		g_bBenchmarkSuccess;
 BOOL 		g_bTrueColor;
 BOOL 		g_bTrueColorBack;
 BOOL 		g_bTrueColorDecor;
-MMRESULT    g_updateTimer;			// timer g�n�ral
+MMRESULT    g_updateTimer;			// timer général
 BOOL		g_bActive = TRUE;		// is application active ?
 BOOL		g_bTermInit = FALSE;	// initialisation en cours
 int			g_objectMax;
@@ -57,6 +60,9 @@ int			g_exploMax;
 
 UINT		g_lastPhase = 999;
 
+
+// Lit un numéro décimal.
+
 int GetNum(char *p)
 {
     int     n = 0;
@@ -70,6 +76,8 @@ int GetNum(char *p)
     return n;
 }
 
+// Lit le fichier de configuration.
+
 BOOL ReadConfig (LPSTR lpCmdLine)
 {
     FILE*       file    = NULL;
@@ -80,7 +88,7 @@ BOOL ReadConfig (LPSTR lpCmdLine)
 
     file = fopen("data\\config.def", "rb");
     if ( file == NULL )   return FALSE;
-    nb = fread(buffer, sizeof(char), 200-1 file);
+    nb = fread(buffer, sizeof(char), 200-1, file);
     buffer[nb] = 0;
     fclose(file);
 
@@ -202,7 +210,7 @@ BOOL ReadConfig (LPSTR lpCmdLine)
 	return TRUE;
 }
 
-// Rewrite Variables
+// Mise à jour principale. [Rewrite Variables]
 
 void UpdateFrame(void)
 {
@@ -211,7 +219,7 @@ void UpdateFrame(void)
 	POINT			posMouse;
 	int				i, term, speed;
 
-	g_pPixmap->MouseBackClear();  // enl�ve la souris dans "back"
+	g_pPixmap->MouseBackClear();  // enlève la souris dans "back"
 	posMouse = g_pEvent->GetLastMousePos();
 
 	phase = g_pEvent->GetPhase();
@@ -234,9 +242,16 @@ void UpdateFrame(void)
 		g_pPixmap->DrawImage(-1, CHBACK, rcRect, 1);  // dessine le fond
 	}
 
+	//[this block remains dormant, yet functional in SB]
+	if (phase == WM_PHASE_INTRO1 ||
+		phase == WM_PHASE_INTRO2)
+	{
+		g_pEvent->IntroStep();
+	}
+
 	if (phase == WM_PHASE_INIT)
 	{
-		g_pEvent->DemoStep();  // d�marre �v. d�mo automatique
+		g_pEvent->DemoStep();  // démarre év. démo automatique
 	}
 
 	if (phase == WM_PHASE_PLAYMOVIE || phase == WM_PHASE_WINMOVIE || WM_PHASE_WINMOVIEDESIGN || WM_PHASE_WINMOVIEMULTI)
@@ -259,7 +274,7 @@ void UpdateFrame(void)
 		if ( g_pEvent->IsShift() )  // shift en cours ?
 		{
 			g_pEvent->DecorAutoShift(posMouse);
-			g_pDecor->Build(clip, posMouse);  // construit juste le d�cor
+			g_pDecor->Build(clip, posMouse);  // construit juste le décor
 		}
 		else
 		{
@@ -269,13 +284,13 @@ void UpdateFrame(void)
 				for ( i=0 ; i<speed ; i++ )
 				{
 					g_pDecor->BlupiStep(i==0);  // avance tous les blupi
-					g_pDecor->MoveStep(i==0);   // avance tous les d�cors
+					g_pDecor->MoveStep(i==0);   // avance tous les décors
 					g_pEvent->DemoStep();       // avance enregistrement/reproduction
 				}
 			}
 
 			g_pEvent->DecorAutoShift(posMouse);
-			g_pDecor->Build(clip, posMouse);  // construit le d�cor
+			g_pDecor->Build(clip, posMouse);  // construit le décor
 			g_pDecor->NextPhase(1);  // refait la carte de temps en temps
 		}
 	}
@@ -284,15 +299,16 @@ void UpdateFrame(void)
 	{
 		term = g_pDecor->IsTerminated();
 		if ( term == 1 )  g_pEvent->ChangePhase(WM_PHASE_LOST);  // perdu
-		if ( term == 2 )  g_pEvent->ChangePhase(WM_PHASE_WINMOVIE);   // gagn�
+		if ( term == 2 )  g_pEvent->ChangePhase(WM_PHASE_WINMOVIE);   // gagné
 	}
 
 	g_pPixmap->MouseBackDraw();  // remet la souris dans "back"
 }
 
+//[excluded from SB release builds]
 void Benchmark()
 {
-	int	i;
+	int		i;
 	POINT	pos = { 0, 0 };
 
 	g_pPixmap->DrawIcon(-1, 2, 10, pos, 0);
@@ -317,14 +333,34 @@ void SetDecor()
 	POINT posMouse;
 
 	g_pPixmap->MouseBackClear();
-	g_pEvent->GetLastMousePos(&posMouse);
-	phase = g_pEvent->GetPhase;
+	posMouse = g_pEvent->GetLastMousePos();
+
+	phase = g_pEvent->GetPhase();
 
 	if (phase == WM_PHASE_PLAY || phase == WM_PHASE_PLAYTEST || phase == WM_PHASE_BUILD)
 	{
-
+		rect.bottom = LYIMAGE;
+		rect.right = LXIMAGE;
+		rect.top = 0;
+		rect.left = 0;
+		g_pDecor->Build(rect);
 	}
+	else {
+		rect.bottom = LYIMAGE;
+		rect.right = LXIMAGE;
+		rect.top = 0;
+		rect.left = 0;
+		g_pPixmap->DrawImage(-1, 0, rect, 1);
+	}
+
+	g_pEvent->FUN_1d7d0();
+	g_lastPhase = phase;
+	g_pPixmap->MouseBackDraw();
 }
+
+
+// Restitue le jeu après une activation en mode fullScreen.
+
 BOOL RestoreGame()
 {
 	if ( g_pPixmap == NULL ) return FALSE;
@@ -333,6 +369,8 @@ BOOL RestoreGame()
 	return g_pPixmap->Restore();
 }
 
+// Libère le jeu avant une désactivation en mode fullScreen.
+
 BOOL FlushGame()
 {
 	if ( g_pPixmap == NULL ) return FALSE;
@@ -340,6 +378,9 @@ BOOL FlushGame()
 	return g_pPixmap->Flush();
 }
 
+
+// Finished with all objects we use; release them.
+
 static void FinishObjects(void)
 {
 	if ( g_pMovie != NULL )
@@ -364,7 +405,7 @@ static void FinishObjects(void)
 
 	if (g_pSound != NULL )
 	{
-		g_pSound->StopMusic();
+		g_pSound->StopMusic(); // stoppe la musique Midi
 
 		delete g_pSound;
 		g_pSound = NULL;
@@ -397,6 +438,9 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message,
 	}
 #endif
 
+	// La touche F10 envoie un autre message pour activer
+	// le menu dans les applications Windows standard !
+	//[The F10 key sends another message to activate the menu in standard Windows apps!]
 	if ( message == WM_SYSKEYDOWN && wParam == VK_F10 )
 	{
 		message = WM_KEYDOWN;
@@ -412,6 +456,16 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message,
 	switch( message )
 	{
 		case WM_TIMER:
+		case WM_UPDATE:
+			if (!g_pEvent->IsMovie())  // pas de film en cours ?
+			{
+				if (g_bActive)
+				{
+					UpdateFrame();
+				}
+				g_pPixmap->Display();
+			}
+			break;
 		case WM_SYSCOLORCHANGE:
 		    OutputDebug("Event WM_SYSCOLORCHANGE\n");
 			break;
@@ -422,9 +476,9 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message,
 
         case WM_ACTIVATEAPP:
 		    g_bActive = (wParam != 0);
-			if (g_pEvent != NULL)
+			if ( g_pEvent != NULL )
 			{
-				g_pEvent->SomethingDecor;
+				g_pEvent->SomethingDecor();
 			}
 			if ( g_bActive )
 			{
@@ -440,7 +494,7 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message,
 					iconDim.x = 64;
 					iconDim.y = 66/2;
 					g_pPixmap->Cache(CHLITTLE, "image16\\little.blp", totalDim, iconDim, TRUE);
-					g_pPixmap->SetTransparent(CHLITTLE, RGB(0,0,255));
+					g_pPixmap->SetTransparent(CHLITTLE, RGB(0,0,255)); // bleu
 
 					g_pPixmap->SavePalette();
 					g_pPixmap->InitSysPalette();
@@ -448,7 +502,7 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message,
 				SetWindowText(hWnd, "Blupi");
 				if ( g_pSound != NULL ) g_pSound->RestartMusic();
 			}
-			else
+			else // désactive ?
 			{
 				if ( g_bFullScreen )
 				{
@@ -459,89 +513,97 @@ LRESULT CALLBACK WindowProc (HWND hWnd, UINT message,
 			}
 			return 0;
 
-			case WM_KEYDOWN:
-				switch( wParam )
-				{
-					case VK_F5:
-						g_pEvent->SetSpeed(1);
-						break;
-					case VK_F6:
-						g_pEvent->SetSpeed(2);
-						break;
-					case VK_F7:
-						g_pEvent->SetSpeed(4);
-						break;
-					case VK_F8:
-						g_pEvent->SetSpeed(8);
-						break;
-				}
+		case WM_DISPLAYCHANGE:
+			OutputDebug("Event WM_DISPLAYCHANGE\n");
 			break;
 
-			case WM_DISPLAYCHANGE:
-				OutputDebug("Event WM_DISPLAYCHANGE\n");
-				break;
-			case WM_QUERYNEWPALETTE:
-				OutputDebug("Event WM_QUERYNEWPALETTE\n");
-				break;
-			case WM_PALETTECHANGED:
-				OutputDebug("Event WM_PALLETECHANGED\n");
-				break;
-			case MM_MCINOTIFY:
-				OutputDebug("Event MM_MCINOTIFY\n");
-				if ( g_pEvent->IsMovie() )
+		case WM_QUERYNEWPALETTE:
+			OutputDebug("Event WM_QUERYNEWPALETTE\n");
+			break;
+
+		case WM_PALETTECHANGED:
+			OutputDebug("Event WM_PALLETECHANGED\n");
+			break;
+
+		case MM_MCINOTIFY:
+			OutputDebug("Event MM_MCINOTIFY\n");
+			if ( g_pEvent->IsMovie() ) // film en cours ?
+			{
+				if ( wParam == MCI_NOTIFY_SUCCESSFUL )
 				{
-					if ( wParam == MCI_NOTIFY_SUCCESSFUL )
-					{
-						g_pEvent->StopMovie();
-					}
+					g_pEvent->StopMovie();
+				}
+			}
+			else
+			{
+				// music over, play it again
+				g_pSound->SuspendMusic();
+				// if music finished, play it again. Otherwise assume that
+				// it was aborted by the user or otherwise
+				if ( wParam == MCI_NOTIFY_SUCCESSFUL )
+				{
+					OutputDebug("Event MCI_NOTIFY_SUCCESSFUL\n");
+					g_pSound->RestartMusic();
 				}
 				else
 				{
-					g_pSound->SuspendMusic();
-					if ( wParam == MCI_NOTIFY_SUCCESSFUL )
-					{
-						OutputDebug("Event MCI_NOTIFY_SUCCESSFUL\n");
-						g_pSound->RestartMusic();
-					}
-					else
-					{
-						char s[50];
-						sprintf(s, "wParam=%d\n", wParam);
-						OutputDebug(s);
-					}
+					char s[50];
+					sprintf(s, "wParam=%d\n", wParam);
+					OutputDebug(s);
 				}
-				break;
+			}
+			break;
+
+		case WM_SETCURSOR:
+//			ChangeSprite();
+//			SetCursor(NULL); // pas de souris visible !
+			return TRUE;
 
 		case WM_LBUTTONDOWN:
+//?			Benchmark();
 			GetCursorPos(&mousePos);
 			ScreenToClient(hWnd, &mousePos);
 			break;
 
+		case WM_RBUTTONDOWN:
+			break;
+
+		case WM_MOUSEMOVE:
+			break;
+
+		case WM_KEYDOWN:
+			switch (wParam)
+			{
+			case VK_F5:
+				g_pEvent->SetSpeed(1);
+				break;
+			case VK_F6:
+				g_pEvent->SetSpeed(2);
+				break;
+			case VK_F7:
+				g_pEvent->SetSpeed(4);
+				break;
+			case VK_F8:
+				g_pEvent->SetSpeed(8);
+				break;
+			}
+			break;
+
 		case WM_DESTROY:
 			KillTimer(g_hWnd, 1);
 			FinishObjects();
 			PostQuitMessage(0);
 			break;
-		case WM_SETCURSOR:
-//			ChangeSprite();
-//			SetCursor(NULL);
-			return TRUE;
-		case WM_UPDATE:
-			if ( !g_pEvent->IsMovie() )
-			{
-				if ( g_bActive )
-				{
-					UpdateFrame();
-				}
-				g_pPixmap->Display();
-			}
-			break;
+		
 	}
 
 	return DefWindowProc(hWnd, message, wParam, lParam);
 
 }
 
+
+// Erreur dans DoInit.
+
 BOOL InitFail(char *msg, BOOL bDirectX)
 {
 	char	buffer[100];
@@ -557,8 +619,9 @@ BOOL InitFail(char *msg, BOOL bDirectX)
 	return FALSE;
 }
 
-//Space for SetTimer
+//[Space for SetTimer]
 
+// Initialisation de l'application.
 
 static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
 {
@@ -567,15 +630,17 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
 	RECT		   rcRect;
 	BOOL 		   bOK;
 
-	bOK = ReadConfig(lpCmdLine);
+	bOK = ReadConfig(lpCmdLine);  // lit le fichier config.def
 
 	InitHInstance(hInstance);
 
+	// Set up and register window class.
 	wc.style = CS_HREDRAW | CS_VREDRAW;
 	wc.lpfnWndProc = WindowProc;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
 	wc.hInstance = hInstance;
+//?	wc.hIcon         = LoadIcon(hInstance, IDI_APPLICATION);
 	wc.hIcon = LoadIcon(hInstance, "IDR_MAINFRAME");
 	wc.hCursor = LoadCursor(hInstance, "IDC_POINTER");
 	wc.hbrBackground = GetStockBrush(BLACK_BRUSH);
@@ -583,6 +648,7 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
 	wc.lpszClassName = NAME;
 	RegisterClass(&wc);
 
+	// Create a window.
 	if (g_bFullScreen)
 	{
 		g_hWnd = CreateWindowEx
@@ -633,13 +699,14 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
 	UpdateWindow(g_hWnd);
 	SetFocus(g_hWnd);
 
-	ChangeSprite(SPRITE_WAIT);
+	ChangeSprite(SPRITE_WAIT);  // met le sablier maison
 
-	if (!bOk)
+	if (!bOk)  // config.def pas correct ?
 	{
 		return InitFail("Game not correctly installed", FALSE);
 	}
 
+	// Crée le pixmap principal.
 	g_pPixmap = new CPixmap;
 	if (g_pPixmap == NULL) return InitFail("New pixmap", TRUE);
 
@@ -674,7 +741,7 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
 
 	g_pSound->Create(g_hWnd);
 	g_pSound->CacheAll();
-	g_pSoundSetState(TRUE);
+	g_pSound->SetState(TRUE);
 
 	g_pMovie = new CMovie;
 	if (g_pMovie == NULL) return InitFail("New movie", FALSE);
@@ -703,6 +770,9 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
 	return TRUE;
 }
 
+
+// Programme principal.
+
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
 					LPSTR lpCmdLine, int nCmdShow)
 {
@@ -728,6 +798,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		}
 		else
 		{
+			// make sure we go to sleep if we have nothing else to do
 			if ( !g_bActive ) WaitMessage();
 		}
 	}
diff --git a/button.cpp b/button.cpp
index 292816e..516ca44 100644
--- a/button.cpp
+++ b/button.cpp
@@ -1,4 +1,4 @@
-// Button.cpp
+// Button.cpp
 //
 
 #include <windows.h>
@@ -23,7 +23,7 @@ CButton::CButton()
     m_type              = 0;
     m_bEnable           = TRUE;
     m_bHide             = FALSE;
-	m_bSomething 		= 0;
+	m_bSomething 		= FALSE;
     m_state             = 0;
     m_mouseState        = 0;
     m_nbMenu            = 0;
@@ -45,9 +45,9 @@ CButton::~CButton()
 
 BOOL CButton::Create(HWND hWnd, CPixmap *pPixmap, CSound *pSound,
                      POINT pos, int type, BOOL bMinimizeRedraw,
-                     int *pMenu, int nbMenu,
+                     /*int *pMenu, int nbMenu,
                      int *pToolTips, int nbToolTips,
-                     int region, UINT message)
+                     int region,*/ UINT message)
 {
     POINT iconDim;
     int i, icon;
@@ -69,14 +69,14 @@ BOOL CButton::Create(HWND hWnd, CPixmap *pPixmap, CSound *pSound,
 	m_bMinimizeRedraw	= bMinimizeRedraw;
 	m_bEnable			= TRUE;
 	m_bHide				= FALSE;
-	m_bSomething 		= 0;
+	m_bSomething 		= FALSE;
 	m_message			= message;
 	m_pos.x				= pos.x;
 	m_pos.y 			= pos.y;
 	m_dim.x				= iconDim.x;
 	m_dim.y 			= iconDim.y;
-	m_nbMenu			= nbMenu;
-	m_nbToolTips		= nbToolTips;
+	m_nbMenu			= 0;
+	m_nbToolTips		= 0;
 	m_selMenu			= 0;
 	m_state				= 0;
 	m_mouseState		= 0;
@@ -84,6 +84,7 @@ BOOL CButton::Create(HWND hWnd, CPixmap *pPixmap, CSound *pSound,
 	m_bRedraw			= TRUE;
 
 /* Do we need this yet?
+	// No. 👍
 ///////////////////////////////////////////////////
 	for ( i=0 ; i<nbMenu ; i++ )
 	{
@@ -122,9 +123,10 @@ BOOL CButton::Create(HWND hWnd, CPixmap *pPixmap, CSound *pSound,
 		m_toolTips[i] = pToolTips[i];
 	}
 
-	return TRUE;
+	
 /////////////////////////////////////////////////////
 */
+	return TRUE;
 }
 
 // Space for unknown menu function.
@@ -135,11 +137,11 @@ void CButton::SetSomethingMenu(int somethingMenu)
 
 	while (0 < i)
 	{
-
+		//TODO
 	}
 }
 
-// Draw a button in its state
+// Draw a button according to its state
 
 void CButton::Draw()
 {
@@ -150,15 +152,15 @@ void CButton::Draw()
 	if ( m_bMinimizeRedraw && !m_bRedraw ) return;
 	m_bRedraw = FALSE, m_bSomething = FALSE;
 
-	if ( m_bHide ) // Hidden button
+	if ( m_bHide ) // is button hidden ?
 	{
 		pos.y 	   = m_pos.y;
 		pos.x	   = m_pos.x;
-		m_pPixmap->DrawPart(-1, CHBACK, m_pos, rect, 1); // Draw the background
+		m_pPixmap->DrawPart(-1, CHBACK, m_pos, rect, 1); // draw the background
 		return;
 	}
 
-	if( m_bEnable )
+	if( m_bEnable ) // is button active ?
 	{
 		m_pPixmap->DrawIcon(-1, CHBUTTON+m_type, m_mouseState, m_pos);
 	}
@@ -251,15 +253,10 @@ void CButton::SetSomething(BOOL bSomething)
 }
 
 
-/*
-// Needed Yet?
-/////////////////////////////////////////
 BOOL CButton::GetHide()
 {
 	return m_bHide;
 }
-/////////////////////////////////////////
-*/
 
 
 void CButton::SetHide(BOOL bHide)
@@ -272,6 +269,9 @@ void CButton::SetHide(BOOL bHide)
 	m_bHide = bHide;
 }
 
+
+// Event handling.
+
 BOOL CButton::TreatEvent(UINT message, WPARAM wParam, LPARAM lParam)
 {
 	POINT		pos;
@@ -293,14 +293,15 @@ BOOL CButton::TreatEvent(UINT message, WPARAM wParam, LPARAM lParam)
 		
 		case WM_LBUTTONUP:
 		case WM_RBUTTONUP:
-	    	if ( MouseUp(pos) )	  return FALSE;
+	    	if ( MouseUp(pos) )	  return FALSE; // (*)
 			break;
 	}
 
 	return FALSE;
 }
 
-// All buttons must receive the BUTTONUP event!
+// (*) All buttons must receive the BUTTONUP event!
+
 
 // Indicates whether the mouse is over this button.
 
@@ -319,7 +320,7 @@ int CButton::GetToolTips(POINT pos)
 
 	if ( m_bHide || !m_bEnable ) return -1;
 
-	if ( m_nbMenu > 1 && m_bMouseDown ) // Drop-down submenu?
+	if ( m_nbMenu > 1 && m_bMouseDown ) // submenu is open?
 	{
 		width += 2+(m_dim.x-1)*m_nbMenu;
 	}
@@ -348,13 +349,16 @@ int CButton::GetToolTips(POINT pos)
 	return m_toolTips[rank];
 }
 
+
+// Detect whether the mouse is on a button.
+
 BOOL CButton::Detect(POINT pos)
 {
 	int		 width = m_dim.x;
 
 	if ( m_bHide || !m_bEnable ) 	return FALSE;
 
-	if ( m_nbMenu > 1 && m_bMouseDown )
+	if ( m_nbMenu > 1 && m_bMouseDown ) // sub-menu is open?
 	{
 		width += 2+(m_dim.x-1)*m_nbMenu;
 	}
@@ -367,6 +371,8 @@ BOOL CButton::Detect(POINT pos)
 	return TRUE;
 }
 
+// Mouse button pressed.
+
 BOOL CButton::MouseDown(POINT pos)
 {
 	if ( !Detect(pos) )  return FALSE;
@@ -380,6 +386,8 @@ BOOL CButton::MouseDown(POINT pos)
 	return TRUE;
 }
 
+// Mouse moved.
+
 BOOL CButton::MouseMove(POINT pos)
 {
 	BOOL 	  bDetect;
@@ -392,18 +400,18 @@ BOOL CButton::MouseMove(POINT pos)
 
 	if ( m_bMouseDown )
 	{
-		if ( bDetect ) m_mouseState = 1;
+		if ( bDetect ) m_mouseState = 1; // pressed
 		else 		   m_mouseState = m_state;
 	}
 	else
 	{
-		if ( bDetect ) m_mouseState = m_state+2;
+		if ( bDetect ) m_mouseState = m_state+2; // hover
 		else		   m_mouseState = m_state;
 	}
 
 	if ( m_nbMenu > 1 &&
 		 m_bMouseDown &&
-		 pos.x > m_pos.x+m_dim.x+2 )
+		 pos.x > m_pos.x+m_dim.x+2 ) // is on sub-menu?
 	{
 		m_selMenu = (pos.x-(m_pos.x+m_dim.x+2))/(m_dim.x-1);
 		if ( m_selMenu >= m_nbMenu )
@@ -422,6 +430,8 @@ BOOL CButton::MouseMove(POINT pos)
 	return m_bMouseDown;
 }
 
+// Mouse button released.
+
 BOOL CButton::MouseUp(POINT pos)
 {
 	BOOL 	bDetect;
diff --git a/button.h b/button.h
index 71fcaa8..5332131 100644
--- a/button.h
+++ b/button.h
@@ -8,9 +8,9 @@ public:
 
 	BOOL	Create(HWND hWnd, CPixmap *pPixmap, CSound *pSound,
 				   POINT pos, int type, BOOL bMinimizeRedraw,
-				   int *pMenu, int nbMenu,
+				   /*int *pMenu, int nbMenu,
 				   int *pTooltips, int nbToolTips,
-				   int region, UINT message);
+				   int region,*/ UINT message);
 	void	SetSomethingMenu(int somethingMenu);
 	void	Draw();
 	void	Redraw();
diff --git a/ddutil.cpp b/ddutil.cpp
index 7a35b2d..2fcbf9e 100644
--- a/ddutil.cpp
+++ b/ddutil.cpp
@@ -19,7 +19,7 @@
 
 // Le message :
 // First-chance exception in Blupi.exe (GDI32.DLL): 0xC0000005: Access Violation.
-// appara�t au endroits marqu�s par (@) ...
+// apparaît au endroits marqués par (@) ...
 
 BOOL g_bDebug = TRUE;
 
diff --git a/decor.cpp b/decor.cpp
index 9fccb05..f27ab2c 100644
--- a/decor.cpp
+++ b/decor.cpp
@@ -10,480 +10,606 @@
 #include "pixmap.h"
 #include "sound.h"
 #include "decor.h"
-#include "action.h"
 #include "text.h"
 #include "misc.h"
-#include "fifo.h"
 #include "DECMOVE.h"
 #include "event.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#define MAXMOVEOBJECT	200
+#define MAXQUART		441
+#define SCROLL_SPEED	8
+#define SCROLL_MARGX	80
+#define SCROLL_MARGY	40
 
+#define BLUPIFLOOR		2
+#define BLUPIOFFY		4 + BLUPIFLOOR
+#define BLUPISURF		12
+#define BLUPISUSPEND	12
+#define OVERHEIGHT		80
 
-#define TEXTDELAY       10
+#define TEXTDELAY	   10 // tooltip popup delay
 
 // Constructor
 // Possibly incomplete
 
 CDecor::CDecor()
 {
-    int i;
+	int i;
 
-    m_hWnd   = NULL;
-    m_pSound = NULL;
-    m_pPixmap = NULL;
+	// unknown_library_function_2bd90(m_jauges, sizeof(CJauge), 2, CJauge::CJauge);
+	m_hWnd = NULL;
+	m_pSound = NULL;
+	m_pPixmap = NULL;
 
-    for (i = 0; i < 200; i++)
-    {
-        m_lastDecorIcon[i] = 0;
-    }
-    m_time = 0;
-    m_bAllMissions = FALSE;
-    m_bInvincible  = FALSE;
-    m_bShowSecret  = FALSE;
-    m_bAccessBuild = FALSE;
-    m_bNetPacked   = FALSE;
-    m_bNetMovePredict = TRUE;
-    m_bNetDebug = FALSE;
-    m_bMulti       = FALSE;
-    m_team = FALSE;
-    m_netPacketsSent = 0;
-    m_netPacketsSent2 = 0;
-    m_netPacketsRecieved = 0;
-    m_netPacketsRecieved2 = 0;
-
-    Init(CHFLOOR, 0);
-    BlupiFlush();
-    MoveFlush();
-    InitDrapeau();
+	for (i = 0; i < 200; i++)
+	{
+		m_lastDecorIcon[i] = 0;
+	}
+	m_time = 0;
+	m_bCheatDoors = FALSE;
+	m_bSuperBlupi = FALSE;
+	m_bDrawSecret = FALSE;
+	m_buildOfficialMissions = FALSE;
+	m_bNetPacked = FALSE;
+	m_bNetMovePredict = TRUE;
+	m_bNetDebug = FALSE;
+	m_bMulti = FALSE;
+	m_team = 0;
+	m_netPacketsSent = 0;
+	m_netPacketsSent2 = 0;
+	m_netPacketsReceived = 0;
+	m_netPacketsReceived2 = 0;
 }
 
 CDecor::~CDecor()
 {
-    UndoClose();
+	// unknown_library_function_2be30(m_jauges, sizeof(CJauge), 2, OutputDebug);
 }
 
 void CDecor::Create(HWND hWnd, CSound* pSound, CPixmap* pPixmap, CNetwork* pNetwork)
 {
-    m_hWnd = hWnd;
-    m_pSound = pSound;
-    m_pPixmap = pPixmap;
-    m_pNetwork = pNetwork;
-    m_input = 0;
-    m_previousInput = 0;
-    m_bHelicopterFlying = FALSE;
-    m_bHelicopterStationary = FALSE;
-    m_bCarMoving = FALSE;
-    m_bCarStationary = FALSE;
-    InitDecor();
-    m_jauges->Create(m_hWnd, m_pPixmap, m_pSound, 169, 450, 1, FALSE);
-    m_jauges->SetHide(TRUE);
-    m_jauges->Create(m_hWnd, m_pPixmap, m_pSound, 295, 450, 3, FALSE);
-    m_jauges->SetHide(TRUE);
+	POINT pos;
+
+	m_hWnd = hWnd;
+	m_pSound = pSound;
+	m_pPixmap = pPixmap;
+	m_pNetwork = pNetwork;
+	m_keyPress = 0;
+	m_lastKeyPress = 0;
+	m_blupiSpeedX = 0;
+	m_bHelicopterFlying = FALSE;
+	m_bHelicopterStationary = FALSE;
+	m_bCarMoving = FALSE;
+	m_bCarStationary = FALSE;
+	InitDecor();
+
+	pos.x = 169;
+	pos.y = 450;
+	m_jauges[0].Create(m_hWnd, m_pPixmap, m_pSound, pos, 1, FALSE);
+	m_jauges[0].SetHide(TRUE);
+	pos.x += DIMJAUGEX + 2;
+	m_jauges[1].Create(m_hWnd, m_pPixmap, m_pSound, pos, 3, FALSE);
+	m_jauges[1].SetHide(TRUE);
+	FUN_15fa0();
+	FlushNotificationMessages();
 }
 
 BOOL CDecor::LoadImages()
 {
-    POINT totalDim, iconDim;
-    char filename[52];
+	POINT totalDim, iconDim;
+	char filename[52];
 
-    if (m_lastRegion != m_region) return TRUE;
-    m_lastRegion = m_region;
+	if (m_lastRegion == m_region) return TRUE;
+	m_lastRegion = m_region;
 
-    totalDim.x = DIMCELX * 2 * 16;
-    totalDim.y = DIMCELY * 2 * 6;
-    iconDim.x = DIMCELX * 2;
-    iconDim.y = DIMCELY * 2;
-        sprintf(filename, "decor%.3d.blp", m_region);
-        if (!m_pPixmap->Cache2(CHFLOOR, filename, totalDim, iconDim, FALSE))
-        return FALSE;
-        if (m_region == 0)
-        {
-            return FALSE;
-    }
-        return TRUE;
+	totalDim.x = LXIMAGE;
+	totalDim.y = LYIMAGE;
+	iconDim.x = 0;
+	iconDim.y = 0;
+	sprintf(filename, "decor%.3d.blp", m_region);
+
+	return m_pPixmap->Cache1(CHBACK, filename, totalDim, iconDim, 0);
 }
 
 void CDecor::InitGamer()
 {
-    m_nbVies = 3;
-
+	m_nbVies = 3;
+	BYTE *ptr = m_doors;
+	for (int i = 50; i != 0; i--) {
+		*(int *)ptr = 0x01010101;
+		ptr += 4;
+	}
 }
 
-void CDecor::InitDecor(int channel, int icon)
+void CDecor::InitDecor()
 {
-    int i;
+	m_posDecor.x = 0;
+	m_posDecor.y = 0;
+	m_dimDecor.x = 100;
+	m_dimDecor.y = 100;
+	m_music = 1;
+	m_region = 2;
+	m_missionTitle[0] = '\0';
+	m_decorAction = 0;
+	for (int i = 0; i < MAXCELY; i++)
+	{
+		for (int j = 0; j < MAXCELX; j++)
+		{
+			m_decor[i][j].icon = -1;
+			m_bigDecor[i][j].icon = -1;
+		}
+	}
+	m_decor[3][4].icon = 40;
+	m_decor[4][4].icon = 38;
+	m_decor[5][4].icon = 39;
+	for (int k = MAXMOVEOBJECT; k != 0; k--)
+	{
+		m_moveObject[k]->type = 0;
+	}
+	FlushBalleTraj();
+	FlushMoveTraj();
+	m_moveObject[0].type = TYPE_TRESOR;
+	m_moveObject[0].stepAdvance = 1;
+	m_moveObject[0].stepRecede = 1;
+	m_moveObject[0].timeStopStart = 0;
+	m_moveObject[0].timeStopEnd = 0;
+	m_moveObject[0].posStart.x = 258;
+	m_moveObject[0].posStart.y = 196;
+	m_moveObject[0].posEnd = m_moveObject[0].posStart;
+	m_moveObject[0].posCurrent = m_moveObject[0].posStart;
+	m_moveObject[0].phase = 0;
+	m_moveObject[0].step = STEP_STOPSTART;
+	m_moveObject[0].time = 0;
+	m_moveObject[0].channel = CHELEMENT;
+	m_moveObject[0].icon = 0;
 
-    m_cameraPos.x = 0;
-    m_cameraPos.y = 0;
-    m_worldDims.x = 100;
-    m_worldDims.y = 100;
-    m_music = 1;
-    m_region = 2;
-    m_missionTitle[0] = '\0';
-    for (int i = 0; i < 100; i++)
-    {
-        for (int j = 0; j < 100; j++)
-        {
-            m_decor[i, j]->icon = -1;
-            m_bigDecor[i, j]->icon = 1;
-        }
-    }
-    m_decor[3, 4]->icon = 40;
-    m_decor[4, 4]->icon = 38;
-    m_decor[5, 4]->icon = 39;
-    for (int k = 0; k < Decor.MAXMOVEOBJECT; k++)
-    {
-        m_moveObject[k]->type = 0;
-    }
-    FlushBalleTraj();
-    FlushMoveTraj();
-    m_moveObject[0]->type = 5;
-    m_moveObject[0]->stepAdvance = 1;
-    m_moveObject[0]->stepRecede = 1;
-    m_moveObject[0]->timeStopStart = 0;
-    m_moveObject[0]->timeStopEnd = 0;
-    m_moveObject[0]->posStart.x = 258;
-    m_moveObject[0]->posStart.y = 196;
-    m_moveObject[0]->posEnd = m_moveObject[0]->posStart;
-    m_moveObject[0]->posCurrent = m_moveObject[0]->posStart;
-    m_moveObject[0]->phase = 0;
-    m_moveObject[0]->step = 1;
-    m_moveObject[0]->time = 0;
-    m_moveObject[0]->channel = 10;
-    m_moveObject[0]->icon = 0;
-    m_moveObject[1]->type = 7;
-    m_moveObject[1]->stepAdvance = 1;
-    m_moveObject[1]->timeStopStart = 0;
-    m_moveObject[1]->timeStopEnd = 0;
-    m_moveObject[1]->posStart.x = 450;
-    m_moveObject[1]->posStart.y = 196;
-    m_moveObject[1]->posEnd = m_moveObject[1]->posStart;
-    m_moveObject[1]->posCurrent = m_moveObject[1]->posStart;
-    m_moveObject[1]->phase = 0;
-    m_moveObject[1]->step = 1;
-    m_moveObject[1]->time = 0;
-    m_moveObject[1]->channel = 10;
-    m_moveObject[1]->icon = 29;
-    m_blupiStartPos.x = 66;
-    m_blupiStartPos.y = 192 + Decor.BLUPIOFFY;
-    m_blupiStartDir = 2;
-    m_blupiAction = 1;
-    m_blupiPhase = 0;
-    m_blupiIcon = 0;
-    m_blupiChannel = 2;
-    m_blupiFocus = TRUE;
-    m_blupiAir = FALSE;
-    m_blupiHelico = FALSE;
-    m_blupiOver = FALSE;
-    m_blupiJeep = FALSE;
-    m_blupiTank = FALSE;
-    m_blupiSkate = FALSE;
-    m_blupiNage = FALSE;
-    m_blupiSurf = FALSE;
-    m_blupiSuspend = FALSE;
-    m_blupiJumpAie = FALSE;
-    m_blupiShield = FALSE;
-    m_blupiPower = FALSE;
-    m_blupiCloud = FALSE;
-    m_blupiHide = FALSE;
-    m_blupiInvert = FALSE;
-    m_blupiBalloon = FALSE;
-    m_blupiEcrase = FALSE;
-    m_blupiMotorHigh = FALSE;
-    m_blupiPosHelico.x = -1;
-    m_blupiActionOuf = 0;
-    m_blupiTimeNoAsc = 0;
-    m_blupiTimeMockery = 0;
-    m_blupiVitesseX = 0.0;
-    m_blupiVitesseY = 0.0;
-    m_blupiValidPos = m_blupiStartPos;
-    m_blupiFront = FALSE;
-    m_blupiBullet = 0;
-    m_blupiCle = 0;
-    m_blupiPerso = 0;
-    m_blupiDynamite = 0;
-    m_nbTresor = 0;
-    m_totalTresor = 1;
-    m_goalPhase = 0;
-    m_scrollPoint = m_blupiStartPos;
-    m_scrollAdd.x = 0;
-    m_scrollAdd.y = 0;
-    m_term = 0;
-    byeByeObjects.Clear();
+	m_moveObject[1].type = TYPE_GOAL;
+	m_moveObject[1].stepAdvance = 1;
+	m_moveObject[1].timeStopStart = 0;
+	m_moveObject[1].timeStopEnd = 0;
+	m_moveObject[1].posStart.x = 450;
+	m_moveObject[1].posStart.y = 196;
+	m_moveObject[1].posEnd = m_moveObject[1].posStart;
+	m_moveObject[1].posCurrent = m_moveObject[1].posStart;
+	m_moveObject[1].phase = 0;
+	m_moveObject[1].step = STEP_STOPSTART;
+	m_moveObject[1].time = 0;
+	m_moveObject[1].channel = CHELEMENT;
+	m_moveObject[1].icon = 29;
+	//TODO: iterate setting blupi fifo positions
+	m_blupiStartPos.x = 66;
+	m_blupiStartPos.y = 192 + BLUPIOFFY;
+	m_blupiStartDir = DIR_RIGHT;
+	m_blupiAction = ACTION_STOP;
+	m_blupiPhase = 0;
+	m_blupiIcon = 0;
+	m_blupiChannel = 2;
+	m_blupiFocus = TRUE;
+	m_blupiAir = FALSE;
+	m_blupiHelico = FALSE;
+	m_blupiOver = FALSE;
+	m_blupiJeep = FALSE;
+	m_blupiTank = FALSE;
+	m_blupiSkate = FALSE;
+	m_blupiNage = FALSE;
+	m_blupiSurf = FALSE;
+	m_blupiSuspend = FALSE;
+	m_blupiJumpAie = FALSE;
+	m_blupiShield = FALSE;
+	m_blupiPower = FALSE;
+	m_blupiCloud = FALSE;
+	m_blupiHide = FALSE;
+	m_blupiInvert = FALSE;
+	m_blupiBalloon = FALSE;
+	m_blupiEcrase = FALSE;
+	m_blupiPosHelico.x = -1;
+	m_blupiActionOuf = 0;
+	m_blupiTimeNoAsc = 0;
+	m_blupiTimeMockery = 0;
+	m_blupiVitesse.x = 0;
+	m_blupiVitesse.y = 0;
+	m_blupiValidPos = m_blupiStartPos;
+	m_blupiEnergyUnused = 100;
+	m_blupiFront = FALSE;
+	m_blupiBullet = 0;
+	m_blupiCle = 0;
+	m_blupiPerso = 0;
+	m_blupiDynamite = 0;
+	m_nbTresor = 0;
+	m_totalTresor = 1;
+	m_goalPhase = 0;
+	m_scrollPoint = m_blupiStartPos;
+	m_scrollAdd.x = 0;
+	m_scrollAdd.y = 0;
+	m_term = 0;
+	m_CC20 = -1;
 }
 
 void CDecor::SetTime(int time)
 {
-    m_time = time;
+	m_time = time;
 }
 
 int CDecor::GetTime()
 {
-    return m_time;
+	return m_time;
 }
 
 void CDecor::PlayPrepare(BOOL bTest)
 {
-    if (bTest)
-    {
-        m_nbVies = 3;
-    }
+	if (bTest)
+	{
+		m_nbVies = 3;
+	}
 
-    if (m_bMulti == 0) {
-        m_blupiPos = m_blupiStartPos;
-        m_blupiDir = m_blupiStartDir;
-    }
-    else
-    {
-        m_nbVies = 10;
-        m_blupiPos = m_blupiStartPos;
-        m_blupiDir = m_blupiStartDir;
+	if (!m_bMulti) {
+		m_blupiPos = m_blupiStartPos;
+		m_blupiDir = m_blupiStartDir;
+	}
+	else
+	{
+		/* todo: set depending on team
+		m_nbVies = 10;
+		m_blupiPos = m_blupiStartPos;
+		m_blupiDir = m_blupiStartDir;
+		*/
 
-    }
-    if (m_blupiDir == 1)
-    {
-        m_blupiIcon = 4;
-    }
-    else
-    {
-        m_blupiIcon = 0;
-    }
-    m_blupiAction = 1;
-    m_blupiPhase = 0;
-    m_blupiFocus = TRUE;
-    m_blupiAir = FALSE;
-    m_blupiHelico = FALSE;
-    m_blupiOver = FALSE;
-    m_blupiJeep = FALSE;
-    m_blupiTank = FALSE;
-    m_blupiSkate = FALSE;
-    m_blupiNage = FALSE;
-    m_blupiSurf = FALSE;
-    m_blupiSuspend = FALSE;
-    m_blupiJumpAie = FALSE;
-    m_blupiShield = FALSE;
-    m_blupiPower = FALSE;
-    m_blupiCloud = FALSE;
-    m_blupiHide = FALSE;
-    m_blupiInvert = FALSE;
-    m_blupiBalloon = FALSE;
-    m_blupiEcrase = FALSE;
-    m_blupiMotorHigh = FALSE;
-    m_blupiActionOuf = 0;
-    m_blupiTimeNoAsc = 0;
-    m_blupiTimeMockery = 0;
-    m_blupiValidPos = m_blupiPos;
-    m_blupiBullet = 0;
-    m_blupiCle = 0;
-    m_blupiPerso = 0;
-    m_blupiDynamite = 0;
-    m_nbTresor = 0;
-    m_totalTresor = 0;
-    for (int i = 0; i < Decor.MAXMOVEOBJECT; i++)
-    {
-        if (m_moveObject[i]->type == 5)
-        {
-            m_totalTresor++;
-        }
-        m_moveObject[i]->posCurrent = m_moveObject[i]->posStart;
-        m_moveObject[i]->step = 1;
-        m_moveObject[i]->phase = 0;
-        m_moveObject[i]->time = 0;
-        if (m_moveObject[i]->type == 5 ||
-            m_moveObject[i]->type == 6 ||
-            m_moveObject[i]->type == 25 ||
-            m_moveObject[i]->type == 26 ||
-            m_moveObject[i]->type == 40 ||
-            m_moveObject[i]->type == 2 ||
-            m_moveObject[i]->type == 3 ||
-            m_moveObject[i]->type == 96 ||
-            m_moveObject[i]->type == 97)
-        {
-            m_moveObject[i]->phase = m_random.Next(23);
-        }
-        if (m_moveObject[i]->type == 23)
-        {
-            m_moveObject[i]->type = 0;
-        }
-        if (m_moveObject[i]->type == TYPE_BALLE)
-        {
-            m_moveObject[i]->type = TYPE_empty;
-        }
-        if ((m_bMulti != FALSE) && (m_moveObject[i] == TYPE_CAISSE) || (m_moveObject[i] == TYPE_GOAL) || (m_moveObject[i] == TYPE_CLE) || (m_moveObject[i] == TYPE_BLUPIHELICO) || (m_moveObject[i] == TYPE_BLUPITANK))
-        {
-            m_moveObject[i]->type = TYPE_empty;
-        }
-    }
-    m_goalPhase = 0;
-    MoveObjectSort();
-    m_scrollPoint = m_blupiPos;
-    m_scrollAdd.x = 0;
-    m_scrollAdd.y = 0;
-    m_blupiPosHelico.x = -1;
-    m_blupiMotorSound = 0;
-    m_blupiFront = FALSE;
-    m_blupiNoBarre = 0;
-    m_blupiValidPos = m_blupiPos;
-    m_blupiFifoNb = 0;
-    m_blupiTimeFire = 0;
-    m_voyageIcon = -1;
-    m_jauges[0].SetHide(TRUE);
-    m_jauges[1].SetHide(TRUE);
-    m_bFoundCle = FALSE;
-    m_term = 0;
-    m_time = 0;
-    m_bPause = FALSE;
-    MoveStep();
-    m_scrollPoint.x = m_blupiPos.x + 30 + m_scrollAdd.x;
-    m_scrollPoint.y = m_blupiPos.y + 30 + m_scrollAdd.y;
+	}
+	if (m_blupiDir == DIR_LEFT)
+	{
+		m_blupiIcon = 4;
+	}
+	else
+	{
+		m_blupiIcon = 0;
+	}
+	m_blupiAction = ACTION_STOP;
+	m_blupiPhase = 0;
+	m_blupiFocus = TRUE;
+	m_blupiAir = FALSE;
+	m_blupiHelico = FALSE;
+	m_blupiOver = FALSE;
+	m_blupiJeep = FALSE;
+	m_blupiTank = FALSE;
+	m_blupiSkate = FALSE;
+	m_blupiNage = FALSE;
+	m_blupiSurf = FALSE;
+	m_blupiSuspend = FALSE;
+	m_blupiJumpAie = FALSE;
+	m_blupiShield = FALSE;
+	m_blupiPower = FALSE;
+	m_blupiCloud = FALSE;
+	m_blupiHide = FALSE;
+	m_blupiInvert = FALSE;
+	m_blupiBalloon = FALSE;
+	m_blupiEcrase = FALSE;
+	m_blupiActionOuf = 0;
+	m_blupiTimeNoAsc = 0;
+	m_blupiTimeMockery = 0;
+	m_blupiValidPos = m_blupiPos;
+	m_blupiEnergyUnused = 100;
+	m_blupiBullet = 0;
+	m_blupiCle = 0;
+	m_blupiPerso = 0;
+	m_blupiDynamite = 0;
+	m_nbTresor = 0;
+	m_totalTresor = 0;
+	for (int i = MAXMOVEOBJECT; i != 0; i--)
+	{
+		if (m_moveObject[i].type == TYPE_TRESOR)
+		{
+			m_totalTresor++;
+		}
+		m_moveObject[i].posCurrent = m_moveObject[i].posStart;
+		m_moveObject[i].step = STEP_STOPSTART;
+		m_moveObject[i].phase = 0;
+		m_moveObject[i].time = 0;
+		if (m_moveObject[i].type == TYPE_TRESOR ||
+			m_moveObject[i].type == TYPE_EGG ||
+			m_moveObject[i].type == TYPE_SHIELD ||
+			m_moveObject[i].type == TYPE_POWER ||
+			m_moveObject[i].type == TYPE_INVERT ||
+			m_moveObject[i].type == TYPE_BOMBEDOWN ||
+			m_moveObject[i].type == TYPE_BOMBEUP ||
+			m_moveObject[i].type == TYPE_BOMBEFOLLOW1 ||
+			m_moveObject[i].type == TYPE_BOMBEFOLLOW2)
+		{
+			m_moveObject[i].phase = rand() % 23;
+		}
+		if (m_moveObject[i].type == TYPE_BALLE)
+		{
+			m_moveObject[i].type = 0;
+		}
+		if ((m_bMulti != FALSE) &&
+			(m_moveObject[i].type == TYPE_CAISSE) ||
+			(m_moveObject[i].type == TYPE_GOAL) ||
+			(m_moveObject[i].type == TYPE_CLE) ||
+			(m_moveObject[i].type == TYPE_BLUPIHELICO) ||
+			(m_moveObject[i].type == TYPE_BLUPITANK))
+		{
+			m_moveObject[i]->type = 0;
+		}
+	}
+	m_goalPhase = 0;
+	MoveObjectSort();
+	UpdateCaisse();
+	m_scrollPoint = m_blupiPos;
+	m_scrollAdd.x = 0;
+	m_scrollAdd.y = 0;
+	m_blupiPosHelico.x = -1;
+	m_blupiMotorSound = 0;
+	m_nbLinkCaisse = 0;
+	m_bHelicopterFlying = FALSE;
+	m_bHelicopterStationary = FALSE;
+	m_bCarMoving = FALSE;
+	m_bCarStationary = FALSE;
+	m_blupiFront = FALSE;
+	m_blupiNoBarre = 0;
+	m_blupiValidPos = m_blupiPos;
+	m_blupiFifoNb = 0;
+	m_blupiTimeFire = 0;
+	FUN_15580();
+	FlushNotificationMessages();
+	m_voyageIcon = -1;
+	m_jauges[0].SetHide(TRUE);
+	m_jauges[1].SetHide(TRUE);
+	m_bFoundCle = FALSE;
+	m_term = 0;
+	m_time = 0;
+	m_bPause = FALSE;
 }
 
 void CDecor::BuildPrepare()
 {
-    for (int i = 0; i < MAXMOVEOBJECT; i++)
-    {
-        m_moveObject[i]->posCurrent = m_moveObject[i]->posStart;
-        m_moveObject[i]->step = 1;
-        m_moveObject[i]->time = 0;
-        m_moveObject[i]->phase = 0;
-        if (m_moveObject[i]->type == 23)
-        {
-            m_moveObject[i]->type = 0;
-        }
-    }
-    m_voyageIcon = -1;
-    m_time = 0;
-    m_bPause = FALSE;
+	for (int i = 0; i < MAXMOVEOBJECT; i++)
+	{
+		m_moveObject[i].posCurrent = m_moveObject[i].posStart;
+		m_moveObject[i].step = STEP_STOPSTART;
+		m_moveObject[i].time = 0;
+		m_moveObject[i].phase = 0;
+		if (m_moveObject[i].type == TYPE_BALLE)
+		{
+			m_moveObject[i].type = 0;
+		}
+	}
+	m_voyageIcon = -1;
+	m_selectedCelPos.x = -1;
+	// field cc20 = -1
+	m_time = 0;
+	m_bPause = FALSE;
+	FUN_15580();
 }
 
-void CDecor::Build()
+int CDecor::IsTerminated()
 {
-    POINT posDecor = DecorNextAction();
-    POINT pos;
-    pos.x = posDecor.x * 2 / 3;
-    pos.y = posDecor.y * 2 / 3;
-    int num = 1;
-    POINT tinyPoint;
-    tinyPoint.x = m_drawBounds.left;
-    RECT rect;
-    rect.left = pos.x % 640;
-    rect.right = 640;
+	return m_term;
+}
 
-    for (int i = 0; i < 3; i++)
-    {
-        tinyPoint.y = m_drawBounds.top;
-        rect.top = pos.y % 480;
-        rect.bottom = 480;
-        for (int j = 0; j < 2; j++)
-        {
-            m_pPixmap->DrawPart(3, tinyPoint, rect);
-            tinyPoint.y += (rect.bottom - rect.top) - num;
-            rect.top = 0;
-            rect.bottom = 480;
-        }
-        tinyPoint.x += (rect.right - rect.left) - num;
-        rect.left = 0;
-        rect.right = 640;
-        if (tinyPoint.x > m_drawBounds.right)
-        {
-            break;
-        }
-        tinyPoint.x = m_drawBounds.left - posDecor.x % 64 - 64;
-        for (int i = posDecor.x / 64 - 1; i < posDecor.x / 64 + (m_drawBounds.right - m_drawBounds.left) / 64 + 3; i++) {
-            tinyPoint.y = m_drawBounds.top - posDecor.y % 64 + 2 - 64;
-            for (int j = posDecor.y / 64 - 1; j < posDecor.y / 64 + (m_drawBounds.bottom - m_drawBounds.top) / 64 + 2; j++)
-            {
-                if (i >= 0 && i < 100 && j >= 0 && j < 100)
-                {
-                    int num2 = m_bigDecor[i, j].icon;
-                }
-            }
-        }
-    }
+void CDecor::MoveStep()
+{
+	MoveObjectStep();
+	if (m_phase == WM_PHASE_PLAY || m_phase == WM_PHASE_PLAYTEST) {
+		BlupiStep();
+		FUN_15d50();
+		FUN_161a0();
+	}
+
+	if (m_phase == WM_PHASE_BUILD) {
+		if (m_keyPress & KEY_RIGHT) {
+			m_posDecor.x += 50;
+			int max = (m_dimDecor.x > 0) ? (m_dimDecor.x - LXIMAGE) : 0;
+			if (m_posDecor.x > max) {
+				m_posDecor.x = max;
+			}
+			m_selectedCelPos.x = -1;
+		}
+		if (m_keyPress & KEY_LEFT) {
+			m_posDecor.x -= 50;
+			if (m_posDecor.x < 0) {
+				m_posDecor.x = 0;
+			}
+			m_selectedCelPos.x = -1;
+		}
+		if (m_keyPress & KEY_DOWN) {
+			m_posDecor.y += 50;
+			int max = (m_dimDecor.y > 0) ? (m_dimDecor.y - LYIMAGE) : 0;
+			if (m_posDecor.y > max) {
+				m_posDecor.y = max;
+			}
+			m_selectedCelPos.x = -1;
+		}
+		if (m_keyPress & KEY_UP) {
+			m_posDecor.x -= 50;
+			if (m_posDecor.x < 0) {
+				m_posDecor.x = 0;
+			}
+			m_selectedCelPos.x = -1;
+		}
+	}
+}
+
+int CDecor::GetBlupiChannelStandard()
+{
+	if (m_bMulti && m_blupiChannel == CHBLUPI && m_team > 0) {
+		return m_team + CHBLUPI1 - 1;
+	}
+	return m_blupiChannel;
+}
+
+int CDecor::GetBlupiChannelActual()
+{
+	if (m_bMulti && m_team > 0) {
+		return m_team + CHBLUPI1 - 1;
+	}
+	return CHBLUPI;
+}
+
+int CDecor::GetIconPerso()
+{
+	if (m_bMulti) {
+		return m_team + 108;
+	}
+	return 108;
 }
 
 BOOL CDecor::BlitzActif(int celx, int cely)
 {
-    POINT pos;
-    pos.x = celx * 64;
-    pos.y = cely * 64;
+	POINT pos;
+	pos.x = celx * DIMOBJX;
+	pos.y = cely * DIMOBJY;
 
-    int num = m_time % 100;
+	//TODO: rewrite from ghidra. winphone code is too different
+	int num = m_time % 100;
 
-    if (m_decor[celx, cely - 1]->icon == 304 && (num == 0 || num == 7 || num == 18 || num == 25 || num == 33 || num == 44) && cely > 0)
-    {
-        PlaySound(69, pos);
-    }
-    return num % 2 == 0 && num < 50;
+	if (m_decor[celx][cely - 1].icon == 304 && (num == 0 || num == 7 || num == 18 || num == 25 || num == 33 || num == 44) && cely > 0)
+	{
+		PlaySound(SOUND_BLITZ, pos, 0);
+	}
+	return num % 2 == 0 && num < 50;
+}
+
+void CDecor::Build(RECT rect)
+{
+	POINT posDecor = DecorNextAction();
+	POINT pos;
+	pos.x = posDecor.x * 2 / 3;
+	pos.y = posDecor.y * 2 / 3;
+	int num = 1;
+	POINT tinyPoint;
+	tinyPoint.x = m_drawBounds.left;
+	RECT clipRect;
+	rect.left = pos.x % LXIMAGE;
+	rect.right = LXIMAGE;
+
+	clipRect = m_pPixmap->GetClipping();
+	//TODO: more^
+
+	for (int i = 0; i < 3; i++)
+	{
+		tinyPoint.y = m_drawBounds.top;
+		rect.top = pos.y % LYIMAGE;
+		rect.bottom = LYIMAGE;
+		for (int j = 0; j < 2; j++)
+		{
+			m_pPixmap->DrawPart(3, tinyPoint, rect);
+			tinyPoint.y += (rect.bottom - rect.top) - num;
+			rect.top = 0;
+			rect.bottom = LYIMAGE;
+		}
+		tinyPoint.x += (rect.right - rect.left) - num;
+		rect.left = 0;
+		rect.right = LXIMAGE;
+		if (tinyPoint.x > m_drawBounds.right)
+		{
+			break;
+		}
+		tinyPoint.x = m_drawBounds.left - posDecor.x % 64 - 64;
+		for (int i = posDecor.x / 64 - 1; i < posDecor.x / 64 + (m_drawBounds.right - m_drawBounds.left) / 64 + 3; i++) {
+			tinyPoint.y = m_drawBounds.top - posDecor.y % 64 + 2 - 64;
+			for (int j = posDecor.y / 64 - 1; j < posDecor.y / 64 + (m_drawBounds.bottom - m_drawBounds.top) / 64 + 2; j++)
+			{
+				if (i >= 0 && i < 100 && j >= 0 && j < 100)
+				{
+					int num2 = m_bigDecor[i, j].icon;
+				}
+			}
+		}
+	}
 }
 
 
 void CDecor::DrawInfo()
 {
-    POINT pos;
-    char text[100];
+	POINT pos;
+	char text[100];
 
-    if (m_phase == WM_PHASE_PLAY || WM_PHASE_PLAYTEST)
-    {
+	if (m_phase == WM_PHASE_PLAY || WM_PHASE_PLAYTEST)
+	{
+		for (int i = 4; i != 0; i--) {
+			if (m_messages[i] != '\0') {
+				pos.x = 10;
+				pos.y = 10;
+				DrawText(m_pPixmap, pos, *m_messages[i], 0);
+			}
+		}
 
-    }
+		if (m_nbVies > 0) {
+			pos.x = -15;
+			for (int i = 0; i < m_nbVies; i++) {
+				pos.y = 417;
+				m_pPixmap->QuickIcon(GetStandardBlupiChannel(), 48, pos);
+				pos.x += 16;
+			}
+		}
+
+		if (m_blupiBullet > 0) {
+			pos.x = -15;
+			pos.y = 398;
+			for (int i = 0; i < m_blupiBullet; i++) {
+				m_pPixmap->QuickIcon(CHELEMENT, 176, pos);
+				pos.x += 4;
+			}
+		}
+
+		//TODO: more
+	}
 }
 
 POINT CDecor::DecorNextAction()
 {
-    int num = 0;
-    if (m_decorAction == 0 || m_bPause)
-    {
-        m_posDecor;
-    }
-    POINT posDecor = m_posDecor;
-    while (tables->table_decor_action[num] != 0)
-    {
-        if (m_decorAction == tables->table_decor_action[num])
-    }
+	int num = 0;
+	if (m_decorAction == 0 || m_bPause)
+	{
+		m_posDecor;
+	}
+	POINT posDecor = m_posDecor;
+	while (tables->table_decor_action[num] != 0)
+	{
+		if (m_decorAction == tables->table_decor_action[num])
+	}
 }
 
 void CDecor::UpdateCaisse()
 {
-    m_nbRankCaisse = 0;
-    for (int i = 0; i < MAXMOVEOBJECT; i++)
-    {
-        if (m_moveObject[i]->type == 12)
-        {
-            m_rankCaisse[m_nbRankCaisse++] = i;
-        }
-    }
+	m_nbRankCaisse = 0;
+	for (int i = 0; i < MAXMOVEOBJECT; i++)
+	{
+		if (m_moveObject[i]->type == 12)
+		{
+			m_rankCaisse[m_nbRankCaisse++] = i;
+		}
+	}
 }
 
 BOOL CDecor::TestPushCaisse(int i, POINT pos, BOOL bPop)
 {
-    POINT move;
+	POINT move;
 
-    move.x = pos.x - m_moveObject[i]->posCurrent.x;
-    move.y = 0;
-    SearchLinkCaisse(i, bPop);
-    int y = m_moveObject[i]->posCurrent.y;
-    for (int j = 0; j < m_nbLinkCaisse; j++)
-    {
-        i = m_linkCaisse[j];
-        if (!TestPushOneCaisse(i, move, y))
-        {
-            return FALSE;
-        }
-    }
-    for (int j = 0; j < m_nbLinkCaisse; j++)
-    {
-        i = m_linkCaisse;
-        int num = i;
-        m_moveObject[num]->posCurrent.x = m_moveObject[num]->posCurrent.x + move.x;
-        m_moveObject[num]->posStart.x = m_moveObject[num]->posStart.x + move.x;
-        int num2 = i;
-        m_moveObject[num]->posEnd.x = m_moveObject[num]->posEnd.x + move.x;
-    }
-    return TRUE;
+	move.x = pos.x - m_moveObject[i]->posCurrent.x;
+	move.y = 0;
+	SearchLinkCaisse(i, bPop);
+	int y = m_moveObject[i]->posCurrent.y;
+	for (int j = 0; j < m_nbLinkCaisse; j++)
+	{
+		i = m_linkCaisse[j];
+		if (!TestPushOneCaisse(i, move, y))
+		{
+			return FALSE;
+		}
+	}
+	for (int j = 0; j < m_nbLinkCaisse; j++)
+	{
+		i = m_linkCaisse;
+		int num = i;
+		m_moveObject[num]->posCurrent.x = m_moveObject[num]->posCurrent.x + move.x;
+		m_moveObject[num]->posStart.x = m_moveObject[num]->posStart.x + move.x;
+		int num2 = i;
+		m_moveObject[num]->posEnd.x = m_moveObject[num]->posEnd.x + move.x;
+	}
+	return TRUE;
 }
 
 BOOL CDecor::TestPushOneCaisse(int i, POINT move, int b)
@@ -493,27 +619,27 @@ BOOL CDecor::TestPushOneCaisse(int i, POINT move, int b)
 
 void CDecor::SearchLinkCaisse(int rank, BOOL bPop)
 {
-    m_nbLinkCaisse = 0;
-    AddLinkCaisse(rank);
-    POINT posCurrent = m_moveObject;
+	m_nbLinkCaisse = 0;
+	AddLinkCaisse(rank);
+	POINT posCurrent = m_moveObject;
 
-    BOOL flag;
-    do
-    {
-        flag = FALSE;
-        for (int i = 0; i < m_nbLinkCaisse; i++)
-        {
-            int num = m_linkCaisse[i];
-            if (m_moveObject[num]->posCurrent.y <=
-                posCurrent.y && (!bPop || (m_moveObject
-                    [num]->posCurrent.x >= posCurrent.x - 32 &&
-                    m_moveObject[num]->posCurrent.x <=
-                    posCurrent.x + 32)))
-            {
+	BOOL flag;
+	do
+	{
+		flag = FALSE;
+		for (int i = 0; i < m_nbLinkCaisse; i++)
+		{
+			int num = m_linkCaisse[i];
+			if (m_moveObject[num]->posCurrent.y <=
+				posCurrent.y && (!bPop || (m_moveObject
+					[num]->posCurrent.x >= posCurrent.x - 32 &&
+					m_moveObject[num]->posCurrent.x <=
+					posCurrent.x + 32)))
+			{
 
-            }
-        }
-    }
+			}
+		}
+	}
 }
 
 BOOL CDecor::AddLinkCaisse(int rank)
@@ -522,23 +648,23 @@ BOOL CDecor::AddLinkCaisse(int rank)
 }
 
 
-BOOL CDecor::LoadBackgroundImages()
+BOOL CDecor::LoadImages()
 {
-    char filename[52];
-    POINT totalDim, iconDim;
-    
-    if (m_region == m_lastRegion) return TRUE;
-    m_lastRegion == m_region;
+	char filename[52];
+	POINT totalDim, iconDim;
 
-    totalDim.x = DIMCELX * 2 * 16;
-    totalDim.y = DIMCELY * 2 * 6;
-    iconDim.x = DIMCELX * 2;
-    iconDim.y = DIMCELY * 2;
-    sprintf(filename, "image\\decor%.3d.blp", m_region);
-    if (!m_pPixmap->Cache(CHFLOOR, filename, totalDim, iconDim, FALSE))
-        return FALSE;
+	if (m_region == m_lastRegion) return TRUE;
+	m_lastRegion == m_region;
 
-    return TRUE;
+	totalDim.x = DIMCELX * 2 * 16;
+	totalDim.y = DIMCELY * 2 * 6;
+	iconDim.x = DIMCELX * 2;
+	iconDim.y = DIMCELY * 2;
+	sprintf(filename, "image\\decor%.3d.blp", m_region);
+	if (!m_pPixmap->Cache(CHFLOOR, filename, totalDim, iconDim, FALSE))
+		return FALSE;
+
+	return TRUE;
 }
 
 
@@ -546,173 +672,173 @@ BOOL CDecor::LoadBackgroundImages()
 
 int CDecor::SetBlupiChannel()
 {
-    if ( m_bMulti = 0 ||
-         m_blupiChannel == ch_blupi00 ||
-         m_team > 0);{
-    return m_team + 10;
-         }
-    return m_blupiChannel;
+	if (m_bMulti = 0 ||
+		m_blupiChannel == ch_blupi00 ||
+		m_team > 0); {
+		return m_team + 10;
+	}
+	return m_blupiChannel;
 }
 
 int CDecor::GetBlupiChannel()
 {
-    int m_blupiChannel = CHBLUPI000;
+	int m_blupiChannel = CHBLUPI000;
 
 
-    if ( m_bMulti != 0 ||
-         m_team > 0);{
-        return m_team + 10;
-         }
-    return CHBLUPI000;
+	if (m_bMulti != 0 ||
+		m_team > 0); {
+		return m_team + 10;
+	}
+	return CHBLUPI000;
 }
 
 
 
-int CDecor::GetPersonalBombIcon()
+int CDecor::GetIconPerso()
 {
-    if ( m_bMulti != 0){
-       return m_team + ICON_BUTTON_PERSONALBOMBICON;
-    }
-    return ICON_BUTTON_PERSONALBOMBICON;
+	if (m_bMulti) {
+		return m_team + ICON_BUTTON_PERSONALBOMBICON;
+	}
+	return ICON_BUTTON_PERSONALBOMBICON;
 }
 
 
 void CDecor::SetTime(int time)
 {
-    m_time            = time;
+	m_time = time;
 }
 
 int CDecor::GetTime()
 {
-    return m_time;
+	return m_time;
 }
 
 int CDecor::GetTargetLevel(int mission)
 {
-    m_targetMission    = mission;
+	m_targetMission = mission;
 }
 
 int CDecor::GetRegion()
 {
-    return m_region;
+	return m_region;
 }
 
 void CDecor::SetRegion(int region)
 {
-    m_region = region;
+	m_region = region;
 }
 
 int CDecor::GetMusic()
 {
-    return m_music;
+	return m_music;
 }
 
 void CDecor::SetMusic(int music)
 {
-    m_music = music;
+	m_music = music;
 }
 
 void CDecor::GetDims(POINT* ptr)
 {
-    ptr->x = m_worldDims.x;
-    ptr->y = m_worldDims.y; 
-    return;
+	ptr->x = m_dimDecor.x;
+	ptr->y = m_dimDecor.y;
+	return;
 }
 
 void CDecor::SetDims(POINT dims)
 {
-    m_worldDims.x = dims.x;
-    m_worldDims.y = dims.y;
+	m_dimDecor.x = dims.x;
+	m_dimDecor.y = dims.y;
 }
 
 int CDecor::GetLives()
 {
-    return m_lives;
+	return m_lives;
 }
 
 void CDecor::SetLives(int lives)
 {
-    m_lives = lives;
+	m_lives = lives;
 }
 
 BOOL CDecor::GetInvincible()
 {
-    return m_bInvincible;
+	return m_bSuperBlupi;
 }
 
 void CDecor::SetInvincible(BOOL invincible)
 {
-    m_bInvincible = invincible;
+	m_bSuperBlupi = invincible;
 }
 
 BOOL CDecor::GetShowSecret()
 {
-    return m_bShowSecret;
+	return m_bDrawSecret;
 }
 
 void CDecor::SetShowSecret(BOOL secret)
 {
-    m_bShowSecret = secret;
+	m_bDrawSecret = secret;
 }
 
 void CDecor::SetAccessBuild(BOOL build)
 {
-    m_bAccessBuild = build;
+	m_bAccessBuild = build;
 }
 
 BOOL CDecor::GetNetPacked()
 {
-    return m_bNetPacked;
+	return m_bNetPacked;
 }
 
 void CDecor::SetNetPacked(BOOL net)
 {
-    m_bNetPacked = net;
+	m_bNetPacked = net;
 }
 
 BOOL CDecor::GetNetMovePredict()
 {
-    return m_bNetMovePredict;
+	return m_bNetMovePredict;
 }
 
 void CDecor::SetNetMovePredict(BOOL netmove)
 {
-    m_bNetMovePredict = netmove;
+	m_bNetMovePredict = netmove;
 }
 
 BOOL CDecor::GetNetDebug()
 {
-    return m_bNetDebug;
+	return m_bNetDebug;
 }
 
 void CDecor::SetMulti(int multi)
 {
-    m_bMulti = multi;
+	m_bMulti = multi;
 }
 
 void CDecor::SetTeam(int team)
 {
-    m_team = team;
+	m_team = team;
 }
 
 void CDecor::GetBlupiInfo(BOOL bHelico, BOOL bJeep, BOOL bSkate, BOOL bNage)
 {
-    bHelico = m_blupiHelico;
-    bJeep = (m_blupiJeep | m_blupiTank);
-    bSkate = m_blupiSkate;
-    bNage = (m_blupiNage | m_blupiSurf);
+	bHelico = m_blupiHelico;
+	bJeep = (m_blupiJeep | m_blupiTank);
+	bSkate = m_blupiSkate;
+	bNage = (m_blupiNage | m_blupiSurf);
 }
 
 void CDecor::MoveObjectSort()
 {
-    CDecor.MoveObject src = default(CDecor->MoveObject);
-    int num = 0;
-    for (int i = 0; i < Decor.MAXMOVEOBJECT; i++)
+	CDecor.MoveObject src = default(CDecor->MoveObject);
+	int num = 0;
+	for (int i = 0; i < MAXMOVEOBJECT; i++)
 }
 
 int CDecor::GetMissionTitle()
 {
-    return m_missionTitle;
+	return m_missionTitle;
 }
 
 void CDecor::GetMissionsCleared()
@@ -722,5 +848,5 @@ void CDecor::GetMissionsCleared()
 
 void CDecor::SetDemoState(BOOL demoState)
 {
-    m_demoState = demoState;
+	m_demoState = demoState;
 }
\ No newline at end of file
diff --git a/decor.h b/decor.h
index 3cac64e..98b1bdb 100644
--- a/decor.h
+++ b/decor.h
@@ -5,6 +5,7 @@
 #include <Windows.h>
 
 #include "DEF.H"
+#include "JAUGE.H"
 #include "SOUND.H"
 #include "PIXMAP.H"
 #include "network.h"
@@ -12,599 +13,294 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#define MAXENERGY		4000
-#define MAXFIRE			400
 
-#define ICON_HILI_STAT	112
-#define ICON_HILI_SEL	113
-#define ICON_HILI_ANY	114
-#define ICON_HILI_OP	115
-#define ICON_HILI_GO	117
-#define ICON_HILI_BUILD	118
-#define ICON_HILI_ERR	119
 #define ICON_BUTTON_PERSONALBOMBICON
 
-// Descripteur d'une cellule du d�cor.
+// Descripteur d'une cellule du décor.
 typedef struct
 {
-	short	floorChannel;
-	short	floorIcon;
-	short	objectChannel;
-	short	objectIcon;
-	short	fog;			// brouillard
-	short	rankMove;		// rang dans m_move
-	short	workBlupi;		// rang du blupi travaillant ici
-	short	fire;
-	int		icon;
+	short icon;
 }
 Cellule;
-// Cette structure doit �tre la plus petite possible, car
+// Cette structure doit être la plus petite possible, car
 // il en existe un tableau de 100x100 = 10'000 cellules !
 
-// Descripteur d'un blupi anim�.
-#define MAXBLUPI	100
-#define MAXUSED		50
-#define MAXLIST		10
 
 typedef struct
 {
-	BOOL	bExist;			// TRUE -> utilis�
-	BOOL	bHili;			// TRUE -> s�lectionn�
-
-	short	perso;
-	short	goalAction;		// action (long terme)
-	short	goalPhase;		// phase (long terme)
-	POINT	goalCel;		// cellule vis�e (long terme)
-	POINT	passCel;		// cellule tranversante
-
-	short	energy;			// �nergie restante
-
-	POINT	cel;			// cellule actuelle
-	POINT	destCel;		// cellule destination
-	short	action;			// action en cours
-	short	aDirect;		// direction actuelle
-	short	sDirect;		// direction souhait�e
-
-	POINT	pos;			// position relative � partir de la cellule
-	short	posZ;			// d�placement z
+	short   type;
+	short   stepAdvance;
+	short   stepRecede;
+	short   timeStopStart;
+	short	timeStopEnd;
+	short	unknown1;
+	POINT	posStart;
+	POINT	posEnd;
+	POINT	posCurrent;
+	short	step;
+	short	time;
+	short	phase;
 	short	channel;
-	short	lastIcon;
 	short	icon;
-	short	phase;			// phase dans l'action
-	short	step;			// pas global
-	short	interrupt;		// 0=prioritaire, 1=normal, 2=misc
-	short	clipLeft;
-
-	int		nbUsed;			// nb de points d�j� visit�s
-	char	nextRankUsed;
-	POINT	posUsed[MAXUSED];
-	char	rankUsed[MAXUSED];
-
-	short	takeChannel;	// objet transport�
-	short	takeIcon;
-
-	POINT	fix;			// point fixe (cultive, pont)
-
-	short	jaugePhase;
-	short	jaugeMax;
-	short	stop;			// 1 -> devra stopper
-	short	bArrow;			// TRUE -> fl�che en dessus de blupi
-	short	bRepeat;		// TRUE -> r�p�te l'action
-	short	nLoop;			// nb de boucles pour GOAL_OTHERLOOP
-	short	cLoop;			// boucle en cours
-	short	vIcon;			// ic�ne variable
-	POINT	goalHili;		// but vis�
-	short	bMalade;		// TRUE -> blupi malade
-	short	bCache;			// TRUE -> cach� (pas dessin�)
-	short	vehicule;		// v�hicule utilis� par blupi, voir (**)
-	char	busyCount;
-	char	busyDelay;
-	char	clicCount;
-	char	clicDelay;
-	char	reserve2[2];
-	short	listButton[MAXLIST];
-	POINT	listCel[MAXLIST];
-	short	listParam[MAXLIST];
-	short	repeatLevelHope;
-	short	repeatLevel;
-	short	reserve3[88];
-}
-Blupi;
-
-// (*)	Personnages :
-//		0 -> blupi
-//		1 -> araign�e
-//		2 -> virus
-//		3 -> tracks
-//		4 -> robot
-//		5 -> bombe
-//		6 -> d�tonnateur de mine (invisible)
-//		7 -> �lectro
-//		8 -> disciple (robot2)
-
-// (**)	V�hicule :
-//		0 -> � pied
-//		1 -> en bateau
-//		2 -> en jeep
-//		3 -> armure
-
-typedef struct
-{
-	int   type;
-	int   stepAdvance;
-	int   stepRecede;
-	int   timeStopStart;
-	int	  timeStopEnd;
-	POINT posStart;
-	POINT posEnd;
-	POINT posCurrent;
-	int   step;
-	int	  time;
-	int	  phase;
-	int	  channel;
-	int   icon;
+	short	unknown2;
 }
 MoveObject;
 
-
-typedef struct
-{		
-	short 	move_frames_forward;
-	short 	move_frames_backward;
-	short 	delay_frames_start;
-	short 	delay_frames_end;
-	POINT 	pos_start;
-	POINT 	pos_end;
-	POINT	pos;
-	short 	move_phase;
-	short 	move_timer;
-	short	life_time;
-	short 	channel;
-	short 	icon;
-}
-PersoType;
-
-typedef struct
-{
-	short 	move_frames_forward;
-	short 	move_frames_backward;
-	short 	delay_frames_start;
-	short 	delay_frames_end;
-	POINT 	pos_start;
-	POINT 	pos_end;
-	POINT	pos;
-	short 	move_phase;
-	short 	move_timer;
-	short	life_time;
-	short 	channel;
-	short 	icon;
-}
-Perso;
-
-
-// Descripteur d'un d�cor anim�.
-#define MAXMOVE		100
-#define MOVEICONNB	1000
-
-typedef struct
-{
-	BOOL	bExist;			// TRUE -> utilis�
-
-	POINT	cel;			// cellule du d�cor
-	short	rankBlupi;		// blupi travaillant ici
-
-	BOOL	bFloor;			// TRUE -> floor, FALSE -> object
-	short	channel;
-	short	icon;
-	short	maskChannel;
-	short	maskIcon;
-	short	phase;			// phase pour pMoves ou pIcon
-	short	rankMoves;		// *nb,dx,dy,...
-	short	rankIcons;		// *nb,i,i,...
-
-	short	total;			// nb total d'�tapes
-	short	delai;			// d�lai entre deux pas
-	short	stepY;			// pas vertical *100
-
-	short	cTotal;
-	short	cDelai;
-}
-Move;
-
-
-class ByeByeObject
-{
-public:
-	int channel;
-	int icon;
-	double posX;
-	double posY;
-	double rotation;
-	double phase;
-	double animationSpeed;
-	double rotationSpeed;
-	double speedX;
-
-protected:
-	ByeByeObject m_byeByeObjects;
-};
-
-
-#define MAXLASTDRAPEAU	50
-
 class CDecor
 {
 public:
 	CDecor();
 	~CDecor();
 
-	// Arrange.cpp
-	void	ArrangeFloor(POINT cel);
-	void	ArrangeMur(POINT cel, int &icon, int index);
-	void	ArrangeBuild(POINT cel, int &channel, int &icon);
-	void	ArrangeObject(POINT cel);
-
-	BOOL	ArrangeFillTestFloor(POINT cel1, POINT cel2);
-	BOOL	ArrangeFillTest(POINT pos);
-	void	ArrangeFillPut(POINT pos, int channel, int icon);
-	void	ArrangeFillSearch(POINT pos);
-	void	ArrangeFill(POINT pos, int channel, int icon, BOOL bFloor);
-
-	void	ArrangeBlupi();
-
-	// Obstacle.cpp
-	void	SearchFloor(int rank, int icon, POINT cel, int *pBits);
-	void	SearchObject(int rank, int icon, POINT cel, int *pBits);
-	void	AjustFloor(int rank, int icon, POINT cel, int *pBits);
-	void	AjustObject(int rank, int icon, POINT cel, int *pBits);
-	BOOL	IsFreeDirect(POINT cel, int direct, int rank);
-	BOOL	IsFreeCelObstacle(POINT cel);
-	BOOL	IsFreeCelFloor(POINT cel, int rank);
-	BOOL	IsFreeCelGo(POINT cel, int rank);
-	BOOL	IsFreeCelHili(POINT cel, int rank);
-	BOOL	IsFreeCel(POINT cel, int rank);
-	BOOL	IsFreeCelDepose(POINT cel, int rank);
-	BOOL	IsFreeCelEmbarque(POINT cel, int rank, int &action, POINT &limit);
-	BOOL	IsFreeCelDebarque(POINT cel, int rank, int &action, POINT &limit);
-	BOOL	IsFreeJump(POINT cel, int direct, int rank, int &action);
-	BOOL	IsFreeGlisse(POINT cel, int direct, int rank, int &action);
-	int		DirectSearch(POINT cel, POINT goal);
-	void	FlushUsed(int rank);
-	void	AddUsedPos(int rank, POINT pos);
-	BOOL	IsUsedPos(int rank, POINT pos);
-	BOOL	SearchBestBase(int rank, int &action, POINT &newCel, int &direct);
-	BOOL	SearchBestPass(int rank, int &action);
-	BOOL	IsWorkableObject(POINT cel, int rank);
-	BOOL	SearchOtherObject(int rank, POINT initCel, int action,
-							  int distMax, int channel,
-							  int firstIcon1, int lastIcon1,
-							  int firstIcon2, int lastIcon2,
-							  POINT &foundCel, int &foundIcon);
-	BOOL	SearchOtherDrapeau(int rank, POINT initCel, int distMax,
-							   POINT &foundCel, int &foundIcon);
-	BOOL	SearchOtherBateau(int rank, POINT initCel, int distMax,
-							  POINT &foundCel, int &foundIcon);
-	BOOL	IsSpiderObject(int icon);
-	BOOL	SearchSpiderObject(int rank, POINT initCel, int distMax,
-							   POINT &foundCel, int &foundIcon);
-	BOOL	IsTracksObject(int icon);
-	BOOL	SearchTracksObject(int rank, POINT initCel, int distMax,
-							   POINT &foundCel, int &foundIcon);
-	BOOL	IsRobotObject(int icon);
-	BOOL	SearchRobotObject(int rank, POINT initCel, int distMax,
-							  POINT &foundCel, int &foundIcon,
-							  int &foundAction);
-	BOOL	IsBombeObject(int icon);
-	BOOL	SearchBombeObject(int rank, POINT initCel, int distMax,
-							  POINT &foundCel, int &foundIcon);
-	BOOL	SearchElectroObject(int rank, POINT initCel, int distMax,
-								POINT &foundCel, int &foundIcon);
-	BOOL	IsUsineBuild(int rank, POINT cel);
-	BOOL	IsUsineFree(int rank, POINT cel);
-	BOOL	IsFireCel(POINT cel);
-	BOOL	IsVirusCel(POINT cel);
-	int		IsBuildPont(POINT &cel, int &iconBuild);
-	BOOL	IsBuildBateau(POINT cel, int &direct);
-	void	InitDrapeau();
-	void	AddDrapeau(POINT cel);
-	void	SubDrapeau(POINT cel);
-	BOOL	TestDrapeau(POINT cel);
-
-	// DecBlupi.cpp
-	void	BlupiFlush();
-	int		BlupiCreate(POINT cel, int action, int direct,
-						int perso, int energy);
-	BOOL	BlupiDelete(POINT cel, int perso=-1);
-	void	BlupiDelete(int rank);
-	void	BlupiKill(int exRank, POINT cel, int type);
-	BOOL	BlupiIfExist(int rank);
-	void	BlupiCheat(int cheat);
-	void	BlupiActualise(int rank);
-	void	BlupiAdaptIcon(int rank);
-	void	BlupiPushFog(int rank);
-	void	BlupiSound(int rank, int sound, POINT pos, BOOL bStop=FALSE);
-	void	BlupiInitAction(int rank, int action, int direct=-1);
-	void	BlupiChangeAction(int rank, int action, int direct=-1);
-	void	ListFlush(int rank);
-	int		ListGetParam(int rank, int button, POINT cel);
-	BOOL	ListPut(int rank, int button, POINT cel, POINT cMem);
-	void	ListRemove(int rank);
-	int		ListSearch(int rank, int button, POINT cel, int &textForButton);
-	BOOL	RepeatAdjust(int rank, int button, POINT &cel, POINT &cMem,
-						 int param, int list);
-	void	GoalStart(int rank, int action, POINT cel);
-	BOOL	GoalNextPhase(int rank);
-	void	SetTotalTime(int total);
-	int		GetTotalTime();
-	void	GoalInitJauge(int rank);
-	void	GoalInitPassCel(int rank);
-	void	GoalAdjustCel(int rank, int &x, int &y);
-	BOOL	GoalNextOp(int rank, short *pTable);
-	void	GoalUnwork(int rank);
-	void	GoalStop(int rank, BOOL bError=FALSE, BOOL bSound=TRUE);
-	BOOL	BlupiIsGoalUsed(POINT cel);
-	void	BlupiStartStopRayon(int rank, POINT startCel, POINT endCel);
-	BOOL	BlupiRotate(int rank);
-	BOOL	BlupiNextAction(int rank);
-	void	BlupiNextGoal(int rank);
-	void	BlupiStep(BOOL bFirst);
-	void	BlupiGetRect(int rank, RECT &rect);
-	int		GetTargetBlupi(POINT pos);
-	void	BlupiDeselect();
-	void	BlupiDeselect(int rank);
-	void	BlupiSetArrow(int rank, BOOL bArrow);
-	void	InitOutlineRect();
-	void	BlupiHiliDown(POINT pos, BOOL bAdd=FALSE);
-	void	BlupiHiliMove(POINT pos, BOOL bAdd=FALSE);
-	void	BlupiHiliUp(POINT pos, BOOL bAdd=FALSE);
-	void	BlupiDrawHili();
-	int		GetDefButton(POINT cel);
-	BOOL	BlupiGoal(int rank, int button, POINT cel, POINT cMem);
-	void	BlupiGoal(POINT cel, int button);
-	void	BlupiDestCel(int rank);
-	BOOL	IsTracksHere(POINT cel, BOOL bSkipInMove);
-	BOOL	IsBlupiHereEx(POINT cel1, POINT cel2, int exRank, BOOL bSkipInMove);
-	BOOL	IsBlupiHereEx(POINT cel, int exRank, BOOL bSkipInMove);
-	BOOL	IsBlupiHere(POINT cel, BOOL bSkipInMove);
-	BOOL	IsBlupiHere(POINT cel, int direct, BOOL bSkipInMove);
-	void	GetLevelJauge(int *pLevels, int *pTypes);
-	BOOL	IsWorkBlupi(int rank);
-	void	BlupiGetButtons(POINT pos, int &nb, int *pButtons, int *pErrors, int &perso);
-	void	TerminatedInit();
-	int		IsTerminated();
-	Term*	GetTerminated();
-
-	// DecMove.cpp
-	void	MoveFlush();
-	int		MoveMaxFire();
-	void	MoveFixInit();
-	BOOL	MoveCreate(POINT cel, int rankBlupi, BOOL bFloor,
-					   int channel, int icon,
-					   int maskChannel, int maskIcon,
-					   int total, int delai, int stepY,
-					   BOOL bMisc=FALSE, BOOL bNotIfExist=FALSE);
-	BOOL	MoveAddMoves(POINT cel, int rankMoves);
-	BOOL	MoveAddIcons(POINT cel, int rankIcons, BOOL bContinue=FALSE);
-	BOOL	MoveStartFire(POINT cel);
-	void	MoveProxiFire(POINT cel);
-	void	MoveFire(int rank);
-	void	MoveStep(BOOL bFirst);
-	void	MoveFinish(POINT cel);
-	void	MoveFinish(int rankBlupi);
-	BOOL	MoveIsUsed(POINT cel);
-	BOOL	MoveGetObject(POINT cel, int &channel, int &icon);
-	BOOL	MovePutObject(POINT cel, int channel, int icon);
-
-	// DecIO.cpp
-	BOOL	Write(int rank, BOOL bUser, int world, int time, int total);
-	BOOL	Read(int rank, BOOL bUser, int &world, int &time, int &total);
-	BOOL	FileExist(int rank, BOOL bUser, int &world, int &time, int &total);
-	void	Flush();
-
-	// DecMap.cpp
-	void	MapInitColors();
-	POINT	ConvCelToMap(POINT cel);
-	POINT	ConvMapToCel(POINT pos);
-	BOOL	MapMove(POINT pos);
-	void	MapPutCel(POINT pos);
-	BOOL	GenerateMap();
-
-	// DecStat.cpp
-	void	StatisticInit();
-	void	StatisticUpdate();
-	int		StatisticGetBlupi();
-	int		StatisticGetFire();
-	void	StatisticDraw();
-	void	GenerateStatictic();
-	BOOL	StatisticDown(POINT pos, int fwKeys);
-	BOOL	StatisticMove(POINT pos, int fwKeys);
-	BOOL	StatisticUp(POINT pos, int fwKeys);
-	int		StatisticDetect(POINT pos);
-
-	// Chemin.cpp
-	void	CheminMemPos(int exRank);
-	BOOL	CheminTestPos(POINT pos, int &rank);
-	int		CheminARebours(int rank);
-	void	CheminFillTerrain(int rank);
-	BOOL	CheminTestDirection(int rank, int pos, int dir,
-								int &next, int &ampli,
-								int &cout, int &action);
-	BOOL	CheminCherche(int rank, int &action);
-	BOOL	IsCheminFree(int rank, POINT dest, int button);
-
 	// Decor.cpp
-	void	SetShiftOffset(POINT offset);
-	POINT	ConvCelToPos(POINT cel);
-	POINT	ConvPosToCel(POINT pos, BOOL bMap=FALSE);
-	POINT	ConvPosToCel2(POINT pos);
-
-	void	Create(HWND hWnd, CSound *pSound, CPixmap *pPixmap, CNetwork *pNetwork);
+	void	Create(HWND hWnd, CSound *pSound, CPixmap *pPixmap,
+		           CNetwork *pNetwork);
 	BOOL	LoadImages();
 	void	InitGamer();
-	BOOL	AddLinkCaisse(int rank);
-	void	InitDecor(int channel, int icon);
-	void	InitAfterBuild();
+	void	InitDecor();
 	void	SetTime(int time);
 	int	    GetTime();
 	void	PlayPrepare(BOOL bTest);
 	void	BuildPrepare();
-	void	Build();
+	int		IsTerminated();
+	void	MoveStep();
+	int		GetBlupiChannelStandard();
+	int		GetBlupiChannelActual();
+	int		GetIconPerso();
 	BOOL	BlitzActif(int celx, int cely);
+	void	Build(RECT rect);
 	void	DrawInfo();
-	void	UpdateCaisse();
 	POINT	DecorNextAction();
-	BOOL	TestPushCaisse(int i, POINT pos, BOOL bPop);
-	void	SearchLinkCaisse(int rank, BOOL bPop);
-	void	ResetHili();
-	BOOL	LoadImages();
-	BOOL	LoadBackgroundImages();
-	BOOL	TestPushOneCaisse(int i, POINT move, int b);
-	void	ClearFog();
-	void	ClearFire();
-	void	SetBuild(BOOL bBuild);
-	void	EnableFog(BOOL bEnable);
-	BOOL	GetInvincible();
-	void	SetInvincible(BOOL bInvincible);
-	BOOL	GetSuper();
-	void	SetSuper(BOOL bSuper);
-	void	FlipOutline();
-	BOOL	PutFloor(POINT cel, int channel, int icon);
-	BOOL	PutObject(POINT cel, int channel, int icon);
-	BOOL	GetFloor(POINT cel, int &channel, int &icon);
-	BOOL	GetObject(POINT cel, int &channel, int &icon);
-	BOOL	SetFire(POINT cel, BOOL bFire);
+	void	TreatKeys(int keys);
+	void	SetSpeedX(int speed);
+	void	SetSpeedY(int speed);
+	void	GetBlupiInfo(BOOL &pbHelico, BOOL &pbJeep, BOOL &pbSkate,
+		                 BOOL &pbNage);
+	int		SoundEnviron(int sound, int obstacle);
+	void	PlaySound(int sound, POINT pos, int _foo);
+	void	StopSound(int sound);
+	void	AdaptMotorVehicleSound(POINT pos);
 
-	void	SetCoin(POINT coin, BOOL bCenter=FALSE);
-	POINT	GetCoin();
-	POINT	GetHome();
-	void	MemoPos(int rank, BOOL bRecord);
-
-	void	SetTime(int time);
-	int		GetTime();
-
-	void	SetMusic(int music);
-	int		GetMusic();
-
-	void	SetSkill(int skill);
-	int		GetSkill();
-
-	void	SetRegion(int region);
+	void	FUN_05c80(int phase);
+	POINT*	ScreenPosToCelPos(POINT *cel, int _foo, int _bar);
+	void	SetCelPosFromScreenPos(POINT cel);
+	void	SetFieldCC38(int _foo, int _bar);
+	void	DeleteCel(int celX, int celY);
+	//void	PlaceSelectableItem();
+	//void	PlaceItemFromMenu1();
+	//void	PlaceItemFromMenu2();
+	//void	PlaceItemFromMenu3();
+	//void	PlaceItemFromMenu4();
+	//void	PlaceItemFromMenu5();
+	//void	PlaceItemFromMenu6();
+	//void	PlaceItemFromMenu7();
+	//void	PlaceItemFromMenu8();
+	//void	PlaceItemFromMenu9();
+	//void	PlaceItemFromMenu10();
+	char*	GetMissionTitle();
+	void	SetMissionTitle(char *str);
 	int		GetRegion();
-
-	void	SetInfoMode(BOOL bInfo);
-	BOOL	GetInfoMode();
-	void	SetInfoHeight(int height);
-	int		GetInfoHeight();
-
-	int 	GetTargetLevel();
-	void	GetBlupiInfo(BOOL bHelico, BOOL bJeep, BOOL bSkate, BOOL bNage);
-
-	char*	GetButtonExist();
-
-	void	BuildPutBlupi();
-	void	BuildMoveFloor(int x, int y, POINT pos, int rank);
-	void	BuildMoveObject(int x, int y, POINT pos, int rank);
-	void	BuildGround(RECT clip);
-	void	Build(RECT clip, POINT posMouse);
-	void	NextPhase(int mode);
-
-	int		CountFloor(int channel, int icon);
-	int		CelOkForAction(POINT cel, int action, int rank,
-						   int   icons[4][4],
-						   POINT &celOutline1,
-						   POINT &celOutline2);
-	int		CelOkForAction(POINT cel, int action, int rank);
-	int		GetHiliRankBlupi(int nb);
-	void	CelHili(POINT pos, int action);
-	void	CelHiliButton(POINT cel, int button);
-	void	CelHiliRepeat(int list);
-	int		GetResHili(POINT posMouse);
-	void	HideTooltips(BOOL bHide);
-
-	void	UndoOpen();
-	void	UndoClose();
-	void	UndoCopy();
-	void	UndoBack();
-	BOOL	IsUndo();
-	BOOL	GetShowSecret();
-	BOOL	GetNetPacked();
-	BOOL	GetNetMovePredict();
-	UINT	GetPhase();
-	int		GetMissionTitle();
 	void	SetRegion(int region);
 	int		GetMusic();
 	void	SetMusic(int music);
-	void	GetDims(POINT* ptr);
-	void	SetDims(POINT dims);
-	int		GetLives();
-	void	SetLives(int lives);
-	void	SetAccessBuild(BOOL build);
-	void	SetNetPacked(BOOL net);
-	void	SetNetMovePredict(BOOL netmove);
+	void	GetDim(POINT *out);
+	void	SetDim(POINT dim);
+	int		GetNbVies();
+	void	SetNbVies(int nbVies);
+	BOOL	GetPause();
+	void	SetPause(BOOL bPause);
+	//void	InitializeDoors();
+	//void	MemorizeDoors();
+	void	SetAllMissions(BOOL bAllMissions);
+	void	CheatAction(int cheat);
+	BOOL	GetSuperBlupi();
+	void	SetSuperBlupi(BOOL bSuperBlupi);
+	BOOL	GetDrawSecret();
+	void	SetDrawSecret(BOOL bDrawSecret);
+	void	SetBuildOfficialMissions(BOOL bBuildOfficialMissions);
+	BOOL	GetNetPacked();
+	void	SetNetPacked(BOOL bNetPacked);
+	BOOL	GetNetMovePredict();
+	void	SetNetMovePredict(BOOL bNetMovePredict);
 	BOOL	GetNetDebug();
-	void	SetMulti(int multi);
+	void	SetNetDebug(BOOL bNetDebug);
+	void	UpdateNetDebug(char *str);
+	void	SetMulti(BOOL bMulti);
 	void	SetTeam(int team);
+	void	BlupiSearchIcon();
+	BOOL	BlupiIsGround();
+	void	BlupiRect(RECT *out, POINT pos);
+	void	BlupiAdjust();
+	void	BlupiBloque(POINT pos, int dir);
+	void	BlupiStep();
+	void	BlupiDead(int action, int action2);
+	void	GetPosDecor(POINT *out, POINT pos);
+	void	BlupiAddFifo(POINT pos);
+	BOOL	DecorDetect(RECT rect, BOOL bCaisse);
+	BOOL	TestPath(RECT rect, POINT start, POINT *end);
+	void	MoveObjectPollution();
+	void	MoveObjectPlouf(POINT pos);
+	void	MoveObjectTiplouf(POINT pos);
+	void	MoveObjectBlup(POINT pos);
+
+	int		IsWorld(POINT pos);
+	void	ActiveSwitch(BOOL bState, POINT cel);
+	char	GetTypeBarre(POINT pos);
+	BOOL	IsLave(POINT pos);
+	BOOL	IsPiege(POINT pos);
+	BOOL	IsGoutte(POINT pos, BOOL bAlways);
+	BOOL	IsScie(POINT pos);
+	BOOL	IsSwitch(POINT pos, POINT *celSwitch);
+	BOOL	IsEcraseur(POINT pos);
+	BOOL	IsBlitz(POINT pos, BOOL bAlways);
+	BOOL	IsRessort(POINT pos);
+	BOOL	IsTemp(POINT pos);
+	BOOL	IsBridge(POINT pos, POINT *celBridge);
+	int		IsDoor(POINT pos, POINT *celPorte);
+	int		IsTeleporte(POINT pos);
+	BOOL	SearchTeleporte(POINT pos, POINT *newpos);
+	BOOL	IsSurfWater(POINT pos);
+	BOOL	IsDeepWater(POINT pos);
+	BOOL	IsOutWater(POINT pos);
+	BOOL	IsPassIcon(int icon);
+	BOOL	IsBlocIcon(int icon);
+	void	FlushBalleTraj();
+	void	SetBalleTraj(POINT pos);
+	BOOL	IsBalleTraj(POINT pos);
+	void	FlushMoveTraj();
+	void	SetMoveTraj(POINT pos);
+	BOOL	IsMoveTraj(POINT pos);
+	int		SearchDistRight(POINT pos, POINT dir, int type);
+	BOOL	IsVentillo(POINT pos);
+	void	NetStopCloud(int rank);
+	void	StartSploutchGlu(POINT pos);
+	BOOL	ObjectStart(POINT pos, int type, int speed, int _foo);
+	BOOL	ObjectDelete(POINT pos, int type, int _foo);
+	void	ModifDecor(POINT pos, int icon, BOOL _foo);
+	void	FUN_15500(short channel, POINT pos);
+	void	FUN_15540(short channel);
+	void	FUN_15580();
+	void	FUN_155e0(byte _foo, short _bar);
+	void	FUN_15610();
+	void	FUN_15c90(int _foo);
+	void	FUN_15610();
+	void	FUN_15c90(int _foo);
+	void	FUN_15d50();
+	void	FUN_15da0(int rank, short phase);
+	void	FUN_15ec0(POINT pos, int *_foo);
+	void	FUN_15fa0();
+	//BOOL	FUN_15fc0(SoundEvent *event);
+	//BOOL	FUN_16020(SoundEvent *event);
+	void	FlushNotificationMessages();
+	void	FUN_160b0();
+	void	PushNotificationMessage(char *str);
+	void	FUN_161a0();
+	void	MoveObjectStep();
+	void	MoveObjectStepLine(int i);
+	void*	MoveObjectStepIcon(int i);
+	void	DynamiteStart(int i, int dx, int dy);
+	int		AscenseurDetect(RECT rect, POINT oldpos, POINT newpos);
+	int		AscenseurVertigo(int i, BOOL *bVertigoLeft, BOOL *bVertigoRight);
+	BOOL	AscenseurShift(int i);
+	void	AscenseurSynchro(int i);
+	
+	void	UpdateCaisse();
+	BOOL	TestPushCaisse(int i, POINT pos, BOOL bPop);
+	BOOL	TestPushOneCaisse(int i, POINT move, int b);
+	void	SearchLinkCaisse(int rank, BOOL bPop);
+	BOOL	AddLinkCaisse(int rank);
+	int		CaisseInFront();
+	int		CaisseGetMove(int max);
+	BOOL	MockeryDetect(POINT pos);
+	BOOL	BlupiElectro(POINT pos);
+	void	MoveObjectFollow(POINT pos);
+	int		MoveObjectDetect(POINT pos, BOOL *pbNear);
+	int		MoveAscenseurDetect(POINT pos, int height);
+	int		MoveChargeDetect(POINT pos);
+	int		MovePersoDetect(POINT pos);
+	int		MoveObjectSomething(POINT pos);
+	int		MoveObjectDelete(POINT pos);
+	int		MoveObjectFree();
+	int		SortGetType(int type);
 	void	MoveObjectSort();
+	void	MoveObjectPriority(int i);
+	int		MoveObjectSearch(POINT pos, int type);
+	void	VoyageGetPosVie(POINT *out, int nbVies);
+	void	VoyageInit(POINT start, POINT end, int icon, int channel);
+	void	VoyageStep();
+	void	VoyageDraw();
+	BOOL	IsRightBorder(int x, int y, int dx, int dy);
+	BOOL	IsFromage(int x, int y);
+	BOOL	IsGrotte(int x, int y);
+	void	AdaptMidBorder(int x, int y);
+	void	AdaptBorder(POINT cel);
+	BOOL	MultiplayerCameraSomething(int foo, int bar);
+	void	GetMissionPath(char *out, int gamer, int mission, BOOL bUser);
+	BOOL	CurrentWrite(int gamer, int mission, BOOL bUser);
+	BOOL	CurrentRead(int gamer, int mission, BOOL bUser);
+	BOOL	MissionPathSomething(int gamer, int mission, BOOL bUser);
+	BOOL	Read(int gamer, int mission, BOOL bUser);
+	BOOL	FUN_1bad0(int foo, int bar, void *baz, void *qux);
+	BOOL	FUN_1c190(int foo, int bar, char *str);
+	BOOL	SearchWorld(int world, POINT *blupi, int *dir);
+	BOOL	SearchDoor(int n, POINT *cel, POINT *blupi);
+	BOOL	AdaptDoors(BOOL bPrivate, int mission);
+	void	OpenDoorsTresor();
+	void	OpenDoor(POINT cel);
+	void	OpenDoorsWin();
+	void	OpenGoldsWin();
+	void	DoorsLost();
+
+	// ?
 	void	GetMissionsCleared();
 	void	SetDemoState(BOOL demoState);
-	
-protected:
-	BOOL	GetSeeBits(POINT cel, char *pBits, int index);
-	int		GetSeeIcon(char *pBits, int index);
 
 protected:
-	static int  MAXMOVEOBJECT[200];
-	static int	MAXQUART[441];
 	HWND		m_hWnd;
 	CSound*		m_pSound;
 	CPixmap*	m_pPixmap;
-    CNetwork*   m_pNetwork;
-    MoveObject  m_moveObject[100][100];
-    Explo       m_explos[100][100];
-    Perso       m_persos[200];
-    int         m_input;
-    int         m_previousInput;
-    POINT       m_cameraPos;
-    POINT       m_worldDims;
+    CNetwork*	m_pNetwork;
+    Cellule		m_decor[MAXCELX][MAXCELY];
+	Cellule		m_bigDecor[MAXCELX][MAXCELY];
+	byte		m_balleTraj[MAXCELX][MAXCELY/8+1];
+	byte		m_moveTraj[MAXCELX][MAXCELY/8+1];
+    MoveObject  m_moveObject[MAXMOVEOBJECT];
+    int         m_keyPress;
+    int         m_lastKeyPress;
+    POINT       m_posDecor;
+    POINT       m_dimDecor;
     POINT       m_selectedCelPos;
-	Random		m_random;
-    WMessage    m_phase;
-    int         m_targetMission;
-    char        m_missionTitle[100];
-    int         m_nbCases;
-	int			m_linkCaisse;
-    int         m_caseIndexes[200];
-    int         m_nbSomethings;
-    int         m_somethingIndexes;
-    POINT       m_pos;
-    POINT       m_safePos;
-	POINT		m_posDecor;
-	RECT		m_drawBounds;
-    Action      m_action;
-    int         m_direction;
-    int         m_actionFrameCount;
-    POINT       m_velocity;
-    Icon4       m_blupiIcon;
-	POINT		m_blupiStartPos;
-	int			m_blupiStartDir;
-	int			m_blupiAction;
-	int			m_blupiPhase;
-    /*
-    undefined
-    undefined
-    undefined
-    undefined
-    */
-	int			m_decor;
-	int			m_bigDecor;
-	int			m_decorAction;
-    IconChannel m_blupiChannel;
-    POINT       m_activeConveyorVelocity;
-	int			m_nbRankCaisse;
-	int			m_rankCaisse;
+
+	int			m_CC18;
+	int			m_CC1C;
+	int			m_CC20;
+
+    int		    m_phase;
+    int         m_term;
+	int			m_music;
+	int			m_region;
+	int			m_lastRegion;
+
+	int			m_CC38;
+
+	int			m_time;
+	char		m_missionTitle[100];
+	BOOL		m_bPause;
+    int			m_nbRankCaisse;
+	int			m_rankCaisse[MAXMOVEOBJECT];
 	int			m_nbLinkCaisse;
-    int         m_activeLiftIndex;
-    int         m_blupiChannel;
+	int			m_linkCaisse[MAXMOVEOBJECT];
+    POINT       m_blupiPos;
+    POINT       m_blupiValidPos;
+    int			m_blupiAction;
+    int         m_blupiDir;
+    int         m_blupiPhase;
+    POINT       m_blupiVitesse;
+    int			m_blupiIcon;
+	int			m_blupiSec;
+	int			m_blupiChannel;
+	POINT		m_blupiVector;
+	int			m_blupiTransport;
 	BOOL		m_blupiFocus;
     BOOL        m_blupiAir;
     BOOL        m_blupiHelico;
@@ -614,7 +310,7 @@ protected:
     BOOL        m_blupiSkate;
     BOOL        m_blupiNage;
     BOOL        m_blupiSurf;
-    BOOL        m_bInWind;
+    BOOL        m_blupiVent;
     BOOL        m_blupiSuspend;
     BOOL        m_blupiJumpAie;
     BOOL        m_blupiShield;
@@ -624,191 +320,101 @@ protected:
 	BOOL        m_blupiInvert;
     BOOL        m_blupiBalloon;
     BOOL        m_blupiEcrase;
-	BOOL		m_blupiMotorHigh;
-	int			m_blupiMotorSound;
 	POINT		m_blupiPosHelico;
-	int			m_blupiActionOuf;
-	int			m_blupiTimeNoAsc;
-	int			m_blupiTimeMockery;
-	double		m_blupiVitesseX;
-	double		m_blupiVitesseY;
-	POINT		m_blupiValidPos;
+	POINT		m_blupiPosMagic;
+	BOOL		m_blupiRestart;
 	BOOL		m_blupiFront;
-	int			m_blupiNoBarre;
-	int			m_blupiFifoNb;
-	CJauge		m_jauges;
-	BOOL		m_bFoundCle;
-	BOOL		m_bPause;
-	int			m_blupiTimeFire;
-	int			m_voyageIcon;
 	int			m_blupiBullet;
 	int			m_blupiCle;
 	int			m_blupiPerso;
 	int			m_blupiDynamite;
-	int			m_nbTresor;
-	int			m_totalTresor;
-	int			m_goalPhase;
-	POINT		m_scrollPoint;
-	POINT		m_scrollAdd;
-	int			m_nbVies;
-    BOOL        m_bUseSafePosition;
-    BOOL        m_bIsTerminating;
-	POINT		m_blupiPos;
-	int			m_blupiDir;
-	int			m_lastDecorIcon;
-    int         m_glue;
-    int         m_keys;
-    int         m_personalBombs;
-    int         m_dynamite;
-    int         m_powerEnergy;
-    int         m_queuedActionFrames;
-    Action      m_queuedAction;
-    int         m_nbSafePositions;
-    POINT       m_safePositions[13];
-    int         m_bMulti;
-    int         m_team;
-    int         m_netPacketsSent;
-    int         m_netPacketsSent2;
-    int         m_netPacketsRecieved;
-    int         m_netPacketsRecieved2;
-    SoundEvent  m_soundEvents[20];
-    int         m_soundEventIndex1;
-    char        m_messages[4][100];
-    int         m_air;
-    int         m_energyUnused;
-    BOOL        m_bHelicopterFlying;
-    BOOL        m_bHelicopterStationary;
-    BOOL        m_bCarMoving;
-    BOOL        m_bCarStationary;
-    BOOL        m_bWorldComplete;
-    BOOL        m_bPrivate;
-    BOOL        m_bAllMissions;		// opendoors
-    BOOL        m_bInvincible;		// megablupi
-    BOOL        m_bShowSecret;  	// showsecret
-    BOOL        m_bAccessBuild; 	// xmission/xnjttjpo
+	int			m_blupiNoBarre;
+	int			m_blupiTimeShield;
+	int			m_blupiTimeFire;
+	int			m_blupiTimeNoAsc;
+	int			m_blupiTimeMockery;
+	int			m_blupiTimeOuf;
+	int			m_blupiActionOuf;
+	int			m_blupiFifoNb;
+	POINT		m_blupiFifoPos[10];
+	POINT		m_blupiStartPos;
+
+	int			m_D418;
+	int			m_D41C;
+	int			m_D420;
+	int			m_D424;
+
+	int			m_blupiStartDir;
+
+	int			m_D42C;
+	int			m_D430;
+	int			m_D434;
+	int			m_D438;
+	int			m_D43C;
+	BOOL		m_bMulti;
+	int			m_team;
+	int			m_netPacketsSent;
+	int			m_netPacketsSent2;
+	int			m_netPacketsReceived;
+	int			m_netPacketsReceived2;
+
+	int			unknown[55];
+
+	SoundEvent	m_soundEvents[20];
+	int			m_soundEventIndex1;
+	int			m_soundEventIndex2;
+
+	int			m_D5DC;
+
+	char		m_messages[4][100];
+
+	int			m_D770;
+
+	CJauge		m_jauges[2];
+	int			m_blupiLevel;
+	int			m_blupiEnergyUnused;
+	BOOL		m_bHelicopterFlying;
+	BOOL		m_bHelicopterStationary;
+	BOOL		m_bCarMoving;
+	BOOL		m_bCarStationary;
+	BOOL		m_bFoundCle;
+	BOOL		m_bPrivate;
+    BOOL        m_bCheatDoors;		// opendoors
+    BOOL        m_bSuperBlupi;		// megablupi
+    BOOL        m_bDrawSecret;  	// showsecret
+    BOOL        m_buildOfficialMissions; 	// xmission/xnjttjpo
     BOOL        m_bNetPacked;		// netpacked
     BOOL        m_bNetMovePredict;  // ynosmooth
     BOOL        m_bNetDebug;		// znetdebug
-	BOOL		m_demoState;
+	int			m_blupiSpeedX;
+	int			m_blupiSpeedY;
     int         m_mission;
-    BYTE        m_missionsCleared[180];
-    BYTE        m_worldsCleared[20];
-    int         m_lives;
-    int         m_chestsCollected;
-    int         m_chestsTotal;
-    POINT       m_cameraTargetPos;
-    POINT       m_cameraTargetOffset;
-    int         m_flyupIcon;
-    int         m_flyupChannel;
-    int         m_flyupFrameCount;
-    int         m_flyupFrameTotal;
-    POINT       m_flyupStartPos;
-    POINT       m_flyupEndPos;
-	BOOL 		m_bScreenShake;
-	int 		m_screenShakeIndex;
-	int 		m_menuSelections[112];
-	BYTE 		m_overloadProtection[100000];
-	Cellule*	m_pUndoDecor;
-	Cellule		m_decor[MAXCELX/2][MAXCELY/2];
-	short		m_rankBlupi[MAXCELX][MAXCELY];
-	Blupi		m_blupi[MAXBLUPI];
-	Move		m_move[MAXMOVE];
-	POINT		m_celCoin;			// cellule sup/gauche
-	POINT		m_celHome;			// pour touche Home
-	POINT		m_celHili;
-	POINT		m_celOutline1;
-	POINT		m_celOutline2;
-	POINT		m_shiftOffset;
-	int			m_iconHili[4][4];
-	int			m_rankHili;			// rang du blupi vis�
-	BOOL		m_bHiliRect;
-	POINT		m_p1Hili;			// coins rectangle de s�lection
-	POINT		m_p2Hili;
-	int			m_shiftHili;
-	int			m_nbBlupiHili;		// nb de blupi s�lectionn�s
-	int			m_rankBlupiHili;	// rang blupi s�lectionn�
-	BOOL		m_bFog;				// TRUE -> brouillard (jeu)
-	BOOL		m_bBuild;			// TRUE -> construction
-	BOOL		m_bInvincible;		// TRUE -> cheat code
-	BOOL		m_bSuper;			// TRUE -> cheat code
-	short		m_colors[100];
-	int			m_time;				// temps relatif global
-	int			m_timeConst;		// temps relatif global constant
-	int			m_timeFlipOutline;	// temps quand basculer mode outline
-	int			m_totalTime;		// temps total pass� sur une partie
-	int			m_phase;			// phase pour la carte
-	POINT		m_celArrow;			// cellule avec fl�che
-	BOOL		m_bOutline;
-	BOOL		m_bGroundRedraw;
-	char		m_buttonExist[MAXBUTTON];
-	int			m_statNb;			// nb de statistiques
-	int			m_statFirst;		// premi�re statistique visible
-	int			m_bStatUp;			// fl�che up statistique
-	int			m_bStatDown;		// fl�che down statistique
-	int			m_statHili;			// statistique survol�e
-	BOOL		m_bStatRecalc;		// TRUE -> recalcule les statistiques
-	BOOL		m_bStatRedraw;		// TRUE -> redessine les statistiques
-	int			m_nbStatHach;		// nb de hachures
-	int			m_nbStatHachBlupi;	// hachures occup�es par blupi
-	int			m_nbStatHachPlanche;// hachures occup�es par planches
-	int			m_nbStatHachTomate;	// hachures occup�es par tomates
-	int			m_nbStatHachMetal;	// hachures occup�es par m�tal
-	int			m_nbStatHachRobot;	// hachures occup�es par robot
-	int			m_nbStatHome;		// nb de maisons
-	int			m_nbStatHomeBlupi;	// maisons occup�es par blupi
-	int			m_nbStatRobots;		// nb d'ennemis
-	int 		m_term;				// conditions pour gagner
-	int			m_winCount;			// compteur avant gagn�
-	int			m_winLastHachBlupi;	// dernier nombre atteint
-	int			m_winLastHachPlanche;// dernier nombre atteint
-	int			m_winLastHachTomate;// dernier nombre atteint
-	int			m_winLastHachMetal;	// dernier nombre atteint
-	int			m_winLastHachRobot;	// dernier nombre atteint
-	int			m_winLastHome;		// dernier nombre atteint
-	int			m_winLastHomeBlupi;	// dernier nombre atteint
-	int			m_winLastRobots;	// dernier nombre atteint
-	int			m_music;			// num�ro musique
-	int			m_region;			// num�ro r�gion (*)
-	int			m_lastRegion;		// num�ro derni�re r�gion
-	int			m_blupiHere;
-	POINT		m_lastDrapeau[MAXLASTDRAPEAU];
-	BOOL		m_bHideTooltips;	// TRUE -> menu pr�sent
-	char		m_text[50];
-	POINT		m_textLastPos;
-	int			m_textCount;
-	int			m_skill;
-	BOOL		m_bInfo;
-	int			m_infoHeight;
-	POINT		m_memoPos[4];
+	BYTE        m_doors[200];
+    int         m_nbVies;
+    int         m_nbTresor;
+    int         m_totalTresor;
+	int			m_goalPhase;
+	int			m_detectIcon;
 
-	BYTE		m_cheminWork[MAXCELX*MAXCELY];
-	int			m_cheminNbPos;
-	POINT		m_cheminPos[MAXBLUPI*2];
-	int			m_cheminRank[MAXBLUPI*2];
+	int			m_D8F8;
 
-	BOOL		m_bFillFloor;
-	int			m_fillSearchChannel;
-	int			m_fillSearchIcon;
-	int			m_fillPutChannel;
-	int			m_fillPutIcon;
-	char*		m_pFillMap;
+    POINT       m_scrollPoint;
+    POINT       m_scrollAdd;
+    int         m_voyageIcon;
+    int         m_voyageChannel;
+    int         m_voyagePhase;
+    int         m_voyageTotal;
+    POINT       m_voyageStart;
+    POINT       m_voyageEnd;
+	int 		m_decorAction;
+	int 		m_decorPhase;
+	int 		m_lastDecorIcon[200];
+	
+	int			reserve[11];
 
-    int SetBlupiChannel();
-    int GetBlupiChannel();
-	int GetPersonalBombIcon();
-    int GetTargetLevel(int mission);
-	BOOL GetShowSecret();
-    void SetShowSecret(BOOL secret);
-	void GetBlupiHitbox(RECT *out, POINT pos);
+	BYTE 		dummy[100000];
 };
 
-// (*)	R�gions :
-//		0 -> normal
-//		1 -> palmier
-//		2 -> hiver
-//		3 -> sapin
-
-/////////////////////////////////////////////////////////////////////////////
 
 POINT GetCel (int x, int y);
 POINT GetCel (POINT cel, int x, int y);
diff --git a/def.h b/def.h
index f79379f..d8fda28 100644
--- a/def.h
+++ b/def.h
@@ -11,31 +11,20 @@
 #define _SE				FALSE	// TRUE eGames Special Edition
 
 
-#define LXIMAGE			640		// dimensions de la fen�tre de jeu
+#define LXIMAGE			640		// dimensions de la fenêtre de jeu
 #define LYIMAGE			480
 
-#define POSDRAWX		144		// surface de dessin
-#define POSDRAWY		15
-#define DIMDRAWX		480
-#define DIMDRAWY		450
-
-#define POSMAPX			8		// surface pour la carte
-#define POSMAPY			15
-#define DIMMAPX			128
-#define DIMMAPY			128
-
 #define MAXCELX			200		// nb max de cellules d'un monde
 #define MAXCELY			200
 
-#define DIMCELX			60		// dimensions d'une cellule (d�cor)
-#define DIMCELY			30
+#define DIMOBJX			64		// dimensions d'un objet
+#define DIMOBJY			64
 
-#define DIMOBJX			120		// dimensions d'un objet
-#define DIMOBJY			120
+#define DIMEXPLOX		128
+#define DIMEXPLOY		128
 
 #define DIMBLUPIX		60		// dimensions de blupi
 #define DIMBLUPIY		60
-#define SHIFTBLUPIY		5		// petit d�calage vers le haut
 
 #define DIMBUTTONX		40		// dimensions d'un button
 #define DIMBUTTONY		40
@@ -43,265 +32,329 @@
 #define DIMJAUGEX		124		// dimensions de la jauge
 #define DIMJAUGEY		22
 
-#define POSSTATX		12		// statistiques
+#define POSSTATX		12
 #define POSSTATY		220
+
 #define DIMSTATX		60
 #define DIMSTATY		30
 
-#define DIMTEXTX		16		// dimensions max d'un caract�re
+#define DIMTEXTX		16		// dimensions max d'un caractère
 #define DIMTEXTY		16
 
-#define DIMLITTLEX		16		// dimensions max d'un petit caract�re
+#define DIMLITTLEX		16		// dimensions max d'un petit caractère
 #define DIMLITTLEY		12
 
-#define CHBACK			0
-#define CHBLUPI000		
-#define CHBLUPI001
-#define CHBLUPI002	
-#define CHBLUPI003
-#define CHFLOOR			1
-#define CHOBJECT		2
-#define CHOBJECTo		3
-#define CHBLUPI			4
-#define CHHILI			5
-#define CHFOG			6
-#define CHMASK1			7
-#define CHLITTLE		8
-#define CHMAP			9
-#define CHBUTTON		10
-#define CHGROUND		11
-#define CHJAUGE			12
-#define CHTEXT			13
-#define CHBIGNUM		14
-#define CHEXPLO
-#define CHELEMENT
-
-#define FOGHIDE			4
+#define CHDECOR			0
+#define CHOBJECT		1
+#define CHBLUPI			2
+#define CHBACK			3
+#define CHBUTTON		4
+#define CHJAUGE			5
+#define CHTEXT			6
+#define CHLITTLE		7
+#define CHMAP			8
+#define CHEXPLO			9
+#define CHELEMENT		10
+#define CHBLUPI1		11
+#define CHBLUPI2		12
+#define CHBLUPI3		13
+#define CHTEMP			14
 
 
 // Directions :
 
-#define DIRECT_E		(0*16)		// est
-#define DIRECT_SE		(1*16)		// sud-est
-#define DIRECT_S		(2*16)		// sud
-#define DIRECT_SO		(3*16)		// sud-ouest
-#define DIRECT_O		(4*16)		// ouest
-#define DIRECT_NO		(5*16)		// nord-ouest
-#define DIRECT_N		(6*16)		// nord
-#define DIRECT_NE		(7*16)		// nord-est
-
-//                  NO
-//            O     |     N
-//             \    |    / 
-//               \  |  / 
-//                 \|/
-//        SO -------o------- NE
-//                 /|\
-//               /  |  \
-//             /    |    \
-//            S     |     E
-//          (y)     SE    (x)
+#define DIR_LEFT	1
+#define DIR_RIGHT	2
 
 
 // Actions :
 
-#define ACTION_STOP			0		// arr�t
-#define ACTION_STOPf		1		// arr�t fatigu�
-#define ACTION_MARCHE		2		// marche
-#define ACTION_MARCHEf		3		// marche fatigu�
-#define ACTION_BUILD		4		// construit
-#define ACTION_PIOCHE		5		// pioche
-#define ACTION_ENERGY		6		// prend de l'�nergie
-#define ACTION_TAKE			8		// fait sauter un objet sur la t�te (est)
-#define ACTION_DEPOSE		9		// repose l'objet sur la t�te (est)
-#define ACTION_SCIE			10		// scie du bois
-#define ACTION_BRULE		11		// blupi crame !
-#define ACTION_TCHAO		12		// blupi disparait !
-#define ACTION_MANGE		13		// blupi mange
-#define ACTION_NAISSANCE	14		// naissance
-#define ACTION_SAUTE2		15		// saute par-dessus un obstacle
-#define ACTION_SAUTE3		16		// saute par-dessus un obstacle
-#define ACTION_SAUTE4		17		// saute par-dessus un obstacle
-#define ACTION_SAUTE5		18		// saute par-dessus un obstacle
-#define ACTION_PONT			19		// pousse un pont
-#define ACTION_MISC1		20		// divers 1 (hausse les �paules)
-#define ACTION_MISC2		21		// divers 2 (grat-grat)
-#define ACTION_MISC3		22		// divers 3 (yoyo)
-#define ACTION_MISC1f		23		// divers 1 fatigu� (bof-bof)
-#define ACTION_GLISSE		24		// glisse en marchant
-#define ACTION_BOIT			25		// blupi boit
-#define ACTION_LABO			26		// blupi travaille dans son laboratoire
-#define ACTION_DYNAMITE		27		// blupi fait p�ter la dynamite
-#define ACTION_DELAY		28		// blupi attend un frame
-#define ACTION_CUEILLE1		29		// blupi cueille des fleurs
-#define ACTION_CUEILLE2		30		// blupi cueille des fleurs
-#define ACTION_MECHE		31		// blupi se bouche les oreilles
-#define ACTION_STOPb		32		// arr�t en bateau
-#define ACTION_MARCHEb		33		// avance en bateau
-#define ACTION_STOPj		34		// arr�t en jeep
-#define ACTION_MARCHEj		35		// avance en jeep
-#define ACTION_ELECTRO		36		// blupi �lectrocut�
-#define ACTION_GRILLE1		37		// blupi grille (phase 1)
-#define ACTION_GRILLE2		38		// blupi grille (phase 2)
-#define ACTION_GRILLE3		39		// blupi grille (phase 3)
-#define ACTION_MISC4		40		// divers 4 (ferme les yeux)
-#define ACTION_CONTENT		41		// blupi est content
-#define ACTION_ARROSE		42		// blupi arrose
-#define ACTION_BECHE		43		// blupi b�che
-#define ACTION_CUEILLE3		44		// blupi cueille des fleurs
-#define ACTION_BUILDBREF	45		// construit
-#define ACTION_BUILDSEC		46		// construit
-#define ACTION_BUILDSOURD	47		// construit
-#define ACTION_BUILDPIERRE	48		// construit
-#define ACTION_PIOCHEPIERRE	49		// pioche
-#define ACTION_PIOCHESOURD	50		// pioche
-#define ACTION_MISC5		51		// divers 5 (oh�)
-#define ACTION_TELEPORTE1	52		// t�l�porte
-#define ACTION_TELEPORTE2	53		// t�l�porte
-#define ACTION_TELEPORTE3	54		// t�l�porte
-#define ACTION_STOPa		55		// arr�t armure
-#define ACTION_MARCHEa		56		// marche armure
-#define ACTION_ARMUREOPEN	57		// ouvre armure
-#define ACTION_ARMURECLOSE	58		// ferme armure
-#define ACTION_SAUTE1		59		// saute dans la jeep
-#define ACTION_MISC6		60		// divers 6 (diabolo)
+#define ACTION_STOP 1
+#define ACTION_MARCH 2
+#define ACTION_TURN 3
+#define ACTION_JUMP 4
+#define ACTION_AIR 5
+#define ACTION_DOWN 6
+#define ACTION_UP 7
+#define ACTION_VERTIGO 8
+#define ACTION_RECEDE 9
+#define ACTION_ADVANCE 10
+#define ACTION_CLEAR1 11
+#define ACTION_SET 12
+#define ACTION_WIN 13
+#define ACTION_PUSH 14
+#define ACTION_STOPHELICO 15
+#define ACTION_MARCHHELICO 16
+#define ACTION_TURNHELICO 17
+#define ACTION_STOPNAGE 18
+#define ACTION_MARCHNAGE 19
+#define ACTION_TURNNAGE 20
+#define ACTION_STOPSURF 21
+#define ACTION_MARCHSURF 22
+#define ACTION_TURNSURF 23
+#define ACTION_DROWN 24
+#define ACTION_STOPJEEP 25
+#define ACTION_MARCHJEEP 26
+#define ACTION_TURNJEEP 27
+#define ACTION_STOPPOP 28
+#define ACTION_POP 29
+#define ACTION_BYE 30
+#define ACTION_STOPSUSPEND 31
+#define ACTION_MARCHSUSPEND 32
+#define ACTION_TURNSUSPEND 33
+#define ACTION_JUMPSUSPEND 34
+#define ACTION_HIDE 35
+#define ACTION_JUMPAIE 36
+#define ACTION_STOPSKATE 37
+#define ACTION_MARCHSKATE 38
+#define ACTION_TURNSKATE 39
+#define ACTION_JUMPSKATE 40
+#define ACTION_AIRSKATE 41
+#define ACTION_TAKESKATE 42
+#define ACTION_DEPOSESKATE 43
+#define ACTION_OUF1a 44
+#define ACTION_OUF1b 45
+#define ACTION_OUF2 46
+#define ACTION_OUF3 47
+#define ACTION_OUF4 48
+#define ACTION_SUCETTE 49
+#define ACTION_STOPTANK 50
+#define ACTION_MARCHTANK 51
+#define ACTION_TURNTANK 52
+#define ACTION_FIRETANK 53
+#define ACTION_GLU 54
+#define ACTION_DRINK 55
+#define ACTION_CHARGE 56
+#define ACTION_ELECTRO 57
+#define ACTION_HELICOGLU 58
+#define ACTION_TURNAIR 59
+#define ACTION_STOPMARCH 60
+#define ACTION_STOPJUMP 61
+#define ACTION_STOPJUMPh 62
+#define ACTION_MOCKERY 63
+#define ACTION_MOCKERYi 64
+#define ACTION_OUF5 65
+#define ACTION_BALLOON 66
+#define ACTION_STOPOVER 67
+#define ACTION_MARCHOVER 68
+#define ACTION_TURNOVER 69
+#define ACTION_RECEDEq 70
+#define ACTION_ADVANCEq 71
+#define ACTION_STOPECRASE 72
+#define ACTION_MARCHECRASE 73
+#define ACTION_TELEPORTE 74
+#define ACTION_CLEAR2 75
+#define ACTION_CLEAR3 76
+#define ACTION_CLEAR4 77
+#define ACTION_CLEAR5 78
+#define ACTION_CLEAR6 79
+#define ACTION_CLEAR7 80
+#define ACTION_CLEAR8 81
+#define ACTION_SWITCH 82
+#define ACTION_MOCKERYp 83
+#define ACTION_NON 84
+#define ACTION_SLOWDOWNSKATE 85
+#define ACTION_TAKEDYNAMITE 86
+#define ACTION_PUTDYNAMITE 87
 
-#define ACTION_A_STOP		100		// araign�e: arr�t
-#define ACTION_A_MARCHE		101		// araign�e: marche
-#define ACTION_A_SAUT		102		// araign�e: saute
-#define ACTION_A_GRILLE		103		// araign�e: grille dans rayon
-#define ACTION_A_POISON		105		// araign�e: empoison�e
-#define ACTION_A_MORT1		106		// araign�e: meurt
-#define ACTION_A_MORT2		107		// araign�e: meurt
-#define ACTION_A_MORT3		108		// araign�e: meurt
 
-#define ACTION_V_STOP		200		// virus: arr�t
-#define ACTION_V_MARCHE		201		// virus: marche
-#define ACTION_V_GRILLE		202		// virus: grille dans rayon
+// Sécurités :
 
-#define ACTION_T_STOP		300		// tracks: arr�t
-#define ACTION_T_MARCHE		301		// tracks: marche
-#define ACTION_T_ECRASE		302		// tracks: �crase un objet
+#define SEC_SHIELD 1
+#define SEC_POWER 2
+#define SEC_CLOUD 3
+#define SEC_HIDE 4
 
-#define ACTION_R_STOP		400		// robot: arr�t
-#define ACTION_R_MARCHE		401		// robot: marche
-#define ACTION_R_APLAT		402		// robot: applatit
-#define ACTION_R_BUILD		403		// robot: construit
-#define ACTION_R_DELAY		404		// robot: construit
-#define ACTION_R_CHARGE		405		// robot: recharge
-#define ACTION_R_ECRASE		406		// robot: �crase un objet
 
-#define ACTION_B_STOP		500		// bombe: arr�t
-#define ACTION_B_MARCHE		501		// bombe: marche
+// Types :
 
-#define ACTION_D_DELAY		600		// d�tonnateur: attend
+#define TYPE_ASCENSEUR 1
+#define TYPE_BOMBEDOWN 2
+#define TYPE_BOMBEUP 3
+#define TYPE_BULLDOZER 4
+#define TYPE_TRESOR 5
+#define TYPE_EGG 6
+#define TYPE_GOAL 7
+#define TYPE_EXPLO1 8
+#define TYPE_EXPLO2 9
+#define TYPE_EXPLO3 10
+#define TYPE_EXPLO4 11
+#define TYPE_CAISSE 12
+#define TYPE_HELICO 13
+#define TYPE_PLOUF 14
+#define TYPE_BLUP 15
+#define TYPE_BOMBEMOVE 16
+#define TYPE_POISSON 17
+#define TYPE_TOMATES 18
+#define TYPE_JEEP 19
+#define TYPE_OISEAU 20
+#define TYPE_CLE 21
+#define TYPE_DOOR 22
+#define TYPE_BALLE 23
+#define TYPE_SKATE 24
+#define TYPE_SHIELD 25
+#define TYPE_POWER 26
+#define TYPE_MAGICTRACK 27
+#define TYPE_TANK 28
+#define TYPE_BULLET 29
+#define TYPE_DRINK 30
+#define TYPE_CHARGE 31
+#define TYPE_BLUPIHELICO 32
+#define TYPE_BLUPITANK 33
+#define TYPE_GLU 34
+#define TYPE_TIPLOUF 35
+#define TYPE_POLLUTION 36
+#define TYPE_CLEAR 37
+#define TYPE_ELECTRO 38
+#define TYPE_TRESORTRACK 39
+#define TYPE_INVERT 40
+#define TYPE_INVERTSTART 41
+#define TYPE_INVERTSTOP 42
+#define TYPE_GUEPE 44
+#define TYPE_OVER 46
+#define TYPE_ASCENSEURs 47
+#define TYPE_ASCENSEURsi 48
+#define TYPE_CLE1 49
+#define TYPE_CLE2 50
+#define TYPE_CLE3 51
+#define TYPE_BRIDGE 52
+#define TYPE_TENTACULE 53
+#define TYPE_CREATURE 54
+#define TYPE_DYNAMITE 55
+#define TYPE_DYNAMITEf 56
+#define TYPE_SHIELDTRACK 57
+#define TYPE_HIDETRACK 58
+#define TYPE_EXPLO5 90
+#define TYPE_EXPLO6 91
+#define TYPE_EXPLO7 92
+#define TYPE_EXPLO8 93
+#define TYPE_EXPLO9 94
+#define TYPE_EXPLO10 95
+#define TYPE_BOMBEFOLLOW1 96
+#define TYPE_BOMBEFOLLOW2 97
+#define TYPE_SPLOUTCH1 98
+#define TYPE_SPLOUTCH2 99
+#define TYPE_SPLOUTCH3 100
+#define TYPE_BOMBEPERSO1 200
+#define TYPE_BOMBEPERSO2 201
+#define TYPE_BOMBEPERSO3 202
+#define TYPE_BOMBEPERSO4 203
 
-#define ACTION_E_STOP		700		// �lectro: arr�t
-#define ACTION_E_MARCHE		701		// �lectro: marche
-#define ACTION_E_DEBUT		702		// �lectro: d�bute
-#define ACTION_E_RAYON		703		// �lectro: rayonne
 
-#define ACTION_D_STOP		800		// disciple: arr�t
-#define ACTION_D_MARCHE		801		// disciple: marche
-#define ACTION_D_BUILD		802		// disciple: construit
-#define ACTION_D_PIOCHE		803		// disciple: pioche
-#define ACTION_D_SCIE		804		// disciple: scie du bois
-#define ACTION_D_TCHAO		805		// disciple: disparait !
-#define ACTION_D_CUEILLE1	806		// disciple: cueille des fleurs
-#define ACTION_D_CUEILLE2	807		// disciple: cueille des fleurs
-#define ACTION_D_MECHE		808		// disciple: se bouche les oreilles
-#define ACTION_D_ARROSE		809		// disciple: arrose
-#define ACTION_D_BECHE		810		// disciple: b�che
+// Steps :
+
+#define STEP_STOPSTART 1
+#define STEP_ADVANCE 2
+#define STEP_STOPEND 3
+#define STEP_RECEDE 4
 
 
 // Sons :
 
-#define SOUND_CLICK			0
-#define SOUND_BOING			1
-#define SOUND_OK1			2
-#define SOUND_OK2			3
-#define SOUND_OK3			4
-#define SOUND_GO1			5
-#define SOUND_GO2			6
-#define SOUND_GO3			7
-#define SOUND_TERM1			8
-#define SOUND_TERM2			9
-#define SOUND_TERM3			10
-#define SOUND_COUPTERRE		11
-#define SOUND_COUPTOC		12
-#define SOUND_SAUT			13
-#define SOUND_HOP			14
-#define SOUND_SCIE			15
-#define SOUND_FEU			16
-#define SOUND_BRULE			17
-#define SOUND_TCHAO			18
-#define SOUND_MANGE			19
-#define SOUND_NAISSANCE		20
-#define SOUND_A_SAUT		21
-#define SOUND_A_HIHI		22
-#define SOUND_PLOUF			23
-#define SOUND_BUT			24
-#define SOUND_RAYON1		25
-#define SOUND_RAYON2		26
-#define SOUND_VIRUS			27
-#define SOUND_GLISSE		28
-#define SOUND_BOIT			29
-#define SOUND_LABO			30
-#define SOUND_DYNAMITE		31
-#define SOUND_PORTE			32
-#define SOUND_FLEUR			33
-#define SOUND_T_MOTEUR		34
-#define SOUND_T_ECRASE		35
-#define SOUND_PIEGE			36
-#define SOUND_AIE			37
-#define SOUND_A_POISON		38
-#define SOUND_R_MOTEUR		39
-#define SOUND_R_APLAT		40
-#define SOUND_R_ROTATE		41
-#define SOUND_R_CHARGE		42
-#define SOUND_B_SAUT		43
-#define SOUND_BATEAU		44
-#define SOUND_JEEP			45
-#define SOUND_MINE			46
-#define SOUND_USINE			47
-#define SOUND_E_RAYON		48
-#define SOUND_E_TOURNE		49
-#define SOUND_ARROSE		50
-#define SOUND_BECHE			51
-#define SOUND_D_BOING		52
-#define SOUND_D_OK			53
-#define SOUND_D_GO			54
-#define SOUND_D_TERM		55
-#define SOUND_BOING1		56
-#define SOUND_BOING2		57
-#define SOUND_BOING3		58
-#define SOUND_OK4			59
-#define SOUND_OK5			60
-#define SOUND_OK6			61
-#define SOUND_OK1f			62
-#define SOUND_OK2f			63
-#define SOUND_OK3f			64
-#define SOUND_OK1e			65
-#define SOUND_OK2e			66
-#define SOUND_OK3e			67
-#define SOUND_GO4			68
-#define SOUND_GO5			69
-#define SOUND_GO6			70
-#define SOUND_TERM4			71
-#define SOUND_TERM5			72
-#define SOUND_TERM6			73
-#define SOUND_COUPSEC		74
-#define SOUND_COUPPIERRE	75
-#define SOUND_COUPSOURD		76
-#define SOUND_COUPBREF		77
-#define SOUND_OPEN			78
-#define SOUND_CLOSE			79
-#define SOUND_TELEPORTE		80
-#define SOUND_ARMUREOPEN	81
-#define SOUND_ARMURECLOSE	82
-#define SOUND_WIN			83
-#define SOUND_LOST			84
-#define SOUND_MOVIE			99
+#define SOUND_CLICK 0
+#define SOUND_JUMP1 1
+#define SOUND_JUMP2 2
+#define SOUND_JUMPEND 3
+#define SOUND_JUMPTOC 4
+#define SOUND_TURN 5
+#define SOUND_VERTIGO 6
+#define SOUND_DOWN 7
+#define SOUND_FALL 8
+#define SOUND_NEW 9
+#define SOUND_BOUM 10
+#define SOUND_TRESOR 11
+#define SOUND_EGG 12
+#define SOUND_ENDKO 13
+#define SOUND_ENDOK 14
+#define SOUND_HELICOSTART 15
+#define SOUND_HELICOHIGH 16
+#define SOUND_HELICOSTOP 17
+#define SOUND_HELICOLOW 18
+#define SOUND_LASTTRESOR 19
+#define SOUND_UP 20
+#define SOUND_LOOKUP 21
+#define SOUND_JUMP0 22
+#define SOUND_PLOUF 23
+#define SOUND_BLUP 24
+#define SOUND_SURF 25
+#define SOUND_DROWN 26
+#define SOUND_ERROR 27
+#define SOUND_JEEPSTART 28
+#define SOUND_JEEPHIGH 29
+#define SOUND_JEEPSTOP 30
+#define SOUND_JEEPLOW 31
+#define SOUND_BYE 32
+#define SOUND_DOOR 33
+#define SOUND_SUSPENDTOC 34
+#define SOUND_SUSPENDJUMP 35
+#define SOUND_SINGE 36
+#define SOUND_PATIENT 37
+#define SOUND_PUSH 38
+#define SOUND_POP 39
+#define SOUND_JUMPAIE 40
+#define SOUND_RESSORT 41
+#define SOUND_STARTSHIELD 42
+#define SOUND_STOPSHIELD 43
+#define SOUND_STARTPOWER 44
+#define SOUND_STOPPOWER 45
+#define SOUND_OUF1 46
+#define SOUND_OUF2 47
+#define SOUND_OUF3 48
+#define SOUND_OUF4 49
+#define SOUND_SUCETTE 50
+#define SOUND_GLU 51
+#define SOUND_FIREOK 52
+#define SOUND_FIREKO 53
+#define SOUND_TAKEGLU 54
+#define SOUND_STARTCLOUD 55
+#define SOUND_STOPCLOUD 56
+#define SOUND_DRINK 57
+#define SOUND_CHARGE 58
+#define SOUND_ELECTRO 59
+#define SOUND_PERSOTAKE 60
+#define SOUND_PERSOPOSE 61
+#define SOUND_STARTHIDE 62
+#define SOUND_STOPHIDE 63
+#define SOUND_TIPLOUF 64
+#define SOUND_MOCKERY 65
+#define SOUND_INVERTSTART 66
+#define SOUND_INVERTSTOP 67
+#define SOUND_OVERSTOP 68
+#define SOUND_BLITZ 69
+#define SOUND_ECRASE 70
+#define SOUND_TELEPORTE 71
+#define SOUND_BRIDGE1 72
+#define SOUND_BRIDGE2 73
+#define SOUND_ANGEL 74
+#define SOUND_SCIE 75
+#define SOUND_SWITCHOFF 76
+#define SOUND_SWITCHON 77
+#define SOUND_JUMPENDb 78
+#define SOUND_JUMPTOCb 79
+#define SOUND_JUMPENDm 80
+#define SOUND_JUMPTOCm 81
+#define SOUND_JUMPENDg 82
+#define SOUND_JUMPTOCg 83
+#define SOUND_JUMPENDo 84
+#define SOUND_JUMPTOCo 85
+#define SOUND_JUMPENDk 86
+#define SOUND_JUMPTOCk 87
+#define SOUND_JUMPENDf 88
+#define SOUND_JUMPTOCf 89
+#define SOUND_JUMPENDh 90
+#define SOUND_JUMPTOCh 91
+#define SOUND_FOLLOW 92
+
+
+// 
+
+#define KEY_LEFT	(1 << 0)
+#define KEY_RIGHT	(1 << 1)
+#define KEY_UP		(1 << 2)
+#define KEY_DOWN	(1 << 3)
+#define KEY_JUMP	(1 << 4)
+#define KEY_FIRE	(1 << 5)
+
 
 
 // Boutons (play) :
@@ -345,18 +398,6 @@
 #define BUTTON_FABARMURE	34
 
 
-// Erreurs :
-
-#define ERROR_MISC			1
-#define ERROR_GROUND		2
-#define ERROR_FREE			3
-#define ERROR_PONTOP		4
-#define ERROR_PONTTERM		5
-#define ERROR_TOURISOL		6
-#define ERROR_TOUREAU		7
-#define ERROR_TELE2			8
-
-
 // Lutins pour la souris
 
 #define SPRITE_ARROW		1
@@ -375,15 +416,6 @@
 #define SPRITE_FILL			14
 
 
-#define TYPE_BALLE
-#define	TYPE_CAISSE
-#define TYPE_GOAL
-#define TYPE_CLE
-#define TYPE_BLUPIHELICO
-#define TYPE_BLUPITANK
-#define TYPE_empty
-#define MAXMOVEOBJECT = 200;
-
 // User define message
 
 #define WM_UPDATE				(WM_USER+1)
@@ -621,23 +653,3 @@
 #define MOUSETYPEWIN			2
 #define MOUSETYPEWINPOS			3
 
-
-
-// Conditions pour gagner.
-
-typedef struct
-{
-	short	bHachBlupi;		// blupi sur dalle hachur�e
-	short	bHachPlanche;	// planches sur dalle hachur�e
-	short	bStopFire;		// feu �teint
-	short	nbMinBlupi;		// nb de blupi n�cessaires
-	short	nbMaxBlupi;		// nb de blupi n�cessaires
-	short	bHomeBlupi;		// blupi � la maison
-	short	bKillRobots;	// plus d'ennemis
-	short	bHachTomate;	// tomates sur dalle hachur�e
-	short	bHachMetal;		// m�tal sur dalle hachur�e
-	short	bHachRobot;		// robot sur dalle hachur�e
-	short	reserve[14];
-}
-Term;
-
diff --git a/jauge.h b/jauge.h
index 6330bac..c75e1de 100644
--- a/jauge.h
+++ b/jauge.h
@@ -10,7 +10,7 @@ public:
     CJauge();
     ~CJauge();
 
-    BOOL    Create(HWND hWnd, CPixmap *pPixmap, CDecor *pDecor,
+    BOOL    Create(HWND hWnd, CPixmap *pPixmap, CSound *pSound,
                    POINT pos, int type, BOOL bMinimizeRedraw);
     void    Draw();
     void    Redraw();
@@ -29,7 +29,6 @@ public:
 protected:
     HWND        m_hWnd;
     CPixmap*    m_pPixmap;
-    CDecor*     m_pDecor;
     CSound*     m_pSound;
     BOOL        m_bHide;
     POINT       m_pos;
diff --git a/pixmap.cpp b/pixmap.cpp
index 75024df..abdc79e 100644
--- a/pixmap.cpp
+++ b/pixmap.cpp
@@ -583,67 +583,7 @@ int CPixmap::SearchColor(int red, int green, int blue)
 
 // Cache une image contenant des ic�nes.
 
-BOOL CPixmap::Cache(int channel, char *pFilename, POINT totalDim, POINT iconDim,
-					BOOL bUsePalette)
-{
-    HRESULT     ddrval;
-
-	if ( channel < 0 || channel >= MAXIMAGE )  return FALSE;
-
-	if ( m_lpDDSurface[channel] != NULL )
-	{
-		Flush(channel);
-	}
-
-    // Create and set the palette.
-	if ( bUsePalette )
-	{
-		if ( m_bDebug )  OutputDebug("Use palette\n");
-		if ( m_lpDDPal != NULL )
-		{
-			if ( m_bDebug )  OutputDebug("Release palette\n");
-			m_lpDDPal->Release();
-			m_lpDDPal = NULL;
-		}
-
-		m_lpDDPal = DDLoadPalette(m_lpDD, pFilename);
-
-		if ( m_lpDDPal )
-		{
-			if ( m_bDebug )  OutputDebug("Set palette\n");
-			m_lpDDSPrimary->SetPalette(NULL);  // indispensable !
-			ddrval = m_lpDDSPrimary->SetPalette(m_lpDDPal);
-			if ( ddrval != DD_OK )
-			{
-				TraceErrorDD(ddrval, pFilename, 1);
-			}
-		}
-	}
-
-    // Create the offscreen surface, by loading our bitmap.
-    m_lpDDSurface[channel] = DDLoadBitmap(m_lpDD, pFilename, 0, 0);
-
-    if ( m_lpDDSurface[channel] == NULL )
-    {
-		OutputDebug("Fatal error: DDLoadBitmap\n");
-        return FALSE;
-    }
-
-    // Set the color key to white
-	if ( m_bDebug )  OutputDebug("DDSetColorKey\n");
-    DDSetColorKey(m_lpDDSurface[channel], RGB(255,255,255));  // blanc
-	
-	strcpy(m_filename[channel], pFilename);
-
-	m_totalDim[channel] = totalDim;
-	m_iconDim[channel]  = iconDim;
-
-	return TRUE;
-}
-
-// Cache une image globale.
-
-BOOL CPixmap::Cache2(int channel, char *pFilename, POINT totalDim, BOOL bUsePalette)
+BOOL CPixmap::Cache1(int channel, char *pFilename, POINT totalDim, BOOL bUsePalette)
 {
 	POINT		iconDim;
 
@@ -670,43 +610,71 @@ BOOL CPixmap::Cache2(int channel, char *pFilename, POINT totalDim, BOOL bUsePale
 
 	if (bUsePalette != 0)
 	{
-
+		//TODO: more
 	}
 }
 
-// Cache une image provenant d'un bitmap.
 
-// Probably not needed?
+// Cache une image globale.
 
-
-BOOL CPixmap::Cache(int channel, HBITMAP hbm, POINT totalDim)
+BOOL CPixmap::Cache2(int channel, char *pFilename, POINT totalDim, POINT iconDim,
+	BOOL bUsePalette)
 {
-	if ( channel < 0 || channel >= MAXIMAGE )  return FALSE;
+	HRESULT     ddrval;
 
-	if ( m_lpDDSurface[channel] != NULL )
+	if (channel < 0 || channel >= MAXIMAGE)  return FALSE;
+
+	if (m_lpDDSurface[channel] != NULL)
 	{
 		Flush(channel);
 	}
 
-    // Create the offscreen surface, by loading our bitmap.
-    m_lpDDSurface[channel] = DDConnectBitmap(m_lpDD, hbm);
+	// Create and set the palette.
+	if (bUsePalette)
+	{
+		if (m_bDebug)  OutputDebug("Use palette\n");
+		if (m_lpDDPal != NULL)
+		{
+			if (m_bDebug)  OutputDebug("Release palette\n");
+			m_lpDDPal->Release();
+			m_lpDDPal = NULL;
+		}
 
-    if ( m_lpDDSurface[channel] == NULL )
-    {
+		m_lpDDPal = DDLoadPalette(m_lpDD, pFilename);
+
+		if (m_lpDDPal)
+		{
+			if (m_bDebug)  OutputDebug("Set palette\n");
+			m_lpDDSPrimary->SetPalette(NULL);  // indispensable !
+			ddrval = m_lpDDSPrimary->SetPalette(m_lpDDPal);
+			if (ddrval != DD_OK)
+			{
+				TraceErrorDD(ddrval, pFilename, 1);
+			}
+		}
+	}
+
+	// Create the offscreen surface, by loading our bitmap.
+	m_lpDDSurface[channel] = DDLoadBitmap(m_lpDD, pFilename, 0, 0);
+
+	if (m_lpDDSurface[channel] == NULL)
+	{
 		OutputDebug("Fatal error: DDLoadBitmap\n");
-        return FALSE;
-    }
+		return FALSE;
+	}
+
+	// Set the color key to white
+	if (m_bDebug)  OutputDebug("DDSetColorKey\n");
+	DDSetColorKey(m_lpDDSurface[channel], RGB(255, 255, 255));  // blanc
+
+	strcpy(m_filename[channel], pFilename);
 
-    // Set the color key to white
-    DDSetColorKey(m_lpDDSurface[channel], RGB(255,255,255));  // blanc
-	
 	m_totalDim[channel] = totalDim;
-	m_iconDim[channel]  = totalDim;
+	m_iconDim[channel] = iconDim;
 
 	return TRUE;
 }
 
-
 // Purge une image.
 
 void CPixmap::Flush(int channel)
diff --git a/pixmap.h b/pixmap.h
index 9dc9078..8106eff 100644
--- a/pixmap.h
+++ b/pixmap.h
@@ -6,48 +6,52 @@
 
 /////////////////////////////////////////////////////////////
 
-#define MAXIMAGE    100
+#define MAXIMAGE	100
 
 
 class CPixmap
 {
 public:
-    CPixmap();
-    ~CPixmap();
+	CPixmap();
+	~CPixmap();
 
-    void    SetDebug(BOOL bDebug);
+	BOOL	CacheAll(BOOL _foo, HWND hWnd, BOOL bFullScreen, BOOL bTrueColor,
+			         BOOL bTrueColorDecor, int mouseType, char *_str, int _baz);
+	int		Benchmark();
+	void	SetDebug(BOOL bDebug);
+	BOOL	Create(HWND hwnd, POINT dim, BOOL bFullScreen, BOOL bTrueColor,
+			       BOOL bTrueColorDecor, int mouseType);
+	BOOL	Flush();
+	BOOL	Restore();
+	BOOL	InitSysPalette();
+	BOOL	GetTrueColor();
+	void	SetBenchmarkSuccess(BOOL bSuccess);
+	void	SetTrueColor(BOOL bTrueColor);
+	void	SetTrueColorDecor(BOOL bTrueColorDecor);
+	BOOL	FUN_28f60(int channel);
 
-    BOOL    Create(HWND hwnd, POINT dim, BOOL bFullScreen, int mouseType, BOOL bTrueColor, BOOL bTrueColorDecor);
-    BOOL    Flush();
-    BOOL    Restore();
-    BOOL    InitSysPalette();
-    BOOL    IsPalette();
-    void    Fill(RECT rect, COLORREF color);
+	BOOL	IsPalette();
+	void	Fill(RECT rect, COLORREF color);
 
-    BOOL    SavePalette();
-    BOOL    RestorePalette();
-    int     SearchColor(int red, int green, int blue);
-    BOOL    Cache(int channel, char *pFilename, POINT totalDim, POINT iconDim, BOOL bUsePalette);
-    BOOL    Cache2(int channel, char *pFilename, POINT totalDim, BOOL bUsePalette);
-    BOOL    Cache(int channel, HBITMAP hbm, POINT totalDim);
-    void    Flush(int channel);
-    void    SetTransparent(int channel, COLORREF color);
-    void    SetTransparent2(int channel, COLORREF color1, COLORREF color2);
-    void    SetClipping(RECT clip);
-    RECT    GetClipping();
-    void    HudIcon(int channel, int rank, POINT pos);
 
-    BOOL    IsIconPixel(int channel, int rank, POINT pos);
+	BOOL	SavePalette();
+	BOOL	RestorePalette();
+	int		SearchColor(int red, int green, int blue);
+	BOOL	Cache1(int channel, char *pFilename, POINT totalDim, POINT iconDim, BOOL bUsePalette);
+	BOOL	Cache2(int channel, char *pFilename, POINT totalDim, POINT iconDim, BOOL bUsePalette);
+	void	Flush(int channel);
+	void	SetTransparent(int channel, COLORREF color);
+	void	SetTransparent2(int channel, COLORREF color1, COLORREF color2);
+	void	SetClipping(RECT clip);
+	RECT	GetClipping();
+	void	QuickIcon(int channel, int rank, POINT pos);
 
-    BOOL    DrawIcon(int chDst, int channel, int rank, POINT pos, int mode=0, BOOL bMask=FALSE);
-    BOOL	DrawIconDemi(int chDst, int channel, int rank, POINT pos, int mode=0, BOOL bMask=FALSE);
-	BOOL	DrawIconPart(int chDst, int channel, int rank, POINT pos, int startY, int endY, int mode=0, BOOL bMask=FALSE);
-	BOOL	DrawPart(int chDst, int channel, POINT dest, RECT rect, int mode=0, BOOL bMask=FALSE);
-	BOOL	DrawImage(int chDst, int channel, RECT rect, int mode=0);
+	BOOL	IsIconPixel(int channel, int rank, POINT pos);
+
+	BOOL	DrawIcon(int chDst, int channel, int rank, POINT pos, int mode = 0, BOOL bMask = FALSE);
+	BOOL	DrawPart(int chDst, int channel, POINT dest, RECT rect, int mode = 0, BOOL bMask = FALSE);
+	BOOL	DrawImage(int chDst, int channel, RECT rect, int mode = 0);
 
-	BOOL	BuildIconMask(int channelMask, int rankMask,
-						  int channel, int rankSrc, int rankDst);
-	
 	BOOL	Display();
 
 	void	SetMousePosSprite(POINT pos, int sprite, BOOL bDemoPlay);
@@ -62,7 +66,7 @@ protected:
 	HRESULT	RestoreAll();
 	HRESULT	BltFast(int chDst, int channel, POINT dst, RECT rcRect, int mode);
 	HRESULT	BltFast(LPDIRECTDRAWSURFACE lpDD,
-					int channel, POINT dst, RECT rcRect, int mode);
+	        int channel, POINT dst, RECT rcRect, int mode);
 
 	void	MouseUpdate();
 	BOOL	MouseQuickDraw(RECT rect);
@@ -71,49 +75,45 @@ protected:
 	void	MouseBackDebug();
 	RECT	MouseRectSprite();
 	void	MouseHotSpot();
-    BOOL    GetTrueColor();
-
-    void SetBenchmarkSuccess(BOOL bSuccess);
-    void SetTrueColor(BOOL bTrueColor);
-    void SetTrueColorDecor(BOOL bTrueColorDecor);
+	BOOL	GetTrueColor();
 
 protected:
-    BOOL                   m_bFullScreen;
-    BOOL                   m_bBenchmarkSuccess;
-    BOOL                   m_bTrueColor;
-    BOOL                   m_bTrueColorDecor;
-    BOOL                   m_field5_0x14; //Need to figure out
-    BOOL                   m_field5_0x18; //Need to figure out
-    int                    m_mouseType;
-    BOOL                   m_bDebug;
-    BOOL                   m_bPalette;
-    HWND                   m_hWnd;
-    POINT                  m_dim;
-    RECT                   m_clipRect;
-    double                 originX;
-    double                 originY;
+	BOOL				   m_bFullScreen;
+	BOOL				   m_bBenchmarkSuccess;
+	BOOL				   m_bTrueColor;
+	BOOL				   m_bTrueColorDecor;
+	BOOL				   m_field5_0x14; //Need to figure out
+	BOOL				   m_field5_0x18; //Need to figure out
+	int					m_mouseType;
+	BOOL				   m_bDebug;
+	BOOL				   m_bPalette;
+	HWND				   m_hWnd;
+	POINT				  m_dim;
+	RECT				   m_clipRect;
+	double				 originX;
+	double				 originY;
 
-    POINT                  m_mousePos;
-    int                    m_mouseSprite;
-    POINT                  m_mouseHotSpot;
-    POINT                  m_mouseBackPos;
-    BOOL                   m_bMouseBack;
-    BOOL                   m_bMouseShow;
-    BOOL                   m_bBackDisplayed;
+	POINT				  m_mousePos;
+	int					m_mouseSprite;
+	POINT				  m_mouseHotSpot;
+	POINT				  m_mouseBackPos;
+	BOOL				   m_bMouseBack;
+	BOOL				   m_bMouseShow;
+	BOOL				   m_bBackDisplayed;
 
-    LPDIRECTDRAW           m_lpDD;
-    LPDIRECTDRAWSURFACE    m_lpDDSPrimary;
-    LPDIRECTDRAWSURFACE    m_lpDDSBack;
-    LPDIRECTDRAWSURFACE    m_lpDDSMouse;
-    LPDIRECTDRAWPALETTE    m_lpDDPal;
-    LPDIRECTDRAWSURFACE    m_lpDDSurface[MAXIMAGE];
-    LPDIRECTDRAWCLIPPER    m_lpClipper;
-    PALETTEENTRY           m_pal[256];
-    PALETTEENTRY           m_sysPal[256];
-    COLORREF               m_colorSurface[2*MAXIMAGE];
+	LPDIRECTDRAW		   m_lpDD;
+	LPDIRECTDRAWSURFACE	m_lpDDSPrimary;
+	LPDIRECTDRAWSURFACE	m_lpDDSBack;
+	LPDIRECTDRAWSURFACE	m_lpDDSMouse;
+	LPDIRECTDRAWPALETTE	m_lpDDPal;
+	LPDIRECTDRAWSURFACE	m_lpDDSurface[MAXIMAGE];
+	LPDIRECTDRAWCLIPPER	m_lpClipper;
+	PALETTEENTRY		   m_pal[256];
+	PALETTEENTRY		   m_sysPal[256];
+	COLORREF			   m_colorSurface[2 * MAXIMAGE];
 
-    char                   m_filename[MAXIMAGE][20];
-    POINT                  m_totalDim[MAXIMAGE];
-    POINT                  m_iconDim[MAXIMAGE];
-    DDBLTFX m_DDbltfx
+	char				   m_filename[MAXIMAGE][20];
+	POINT				  m_totalDim[MAXIMAGE];
+	POINT				  m_iconDim[MAXIMAGE];
+	DDBLTFX m_DDbltfx
 }
\ No newline at end of file