Mercurial > hg > dmlib

diff dmsimple.c @ 721:bb14d7907eb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename many pack & resource handling functions.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 21 Apr 2013 16:40:45 +0300
parents 0888971cbff8
children 3d813c81f33c
line wrap: on
line diff
--- a/dmsimple.c	Thu Apr 18 00:01:50 2013 +0300
+++ b/dmsimple.c	Sun Apr 21 16:40:45 2013 +0300
@@ -80,11 +80,11 @@
 #endif
 #ifdef DM_USE_TREMOR
         case DM_ASETUP_TREMOR:
-            if (engine.audioPos + len >= engine.audioRes->rdataSize)
+            if (engine.audioPos + len >= engine.audioRes->resSize)
                 engine.exitFlag = TRUE;
             else
             {
-                memcpy(stream, engine.audioRes->rdata + engine.audioPos, len);
+                memcpy(stream, engine.audioRes->resData + engine.audioPos, len);
                 engine.audioPos += len;
             }
             break;
@@ -140,7 +140,7 @@
         if ((err = engineShowProgress(loaded, total)) != DMERR_OK)
             return err;
 
-        err = dmres_preload(engine.resources, first, &loaded, &total);
+        err = dmResourcesPreload(engine.resources, first, &loaded, &total);
         first = FALSE;
     }
     while (err == DMERR_PROGRESS);
@@ -607,7 +607,7 @@
 
     // Initialize resource subsystem
     dmPrint(1, "Initializing resources subsystem.\n");
-    if ((err = dmres_init(&engine.resources, engine.optPackFilename,
+    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));
@@ -890,7 +890,7 @@
 #endif
 
     engineShutdownEffects(&engine);
-    dmres_close(engine.resources);
+    dmResourcesClose(engine.resources);
 
     if (engine.demoShutdown != NULL)
         engine.demoShutdown(&engine);