--- a/dmsimple.c	Sun Apr 21 18:34:13 2013 +0300
+++ b/dmsimple.c	Sun Apr 21 19:29:00 2013 +0300
@@ -249,10 +249,10 @@
 int engineParseSetupConfig(const char *filename)
 {
     DMResource *file = NULL;
-    int res = DMERR_OK;
+    int res;
     char buf[128];
 
-    if ((file = dmf_open(engine.resources, filename)) == NULL)
+    if ((res = dmf_open(engine.resources, filename, &file)) != DMERR_OK)
         return DMERR_FOPEN;
 
     while (dmfgets(buf, sizeof(buf), file) != NULL)
@@ -353,19 +353,19 @@
     }
 
     // Fetch and decompress setup image, try regular resources first
-    file = dmf_open(engine.resources, engineSetupImageName);
-    if (file == NULL)
-        file = dmf_create_memio(NULL, engineSetupImageName, engineSetupImage, sizeof(engineSetupImage));
-
-    menuBgImage = dmLoadImage(file);
-    dmf_close(file);
+    if ((result = dmf_open(engine.resources, engineSetupImageName, &file)) == DMERR_OK ||
+        (result = dmf_create_memio(NULL, engineSetupImageName, engineSetupImage, sizeof(engineSetupImage), &file)) == DMERR_OK)
+    {
+        menuBgImage = dmLoadImage(file);
+        dmf_close(file);
+    }
 
-    file = dmf_open(engine.resources, engineSetupMenuBarName);
-    if (file == NULL)
-        file = dmf_create_memio(NULL, engineSetupMenuBarName, engineSetupMenuBar, sizeof(engineSetupMenuBar));
-
-    menuBarImage = dmLoadImage(file);
-    dmf_close(file);
+    if ((result = dmf_open(engine.resources, engineSetupMenuBarName, &file)) == DMERR_OK ||
+        (result = dmf_create_memio(NULL, engineSetupMenuBarName, engineSetupMenuBar, sizeof(engineSetupMenuBar), &file)) == DMERR_OK)
+    {
+        menuBarImage = dmLoadImage(file);
+        dmf_close(file);
+    }
 
     if (menuBgImage == NULL || menuBarImage == NULL)
     {
@@ -386,12 +386,12 @@
 
 
     // Load up the bitmap font
-    file = dmf_open(engine.resources, engineSetupFontName);
-    if (file == NULL)
-        file = dmf_create_memio(NULL, engineSetupFontName, engineSetupFont, sizeof(engineSetupFont));
-
-    result = dmLoadBitmapFont(file, &menuFont);
-    dmf_close(file);
+    if ((result = dmf_open(engine.resources, engineSetupFontName, &file)) == DMERR_OK ||
+        (result = dmf_create_memio(NULL, engineSetupFontName, engineSetupFont, sizeof(engineSetupFont), &file)) == DMERR_OK)
+    {
+        result = dmLoadBitmapFont(file, &menuFont);
+        dmf_close(file);
+    }
     if (result != DMERR_OK)
     {
         dmError("Could not instantiate setup screen font, %d: %s\n",