mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

add title options and block tutorial

Browse source
This commit is contained in:
IntelOrca 2014-04-26 16:53:21 +01:00
parent b9ea3b1143
commit 781d0fdf26
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/title.c
View file

@ -34,6 +34,9 @@
#include "scenario.h" #include "scenario.h"
#include "viewport.h" #include "viewport.h"
static const int gOldMusic = 0;
static const int gRandomShowcase = 0;
#pragma region Showcase script #pragma region Showcase script
enum { enum {
@ -134,7 +137,8 @@ static void title_create_windows()
static void title_init_showcase() static void title_init_showcase()
{ {
_currentScript = _magicMountainScript; _currentScript = _magicMountainScript;
// _currentScript = generate_random_script(); if (gRandomShowcase)
_currentScript = generate_random_script();
_scriptWaitCounter = 0; _scriptWaitCounter = 0;
title_update_showcase(); title_update_showcase();
} }
@ -221,6 +225,11 @@ static void title_update_showcase()
break; break;
case TITLE_SCRIPT_RESTART: case TITLE_SCRIPT_RESTART:
_currentScript = _magicMountainScript; _currentScript = _magicMountainScript;
if (gRandomShowcase) {
if (_currentScript != NULL)
free(_currentScript);
_currentScript = generate_random_script();
}
break; break;
} }
} while (_scriptWaitCounter == 0); } while (_scriptWaitCounter == 0);
@ -291,11 +300,14 @@ static void title_play_music()
return; return;
// Play old title music // Play old title music
// char musicPath[_MAX_PATH]; char musicPath[_MAX_PATH];
// strcpy(musicPath, RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); strcpy(musicPath, get_file_path(PATH_ID_CSS17));
// strcat(musicPath, "\\data\\css50.dat"); if (gOldMusic) {
strcpy(musicPath, RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char));
strcat(musicPath, "\\data\\css50.dat");
}
if (RCT2_CALLFUNC_3(0x0040194E, int, int, int, int, 3, get_file_path(PATH_ID_CSS17), 0)) // play music if (RCT2_CALLFUNC_3(0x0040194E, int, int, int, int, 3, musicPath, 0)) // play music
RCT2_CALLPROC_5(0x00401999, int, int, int, int, int, 3, 1, 0, 0, 0); RCT2_CALLPROC_5(0x00401999, int, int, int, int, int, 3, 1, 0, 0, 0);
RCT2_GLOBAL(0x009AF600, uint8) = 1; RCT2_GLOBAL(0x009AF600, uint8) = 1;

6
src/tutorial.c
View file

@ -20,6 +20,7 @@
#include "addresses.h" #include "addresses.h"
#include "tutorial.h" #include "tutorial.h"
#include "window_error.h"
/** /**
* *
@ -27,7 +28,10 @@
*/ */
void tutorial_start(int type) void tutorial_start(int type)
{ {
RCT2_CALLPROC_X(0x0066ECC1, type, 0, 0, 0, 0, 0, 0); strcpy((char*)0x009BC677, "Tutorial not implemented.");
window_error_open(3165, -1);
// RCT2_CALLPROC_X(0x0066ECC1, type, 0, 0, 0, 0, 0, 0);
} }
/** /**