# Copyright (C) 2007  Marcel Unbehaun <frostworks@gmx.de>
# Copyright (C) 2007  Peter De Wachter <pdewacht@gmail.com>
# Distributed under the same license as the game. See debian/copyright.

Index: val-and-rick-0.1a.dfsg1/src/abagames/util/logger.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/logger.d	2007-09-07 00:17:49.000000000 +0200
+++ val-and-rick-0.1a.dfsg1/src/abagames/util/logger.d	2007-09-07 00:17:54.000000000 +0200
@@ -5,7 +5,7 @@
  */
 module abagames.util.logger;
 
-private import std.stream;
+private import std.cstream;
 private import std.string;
 
 /**
@@ -56,28 +56,28 @@
 
   public static void info(char[] msg, bool nline = true) {
     if (nline)
-      stderr.writeLine(msg);
+      derr.writeLine(msg);
     else
-      stderr.writeString(msg);
+      derr.writeString(msg);
   }
 
   public static void info(double n, bool nline = true) {
     if (nline)
-      stderr.writeLine(std.string.toString(n));
+      derr.writeLine(std.string.toString(n));
     else
-      stderr.writeString(std.string.toString(n) ~ " ");
+      derr.writeString(std.string.toString(n) ~ " ");
   }
 
   public static void error(char[] msg) {
-    stderr.writeLine("Error: " ~ msg);
+    derr.writeLine("Error: " ~ msg);
   }
 
   public static void error(Exception e) {
-    stderr.writeLine("Error: " ~ e.toString());
+    derr.writeLine("Error: " ~ e.toString());
   }
 
   public static void error(Error e) {
-    stderr.writeLine("Error: " ~ e.toString());
+    derr.writeLine("Error: " ~ e.toString());
     if (e.next)
       error(e.next);
   }
Index: val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/luminous.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/luminous.d	2007-09-07 00:17:49.000000000 +0200
+++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/luminous.d	2007-09-07 00:17:54.000000000 +0200
@@ -7,6 +7,7 @@
 
 private import std.math;
 private import std.string;
+private import std.c.string;
 private import opengl;
 private import abagames.util.actor;
 
Index: val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/src/abagames/vr/barrage.d	2007-09-07 00:22:29.000000000 +0200
+++ val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d	2007-09-07 00:24:50.000000000 +0200
@@ -30,6 +30,7 @@
     char[][] dirs = listdir(BARRAGE_DIR_NAME);
     foreach (char[] dirName; dirs) {
       char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
+      parser[dirName] = null;
       foreach (char[] fileName; files) {
         if (getExt(fileName) != "xml")
           continue;
Index: val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/texture.d	2007-09-07 00:25:03.000000000 +0200
+++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d	2007-09-07 00:26:42.000000000 +0200
@@ -25,7 +25,7 @@
   Uint32[128 * 128] maskPixels;
 
   public static SDL_Surface* loadBmp(char[] name) {
-    if (surface[name]) {
+    if ((name in surface) != null) {
       return surface[name];
     } else {
       char[] fileName = imagesDir ~ name;