X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_bd%2Fbd_caveset.c;h=50598fb7a0ec4dbe69a68e0bc69f7bc582a4de78;hb=a320610bbc4a03e1254efa9316d5b11350b4a89b;hp=36b82a5e0bb664a8c541f01ca87e59cd332f29b2;hpb=a413902ed6f29c148a778b83f595198341c00fda;p=rocksndiamonds.git

diff --git a/src/game_bd/bd_caveset.c b/src/game_bd/bd_caveset.c
index 36b82a5e..50598fb7 100644
--- a/src/game_bd/bd_caveset.c
+++ b/src/game_bd/bd_caveset.c
@@ -504,12 +504,11 @@ static void caveset_name_set_from_filename(char *filename)
 */
 boolean gd_caveset_load_from_file(char *filename)
 {
-  GError *error = NULL;
   gsize length;
   char *buf;
-  boolean read;
   List *new_caveset;
   struct stat st;
+  File *file;
 
   if (stat(filename, &st) != 0)
   {
@@ -525,12 +524,22 @@ boolean gd_caveset_load_from_file(char *filename)
     return FALSE;
   }
 
-  read = g_file_get_contents (filename, &buf, &length, &error);
-  if (!read)
+  if (!(file = openFile(filename, MODE_READ)))
   {
-    Warn("%s", error->message);
+    Warn("cannot open file '%s'", filename);
 
-    g_error_free(error);
+    return FALSE;
+  }
+
+  buf = checked_malloc(st.st_size + 1);
+  length = readFile(file, buf, 1, st.st_size);
+  buf[length] = '\0';
+
+  closeFile(file);
+
+  if (length < st.st_size)
+  {
+    Warn("cannot read file '%s'", filename);
 
     return FALSE;
   }