From ce7a0ac27b4b87cfb9538f515f658dca38ff8eeb Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Sun, 26 Jul 2015 16:07:58 +0200
Subject: [PATCH] Remove Infogrames disclaimer from intro and fix config option

---
 data/language/english_uk.txt  |  4 ++--
 src/intro.c                   | 23 ++---------------------
 src/localisation/string_ids.h |  3 ---
 src/openrct2.c                |  7 +++++--
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt
index 21d6989d8c..71d6f8a96e 100644
--- a/data/language/english_uk.txt
+++ b/data/language/english_uk.txt
@@ -2976,8 +2976,8 @@ STR_2965    :{WINDOW_COLOUR_2}
 STR_2966    :
 STR_2967    :
 STR_2968    :
-STR_2969    :Use of this product is subject to the terms of a licence agreement
-STR_2970    :found in the product's {OPENQUOTES}ReadMe{ENDQUOTES} file and in the manual
+STR_2969    :<not used anymore>
+STR_2970    :<not used anymore>
 STR_2971    :Main colour scheme
 STR_2972    :Alternative colour scheme 1
 STR_2973    :Alternative colour scheme 2
diff --git a/src/intro.c b/src/intro.c
index c4ddd3b2b9..0757c467ff 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -47,29 +47,10 @@ void intro_update()
 
 	RCT2_GLOBAL(0x009E2C78, int) = 1;
 	switch ((*part)) {
+	// Cases 8 and 9 were used for the disclaimer text. There might be some residual occurences.
 	case 8:
-		// Clear the screen
-		gfx_clear(screenDPI, 10);
-
-		// Draw the disclaimer text
-		gfx_draw_string_centred(screenDPI, STR_LICENCE_AGREEMENT_NOTICE_1, screenWidth / 2, 180, 13, 0);
-		gfx_draw_string_centred(screenDPI, STR_LICENCE_AGREEMENT_NOTICE_2, screenWidth / 2, 195, 13, 0);
-
-		// Set palette thing
-		gfx_transpose_palette(1532, 255);
-
-		// Reset wait counter
-		_tick_counter = 0;
-
-		// Move to next part
-		(*part)++;
-		break;
 	case 9:
-		// Wait 320 game ticks, then move to part 1
-		_tick_counter++;
-		if (_tick_counter >= 320)
-			(*part) = 1;
-		break;
+		(*part) = 1;
 	case 1:
 		// Clear the screen
 		gfx_clear(screenDPI, 10);
diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h
index adfffa116c..808c45cad3 100644
--- a/src/localisation/string_ids.h
+++ b/src/localisation/string_ids.h
@@ -1372,9 +1372,6 @@ enum {
 	STR_CHANGE_SIGN_TEXT_TIP = 2994,
 	STR_DEMOLISH_SIGN_TIP = 2995,
 
-	STR_LICENCE_AGREEMENT_NOTICE_1 = 2969,
-	STR_LICENCE_AGREEMENT_NOTICE_2 = 2970,
-
 	STR_COLOUR_SCHEME_TO_CHANGE_TIP = 2975,
 	STR_PAINT_INDIVIDUAL_AREA_TIP = 2976,
 
diff --git a/src/openrct2.c b/src/openrct2.c
index 3ac3b6eb3d..8177e3e830 100644
--- a/src/openrct2.c
+++ b/src/openrct2.c
@@ -222,9 +222,12 @@ void openrct2_launch()
 {
 	if (openrct2_initialise()) {
 		RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = 0;
+		if((gOpenRCT2StartupAction == STARTUP_ACTION_TITLE) && gConfigGeneral.play_intro)
+			gOpenRCT2StartupAction = STARTUP_ACTION_INTRO;
+
 		switch (gOpenRCT2StartupAction) {
 		case STARTUP_ACTION_INTRO:
-			RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = 8;
+			RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = 1;
 			break;
 		case STARTUP_ACTION_TITLE:
 			RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_TITLE_DEMO;
@@ -386,4 +389,4 @@ void openrct2_reset_object_tween_locations()
 		_spritelocations1[i].y = _spritelocations2[i].y = g_sprite_list[i].unknown.y;
 		_spritelocations1[i].z = _spritelocations2[i].z = g_sprite_list[i].unknown.z;
 	}
-}
\ No newline at end of file
+}