aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-16 23:29:00 +0000
committerFilippos Karapetis2009-10-16 23:29:00 +0000
commite4c23834dd2972c75f6f698f9f55320c1784218f (patch)
treee2c3c97b794b32ee5ee7890a4c07a0c73ce5cd4c /engines/sci/gfx
parent0479964ad7bc6f59d10638427f3f68406dd0e05c (diff)
downloadscummvm-rg350-e4c23834dd2972c75f6f698f9f55320c1784218f.tar.gz
scummvm-rg350-e4c23834dd2972c75f6f698f9f55320c1784218f.tar.bz2
scummvm-rg350-e4c23834dd2972c75f6f698f9f55320c1784218f.zip
Moved sci_ffs() inside iterator.cpp, the only place where it's actually used, and removed tools.*. Also, removed all the unused includes to tools.h from several places
svn-id: r45176
Diffstat (limited to 'engines/sci/gfx')
-rw-r--r--engines/sci/gfx/gfx_system.h1
-rw-r--r--engines/sci/gfx/res_font.cpp1
-rw-r--r--engines/sci/gfx/res_pic.cpp3
3 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/gfx/gfx_system.h b/engines/sci/gfx/gfx_system.h
index 37b915f518..7dd779ca01 100644
--- a/engines/sci/gfx/gfx_system.h
+++ b/engines/sci/gfx/gfx_system.h
@@ -28,7 +28,6 @@
#include "common/scummsys.h"
#include "common/rect.h"
-#include "sci/tools.h"
#include "sci/gfx/palette.h"
namespace Sci {
diff --git a/engines/sci/gfx/res_font.cpp b/engines/sci/gfx/res_font.cpp
index fd2cae08e6..6533558388 100644
--- a/engines/sci/gfx/res_font.cpp
+++ b/engines/sci/gfx/res_font.cpp
@@ -23,6 +23,7 @@
*
*/
+#include "common/endian.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
diff --git a/engines/sci/gfx/res_pic.cpp b/engines/sci/gfx/res_pic.cpp
index 0196ad57a4..4ecec28011 100644
--- a/engines/sci/gfx/res_pic.cpp
+++ b/engines/sci/gfx/res_pic.cpp
@@ -24,6 +24,9 @@
*/
#include <time.h> // for time() to seed rand() via srand()
+
+#include "common/endian.h"
+
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
#include "sci/sci.h" // for kDebugLevelSci0Pic