From 90edff0368ee6b51be9f4d599e0e0fdfdba400a3 Mon Sep 17 00:00:00 2001
From: Mathieu Schroeter <mathieu@schroetersa.ch>
Date: Sun, 5 Feb 2017 11:17:48 +0100
Subject: [PATCH] Remove static specific stuff for egames

---
 def.h     |  2 --
 event.cpp | 17 -----------------
 misc.cpp  |  7 -------
 movie.cpp |  5 -----
 4 files changed, 31 deletions(-)

diff --git a/def.h b/def.h
index bc0d7a3..f59ade4 100644
--- a/def.h
+++ b/def.h
@@ -6,8 +6,6 @@
 #include <Windows.h>
 
 #define _INTRO			false	// true si images d'introduction
-#define _EGAMES			false	// true version pour eGames
-#define _SE				false	// true eGames Special Edition
 
 
 #define LXIMAGE			640		// dimensions de la fenêtre de jeu
diff --git a/event.cpp b/event.cpp
index cf7a6a8..91679c7 100644
--- a/event.cpp
+++ b/event.cpp
@@ -415,7 +415,6 @@ static Phase table[] =
 				399+40, 330,
 				{1,TX_BUTTON_SETUP6},
 			},
-#if !_EGAMES
 			{
 				WM_BUTTON7,
 				0, {1,50},
@@ -428,7 +427,6 @@ static Phase table[] =
 				514+40, 330,
 				{1,TX_BUTTON_SETUP8},
 			},
-#endif
 			{
 				WM_BUTTON9,
 				0, {1,50},
@@ -494,7 +492,6 @@ static Phase table[] =
 				399+40, 330,
 				{1,TX_BUTTON_SETUP6},
 			},
-#if !_EGAMES
 			{
 				WM_BUTTON7,
 				0, {1,50},
@@ -507,7 +504,6 @@ static Phase table[] =
 				514+40, 330,
 				{1,TX_BUTTON_SETUP8},
 			},
-#endif
 			{
 				WM_BUTTON9,
 				0, {1,50},
@@ -1833,16 +1829,7 @@ bool CEvent::DrawButtons()
 	{
 		pos.x = 580;
 		pos.y = 465;
-#if _EGAMES
-		DrawText(m_pPixmap, pos, "Version 1.0", FONTLITTLE);
-#else
 		DrawText(m_pPixmap, pos, "Version 1.7", FONTLITTLE);
-#endif
-#if _SE
-		pos.x = 580;
-		pos.y = 465-20;
-		DrawText(m_pPixmap, pos, "S E", FONTRED);
-#endif
 	}
 
 	if ( m_phase == WM_PHASE_SETUP  ||
@@ -2280,9 +2267,7 @@ bool CEvent::DrawButtons()
 		DrawTextCenter(TX_INFO_SETUP5, 169+40, 80);
 		DrawTextCenter(TX_INFO_SETUP2, 284+40, 80);
 		DrawTextCenter(TX_INFO_SETUP3, 399+40, 80);
-#if !_EGAMES
 		DrawTextCenter(TX_INFO_SETUP4, 514+40, 80);
-#endif
 
 		sprintf(res, "x%d", m_speed);
 		lg = GetTextWidth(res);
@@ -2302,7 +2287,6 @@ bool CEvent::DrawButtons()
 		pos.y = 330-20;
 		DrawText(m_pPixmap, pos, res);
 
-#if !_EGAMES
 		if ( m_pMovie->GetEnable() )
 		{
 			if ( m_bMovie )  LoadString(TX_OUI, res, 50);
@@ -2316,7 +2300,6 @@ bool CEvent::DrawButtons()
 		pos.x = (514+40)-lg/2;
 		pos.y = 330-20;
 		DrawText(m_pPixmap, pos, res);
-#endif
 
 		if ( m_scrollSpeed == 0 )  LoadString(TX_INFO_NOSCROLL, res, 50);
 		else                       sprintf(res, "%d", m_scrollSpeed);
diff --git a/misc.cpp b/misc.cpp
index f30474f..e78c0e3 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -124,14 +124,7 @@ void AddUserPath(char *pFilename)
 	char					last;
 	SECURITY_ATTRIBUTES		att;
 
-#if _EGAMES
-	strcpy(temp, "c:\\Planet Blupi Full\\");
-#if _SE
-	strcpy(temp, "c:\\Planet Blupi SE\\");
-#endif
-#else
 	strcpy(temp, "c:\\Planète Blupi\\");
-#endif
 
 	att.nLength = sizeof(SECURITY_ATTRIBUTES);
 	att.lpSecurityDescriptor = NULL;
diff --git a/movie.cpp b/movie.cpp
index 4541dc3..6711a5f 100644
--- a/movie.cpp
+++ b/movie.cpp
@@ -221,10 +221,6 @@ CMovie::~CMovie()
 
 bool CMovie::Create()
 {
-#if _EGAMES
-	m_bEnable = false;
-	return false;
-#else
 	if ( initAVI() )
 	{
 		m_bEnable = true;
@@ -235,7 +231,6 @@ bool CMovie::Create()
 		m_bEnable = false;
 		return false;
 	}
-#endif
 }
 
 // Retourne l'état de DirectMovie.