Mercurial > hg > dmlib

changeset 1043:6ca9c334f5cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 01 Mar 2015 17:46:27 +0200
parents c71fcf44b678
children 1ec6ae223941
files src/dmengine.c
diffstat 1 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmengine.c	Sun Mar 01 17:31:48 2015 +0200
+++ b/src/dmengine.c	Sun Mar 01 17:46:27 2015 +0200
@@ -115,12 +115,8 @@
 
 static int engineResImageLoad(DMResource *res)
 {
-    SDL_Surface *img = dmLoadImage(res);
-    if (res != NULL)
-    {
-        res->resData = img;
+    if ((res->resData = dmLoadImage(res)) != NULL)
         return DMERR_OK;
-    }
     else
         return dmferror(res);
 }
@@ -212,7 +208,7 @@
 {
     OggVorbis_File vf;
 
-    dmMsg(1, "vorbisfile '%s', %d bytes resource loading\n",
+    dmMsg(2, "vorbisfile '%s', %d bytes resource loading\n",
         res->filename, res->rawSize);
 
     if (ov_open_callbacks(res, &vf, NULL, 0, vorbisFileCBS) < 0)
@@ -225,7 +221,7 @@
         return DMERR_MALLOC;
     }
 
-    dmMsg(1, "rdataSize=%d bytes?\n", res->resSize);
+    dmMsg(2, "rdataSize=%d bytes?\n", res->resSize);
 
     BOOL eof = FALSE;
     int left = res->resSize;
@@ -329,8 +325,15 @@
 void *engineGetResource(DMEngineData *eng, const char *name)
 {
     DMResource *res;
-    if (eng != NULL &&
-        (res = dmResourceFind(eng->resources, name)) != NULL &&
+    if (eng == NULL)
+    {
+        dmError(DMERR_INTERNAL,
+            "Engine not initialized but engineGetResource('%s') called.\n",
+            name);
+        return NULL;
+    }
+
+    if ((res = dmResourceFind(eng->resources, name)) != NULL &&
         res->resData != NULL)
         return res->resData;
     else