[Scummvm-cvs-logs] SF.net SVN: scummvm:[38335] scummvm/trunk/engines/sci/scicore
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 16 01:34:41 CET 2009
Revision: 38335
http://scummvm.svn.sourceforge.net/scummvm/?rev=38335&view=rev
Author: fingolfin
Date: 2009-02-16 00:34:40 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
SCI: cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/scicore/aatree.cpp
scummvm/trunk/engines/sci/scicore/exe_lzexe.cpp
scummvm/trunk/engines/sci/scicore/exe_raw.cpp
scummvm/trunk/engines/sci/scicore/hashmap.cpp
scummvm/trunk/engines/sci/scicore/resource.cpp
scummvm/trunk/engines/sci/scicore/resource_patch.cpp
scummvm/trunk/engines/sci/scicore/sci_memory.cpp
scummvm/trunk/engines/sci/scicore/script.cpp
scummvm/trunk/engines/sci/scicore/tools.cpp
scummvm/trunk/engines/sci/scicore/versions.cpp
scummvm/trunk/engines/sci/scicore/vocab.cpp
scummvm/trunk/engines/sci/scicore/vocab_debug.cpp
Modified: scummvm/trunk/engines/sci/scicore/aatree.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/aatree.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/aatree.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -25,7 +25,6 @@
***************************************************************************/
-#include <stdlib.h>
#include "sci/include/aatree.h"
#include "sci/include/sci_memory.h"
Modified: scummvm/trunk/engines/sci/scicore/exe_lzexe.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/exe_lzexe.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/exe_lzexe.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -27,7 +27,6 @@
/* Based on public domain code by Mitugu Kurizono. */
-#include <stdio.h>
#include "sci/include/sci_memory.h"
#include "sci/scicore/exe_dec.h"
Modified: scummvm/trunk/engines/sci/scicore/exe_raw.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/exe_raw.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/exe_raw.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -25,7 +25,6 @@
***************************************************************************/
-#include <stdio.h>
#include "sci/include/sci_memory.h"
struct _exe_handle {
Modified: scummvm/trunk/engines/sci/scicore/hashmap.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/hashmap.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/hashmap.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -30,9 +30,6 @@
** HASH_MAX: Maximum hash value
** HASH(x): Hashes a value of type TYPE to an int from 0 to HASH_MAX
*/
-#include <stdio.h>
-#include <stdlib.h>
-
#ifdef MUST_FREE
# define CLEAR_NODE(n) free(n->name); n->name = NULL
# define FREE_PARAM(n) free(n)
Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -34,12 +34,6 @@
#include "sci/include/sciresource.h"
#include "sci/include/vocabulary.h" /* For SCI version auto-detection */
-#include <ctype.h>
-
-#ifdef WIN32
-#include <direct.h>
-#endif
-
#undef SCI_REQUIRE_RESOURCE_FILES
/* #define SCI_VERBOSE_RESMGR 1 */
Modified: scummvm/trunk/engines/sci/scicore/resource_patch.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource_patch.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/resource_patch.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -29,10 +29,6 @@
#include "sci/include/sciresource.h"
#include "sci/include/sci_memory.h"
-#ifdef WIN32
-#include <direct.h>
-#endif
-
void
sci0_sprintf_patch_file_name(char *string, resource_t *res) {
sprintf(string, "%s.%03i", sci_resource_types[res->type], res->number);
Modified: scummvm/trunk/engines/sci/scicore/sci_memory.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/sci_memory.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/sci_memory.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -34,6 +34,7 @@
***************************************************************************/
#include "sci/include/sci_memory.h"
+#include "common/util.h"
/*#define POISON_MEMORY*/
Modified: scummvm/trunk/engines/sci/scicore/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/script.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/script.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -29,6 +29,7 @@
#include "sci/include/sciresource.h"
#include "sci/include/engine.h"
+#include "common/util.h"
/* #define SCRIPT_DEBUG */
Modified: scummvm/trunk/engines/sci/scicore/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/tools.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/tools.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -25,16 +25,14 @@
***************************************************************************/
-#include <stdlib.h>
+#include "common/scummsys.h"
+#include "common/str.h"
#ifdef UNIX
#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
#include <fnmatch.h>
#endif
-#include "common/scummsys.h"
-#include "common/str.h"
-
#include "sci/include/engine.h"
#ifdef HAVE_SYS_TIME_H
Modified: scummvm/trunk/engines/sci/scicore/versions.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/versions.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/versions.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -22,7 +22,6 @@
#include "sci/include/versions.h"
#include "sci/include/engine.h"
#include "sci/include/resource.h"
-#include <ctype.h>
#include "sci/scicore/games.h"
#include "sci/scicore/exe.h"
Modified: scummvm/trunk/engines/sci/scicore/vocab.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/vocab.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/vocab.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -31,8 +31,6 @@
#include "sci/include/engine.h"
#include "sci/include/kernel.h"
-#include <ctype.h>
-
int vocab_version;
#define VOCAB_RESOURCE_PARSE_TREE_BRANCHES vocab_version==1 ? \
Modified: scummvm/trunk/engines/sci/scicore/vocab_debug.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/vocab_debug.cpp 2009-02-16 00:17:27 UTC (rev 38334)
+++ scummvm/trunk/engines/sci/scicore/vocab_debug.cpp 2009-02-16 00:34:40 UTC (rev 38335)
@@ -3,7 +3,6 @@
*/
-#include <string.h>
#include "sci/include/engine.h"
#include "sci/include/sciresource.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list