Removed all JA2DEMO code

ja2-stracciatella · Mar 24, 2013 · c161791 · c161791
1 parent 32822f1
commit c161791
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 26 deletions.
diff --git a/Build/GameRes.cc b/Build/GameRes.cc
@@ -225,11 +225,7 @@ char const* GetMLGFilename(MultiLanguageGraphic const id)
     case MLG_SPLASH:             return INTERFACEDIR "/splash.sti";
     case MLG_STATSBOX:           return LAPTOPDIR "/statsbox.sti";
     case MLG_STOREPLAQUE:        return LAPTOPDIR "/bobbystoreplaque.sti";
-# if defined JA2DEMO
-    case MLG_TITLETEXT:          return INTERFACEDIR "/titletext.sti";
-# else
     case MLG_TITLETEXT:          return LOADSCREENSDIR "/titletext.sti";
-# endif
     case MLG_TOALUMNI:           return LAPTOPDIR "/toalumni.sti";
     case MLG_TOMUGSHOTS:         return LAPTOPDIR "/tomugshots.sti";
     case MLG_TOSTATS:            return LAPTOPDIR "/tostats.sti";

diff --git a/Build/Laptop/AIMMembers.cc b/Build/Laptop/AIMMembers.cc
@@ -3041,7 +3041,7 @@ static void WaitForMercToFinishTalkingOrUserToClick(void)
 }
 
 
-#if defined JA2TESTVERSION || defined JA2DEMO
+#if defined JA2TESTVERSION
 
 void DemoHiringOfMercs()
 {

diff --git a/Build/Laptop/AIMMembers.h b/Build/Laptop/AIMMembers.h
@@ -42,7 +42,7 @@ void TempHiringOfMercs( UINT8 ubNumberOfMercs, BOOLEAN fReset );
 #endif
 
 
-#if defined ( JA2TESTVERSION ) || defined ( JA2DEMO )
+#if defined ( JA2TESTVERSION )
  void DemoHiringOfMercs(void);
 #endif
 

diff --git a/Build/Laptop/Laptop.cc b/Build/Laptop/Laptop.cc
@@ -2884,7 +2884,7 @@ void HandleKeyBoardShortCutsForLapTop(UINT16 usEvent, UINT32 usParam, UINT16 usK
 			ShouldTheHelpScreenComeUp(HELP_SCREEN_LAPTOP, TRUE);
 			break;
 
-#if defined JA2TESTVERSION || defined JA2DEMO
+#if defined JA2TESTVERSION
 		case 'w':
 			DemoHiringOfMercs();
 			break;

diff --git a/Build/Strategic/Scheduling.cc b/Build/Strategic/Scheduling.cc
@@ -940,7 +940,7 @@ void PostSchedules()
 {
 	BOOLEAN fDefaultSchedulesPossible = FALSE;
 
-	#if defined( DISABLESCHEDULES ) || defined( JA2DEMO ) //definition found at top of this .c file.
+	#if defined( DISABLESCHEDULES ) //definition found at top of this .c file.
 
 		return;
 

diff --git a/Build/Tactical/Turn_Based_Input.cc b/Build/Tactical/Turn_Based_Input.cc
@@ -93,9 +93,7 @@
 
 #ifdef JA2TESTVERSION
 #	include "Ambient_Control.h"
-#	ifndef JA2DEMO
-#		include "MapScreen.h"
-#	endif
+#	include "MapScreen.h"
 #endif
 
 #ifdef JA2BETAVERSION
@@ -1650,7 +1648,7 @@ static void HandleModCtrl(UINT32 const key, UIEventKind* const new_event)
 
 		case 'o': if (CHEATER_CHEAT_LEVEL()) CreatePlayerControlledMonster(); break;
 
-#if defined JA2TESTVERSION && !defined JA2DEMO
+#if defined JA2TESTVERSION
 		// Display player's highest progress percentage
 		case 'p': DumpSectorDifficultyInfo(); break;
 #endif

diff --git a/Build/Utils/Message.cc b/Build/Utils/Message.cc
@@ -318,7 +318,7 @@ void ScreenMsg(UINT16 usColor, UINT8 ubPriority, const wchar_t* pStringA, ...)
 	switch (ubPriority)
 	{
 		case MSG_DEBUG:
-#if defined _DEBUG && !defined JA2DEMO
+#if defined _DEBUG
 			usColor = DEBUG_COLOR;
 			break;
 #else
@@ -412,7 +412,7 @@ static void TacticalScreenMsg(UINT16 colour, UINT8 const priority, const wchar_t
 #endif
 
 		case MSG_DEBUG:
-#if defined _DEBUG && !defined JA2DEMO
+#if defined _DEBUG
 		{
 			wchar_t DestStringA[512];
 			wcscpy(DestStringA, msg);
@@ -508,7 +508,7 @@ void MapScreenMessage(UINT16 usColor, UINT8 ubPriority, const wchar_t* pStringA,
 			return;
 
 		case MSG_DEBUG:
-#if defined _DEBUG && !defined JA2DEMO
+#if defined _DEBUG
 			wcscpy(DestStringA, DestString);
 			swprintf(DestString, lengthof(DestString), L"Debug: %ls", DestStringA);
 			usColor = DEBUG_COLOR;

diff --git a/Makefile b/Makefile
@@ -108,17 +108,6 @@ CFLAGS += -DJA2
 CFLAGS += -DMICROINI_STATIC
 
 
-ifdef WITH_DEMO
-  CFLAGS += -DJA2DEMO
-endif
-
-ifdef WITH_DEMO_ADS
-  ifndef WITH_DEMO
-    $(error WITH_DEMO_ADS needs WITH_DEMO)
-  endif
-  CFLAGS += -DJA2DEMOADS
-endif
-
 ifdef WITH_FIXMES
   CFLAGS += -DWITH_FIXMES
 endif