aboutsummaryrefslogtreecommitdiff
path: root/engines/cge
diff options
context:
space:
mode:
authorPaul Gilbert2011-07-03 12:30:27 +1000
committerPaul Gilbert2011-07-03 12:30:27 +1000
commit334de9626ae6e6e5cd66582993fe799b329a0a50 (patch)
treee15b25c72ee51e9103257122f3b4dc08ce457319 /engines/cge
parentbf6a5256fe325816626156703b389273e10f1ae5 (diff)
downloadscummvm-rg350-334de9626ae6e6e5cd66582993fe799b329a0a50.tar.gz
scummvm-rg350-334de9626ae6e6e5cd66582993fe799b329a0a50.tar.bz2
scummvm-rg350-334de9626ae6e6e5cd66582993fe799b329a0a50.zip
CGE: Removed C standard library includes
Diffstat (limited to 'engines/cge')
-rw-r--r--engines/cge/bitmap.cpp2
-rw-r--r--engines/cge/btfile.cpp1
-rw-r--r--engines/cge/cfile.cpp2
-rw-r--r--engines/cge/cge_main.cpp6
-rw-r--r--engines/cge/game.cpp1
-rw-r--r--engines/cge/gettext.cpp1
-rw-r--r--engines/cge/mixer.cpp1
-rw-r--r--engines/cge/snail.cpp2
-rw-r--r--engines/cge/startup.cpp3
-rw-r--r--engines/cge/text.cpp3
-rw-r--r--engines/cge/vga13h.cpp4
-rw-r--r--engines/cge/vga13h.h1
-rw-r--r--engines/cge/vmenu.cpp1
-rw-r--r--engines/cge/vol.cpp3
-rw-r--r--engines/cge/wav.h1
15 files changed, 1 insertions, 31 deletions
diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp
index 3bcf751b40..e4e0a37eb3 100644
--- a/engines/cge/bitmap.cpp
+++ b/engines/cge/bitmap.cpp
@@ -471,7 +471,7 @@ bool Bitmap::loadBMP(XFile *f) {
_w = hea.wid;
if ((_m = farnew(byte, _h * _w)) != NULL) {
int16 r = (4 - (hea.wid & 3)) % 4;
- byte buf[3]; int i;
+ byte buf[3];
for (i = _h - 1; i >= 0; i--) {
f->read(_m + (_w * i), _w);
if (r && f->_error == 0)
diff --git a/engines/cge/btfile.cpp b/engines/cge/btfile.cpp
index 18bd2d72e7..3d0ce8a061 100644
--- a/engines/cge/btfile.cpp
+++ b/engines/cge/btfile.cpp
@@ -28,7 +28,6 @@
#include "cge/btfile.h"
#include "common/system.h"
#include "common/str.h"
-#include <string.h>
namespace CGE {
diff --git a/engines/cge/cfile.cpp b/engines/cge/cfile.cpp
index ee2aecbc42..51e580a53b 100644
--- a/engines/cge/cfile.cpp
+++ b/engines/cge/cfile.cpp
@@ -26,8 +26,6 @@
*/
#include "cge/cfile.h"
-#include <fcntl.h>
-#include <string.h>
#include "common/system.h"
namespace CGE {
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 9f9bebad0c..b8b0a2e3cc 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -43,10 +43,6 @@
#include "cge/mixer.h"
#include "cge/cge_main.h"
#include "cge/cge.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
#include "common/str.h"
namespace CGE {
@@ -1766,8 +1762,6 @@ bool CGEEngine::showTitle(const char *name) {
#else
// At this point the game originally read the boot sector to get
// the serial number for it's copy protection check
- uint32 sn = 0;
- STARTUP::Summa |= Lo(sn) | Hi(sn);
#endif
//-----------------------------------------
movie("X00"); // paylist
diff --git a/engines/cge/game.cpp b/engines/cge/game.cpp
index 72233f746a..3acafd80e7 100644
--- a/engines/cge/game.cpp
+++ b/engines/cge/game.cpp
@@ -27,7 +27,6 @@
#include "cge/game.h"
#include "cge/events.h"
-#include <stdlib.h>
namespace CGE {
diff --git a/engines/cge/gettext.cpp b/engines/cge/gettext.cpp
index 9a6c1539d1..c48b281771 100644
--- a/engines/cge/gettext.cpp
+++ b/engines/cge/gettext.cpp
@@ -28,7 +28,6 @@
#include "cge/gettext.h"
#include "cge/events.h"
#include "cge/cge_main.h"
-#include <string.h>
namespace CGE {
diff --git a/engines/cge/mixer.cpp b/engines/cge/mixer.cpp
index 18bbfb65b5..e3fd2c07ed 100644
--- a/engines/cge/mixer.cpp
+++ b/engines/cge/mixer.cpp
@@ -31,7 +31,6 @@
#include "cge/events.h"
#include "cge/snddrv.h"
#include "cge/cge_main.h"
-#include <string.h>
namespace CGE {
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index fbde5bd846..308ffb231c 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -32,8 +32,6 @@
#include "cge/bitmaps.h"
#include "cge/text.h"
#include "cge/cge_main.h"
-#include <stdio.h>
-#include <stdlib.h>
#include "cge/events.h"
namespace CGE {
diff --git a/engines/cge/startup.cpp b/engines/cge/startup.cpp
index b024701c93..39a2b66e4b 100644
--- a/engines/cge/startup.cpp
+++ b/engines/cge/startup.cpp
@@ -30,9 +30,6 @@
#include "cge/sound.h"
#include "cge/cfile.h"
#include "cge/snddrv.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
namespace CGE {
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp
index f98b7f5d1c..85ef17f4cf 100644
--- a/engines/cge/text.cpp
+++ b/engines/cge/text.cpp
@@ -33,9 +33,6 @@
#include "cge/game.h"
#include "cge/snail.h"
#include "cge/cge_main.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
namespace CGE {
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 43de8dc9b7..dc11ffbf6a 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -33,10 +33,6 @@
#include "cge/vol.h"
#include "cge/text.h"
#include "cge/cge_main.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
#include "cge/cge.h"
namespace CGE {
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index b14edb9ba9..a063e40508 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -30,7 +30,6 @@
#include "graphics/surface.h"
#include "cge/general.h"
-#include <stddef.h>
#include "cge/bitmap.h"
#include "cge/snail.h"
#include "cge/cge.h"
diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp
index d999dfa760..8ad3848cdb 100644
--- a/engines/cge/vmenu.cpp
+++ b/engines/cge/vmenu.cpp
@@ -28,7 +28,6 @@
#include "cge/vmenu.h"
#include "cge/events.h"
#include "cge/cge_main.h"
-#include <string.h>
namespace CGE {
diff --git a/engines/cge/vol.cpp b/engines/cge/vol.cpp
index 5f8573706b..332ae869c8 100644
--- a/engines/cge/vol.cpp
+++ b/engines/cge/vol.cpp
@@ -28,9 +28,6 @@
#include "cge/vol.h"
#include "common/system.h"
#include "common/str.h"
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
namespace CGE {
diff --git a/engines/cge/wav.h b/engines/cge/wav.h
index 57187f7b87..062f83dfca 100644
--- a/engines/cge/wav.h
+++ b/engines/cge/wav.h
@@ -29,7 +29,6 @@
#define __CGE_WAV__
#include "cge/general.h"
-#include <string.h>
namespace CGE {