From 34a1ff2cc3e20cce8c39895a2e1224acee4d95ec Mon Sep 17 00:00:00 2001
From: Daniel Collin <daniel@collin.com>
Date: Wed, 9 Jan 2013 09:42:22 +0100
Subject: [PATCH] Merged latest from kusma/rocket

Also fixed compile errors due to synclib changes (just some double ->
float casting)
---
 ogl_editor/src/Editor.c          | 4 ++--
 ogl_editor/src/windows/Dialogs.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ogl_editor/src/Editor.c b/ogl_editor/src/Editor.c
index a5d0812..c2f829f 100644
--- a/ogl_editor/src/Editor.c
+++ b/ogl_editor/src/Editor.c
@@ -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);
@@ -1101,7 +1101,7 @@ static void onEnterCurrentValue()
    
     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;
     }
     else
diff --git a/ogl_editor/src/windows/Dialogs.c b/ogl_editor/src/windows/Dialogs.c
index 388b04c..fd04263 100644
--- a/ogl_editor/src/windows/Dialogs.c
+++ b/ogl_editor/src/windows/Dialogs.c
@@ -31,7 +31,7 @@ int Dialog_save(wchar_t* path, int pathSize)
 	(void)pathSize;
 	ZeroMemory(&dialog, 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.nMaxFile = MAX_PATH;
 	dialog.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;