From 2705815d1d8fc12b7960f7070682f47404870951 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 16 Mar 2004 08:25:46 +0000
Subject: Fixed warnings. I hope I didn't break anything!

svn-id: r13317
---
 saga/gamedesc.cpp | 6 +++---
 saga/resfile.cpp  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'saga')

diff --git a/saga/gamedesc.cpp b/saga/gamedesc.cpp
index e9fe24385c..2a02779921 100644
--- a/saga/gamedesc.cpp
+++ b/saga/gamedesc.cpp
@@ -164,7 +164,7 @@ R_GAME_DISPLAYINFO IHNM_DisplayInfo = {
 	248, 255  /* Overlay palette start index and length */
 };
 
-R_GAME_RESOURCEINFO IHNM_Resources[] = {
+R_GAME_RESOURCEINFO IHNM_Resources = {
 	IHNM_SCENE_LUT,  /* Scene lookup table RN */
 	IHNM_SCRIPT_LUT, /* Script lookup table RN */
 	
@@ -268,7 +268,7 @@ R_GAMEDESC GameDescs[] = {
 		  
 		0,
 
-		IHNM_Resources,
+		&IHNM_Resources,
 	  
 		ARRAYSIZE(IHNMDEMO_GameFiles),
 		IHNMDEMO_GameFiles,
@@ -292,7 +292,7 @@ R_GAMEDESC GameDescs[] = {
 			  
 		1,
 
-		IHNM_Resources,
+		&IHNM_Resources,
 
 		ARRAYSIZE(IHNMCD_GameFiles),
 		IHNMCD_GameFiles,
diff --git a/saga/resfile.cpp b/saga/resfile.cpp
index ba1029e174..e8d4d5687b 100644
--- a/saga/resfile.cpp
+++ b/saga/resfile.cpp
@@ -129,7 +129,7 @@ bool ResourceFile::loadResource(int32 rn, byte **res, int32 *res_len) {
 
 	assert(res != NULL && res_len != NULL);
 	*res = NULL;
-	*res_len = NULL;
+	*res_len = 0;
 
 	if (!R_PBOUNDS(rn, _resTblCt)) {
 		return false;
@@ -151,7 +151,7 @@ bool ResourceFile::loadResource(int32 rn, byte **res, int32 *res_len) {
 
 	*res = new_res;
 	*res_len = new_res_len;
-		
+
 	return true;
 }
 
-- 
cgit v1.2.3