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

Fix x86 build

This commit is contained in:
Ted John 2016-12-07 02:57:36 +00:00
parent 7ddc7a6664
commit ca27018231
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/File.cpp
View File

@ -51,9 +51,9 @@ namespace File
}
else
{
result = fs.ReadArray<uint8>(fsize);
result = fs.ReadArray<uint8>((size_t)fsize);
}
*length = fsize;
*length = (size_t)fsize;
return result;
}
}

10
src/windows/title_editor.c
View File

@ -342,7 +342,7 @@ static void window_title_editor_mouseup(rct_window *w, int widgetIndex)
if (window_title_editor_check_can_edit()) {
if (w->selected_list_item != -1) {
TitleSequenceRemovePark(_editingTitleSequence, w->selected_list_item);
if (w->selected_list_item >= _editingTitleSequence->NumSaves) {
if (w->selected_list_item >= (sint16)_editingTitleSequence->NumSaves) {
w->selected_list_item--;
}
}
@ -356,7 +356,7 @@ static void window_title_editor_mouseup(rct_window *w, int widgetIndex)
}
break;
case WIDX_TITLE_EDITOR_LOAD_SAVE:
if (w->selected_list_item >= 0 && w->selected_list_item < _editingTitleSequence->NumSaves) {
if (w->selected_list_item >= 0 && w->selected_list_item < (sint16)_editingTitleSequence->NumSaves) {
TitleSequenceParkHandle * handle = TitleSequenceGetParkHandle(_editingTitleSequence, w->selected_list_item);
if (handle->IsScenario) {
scenario_load_rw(handle->RWOps);
@ -392,11 +392,11 @@ static void window_title_editor_mouseup(rct_window *w, int widgetIndex)
case WIDX_TITLE_EDITOR_DELETE:
if (window_title_editor_check_can_edit()) {
if (w->selected_list_item != -1 && w->selected_list_item < (sint16)_editingTitleSequence->NumCommands) {
for (int i = w->selected_list_item; i < _editingTitleSequence->NumCommands - 1; i++) {
for (int i = w->selected_list_item; i < (sint16)_editingTitleSequence->NumCommands - 1; i++) {
_editingTitleSequence->Commands[i] = _editingTitleSequence->Commands[i + 1];
}
_editingTitleSequence->NumCommands--;
if (w->selected_list_item >= _editingTitleSequence->NumCommands) {
if (w->selected_list_item >= (sint16)_editingTitleSequence->NumCommands) {
w->selected_list_item--;
}
window_title_editor_save_sequence();
@ -454,7 +454,7 @@ static void window_title_editor_mouseup(rct_window *w, int widgetIndex)
break;
case WIDX_TITLE_EDITOR_PLAY:
if (!_isSequencePlaying && (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)) {
gTitleCurrentSequence = (int)_selectedTitleSequence;
gTitleCurrentSequence = (uint16)_selectedTitleSequence;
_isSequencePlaying = true;
}
break;