From 463131117c6adc68c22e80fffb3ff0f9b63a7d05 Mon Sep 17 00:00:00 2001
From: IntelOrca <ted@brambles.org>
Date: Wed, 3 Jun 2015 17:11:19 +0100
Subject: [PATCH] fix edit command line function

---
 src/cmdline.c  |  2 +-
 src/openrct2.c | 39 +++++++++++++++++++--------------------
 src/rct2.c     |  1 -
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/cmdline.c b/src/cmdline.c
index b61452922f..1928375a6c 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -118,7 +118,7 @@ static int cmdline_for_edit(const char **argv, int argc)
 {
 	gOpenRCT2StartupAction = STARTUP_ACTION_EDIT;
 	if (argc >= 1)
-		strcpy(gOpenRCT2StartupActionPath, argv[1]);
+		strcpy(gOpenRCT2StartupActionPath, argv[0]);
 
 	return 0;
 }
diff --git a/src/openrct2.c b/src/openrct2.c
index 6721a5e008..56e8ff19ec 100644
--- a/src/openrct2.c
+++ b/src/openrct2.c
@@ -164,29 +164,28 @@ bool openrct2_initialise()
 void openrct2_launch()
 {
 	if (openrct2_initialise()) {
-	switch (gOpenRCT2StartupAction) {
-	case STARTUP_ACTION_INTRO:
-		RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = 8;
-		break;
-	case STARTUP_ACTION_TITLE:
 		RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = 0;
-		RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_TITLE_DEMO;
-		break;
-	case STARTUP_ACTION_OPEN:
-		assert(gOpenRCT2StartupActionPath != NULL);
-		rct2_open_file(gOpenRCT2StartupActionPath);
+		switch (gOpenRCT2StartupAction) {
+		case STARTUP_ACTION_INTRO:
+			RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = 8;
+			break;
+		case STARTUP_ACTION_TITLE:
+			RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_TITLE_DEMO;
+			break;
+		case STARTUP_ACTION_OPEN:
+			assert(gOpenRCT2StartupActionPath != NULL);
+			rct2_open_file(gOpenRCT2StartupActionPath);
 
-		RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = 0;
-		RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_PLAYING;
-		break;
-	case STARTUP_ACTION_EDIT:
-		if (strlen(gOpenRCT2StartupActionPath) == 0) {
-			editor_load();
-		} else {
-			editor_load_landscape(gOpenRCT2StartupActionPath);
+			RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_PLAYING;
+			break;
+		case STARTUP_ACTION_EDIT:
+			if (strlen(gOpenRCT2StartupActionPath) == 0) {
+				editor_load();
+			} else {
+				editor_load_landscape(gOpenRCT2StartupActionPath);
+			}
+			break;
 		}
-		break;
-	}
 		openrct2_loop();
 	}
 	openrct2_dispose();
diff --git a/src/rct2.c b/src/rct2.c
index d52781fd47..85186d1040 100644
--- a/src/rct2.c
+++ b/src/rct2.c
@@ -124,7 +124,6 @@ int rct2_init()
 		title_load();
 
 		gfx_clear(RCT2_ADDRESS(RCT2_ADDRESS_SCREEN_DPI, rct_drawpixelinfo), 10);
-		RCT2_GLOBAL(RCT2_ADDRESS_RUN_INTRO_TICK_PART, uint8) = gConfigGeneral.play_intro ? 8 : 255;
 	}
 
 	log_verbose("initialising game finished");