Remove static demo version limits

blupi-d.rc

@@ -410,10 +410,6 @@ BEGIN
     TX_PRIVATE_HOMEBLUPI    "1|Jeder Blupi\n1|in seinem Haus."
     TX_PRIVATE_KILLROBOTS   "1|Alle Feinde\n1|zerstören !"
     TX_BUTTON_UNDO          "Letzten Befehl rückgängig machen"
-    TX_DEMO_END1            "Sie haben soeben mit der DEMO Version von Planet Blupi gespielt."
-    TX_DEMO_END2            "Hoffentlich hatten Sie genau soviel Spass beim Spielen wie wir beim herstellen des Spiels !"
-    TX_DEMO_END3            "Dieses Spiel wurde entwickelt von Epsitec SA, CH-1092 Belmont"
-    TX_DEMO_END4            "http://www.blupi.com            blupi@epsitec.ch"
     TX_FULL_END1            "Sie haben soeben mit PLANET BLUPI gespielt."
     TX_FULL_END2            "Hoffentlich hatten Sie genau soviel Spass beim Spielen wie wir beim herstellen des Spiels !"
     TX_FULL_END3            "Herausgegeben von WG Verlag & Lizenzen AG"

blupi-e.rc

@@ -410,10 +410,6 @@ BEGIN
     TX_PRIVATE_HOMEBLUPI    "1|Each Blupi in\n1|his house."
     TX_PRIVATE_KILLROBOTS   "1|Kill all\n1|enemies !"
     TX_BUTTON_UNDO          "Cancel last operation"
-    TX_DEMO_END1            "You have played the DEMO version of Planet Blupi."
-    TX_DEMO_END2            "We hope you have had as much fun playing the game as we had making it !"
-    TX_DEMO_END3            "This game is an original creation of EPSITEC SA, CH-1092 Belmont"
-    TX_DEMO_END4            "http://www.blupi.com            blupi@epsitec.ch"
     TX_FULL_END1            "You have played Planet Blupi."
     TX_FULL_END2            "We hope you have had as much fun playing the game as we had making it !"
     TX_FULL_END3            "This game is an original creation of EPSITEC SA, CH-1092 Belmont"

blupi-f.rc

@@ -410,10 +410,6 @@ BEGIN
     TX_PRIVATE_HOMEBLUPI    "1|Chaque Blupi dans\n1|sa maison."
     TX_PRIVATE_KILLROBOTS   "1|Supprimer tous les\n1|ennemis !"
     TX_BUTTON_UNDO          "Annuler la dernière opération"
-    TX_DEMO_END1            "Vous avez joué à la version DEMO de Planète Blupi."
-    TX_DEMO_END2            "Nous espérons que vous avez eu autant de plaisir à y jouer que nous à le réaliser !"
-    TX_DEMO_END3            "Ce jeu est une création originale d'EPSITEC SA, CH-1092 Belmont"
-    TX_DEMO_END4            "http://www.blupi.com            blupi@epsitec.ch"
     TX_FULL_END1            "Vous avez joué à Planète Blupi."
     TX_FULL_END2            "Nous espérons que vous avez eu autant de plaisir à y jouer que nous à le réaliser !"
     TX_FULL_END3            "Ce jeu est une création originale d'EPSITEC SA, CH-1092 Belmont"

def.h

@@ -5,7 +5,6 @@
 
 #include <Windows.h>
 
-#define _DEMO			false	// true=demo, false=complet
 #define _INTRO			false	// true si images d'introduction
 #define _EGAMES			false	// true version pour eGames
 #define _SE				false	// true eGames Special Edition

event.cpp

@@ -127,14 +127,12 @@ static Phase table[] =
 				16, 424-60-42*1,
 				{1,TX_BUTTON_JOUER},
 			},
-#if !_DEMO
 			{
 				WM_PHASE_PRIVATE,
 				0, {1,49},
 				16, 424-60-42*0,
 				{1,TX_BUTTON_PRIVE},
 			},
-#endif
 			{
 				WM_PHASE_BYE,
 //?				WM_CLOSE,
@@ -229,7 +227,6 @@ static Phase table[] =
 				42+42*7, 433,
 				{1,TX_BUTTON_SETUP},
 			},
-#if !_DEMO
 			{
 				WM_PHASE_BUILD,
 				0, {1,49},
@@ -248,7 +245,6 @@ static Phase table[] =
 				150, 230+42,
 				{1,TX_BUTTON_SKILL},
 			},
-#endif
 			{
 				WM_PHASE_INIT,
 				0, {1,40},
@@ -325,14 +321,12 @@ static Phase table[] =
 				42+42*0, 433,
 				{1,TX_BUTTON_CANCELP},
 			},
-#if !_DEMO
 			{
 				WM_PHASE_HELP,
 				0, {1,86},
 				42+42*9, 433,
 				{1,TX_BUTTON_HELP},
 			},
-#endif
 			{
 				0
 			},
@@ -1844,11 +1838,6 @@ bool CEvent::DrawButtons()
 #else
 		DrawText(m_pPixmap, pos, "Version 1.7", FONTLITTLE);
 #endif
-#if _DEMO
-		pos.x = 580;
-		pos.y = 465-20;
-		DrawText(m_pPixmap, pos, "D E M O", FONTRED);
-#endif
 #if _SE
 		pos.x = 580;
 		pos.y = 465-20;
@@ -2195,7 +2184,6 @@ bool CEvent::DrawButtons()
 		DrawBignum(m_pPixmap, pos, world+1);
 	}
 
-#if !_DEMO
 	// Affiche facile/difficile.
 	if ( m_phase == WM_PHASE_INFO )
 	{
@@ -2234,7 +2222,6 @@ bool CEvent::DrawButtons()
 			}
 		}
 	}
-#endif
 
 	// Affiche le libellé de l'énigme.
 	if ( m_phase == WM_PHASE_INFO     ||
@@ -2342,39 +2329,29 @@ bool CEvent::DrawButtons()
 	// Affiche le texte de fin de la version demo.
 	if ( m_phase == WM_PHASE_BYE )
 	{
-#if _DEMO
-		LoadString(TX_DEMO_END1, res, 100);
-#else
 		LoadString(TX_FULL_END1, res, 100);
-#endif
+
 		lg = GetTextWidth(res);
 		pos.x = LXIMAGE/2-lg/2;
 		pos.y = 20;
 		DrawText(m_pPixmap, pos, res);
-#if _DEMO
+
-		LoadString(TX_DEMO_END2, res, 100);
-#else
 		LoadString(TX_FULL_END2, res, 100);
-#endif
+
 		lg = GetTextWidth(res);
 		pos.x = LXIMAGE/2-lg/2;
 		pos.y = 40;
 		DrawText(m_pPixmap, pos, res);
 
-#if _DEMO
-		LoadString(TX_DEMO_END3, res, 100);
-#else
 		LoadString(TX_FULL_END3, res, 100);
-#endif
+
 		lg = GetTextWidth(res);
 		pos.x = LXIMAGE/2-lg/2;
 		pos.y = 430;
 		DrawText(m_pPixmap, pos, res);
-#if _DEMO
+
-		LoadString(TX_DEMO_END4, res, 100);
-#else
 		LoadString(TX_FULL_END4, res, 100);
-#endif
+
 		lg = GetTextWidth(res);
 		pos.x = LXIMAGE/2-lg/2;
 		pos.y = 450;
@@ -2751,7 +2728,6 @@ bool CEvent::IsHelpHide()
 {
 	bool	bHide = true;
 
-#if !_DEMO
 	if ( m_bHelp || m_pDecor->GetTotalTime() > DEF_TIME_HELP )
 	{
 		bHide = false;
@@ -2760,7 +2736,7 @@ bool CEvent::IsHelpHide()
 	{
 		bHide = true;  // pas d'aide pour les exercices
 	}
-#endif
+
 	return bHide;
 }
 
@@ -3009,23 +2985,18 @@ bool CEvent::ChangePhase(UINT phase)
 		{
 			bEnable = false;
 		}
-#if !_DEMO
+
 		if ( m_bAccessBuild ||
 			 m_pDecor->GetTotalTime() > DEF_TIME_HELP*6 )
 		{
 			bEnable = true;
 		}
-#endif
+
 		if ( GetWorld() >= 99 )
 		{
 			bEnable = false;
 		}
-#if _DEMO
+
-		if ( GetWorld() >= 4-1 )
-		{
-			bEnable = false;
-		}
-#endif
 		if ( m_bPrivate )
 		{
 			bEnable = GetWorld()<20-1;
@@ -3039,7 +3010,6 @@ bool CEvent::ChangePhase(UINT phase)
 		}
 		SetHide(WM_PHASE_BUILD, bHide);
 
-#if !_DEMO
 		if ( m_bSchool )
 		{
 			SetHide(WM_PHASE_SKILL1, true);
@@ -3050,7 +3020,6 @@ bool CEvent::ChangePhase(UINT phase)
 			SetState(WM_PHASE_SKILL1, m_pDecor->GetSkill()==0?1:0);
 			SetState(WM_PHASE_SKILL2, m_pDecor->GetSkill()==1?1:0);
 		}
-#endif
 	}
 
 	if ( m_phase == WM_PHASE_STOP )
@@ -4750,14 +4719,13 @@ bool CEvent::TreatEventBase(const SDL_Event &event)
 							bEnable = m_bSpeed;
 							m_bChangeCheat = true;
 						}
-#if !_DEMO
+
 						if ( m_rankCheat == 5 )  // helpme ?
 						{
 							m_bHelp = !m_bHelp;
 							bEnable = m_bHelp;
 							m_bChangeCheat = true;
 						}
-#endif
 
 						if ( m_rankCheat == 6 )  // invincible ?
 						{
@@ -4773,14 +4741,12 @@ bool CEvent::TreatEventBase(const SDL_Event &event)
 							m_bChangeCheat = true;
 						}
 
-#if !_DEMO
 						if ( m_rankCheat == 8 )  // construire ?
 						{
 							m_bAccessBuild = !m_bAccessBuild;
 							bEnable = m_bAccessBuild;
 							m_bChangeCheat = true;
 						}
-#endif
 
 						if ( m_phase != WM_PHASE_PLAY )
 						{

misc.cpp

@@ -126,9 +126,6 @@ void AddUserPath(char *pFilename)
 
 #if _EGAMES
 	strcpy(temp, "c:\\Planet Blupi Full\\");
-#if _DEMO
-	strcpy(temp, "c:\\Planet Blupi Demo\\");
-#endif
 #if _SE
 	strcpy(temp, "c:\\Planet Blupi SE\\");
 #endif

resource.h

@@ -137,10 +137,6 @@
 #define TX_PRIVATE_HOMEBLUPI            196
 #define TX_PRIVATE_KILLROBOTS           197
 #define TX_BUTTON_UNDO                  198
-#define TX_DEMO_END1                    199
-#define TX_DEMO_END2                    200
-#define TX_DEMO_END3                    201
-#define TX_DEMO_END4                    202
 #define TX_FULL_END1                    203
 #define TX_FULL_END2                    204
 #define TX_FULL_END3                    205