[Scummvm-cvs-logs] SF.net SVN: scummvm:[46258] scummvm/trunk/engines/saga

[eriktorbjorn at users.sourceforge.net]

Revision: 46258
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46258&view=rev
Author:   eriktorbjorn
Date:     2009-12-04 19:00:40 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
Silenced GCC warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/saga/resource.cpp
    scummvm/trunk/engines/saga/resource.h

Modified: scummvm/trunk/engines/saga/resource.cpp
===================================================================
--- scummvm/trunk/engines/saga/resource.cpp	2009-12-04 18:41:16 UTC (rev 46257)
+++ scummvm/trunk/engines/saga/resource.cpp	2009-12-04 19:00:40 UTC (rev 46258)
@@ -236,19 +236,19 @@
 
 	//// Detect and add SFX files ////////////////////////////////////////////////
 	SoundFileInfo sfxFiles[] = {
-		{	GID_ITE,	"sounds.rsc",		false	},
-		{	GID_ITE,	"sounds.cmp",		true	},
-		{	GID_ITE,	"soundsd.rsc",		false	},
-		{	GID_ITE,	"soundsd.cmp",		true	},
+		{	GID_ITE,	"sounds.rsc",		false,	0	},
+		{	GID_ITE,	"sounds.cmp",		true,	0	},
+		{	GID_ITE,	"soundsd.rsc",		false,	0	},
+		{	GID_ITE,	"soundsd.cmp",		true,	0	},
 #ifdef ENABLE_IHNM
-		{	GID_IHNM,	"sfx.res",			false	},
-		{	GID_IHNM,	"sfx.cmp",			true	},
+		{	GID_IHNM,	"sfx.res",			false,	0	},
+		{	GID_IHNM,	"sfx.cmp",			true,	0	},
 #endif
 #ifdef ENABLE_SAGA2
-		{	GID_FTA2,	"ftasound.hrs",		false	},
-		{	GID_DINO,	"dinosnd.hrs",		false	},
+		{	GID_FTA2,	"ftasound.hrs",		false,	0	},
+		{	GID_DINO,	"dinosnd.hrs",		false,	0	},
 #endif
-		{	-1,			NULL,				false	}
+		{	-1,			"",				false,	0	}
 	};
 
 	_soundFileName[0] = 0;
@@ -283,7 +283,7 @@
 #ifdef ENABLE_SAGA2
 		{	GID_FTA2,	"ftavoice.hrs",					false	,	0},
 #endif
-		{	-1,			NULL,							false	,	0}
+		{	-1,			"",							false	,	0}
 	};
 
 	// Detect and add voice files
@@ -329,11 +329,11 @@
 
 	//// Detect and add music files /////////////////////////////////////////
 	SoundFileInfo musicFiles[] = {
-		{	GID_ITE,	"music.rsc",	false	},
-		{	GID_ITE,	"music.cmp",	true	},
-		{	GID_ITE,	"musicd.rsc",	false	},
-		{	GID_ITE,	"musicd.cmp",	true	},
-		{	-1,			NULL,			false	}
+		{	GID_ITE,	"music.rsc",	false,	0	},
+		{	GID_ITE,	"music.cmp",	true,	0	},
+		{	GID_ITE,	"musicd.rsc",	false,	0	},
+		{	GID_ITE,	"musicd.cmp",	true,	0	},
+		{	-1,			"",			false	,	0}
 	};
 
 	// Check for digital music in ITE

Modified: scummvm/trunk/engines/saga/resource.h
===================================================================
--- scummvm/trunk/engines/saga/resource.h	2009-12-04 18:41:16 UTC (rev 46257)
+++ scummvm/trunk/engines/saga/resource.h	2009-12-04 19:00:40 UTC (rev 46258)
@@ -107,6 +107,9 @@
 		_fileSize(0) {
 	}
 
+	virtual ~ResourceContext() {
+	}
+
 	bool isCompressed() const {
 		return _isCompressed;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.