mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Gericom 2015-02-27 13:40:15 +01:00
parent 69545bfbd9 b89af82f07
commit 4157ddc065
13 changed files with 3527 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
data/language/dutch.txt
View File

@ -2679,15 +2679,15 @@ STR_2677 :???
STR_2678 :???
STR_2679 :???
STR_2680 :???
STR_2681 :???
STR_2682 :???
STR_2683 :???
STR_2684 :???
STR_2685 :???
STR_2686 :???
STR_2687 :???
STR_2688 :???
STR_2689 :???
STR_2681 :{MEDIUMFONT}{BLACK}Krijg 5.000 extra geld
STR_2682 :{MEDIUMFONT}{BLACK}Wissel tussen betaalde en gratis entree
STR_2683 :{MEDIUMFONT}{BLACK}Alle bezoekers hebben een maximale tevredenheid
STR_2684 :{MEDIUMFONT}{BLACK}Er arriveert een grote groep bezoekers
STR_2685 :Parameters voor Simplex noise
STR_2686 :Minimum:
STR_2687 :Maximum:
STR_2688 :Basisfrequentie:
STR_2689 :Octaven:
STR_2690 :Kaartgenerator
STR_2691 :{WINDOW_COLOUR_2}Basishoogte:
STR_2692 :{WINDOW_COLOUR_2}Waterniveau:
@ -2698,13 +2698,13 @@ STR_2696 :Bomen plaatsen
STR_2697 :???
STR_2698 :???
STR_2699 :???
STR_2700 :???
STR_2701 :???
STR_2702 :???
STR_2703 :???
STR_2704 :???
STR_2705 :???
STR_2706 :???
STR_2700 :Automatisch opslaan:
STR_2701 :Elke week
STR_2702 :Elke 2 weken
STR_2703 :Elke maand
STR_2704 :Elke 4 maanden
STR_2705 :Elk jaar
STR_2706 :Nooit
STR_2707 :Open nieuw scherm
STR_2708 :{WINDOW_COLOUR_1}Weet je zeker dat je {STRINGID} wilt vervangen?
STR_2709 :Vervangen
@ -2764,7 +2764,7 @@ STR_2762 :Betalen per rit
STR_2763 :???
STR_2764 :Tevreden gasten
STR_2765 :Grote groep
STR_2766 :???
STR_2766 :Win scenario
STR_2767 :Weer vastzetten
STR_2768 :Weer vrijgeven
STR_2769 :Park openen

14
data/language/english_uk.txt
View File

@ -2683,10 +2683,10 @@ STR_2677 :???
STR_2678 :???
STR_2679 :???
STR_2680 :???
STR_2681 :???
STR_2682 :???
STR_2683 :???
STR_2684 :???
STR_2681 :{MEDIUMFONT}{BLACK}Increases your money by 5,000
STR_2682 :{MEDIUMFONT}{BLACK}Toggle between Free and Paid Entry
STR_2683 :{MEDIUMFONT}{BLACK}Increases every peeps happiness to max
STR_2684 :{MEDIUMFONT}{BLACK}Large group of peeps arrive
STR_2685 :Simplex Noise Parameters
STR_2686 :{WINDOW_COLOUR_2}Low:
STR_2687 :{WINDOW_COLOUR_2}High:
@ -2720,8 +2720,8 @@ STR_2714 :-
STR_2715 :.
STR_2716 :/
STR_2717 :'
STR_2718 :???
STR_2719 :???
STR_2718 :(up)
STR_2719 :(new file)
STR_2720 :{UINT16}sec
STR_2721 :{UINT16}secs
STR_2722 :{UINT16}min:{UINT16}sec
@ -2751,7 +2751,7 @@ STR_2745 :\
STR_2746 :]
STR_2747 :{ENDQUOTES}
STR_2748 :Bar
STR_2749 :???
STR_2749 :My new scenario
# New strings used in the cheats window previously these were ???
STR_2750 :Move all items to top
STR_2751 :Move all items to bottom

14
data/language/english_us.txt
View File

@ -2683,10 +2683,10 @@ STR_2677 :???
STR_2678 :???
STR_2679 :???
STR_2680 :???
STR_2681 :???
STR_2682 :???
STR_2683 :???
STR_2684 :???
STR_2681 :{MEDIUMFONT}{BLACK}Increases your money by 5,000
STR_2682 :{MEDIUMFONT}{BLACK}Toggle between Free and Paid Entry
STR_2683 :{MEDIUMFONT}{BLACK}Increases every peeps happiness to max
STR_2684 :{MEDIUMFONT}{BLACK}Large group of peeps arrive
STR_2685 :Simplex Noise Parameters
STR_2686 :{WINDOW_COLOUR_2}Low:
STR_2687 :{WINDOW_COLOUR_2}High:
@ -2720,8 +2720,8 @@ STR_2714 :-
STR_2715 :.
STR_2716 :/
STR_2717 :'
STR_2718 :???
STR_2719 :???
STR_2718 :(up)
STR_2719 :(new file)
STR_2720 :{UINT16}sec
STR_2721 :{UINT16}secs
STR_2722 :{UINT16}min:{UINT16}sec
@ -2751,7 +2751,7 @@ STR_2745 :\
STR_2746 :]
STR_2747 :{ENDQUOTES}
STR_2748 :Bar
STR_2749 :???
STR_2749 :My new scenario

3450
data/language/italian.txt Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/editor.c
View File

@ -89,6 +89,8 @@ void editor_load()
load_palette();
gfx_invalidate_screen();
RCT2_GLOBAL(0x009DEA66, sint16) = 0;
strcpy((char*)RCT2_ADDRESS_SCENARIO_NAME, language_get_string(2749));
}
/**

17
src/ride/ride.c
View File

@ -569,15 +569,18 @@ void ride_construct_new(ride_list_item listItem)
*/
void ride_construct(int rideIndex)
{
rct_xy_element trackElement;
rct_window *w;
// Open construction window
// HACK In the original game this created a mouse up event. This has been
// replaced with a direct call to the function that gets called.
// Eventually should be changed so the ride window does not need to be opened.
w = window_ride_main_open(rideIndex);
window_ride_construct(w);
window_close_by_number(WC_RIDE, rideIndex);
if (sub_6CAF80(rideIndex, &trackElement)) {
ride_find_track_gap(&trackElement, &trackElement);
w = window_get_main();
if (w != NULL && ride_modify(&trackElement))
window_scroll_to_location(w, trackElement.x, trackElement.y, trackElement.element->base_height * 8);
} else {
sub_6CC3FB(rideIndex);
}
}
/**

21
src/windows/cheats.c
View File

@ -571,25 +571,12 @@ static void window_cheats_paint()
window_cheats_draw_tab_images(dpi, w);
if (w->page == WINDOW_CHEATS_PAGE_MONEY){
char buffer[256];
// Format text
sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Increases your money by 5,000.");
// Draw shadow
gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Toggle between Free and Paid Entry");
// Draw shadow
gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
gfx_draw_string(dpi, language_get_string(2681), 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
gfx_draw_string(dpi, language_get_string(2682), 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
}
else if (w->page == WINDOW_CHEATS_PAGE_GUESTS){
char buffer[256];
// Format text
sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Increases every peeps happiness to max.");
// Draw shadow
gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
sprintf(buffer, "%c%c%s", FORMAT_MEDIUMFONT, FORMAT_BLACK, "Large group of peeps arrive");
gfx_draw_string(dpi, buffer, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
gfx_draw_string(dpi, language_get_string(2683), 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
gfx_draw_string(dpi, language_get_string(2684), 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
}
}

3
src/windows/game_bottom_toolbar.c
View File

@ -610,13 +610,16 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rc
break;
case NEWS_ITEM_MONEY:
gfx_draw_sprite(dpi, SPR_FINANCE, x, y, 0);
break;
case NEWS_ITEM_RESEARCH:
gfx_draw_sprite(dpi, (newsItem->assoc < 0x10000 ? SPR_NEW_RIDE : SPR_SCENERY), x, y, 0);
break;
case NEWS_ITEM_PEEPS:
gfx_draw_sprite(dpi, SPR_GUESTS, x, y, 0);
break;
case NEWS_ITEM_AWARD:
gfx_draw_sprite(dpi, SPR_AWARD, x, y, 0);
break;
case NEWS_ITEM_GRAPH:
gfx_draw_sprite(dpi, SPR_GRAPH, x, y, 0);
break;

6
src/windows/loadsave.c
View File

@ -502,7 +502,7 @@ static void window_loadsave_populate_list(int includeNewItem, bool browsable, co
}
if (!topLevel){
listItem = &_listItems[_listItemsCount];
strncpy(listItem->name, "(up) ", sizeof(listItem->name));
strncpy(listItem->name, language_get_string(2718), sizeof(listItem->name));
memset(listItem->path, '\0', MAX_PATH);
strncpy(listItem->path, directory, lastSlash + 1);
_listItemsCount++;
@ -511,7 +511,7 @@ static void window_loadsave_populate_list(int includeNewItem, bool browsable, co
if (includeNewItem) {
listItem = &_listItems[_listItemsCount];
strncpy(listItem->name, "(new file)", sizeof(listItem->name));
strncpy(listItem->name, language_get_string(2719), sizeof(listItem->name));
listItem->path[0] = 0;
_listItemsCount++;
}
@ -749,4 +749,4 @@ static void window_overwrite_prompt_paint()
}
#pragma endregion
#pragma endregion

43
src/windows/new_campaign.c
View File

@ -129,8 +129,6 @@ int ride_name_compare(const void *a, const void *b)
*/
void window_new_campaign_open(sint16 campaignType)
{
// RCT2_CALLPROC_X(0x0069E16F, campaignType, 0, 0, 0, 0, 0, 0);
rct_window *w;
rct_ride *ride;
int i, numApplicableRides;
@ -178,7 +176,6 @@ void window_new_campaign_open(sint16 campaignType)
if (!(RCT2_GLOBAL(RCT2_ADDRESS_RIDE_FLAGS + (ride->type * 8), uint32) & 0x03820000))
window_new_campaign_rides[numApplicableRides++] = i;
}
window_new_campaign_rides[numApplicableRides] = 255;
// Take top 40 most reliable rides
if (numApplicableRides > 40) {
@ -188,6 +185,8 @@ void window_new_campaign_open(sint16 campaignType)
// Sort rides by name
qsort(window_new_campaign_rides, numApplicableRides, sizeof(uint8), ride_name_compare);
window_new_campaign_rides[numApplicableRides] = 255;
}
/**
@ -280,28 +279,26 @@ static void window_new_campaign_mousedown(int widgetIndex, rct_window *w, rct_wi
);
}
} else {
if (window_new_campaign_rides[0] != 255) {
int numItems = 0;
for (int i = 0; i < 40; i++) {
if (window_new_campaign_rides[i] == 255)
break;
int numItems = 0;
for (int i = 0; i < 40; i++) {
if (window_new_campaign_rides[i] == 255)
break;
rct_ride *ride = GET_RIDE(window_new_campaign_rides[i]);
gDropdownItemsFormat[i] = 1142;
gDropdownItemsArgs[i] = (ride->name_arguments << 16) | ride->name;
numItems++;
}
window_dropdown_show_text_custom_width(
w->x + dropdownWidget->left,
w->y + dropdownWidget->top,
dropdownWidget->bottom - dropdownWidget->top + 1,
w->colours[1],
0x80,
numItems,
dropdownWidget->right - dropdownWidget->left - 3
);
rct_ride *ride = GET_RIDE(window_new_campaign_rides[i]);
gDropdownItemsFormat[i] = 1142;
gDropdownItemsArgs[i] = ((uint64)ride->name_arguments << 16ULL) | ride->name;
numItems++;
}
window_dropdown_show_text_custom_width(
w->x + dropdownWidget->left,
w->y + dropdownWidget->top,
dropdownWidget->bottom - dropdownWidget->top + 1,
w->colours[1],
0x80,
numItems,
dropdownWidget->right - dropdownWidget->left - 3
);
}
break;
case WIDX_WEEKS_INCREASE_BUTTON:

2
src/windows/options.c
View File

@ -357,6 +357,8 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
switch (widgetIndex) {
case WIDX_SOUND_DROPDOWN:
audio_get_devices();
// populate the list with the sound devices
for (i = 0; i < gAudioDeviceCount; i++) {
gDropdownItemsFormat[i] = 1142;

17
src/windows/ride.c
View File

@ -1530,23 +1530,8 @@ static void window_ride_init_viewport(rct_window *w)
*/
void window_ride_construct(rct_window *w)
{
int rideIndex = w->number;
rct_xy_element trackElement;
window_close_by_class(WC_RIDE_CONSTRUCTION);
w = window_find_by_number(WC_RIDE, rideIndex);
if (w == NULL)
return;
if (sub_6CAF80(rideIndex, &trackElement)) {
ride_find_track_gap(&trackElement, &trackElement);
w = window_get_main();
if (w != NULL && ride_modify(&trackElement))
window_scroll_to_location(w, trackElement.x, trackElement.y, trackElement.element->base_height * 8);
} else {
sub_6CC3FB(rideIndex);
}
ride_construct(w->number);
}
/**

2
src/windows/scenery.c
View File

@ -1099,7 +1099,7 @@ void window_scenery_scrollpaint()
gfx_draw_sprite(clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32,
tertiaryColour);
imageId = (sceneryEntry->image + 0x40000006) | (window_scenery_primary_colour << 19);
imageId = (sceneryEntry->image + 0x40000006) | ((window_scenery_primary_colour + 0x70) << 19);
gfx_draw_sprite(clipdpi, imageId, 0x2F, (sceneryEntry->wall.height * 2) + 0x32,
tertiaryColour);
}