SCI: Tons of cleanup

svn-id: r38721

3 files changed, 8 insertions, 22 deletions

diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h
index aed9040ac5..2abcf2f4da 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/include/engine.h
@@ -33,12 +33,6 @@ namespace Common {
 	class WriteStream;
 }
 
-// FIXME. Remove after transiton to File class
-#include <sys/stat.h>
-
-// FIXME. Remove this eventually
-#include <time.h>
-
 #include "sci/tools.h"
 #include "sci/include/sciresource.h"
 #include "sci/include/script.h"
@@ -76,7 +70,7 @@ namespace Sci {
 #define MAX_GAMEDIR_SIZE 32 /* Used for subdirectory inside of "~/.freesci/" */
 #define MAX_SAVEGAME_NR 20 /* Maximum number of savegames */
 
-#define MAX_SAVE_DIR_SIZE MAX_HOMEDIR_SIZE + STRLEN_FREESCI_GAMEDIR + MAX_GAMEDIR_SIZE + 4
+#define MAX_SAVE_DIR_SIZE MAXPATHLEN + STRLEN_FREESCI_GAMEDIR + MAX_GAMEDIR_SIZE + 4
 /* +4 for the three slashes and trailing \0 */
 
 /* values for EngineState.restarting_flag */
diff --git a/engines/sci/include/gfx_resmgr.h b/engines/sci/include/gfx_resmgr.h
index 7794800db8..6ba34b8815 100644
--- a/engines/sci/include/gfx_resmgr.h
+++ b/engines/sci/include/gfx_resmgr.h
@@ -53,7 +53,7 @@ typedef enum {
 #define GFXR_RES_NR(id) (id & 0xffff)
 
 
-typedef struct gfx_resource_struct {
+struct gfx_resource_t {
 	int ID; /* Resource ID */
 	int lock_sequence_nr; /* See description of lock_counter in gfx_resstate_t */
 	int mode; /* A mode type hash */
@@ -72,7 +72,7 @@ typedef struct gfx_resource_struct {
 		gfxr_pic_t *pic;
 	} unscaled_data;
 
-} gfx_resource_t;
+};
 
 
 struct _gfx_options;
diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h
index 67205665b5..74b6d33a2b 100644
--- a/engines/sci/include/sciresource.h
+++ b/engines/sci/include/sciresource.h
@@ -40,15 +40,6 @@ namespace Sci {
 #define SCI_MAX_RESOURCE_SIZE 0x0400000
 /* The maximum allowed size for a compressed or decompressed resource */
 
-#ifdef WIN32
-#  define DIR_SEPARATOR_STR "\\"
-#  define PATH_SEPARATOR_STR ";"
-#else
-#  define DIR_SEPARATOR_STR "/"
-#  define PATH_SEPARATOR_STR ":"
-#endif
-
-
 /*** RESOURCE STATUS TYPES ***/
 #define SCI_STATUS_NOMALLOC 0
 #define SCI_STATUS_ALLOCATED 1
@@ -146,7 +137,8 @@ struct resource_altsource_t {
 };
 
 
-typedef struct _resource_struct {
+/** Struct for storing resources in memory */
+struct resource_t {
 	unsigned char *data;
 
 	unsigned short number;
@@ -161,11 +153,11 @@ typedef struct _resource_struct {
 	unsigned char status;
 	unsigned short lockers; /* Number of places where this resource was locked */
 
-	struct _resource_struct *next; /* Position marker for the LRU queue */
-	struct _resource_struct *prev;
+	resource_t *next; /* Position marker for the LRU queue */
+	resource_t *prev;
 
 	resource_altsource_t *alt_sources; /* SLL of alternative resource data sources */
-} resource_t; /* for storing resources in memory */
+}; 
 
 
 struct ResourceManager {