thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SLUDGE: header formatting

Browse source
This commit is contained in:
yinsimei 2017-06-05 19:10:47 +02:00 • committed by Eugene Sandulenko
parent c44b4f3128
commit a8ccd05315
49 changed files with 423 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

37
engines/sludge/backdrop.cpp
View file

@ -20,32 +20,25 @@
* *
*/ */
#include "allfiles.h"
#include "debug.h"
#include "newfatal.h"
#include "colours.h"
#include "fileset.h"
#include "cursors.h"
#include "backdrop.h"
#include "language.h"
#include "moreio.h"
#include "variable.h"
#include "zbuffer.h"
#include "graphics.h"
#include "line.h"
#include "people.h"
#include "talk.h"
#include "sludger.h"
#include "statusba.h"
#include "variable.h"
#include "CommonCode/version.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/rect.h"
#include "image/png.h" #include "image/png.h"
#include "graphics/surface.h" #include "graphics/surface.h"
#include "graphics/palette.h" #include "graphics/palette.h"
#include "sludge.h"
#include "imgloader.h" #include "sludge/allfiles.h"
#include "common/rect.h" #include "sludge/newfatal.h"
#include "sludge/colours.h"
#include "sludge/fileset.h"
#include "sludge/backdrop.h"
#include "sludge/moreio.h"
#include "sludge/zbuffer.h"
#include "sludge/graphics.h"
#include "sludge/line.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/variable.h"
#include "sludge/imgloader.h"
namespace Sludge { namespace Sludge {

4
engines/sludge/backdrop.h
View file

@ -23,8 +23,8 @@
#ifndef SLUDGE_BACKDROP_H #ifndef SLUDGE_BACKDROP_H
#define SLUDGE_BACKDROP_H #define SLUDGE_BACKDROP_H
#include "variable.h" #include "sludge/graphics.h"
#include "graphics.h" #include "sludge/variable.h"
namespace Sludge { namespace Sludge {

16
engines/sludge/bg_effects.cpp
View file

@ -20,17 +20,17 @@
* *
*/ */
#include "allfiles.h"
#include "backdrop.h"
#include "colours.h"
#include "debug.h"
#include "graphics.h"
#include "newfatal.h"
#include "moreio.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/colours.h"
#include "sludge/debug.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
namespace Sludge { namespace Sludge {
#if 0 #if 0

62
engines/sludge/builtin.cpp
View file

@ -24,37 +24,37 @@
#include <SDL/SDL.h> #include <SDL/SDL.h>
#endif #endif
#include "debug.h" #include "sludge/debug.h"
#include "allfiles.h" #include "sludge/allfiles.h"
#include "sludger.h" #include "sludge/sludger.h"
#include "builtin.h" #include "sludge/builtin.h"
#include "stringy.h" #include "sludge/stringy.h"
#include "newfatal.h" #include "sludge/newfatal.h"
#include "cursors.h" #include "sludge/cursors.h"
#include "statusba.h" #include "sludge/statusba.h"
#include "loadsave.h" #include "sludge/loadsave.h"
#include "backdrop.h" #include "sludge/backdrop.h"
#include "bg_effects.h" #include "sludge/bg_effects.h"
#include "sprites.h" #include "sludge/sprites.h"
#include "fonttext.h" #include "sludge/fonttext.h"
#include "sprbanks.h" #include "sludge/sprbanks.h"
#include "people.h" #include "sludge/people.h"
#include "sound.h" #include "sludge/sound.h"
#include "objtypes.h" #include "sludge/objtypes.h"
#include "floor.h" #include "sludge/floor.h"
#include "zbuffer.h" #include "sludge/zbuffer.h"
#include "talk.h" #include "sludge/talk.h"
#include "region.h" #include "sludge/region.h"
#include "language.h" #include "sludge/language.h"
#include "moreio.h" #include "sludge/moreio.h"
#include "movie.h" #include "sludge/movie.h"
#include "savedata.h" #include "sludge/savedata.h"
#include "freeze.h" #include "sludge/freeze.h"
#include "colours.h" #include "sludge/colours.h"
#include "language.h" #include "sludge/language.h"
#include "thumbnail.h" #include "sludge/thumbnail.h"
#include "graphics.h" #include "sludge/graphics.h"
#include "CommonCode/utf8.h" #include "sludge/CommonCode/utf8.h"
namespace Sludge { namespace Sludge {

14
engines/sludge/cursors.cpp
View file

@ -28,13 +28,13 @@
#endif #endif
#endif #endif
#include "allfiles.h" #include "sludge/allfiles.h"
#include "cursors.h" #include "sludge/cursors.h"
#include "colours.h" #include "sludge/colours.h"
#include "sprites.h" #include "sludge/sprites.h"
#include "sprbanks.h" #include "sludge/sprbanks.h"
#include "people.h" #include "sludge/people.h"
#include "sludger.h" #include "sludge/sludger.h"
namespace Sludge { namespace Sludge {

6
engines/sludge/debug.cpp
View file

@ -24,9 +24,9 @@
#include <stdarg.h> #include <stdarg.h>
#endif #endif
#include "allfiles.h" #include "sludge/allfiles.h"
#include "debug.h" #include "sludge/debug.h"
#include "language.h" #include "sludge/language.h"
namespace Sludge { namespace Sludge {

16
engines/sludge/fileset.cpp
View file

@ -27,16 +27,16 @@
#include <iconv.h> #include <iconv.h>
#endif #endif
#include "debug.h"
#include "stringy.h"
#include "allfiles.h"
#include "moreio.h"
#include "newfatal.h"
#include "CommonCode/version.h"
#include "common/file.h" #include "common/file.h"
#include "common/debug.h" #include "common/debug.h"
#include "sludge.h"
#include "sludge/debug.h"
#include "sludge/stringy.h"
#include "sludge/allfiles.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/CommonCode/version.h"
namespace Sludge { namespace Sludge {

13
engines/sludge/floor.cpp
View file

@ -19,12 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "newfatal.h" #include "sludge/allfiles.h"
#include "fileset.h" #include "sludge/newfatal.h"
#include "moreio.h" #include "sludge/fileset.h"
#include "floor.h" #include "sludge/moreio.h"
#include "line.h" #include "sludge/floor.h"
#include "sludge/line.h"
namespace Sludge { namespace Sludge {

25
engines/sludge/fonttext.cpp
View file

@ -19,22 +19,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "platform-dependent.h"
#include <stdint.h> #include "sludge/debug.h"
#include <string.h> #include "sludge/allfiles.h"
#include "sludge/stringy.h"
#include "CommonCode/utf8.h" #include "sludge/sprites.h"
#include "sludge/colours.h"
#include "debug.h" #include "sludge/fonttext.h"
#include "allfiles.h" #include "sludge/newfatal.h"
#include "stringy.h" #include "sludge/moreio.h"
#include "sludge/platform-dependent.h"
#include "sprites.h" #include "sludge/CommonCode/utf8.h"
#include "colours.h"
#include "fonttext.h"
#include "newfatal.h"
#include "moreio.h"
namespace Sludge { namespace Sludge {

32
engines/sludge/freeze.cpp
View file

@ -19,22 +19,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h" #include "sludge/allfiles.h"
#include "debug.h" #include "sludge/debug.h"
#include "graphics.h" #include "sludge/graphics.h"
#include "newfatal.h" #include "sludge/newfatal.h"
#include "sprites.h" #include "sludge/sprites.h"
#include "sprbanks.h" #include "sludge/sprbanks.h"
#include "people.h" #include "sludge/people.h"
#include "sludger.h" #include "sludge/sludger.h"
#include "objtypes.h" #include "sludge/objtypes.h"
#include "region.h" #include "sludge/region.h"
#include "backdrop.h" #include "sludge/backdrop.h"
#include "talk.h" #include "sludge/talk.h"
#include "fonttext.h" #include "sludge/fonttext.h"
#include "statusba.h" #include "sludge/statusba.h"
#include "freeze.h" #include "sludge/freeze.h"
#include "zbuffer.h" #include "sludge/zbuffer.h"
namespace Sludge { namespace Sludge {

35
engines/sludge/graphics.cpp
View file

@ -23,25 +23,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <SDL/SDL.h> #include <SDL/SDL.h>
#endif
#include "allfiles.h"
#include "debug.h"
#include "platform-dependent.h"
#include "CommonCode/specialsettings.h"
#include "graphics.h"
#include "language.h"
#include "newfatal.h"
#include "sprbanks.h"
#include "zbuffer.h"
#include "backdrop.h"
#include "shaders.h"
#include "movie.h"
#include "stringy.h"
#include "language.h" // for settings
#if 0
#if !defined(HAVE_GLES2) #if !defined(HAVE_GLES2)
#ifdef _WIN32 #ifdef _WIN32
#include <GL\glu.h> // handy for gluErrorString #include <GL\glu.h> // handy for gluErrorString
@ -53,6 +35,20 @@
#endif #endif
#endif #endif
#include "sludge/allfiles.h"
#include "sludge/debug.h"
#include "sludge/platform-dependent.h"
#include "sludge/graphics.h"
#include "sludge/language.h"
#include "sludge/newfatal.h"
#include "sludge/sprbanks.h"
#include "sludge/zbuffer.h"
#include "sludge/backdrop.h"
#include "sludge/shaders.h"
#include "sludge/movie.h"
#include "sludge/stringy.h"
#include "sludge/CommonCode/specialsettings.h"
namespace Sludge { namespace Sludge {
unsigned int winWidth, winHeight; unsigned int winWidth, winHeight;
@ -857,9 +853,8 @@ void setupOpenGLStuff() {
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
#endif
setGraphicsWindow(gameSettings.userFullScreen, false); setGraphicsWindow(gameSettings.userFullScreen, false);
#endif
#if !defined(HAVE_GLES2) #if !defined(HAVE_GLES2)
#if 0 #if 0
/* Check for graphics capabilities... */ /* Check for graphics capabilities... */

2
engines/sludge/graphics.h
View file

@ -39,9 +39,9 @@ struct texture {
#if 0 #if 0
GLubyte *data; GLubyte *data;
GLuint name; GLuint name;
double texW, texH;
#endif #endif
Graphics::Surface surface; Graphics::Surface surface;
double texW, texH;
}; };
#if 0 #if 0

5
engines/sludge/helpers.cpp
View file

@ -19,11 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "helpers.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
#include "sludge/helpers.h"
namespace Sludge { namespace Sludge {
bool fileExists(const char *file) { bool fileExists(const char *file) {

6
engines/sludge/hsi.cpp
View file

@ -25,9 +25,9 @@
#include "graphics/surface.h" #include "graphics/surface.h"
#include "colours.h" #include "sludge/colours.h"
#include "hsi.h" #include "sludge/hsi.h"
#include "sludge.h" #include "sludge/sludge.h"
namespace Sludge { namespace Sludge {

10
engines/sludge/imgloader.cpp
View file

@ -25,11 +25,11 @@
#include "image/png.h" #include "image/png.h"
#include "graphics/surface.h" #include "graphics/surface.h"
#include "allfiles.h" #include "sludge/allfiles.h"
#include "hsi.h" #include "sludge/hsi.h"
#include "imgloader.h" #include "sludge/imgloader.h"
#include "colours.h" #include "sludge/colours.h"
#include "sludge.h" #include "sludge/sludge.h"
namespace Sludge { namespace Sludge {

16
engines/sludge/language.cpp
View file

@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "stringy.h"
#include "newfatal.h"
#include "moreio.h"
#include "language.h"
#include "CommonCode/version.h"
#include "platform-dependent.h"
#include "sludge.h" #include "sludge/allfiles.h"
#include "sludge/stringy.h"
#include "sludge/newfatal.h"
#include "sludge/moreio.h"
#include "sludge/language.h"
#include "sludge/platform-dependent.h"
#include "sludge/sludge.h"
#include "sludge/CommonCode/version.h"
#include "common/debug.h" #include "common/debug.h"

4
engines/sludge/language.h
View file

@ -22,10 +22,10 @@
#ifndef LANGUAGE_H #ifndef LANGUAGE_H
#define LANGUAGE_H #define LANGUAGE_H
#include "allfiles.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
namespace Sludge { namespace Sludge {
struct settingsStruct { struct settingsStruct {

4
engines/sludge/line.cpp
View file

@ -23,8 +23,8 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include "graphics.h" #include "sludge/graphics.h"
#include "allfiles.h" #include "sludge/allfiles.h"
namespace Sludge { namespace Sludge {

45
engines/sludge/loadsave.cpp
View file

@ -19,28 +19,29 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "sprites.h" #include "sludge/allfiles.h"
#include "fonttext.h" #include "sludge/sprites.h"
#include "newfatal.h" #include "sludge/fonttext.h"
#include "variable.h" #include "sludge/newfatal.h"
#include "CommonCode/version.h" #include "sludge/variable.h"
#include "language.h" #include "sludge/language.h"
#include "moreio.h" #include "sludge/moreio.h"
#include "sludger.h" #include "sludge/sludger.h"
#include "people.h" #include "sludge/people.h"
#include "talk.h" #include "sludge/talk.h"
#include "objtypes.h" #include "sludge/objtypes.h"
#include "backdrop.h" #include "sludge/backdrop.h"
#include "region.h" #include "sludge/region.h"
#include "floor.h" #include "sludge/floor.h"
#include "zbuffer.h" #include "sludge/zbuffer.h"
#include "cursors.h" #include "sludge/cursors.h"
#include "statusba.h" #include "sludge/statusba.h"
#include "sound.h" #include "sludge/sound.h"
#include "fileset.h" #include "sludge/fileset.h"
#include "debug.h" #include "sludge/debug.h"
#include "loadsave.h" #include "sludge/loadsave.h"
#include "sludge/CommonCode/version.h"
namespace Sludge { namespace Sludge {

48
engines/sludge/main_loop.cpp
View file

@ -52,30 +52,32 @@
#include <SDL/SDL_syswm.h> #include <SDL/SDL_syswm.h>
#endif #endif
#include "allfiles.h"
#include "debug.h"
#include "platform-dependent.h"
#include "language.h"
#include "stringy.h"
#include "sludger.h"
#include "backdrop.h"
#include "language.h"
#include "newfatal.h"
#include "people.h"
#include "floor.h"
#include "objtypes.h"
#include "talk.h"
#include "statusba.h"
#include "transition.h"
#include "CommonCode/specialsettings.h"
#include "timing.h"
#include "sound.h"
#include "sludger.h"
#include "graphics.h"
#include "helpers.h"
#include "graphics/surface.h"
#include "common/debug.h" #include "common/debug.h"
#include "sludge.h"
#include "graphics/surface.h"
#include "sludge/allfiles.h"
#include "sludge/debug.h"
#include "sludge/platform-dependent.h"
#include "sludge/language.h"
#include "sludge/stringy.h"
#include "sludge/sludger.h"
#include "sludge/backdrop.h"
#include "sludge/language.h"
#include "sludge/newfatal.h"
#include "sludge/people.h"
#include "sludge/floor.h"
#include "sludge/objtypes.h"
#include "sludge/talk.h"
#include "sludge/statusba.h"
#include "sludge/transition.h"
#include "sludge/timing.h"
#include "sludge/sound.h"
#include "sludge/sludger.h"
#include "sludge/graphics.h"
#include "sludge/helpers.h"
#include "sludge/sludge.h"
#include "sludge/CommonCode/specialsettings.h"
namespace Sludge { namespace Sludge {

3
engines/sludge/memwatch.cpp
View file

@ -19,10 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "common/debug.h" #include "common/debug.h"
#include "sludge/allfiles.h"
namespace Sludge { namespace Sludge {
void *allKnownMem[3000]; void *allKnownMem[3000];

12
engines/sludge/moreio.cpp
View file

@ -19,16 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "moreio.h"
#include "newfatal.h"
#include "stringy.h"
#include "sludge.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/stringy.h"
#include "sludge/sludge.h"
#if defined __unix__ && !(defined __APPLE__) #if defined __unix__ && !(defined __APPLE__)
#include <endian.h> #include <endian.h>
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN

32
engines/sludge/movie.cpp
View file

@ -21,31 +21,10 @@
*/ */
#if 0 #if 0
#include <SDL/SDL.h> #include <SDL/SDL.h>
#endif
#include <math.h>
#include "CommonCode/specialsettings.h"
#include "libwebm/mkvreader.hpp"
#include "libwebm/mkvparser.hpp"
#if 0
#define VPX_CODEC_DISABLE_COMPAT 1 #define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx/vpx_decoder.h" #include "vpx/vpx_decoder.h"
#include "vpx/vp8dx.h" #include "vpx/vp8dx.h"
#define interface (&vpx_codec_vp8_dx_algo) #define interface (&vpx_codec_vp8_dx_algo)
#endif
#include "newfatal.h"
#include "timing.h"
#include "graphics.h"
#include "movie.h"
#include "shaders.h"
#include "sound.h"
#if 0
#include "vorbis/codec.h" #include "vorbis/codec.h"
#define OV_EXCLUDE_STATIC_CALLBACKS #define OV_EXCLUDE_STATIC_CALLBACKS
#include "vorbis/vorbisfile.h" #include "vorbis/vorbisfile.h"
@ -56,6 +35,17 @@
#include "AL/alure.h" #include "AL/alure.h"
#endif #endif
#include "sludge/CommonCode/specialsettings.h"
#include "sludge/libwebm/mkvreader.hpp"
#include "sludge/libwebm/mkvparser.hpp"
#include "sludge/newfatal.h"
#include "sludge/timing.h"
#include "sludge/graphics.h"
#include "sludge/movie.h"
#include "sludge/shaders.h"
#include "sludge/sound.h"
namespace Sludge { namespace Sludge {
extern int specialSettings; extern int specialSettings;

18
engines/sludge/newfatal.cpp
View file

@ -26,16 +26,16 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include "allfiles.h"
#include "common/debug.h" #include "common/debug.h"
#include "platform-dependent.h"
#include "CommonCode/version.h" #include "sludge/allfiles.h"
#include "sound.h" #include "sludge/platform-dependent.h"
#include "stringy.h" #include "sludge/sound.h"
#include "errors.h" #include "sludge/stringy.h"
#include "graphics.h" #include "sludge/errors.h"
#include "sludge.h" #include "sludge/graphics.h"
#include "sludge/sludge.h"
#include "sludge/CommonCode/version.h"
namespace Sludge { namespace Sludge {

2
engines/sludge/newfatal.h
View file

@ -22,7 +22,7 @@
#ifndef SLUDGE_NEWFATAL_H #ifndef SLUDGE_NEWFATAL_H
#define SLUDGE_NEWFATAL_H #define SLUDGE_NEWFATAL_H
#include "errors.h" #include "sludge/errors.h"
namespace Sludge { namespace Sludge {

15
engines/sludge/objtypes.cpp
View file

@ -19,13 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "objtypes.h" #include "sludge/allfiles.h"
#include "variable.h" #include "sludge/objtypes.h"
#include "newfatal.h" #include "sludge/variable.h"
#include "moreio.h" #include "sludge/newfatal.h"
#include "fileset.h" #include "sludge/moreio.h"
#include "CommonCode/version.h" #include "sludge/fileset.h"
#include "sludge/CommonCode/version.h"
namespace Sludge { namespace Sludge {

36
engines/sludge/people.cpp
View file

@ -19,26 +19,26 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include "CommonCode/version.h" #include "sludge/allfiles.h"
#include "sprites.h" #include "sludge/sprites.h"
#include "sprbanks.h" #include "sludge/sprbanks.h"
#include "sludger.h" #include "sludge/sludger.h"
#include "objtypes.h" #include "sludge/objtypes.h"
#include "region.h" #include "sludge/region.h"
#include "people.h" #include "sludge/people.h"
#include "talk.h" #include "sludge/talk.h"
#include "newfatal.h" #include "sludge/newfatal.h"
#include "variable.h" #include "sludge/variable.h"
#include "moreio.h" #include "sludge/moreio.h"
#include "loadsave.h" #include "sludge/loadsave.h"
#include "floor.h" #include "sludge/floor.h"
#include "zbuffer.h" #include "sludge/zbuffer.h"
#include "sound.h" #include "sludge/sound.h"
#include "debug.h" #include "sludge/debug.h"
#include "sludge/CommonCode/version.h"
#define ANGLEFIX (180.0 / 3.14157) #define ANGLEFIX (180.0 / 3.14157)
#define ANI_STAND 0 #define ANI_STAND 0

15
engines/sludge/region.cpp
View file

@ -19,13 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "objtypes.h" #include "sludge/allfiles.h"
#include "region.h" #include "sludge/backdrop.h"
#include "newfatal.h" #include "sludge/moreio.h"
#include "sludger.h" #include "sludge/newfatal.h"
#include "moreio.h" #include "sludge/objtypes.h"
#include "backdrop.h" #include "sludge/region.h"
#include "sludge/sludger.h"
namespace Sludge { namespace Sludge {

13
engines/sludge/savedata.cpp
View file

@ -21,16 +21,15 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <string.h>
#include "allfiles.h"
#include "debug.h"
#include "variable.h"
#include "newfatal.h"
#include "moreio.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
#include "sludge/debug.h"
#include "sludge/variable.h"
#include "sludge/newfatal.h"
#include "sludge/moreio.h"
#define LOAD_ERROR "Can't load custom data...\n\n" #define LOAD_ERROR "Can't load custom data...\n\n"
namespace Sludge { namespace Sludge {

11
engines/sludge/shaders.cpp
View file

@ -19,11 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "debug.h" #include "sludge/allfiles.h"
#include "stringy.h" #include "sludge/debug.h"
#include "shaders.h" #include "sludge/stringy.h"
#include "graphics.h" #include "sludge/shaders.h"
#include "sludge/graphics.h"
namespace Sludge { namespace Sludge {

3
engines/sludge/sludge.cpp
View file

@ -20,7 +20,6 @@
* *
*/ */
#include "common/scummsys.h" #include "common/scummsys.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/debug-channels.h" #include "common/debug-channels.h"
@ -29,7 +28,7 @@
#include "engines/util.h" #include "engines/util.h"
#include "sludge/sludge.h" #include "sludge/sludge.h"
#include "main_loop.h" #include "sludge/main_loop.h"
namespace Sludge { namespace Sludge {

63
engines/sludge/sludger.cpp
View file

@ -33,38 +33,39 @@
#include <iconv.h> #include <iconv.h>
#endif #endif
#include "allfiles.h"
#include "platform-dependent.h"
#include "CommonCode/version.h"
#include "sludger.h"
#include "backdrop.h"
#include "cursors.h"
#include "colours.h"
#include "objtypes.h"
#include "region.h"
#include "sprites.h"
#include "sprbanks.h"
#include "people.h"
#include "talk.h"
#include "newfatal.h"
#include "stringy.h"
#include "moreio.h"
#include "statusba.h"
#include "builtin.h"
#include "fonttext.h"
#include "freeze.h"
#include "floor.h"
#include "zbuffer.h"
#include "sound.h"
#include "loadsave.h"
#include "fileset.h"
#include "transition.h"
#include "language.h"
#include "CommonCode/specialsettings.h"
#include "graphics.h"
#include "variable.h"
#include "common/debug.h" #include "common/debug.h"
#include "sludge.h"
#include "sludge/allfiles.h"
#include "sludge/platform-dependent.h"
#include "sludge/sludger.h"
#include "sludge/backdrop.h"
#include "sludge/cursors.h"
#include "sludge/colours.h"
#include "sludge/objtypes.h"
#include "sludge/region.h"
#include "sludge/sprites.h"
#include "sludge/sprbanks.h"
#include "sludge/people.h"
#include "sludge/talk.h"
#include "sludge/newfatal.h"
#include "sludge/stringy.h"
#include "sludge/moreio.h"
#include "sludge/statusba.h"
#include "sludge/builtin.h"
#include "sludge/fonttext.h"
#include "sludge/freeze.h"
#include "sludge/floor.h"
#include "sludge/zbuffer.h"
#include "sludge/sound.h"
#include "sludge/loadsave.h"
#include "sludge/fileset.h"
#include "sludge/transition.h"
#include "sludge/language.h"
#include "sludge/graphics.h"
#include "sludge/variable.h"
#include "sludge/sludge.h"
#include "sludge/CommonCode/specialsettings.h"
#include "sludge/CommonCode/version.h"
namespace Sludge { namespace Sludge {

10
engines/sludge/sludger.h
View file

@ -24,13 +24,13 @@
#include <stdint.h> #include <stdint.h>
#include "allfiles.h"
#include "variable.h"
#include "csludge.h"
#include "language.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
#include "sludge/variable.h"
#include "sludge/csludge.h"
#include "sludge/language.h"
namespace Sludge { namespace Sludge {
#ifndef _WIN32 #ifndef _WIN32

4
engines/sludge/sound.h
View file

@ -29,10 +29,10 @@
#define HWND void * #define HWND void *
#endif #endif
#include "variable.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/variable.h"
namespace Sludge { namespace Sludge {
// Sound list stuff // Sound list stuff

12
engines/sludge/sound_bass.cpp
View file

@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "newfatal.h" #include "sludge/allfiles.h"
#include "bass.h" #include "sludge/newfatal.h"
#include "sound.h" #include "sludge/sound.h"
#include "moreio.h" #include "sludge/moreio.h"
#include "fileset.h" #include "sludge/fileset.h"
#define MAX_SAMPLES 8 #define MAX_SAMPLES 8
#define MAX_MODS 3 #define MAX_MODS 3

11
engines/sludge/sound_nosound.cpp
View file

@ -19,11 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "newfatal.h" #include "sludge/allfiles.h"
#include "sound.h" #include "sludge/newfatal.h"
#include "moreio.h" #include "sludge/sound.h"
#include "fileset.h" #include "sludge/moreio.h"
#include "sludge/fileset.h"
namespace Sludge { namespace Sludge {

14
engines/sludge/sound_openal.cpp
View file

@ -26,15 +26,15 @@
#include "AL/alure.h" #include "AL/alure.h"
#endif #endif
#include "allfiles.h"
#include "debug.h"
#include "newfatal.h"
#include "sound.h"
#include "moreio.h"
#include "fileset.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
#include "sludge/debug.h"
#include "sludge/newfatal.h"
#include "sludge/sound.h"
#include "sludge/moreio.h"
#include "sludge/fileset.h"
#define MAX_SAMPLES 8 #define MAX_SAMPLES 8
#define MAX_MODS 3 #define MAX_MODS 3
#define NUM_BUFS 3 #define NUM_BUFS 3

11
engines/sludge/sprbanks.cpp
View file

@ -19,11 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "sprites.h" #include "sludge/allfiles.h"
#include "sprbanks.h" #include "sludge/sprites.h"
#include "newfatal.h" #include "sludge/sprbanks.h"
#include "debug.h" #include "sludge/newfatal.h"
#include "sludge/debug.h"
namespace Sludge { namespace Sludge {

2
engines/sludge/sprbanks.h
View file

@ -22,7 +22,7 @@
#ifndef SLUDGE_SPRBANKS_H #ifndef SLUDGE_SPRBANKS_H
#define SLUDGE_SPRBANKS_H #define SLUDGE_SPRBANKS_H
#include "sprites.h" #include "sludge/sprites.h"
namespace Sludge { namespace Sludge {

29
engines/sludge/sprites.cpp
View file

@ -22,20 +22,21 @@
#include "graphics/surface.h" #include "graphics/surface.h"
#include "graphics/transparent_surface.h" #include "graphics/transparent_surface.h"
#include "allfiles.h"
#include "fileset.h" #include "sludge/allfiles.h"
#include "people.h" #include "sludge/fileset.h"
#include "sprites.h" #include "sludge/people.h"
#include "moreio.h" #include "sludge/sprites.h"
#include "newfatal.h" #include "sludge/moreio.h"
#include "colours.h" #include "sludge/newfatal.h"
#include "backdrop.h" #include "sludge/colours.h"
#include "sludger.h" #include "sludge/backdrop.h"
#include "zbuffer.h" #include "sludge/sludger.h"
#include "debug.h" #include "sludge/zbuffer.h"
#include "graphics.h" #include "sludge/debug.h"
#include "imgloader.h" #include "sludge/graphics.h"
#include "shaders.h" #include "sludge/imgloader.h"
#include "sludge/shaders.h"
namespace Sludge { namespace Sludge {

19
engines/sludge/statusba.cpp
View file

@ -19,18 +19,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "backdrop.h"
#include "colours.h"
#include "sprites.h"
#include "fonttext.h"
#include "moreio.h"
#include "stringy.h"
#include "newfatal.h"
#include "statusba.h"
#include "common/file.h" #include "common/file.h"
#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/colours.h"
#include "sludge/sprites.h"
#include "sludge/fonttext.h"
#include "sludge/moreio.h"
#include "sludge/stringy.h"
#include "sludge/newfatal.h"
#include "sludge/statusba.h"
namespace Sludge { namespace Sludge {
spritePalette verbLinePalette; spritePalette verbLinePalette;

4
engines/sludge/stringy.cpp
View file

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h" #include "sludge/allfiles.h"
#include "newfatal.h" #include "sludge/newfatal.h"
#ifndef SLUDGE_STRINGY_H #ifndef SLUDGE_STRINGY_H
#define SLUDGE_STRINGY_H #define SLUDGE_STRINGY_H

29
engines/sludge/talk.cpp
View file

@ -19,20 +19,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "backdrop.h" #include "sludge/allfiles.h"
#include "sprites.h" #include "sludge/backdrop.h"
#include "sludger.h" #include "sludge/sprites.h"
#include "objtypes.h" #include "sludge/sludger.h"
#include "region.h" #include "sludge/objtypes.h"
#include "sprbanks.h" #include "sludge/region.h"
#include "people.h" #include "sludge/sprbanks.h"
#include "talk.h" #include "sludge/people.h"
#include "sound.h" #include "sludge/talk.h"
#include "fonttext.h" #include "sludge/sound.h"
#include "newfatal.h" #include "sludge/fonttext.h"
#include "stringy.h" #include "sludge/newfatal.h"
#include "moreio.h" #include "sludge/stringy.h"
#include "sludge/moreio.h"
namespace Sludge { namespace Sludge {

2
engines/sludge/talk.h
View file

@ -22,7 +22,7 @@
#ifndef SLUDGE_TALK_H #ifndef SLUDGE_TALK_H
#define SLUDGE_TALK_H #define SLUDGE_TALK_H
#include "sprites.h" #include "sludge/sprites.h"
namespace Sludge { namespace Sludge {

19
engines/sludge/thumbnail.cpp
View file

@ -19,15 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "errors.h" #include "sludge/allfiles.h"
#include "moreio.h" #include "sludge/errors.h"
#include "CommonCode/version.h" #include "sludge/moreio.h"
#include "sludger.h" #include "sludge/sludger.h"
#include "colours.h" #include "sludge/colours.h"
#include "backdrop.h" #include "sludge/backdrop.h"
#include "graphics.h" #include "sludge/graphics.h"
#include "newfatal.h" #include "sludge/newfatal.h"
#include "sludge/CommonCode/version.h"
namespace Sludge { namespace Sludge {

12
engines/sludge/transition.cpp
View file

@ -19,12 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include <stdint.h> #include <stdint.h>
#include "allfiles.h"
#include "colours.h" #include "sludge/allfiles.h"
#include "backdrop.h" #include "sludge/colours.h"
#include "graphics.h" #include "sludge/backdrop.h"
#include "newfatal.h" #include "sludge/graphics.h"
#include "sludge/newfatal.h"
#if 0 #if 0
extern GLuint snapshotTextureName; extern GLuint snapshotTextureName;

27
engines/sludge/variable.cpp
View file

@ -19,21 +19,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "debug.h"
#include "allfiles.h"
#include "variable.h"
#include "newfatal.h"
#include "stringy.h"
#include "objtypes.h"
#include "people.h"
#include "fileset.h"
#include "sludge.h"
#include "common/debug.h"
#include <dirent.h> #include <dirent.h>
#include "moreio.h"
#include "common/debug.h"
#include "sludge/debug.h"
#include "sludge/allfiles.h"
#include "sludge/variable.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/stringy.h"
#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/fileset.h"
#include "sludge/sludge.h"
#ifdef _WIN32 #ifdef _WIN32
#include "windows.h" #include "windows.h"

16
engines/sludge/vid.cpp
View file

@ -19,23 +19,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#ifndef _MSC_VER // Microsoft compiler? #ifndef _MSC_VER // Microsoft compiler?
#include <unistd.h> // For unlink #include <unistd.h> // For unlink
#else #else
#include <io.h> #include <io.h>
#include <stdio.h> #include <stdio.h>
#endif
#include "newfatal.h"
#include "stringy.h"
#if 0
#include "vfw.h" #include "vfw.h"
#endif #endif
#include "sound.h"
#include "colours.h" #include "sludge/allfiles.h"
#include "fileset.h" #include "sludge/newfatal.h"
#include "sludge/stringy.h"
#include "sludge/sound.h"
#include "sludge/colours.h"
#include "sludge/fileset.h"
namespace Sludge { namespace Sludge {

13
engines/sludge/zbuffer.cpp
View file

@ -19,12 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
*/ */
#include "allfiles.h"
#include "zbuffer.h" #include "sludge/allfiles.h"
#include "fileset.h" #include "sludge/zbuffer.h"
#include "moreio.h" #include "sludge/fileset.h"
#include "newfatal.h" #include "sludge/moreio.h"
#include "graphics.h" #include "sludge/newfatal.h"
#include "sludge/graphics.h"
namespace Sludge { namespace Sludge {