vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged latest from kusma/rocket

Browse Source 
Also fixed compile errors due to synclib changes (just some double ->
float casting)
This commit is contained in:
Daniel Collin 2013-01-09 09:42:22 +01:00
parent 55ac22414a
commit 34a1ff2cc3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ogl_editor/src/Editor.c
View File

@ -331,7 +331,7 @@ static int drawCurrentValue(int posX, int sizeY)
} }
} }
value = sync_get_val(track, current_row); value = (float)sync_get_val(track, current_row);
} }
snprintf(valueText, 256, "%f", value); snprintf(valueText, 256, "%f", value);
@ -1101,7 +1101,7 @@ static void onEnterCurrentValue()
if (track->num_keys > 0) if (track->num_keys > 0)
{ {
key.value = sync_get_val(track, rowPos); key.value = (float)sync_get_val(track, rowPos);
key.type = track->keys[emaxi(idx - 1, 0)].type; key.type = track->keys[emaxi(idx - 1, 0)].type;
} }
else else

2
ogl_editor/src/windows/Dialogs.c
View File

@ -31,7 +31,7 @@ int Dialog_save(wchar_t* path, int pathSize)
(void)pathSize; (void)pathSize;
ZeroMemory(&dialog, sizeof(dialog)); ZeroMemory(&dialog, sizeof(dialog));
dialog.lStructSize = sizeof(dialog); dialog.lStructSize = sizeof(dialog);
dialog.lpstrFilter = L"Rocket (*.rocket)\0*All Files (*.*)\0*.*\0"; dialog.lpstrFilter = L"*All Files (*.*)\0*.*\0";
dialog.lpstrFile = path; dialog.lpstrFile = path;
dialog.nMaxFile = MAX_PATH; dialog.nMaxFile = MAX_PATH;
dialog.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; dialog.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;