From fc2044f743400ceb3a2b913d29d7c2cf11b990e6 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <khalek@users.sourceforge.net>
Date: Sat, 5 Jun 2004 11:12:51 +0000
Subject: [PATCH] Set graphics cursor before using it, fixes segfault when
 launching ihnm from the launcher. Fixes bug #966614

svn-id: r13934
---
 saga/gfx.cpp   |  1 +
 saga/input.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/saga/gfx.cpp b/saga/gfx.cpp
index c98ebc5da59..454e368b5ee 100644
--- a/saga/gfx.cpp
+++ b/saga/gfx.cpp
@@ -67,6 +67,7 @@ int GFX_Init(OSystem *system, int width, int height) {
 	GfxModule.black_index = -1;
 
 	// For now, always show the mouse cursor.
+	GFX_SetCursor(1);
 	SYSINPUT_ShowMouse();
 
 	return R_SUCCESS;
diff --git a/saga/input.cpp b/saga/input.cpp
index b6f4f97f460..eac43741f30 100644
--- a/saga/input.cpp
+++ b/saga/input.cpp
@@ -20,15 +20,15 @@
  * $Header$
  *
  */
-#include "saga.h"
-#include "reinherit.h"
+#include "saga/saga.h"
+#include "saga/reinherit.h"
 
-#include "actor_mod.h"
-#include "console_mod.h"
-#include "interface_mod.h"
-#include "render_mod.h"
-#include "scene_mod.h"
-#include "script_mod.h"
+#include "saga/actor_mod.h"
+#include "saga/console_mod.h"
+#include "saga/interface_mod.h"
+#include "saga/render_mod.h"
+#include "saga/scene_mod.h"
+#include "saga/script_mod.h"
 
 namespace Saga {