--- a/editor/edmain.cpp	Sun Apr 21 16:42:35 2013 +0300
+++ b/editor/edmain.cpp	Sun Apr 21 16:46:03 2013 +0300
@@ -45,13 +45,13 @@
     }
 #endif
 #ifdef DM_USE_TREMOR
-    if (engine->audioPos + len >= engine->audioRes->rdataSize)
+    if (engine->audioPos + len >= engine->audioRes->resSize)
     {
         engine->exitFlag = true;
     }
     else
     {
-        memcpy(stream, (Uint8 *) engine->audioRes->rdata + engine->audioPos, len);
+        memcpy(stream, (Uint8 *) engine->audioRes->resData + engine->audioPos, len);
         engine->audioPos += len;
     }
 #endif
@@ -62,8 +62,9 @@
 {
     int err;
 
-    if ((err = dmres_init(&engine.resources, engine.optPackFilename, engine.optDataPath,
-                           engine.optResFlags, engineClassifier)) != DMERR_OK)
+    if ((err = dmResourcesInit(
+        &engine.resources, engine.optPackFilename, engine.optDataPath,
+        engine.optResFlags, engineClassifier)) != DMERR_OK)
     {
         dmError("Could not initialize resource manager: %d, %s.\n",
             err, dmErrorStr(err));
@@ -74,20 +75,20 @@
 
 int DemoEditor::loadResources()
 {
-    int err, loaded, total;
-    err = dmres_preload(engine.resources, true, &loaded, &total);
+    int err, loaded = 0, total = 0;
+    BOOL first = TRUE;
 
-    while ((err = dmres_preload(engine.resources, false, &loaded, &total)) == DMERR_PROGRESS)
+    do
     {
+/*
         // Show a nice progress bar while loading
-        if (total > 0 && (loaded % 2) == 0)
-        {
-/*
-            if ((err = engineShowProgress(loaded, total)) != DMERR_OK)
-                return err;
+        if ((err = engineShowProgress(loaded, total)) != DMERR_OK)
+            return err;
 */
-        }
+        err = dmResourcesPreload(engine.resources, first, &loaded, &total);
+        first = FALSE;
     }
+    while (err == DMERR_PROGRESS);
     return DMERR_OK;
 }
 
@@ -259,7 +260,7 @@
     if (engine.audioRes != NULL)
     {
         timelineAudioTrack->setWaveform(
-            engine.audioRes->rdata, engine.audioRes->rdataSize,
+            engine.audioRes->resData, engine.audioRes->resSize,
             engine.optAfmt.format, engine.optAfmt.channels,
             engine.optAfmt.freq);
     }
@@ -356,7 +357,7 @@
     delete currTimeline;
     dmFreePreparedTimelineData(engine.ptl);
     engineShutdownEffects(&engine);
-    dmres_close(engine.resources);
+    dmResourcesClose(engine.resources);
 
     if (engine.demoShutdown != NULL)
         engine.demoShutdown(&engine);