update path includes for recent directory changes

backends/platform/sdl/sdl_driver.cpp

@@ -37,7 +37,7 @@
 	#include "backends/saves/default/default-saves.h"
 #endif
 #include "backends/timer/default/default-timer.h"
-#include "mixer/mixer_intern.h"
+#include "sound/mixer_intern.h"
 
 #include "backends/timer/default/default-timer.h"
 #include "backends/saves/default/default-saves.h"

engines/grim/actor.cpp

@@ -23,13 +23,13 @@
  *
  */
 
-#include "engine/actor.h"
-#include "engine/grim.h"
-#include "engine/colormap.h"
-#include "engine/costume.h"
-#include "engine/lipsync.h"
-#include "engine/smush/smush.h"
-#include "engine/imuse/imuse.h"
+#include "engines/grim/actor.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/colormap.h"
+#include "engines/grim/costume.h"
+#include "engines/grim/lipsync.h"
+#include "engines/grim/smush/smush.h"
+#include "engines/grim/imuse/imuse.h"
 
 int g_winX1, g_winY1, g_winX2, g_winY2;
 

engines/grim/actor.h

@@ -26,9 +26,9 @@
 #ifndef ACTOR_H
 #define ACTOR_H
 
-#include "engine/color.h"
-#include "engine/resource.h"
-#include "engine/vector3d.h"
+#include "engines/grim/color.h"
+#include "engines/grim/resource.h"
+#include "engines/grim/vector3d.h"
 
 class TextObject;
 class Sector;

engines/grim/bitmap.cpp

@@ -25,8 +25,8 @@
 
 #include "common/endian.h"
 
-#include "engine/bitmap.h"
-#include "engine/gfx_base.h"
+#include "engines/grim/bitmap.h"
+#include "engines/grim/gfx_base.h"
 
 static void decompress_codec3(const char *compressed, char *result);
 

engines/grim/bitmap.h

@@ -26,7 +26,7 @@
 #ifndef BITMAP_H
 #define BITMAP_H
 
-#include "engine/resource.h"
+#include "engines/grim/resource.h"
 
 class Bitmap : public Resource {
 public:

engines/grim/cmd_line.cpp

@@ -25,8 +25,8 @@
 
 #include "common/fs.h"
 
-#include "engine/cmd_line.h"
-#include "engine/version.h"
+#include "engines/grim/cmd_line.h"
+#include "engines/grim/version.h"
 
 #define DETECTOR_TESTING_HACK
 

engines/grim/colormap.h

@@ -28,7 +28,7 @@
 
 #include "common/endian.h"
 
-#include "engine/resource.h"
+#include "engines/grim/resource.h"
 
 class CMap : public Resource {
 public:

engines/grim/costume.cpp

@@ -25,16 +25,16 @@
 
 #include "common/endian.h"
 
-#include "engine/colormap.h"
-#include "engine/costume.h"
-#include "engine/actor.h"
-#include "engine/textsplit.h"
-#include "engine/grim.h"
-#include "engine/keyframe.h"
-#include "engine/material.h"
-#include "engine/lua.h"
+#include "engines/grim/colormap.h"
+#include "engines/grim/costume.h"
+#include "engines/grim/actor.h"
+#include "engines/grim/textsplit.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/keyframe.h"
+#include "engines/grim/material.h"
+#include "engines/grim/lua.h"
 
-#include "engine/imuse/imuse.h"
+#include "engines/grim/imuse/imuse.h"
 
 // A costume in the Residual/GrimE engine consists of a set of
 // components, and a set of chores.  Each component represents an

engines/grim/costume.h

@@ -26,7 +26,7 @@
 #ifndef COSTUME_H
 #define COSTUME_H
 
-#include "engine/model.h"
+#include "engines/grim/model.h"
 
 #define DEFAULT_COLORMAP "item.cmp"
 

engines/grim/font.cpp

@@ -25,7 +25,7 @@
 
 #include "common/endian.h"
 
-#include "engine/font.h"
+#include "engines/grim/font.h"
 
 Font::Font(const char *filename, const char *data, int /*len*/) :
 	Resource(filename) {

engines/grim/font.h

@@ -26,7 +26,7 @@
 #ifndef FONT_H
 #define FONT_H
 
-#include "engine/resource.h"
+#include "engines/grim/resource.h"
 
 class Font : public Resource {
 public:

engines/grim/gfx_base.h

@@ -26,9 +26,9 @@
 #ifndef GFX_BASE_H
 #define GFX_BASE_H
 
-#include "engine/model.h"
-#include "engine/scene.h"
-#include "engine/primitives.h"
+#include "engines/grim/model.h"
+#include "engines/grim/scene.h"
+#include "engines/grim/primitives.h"
 
 struct Shadow;
 

engines/grim/gfx_opengl.cpp

@@ -26,11 +26,11 @@
 #include "common/endian.h"
 #include "common/system.h"
 
-#include "engine/actor.h"
-#include "engine/colormap.h"
-#include "engine/font.h"
-#include "engine/material.h"
-#include "engine/gfx_opengl.h"
+#include "engines/grim/actor.h"
+#include "engines/grim/colormap.h"
+#include "engines/grim/font.h"
+#include "engines/grim/material.h"
+#include "engines/grim/gfx_opengl.h"
 
 #ifdef USE_OPENGL
 

engines/grim/gfx_opengl.h

@@ -26,7 +26,7 @@
 #ifndef GFX_OPENGL_H
 #define GFX_OPENGL_H
 
-#include "engine/gfx_base.h"
+#include "engines/grim/gfx_base.h"
 
 #ifdef USE_OPENGL
 

engines/grim/gfx_tinygl.cpp

@@ -26,11 +26,11 @@
 #include "common/endian.h"
 #include "common/system.h"
 
-#include "engine/actor.h"
-#include "engine/colormap.h"
-#include "engine/material.h"
-#include "engine/font.h"
-#include "engine/gfx_tinygl.h"
+#include "engines/grim/actor.h"
+#include "engines/grim/colormap.h"
+#include "engines/grim/material.h"
+#include "engines/grim/font.h"
+#include "engines/grim/gfx_tinygl.h"
 
 // below funcs lookAt, transformPoint and tgluProject are from Mesa glu sources
 static void lookAt(TGLfloat eyex, TGLfloat eyey, TGLfloat eyez, TGLfloat centerx,

engines/grim/gfx_tinygl.h

@@ -26,7 +26,7 @@
 #ifndef GFX_TINYGL_H
 #define GFX_TINYGL_H
 
-#include "engine/gfx_base.h"
+#include "engines/grim/gfx_base.h"
 
 #include "graphics/tinygl/zgl.h"
 

engines/grim/grim.cpp

@@ -25,14 +25,14 @@
 
 #include "common/events.h"
 
-#include "engine/grim.h"
-#include "engine/lua.h"
-#include "engine/actor.h"
-#include "engine/smush/smush.h"
-#include "engine/savegame.h"
-#include "engine/registry.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/lua.h"
+#include "engines/grim/actor.h"
+#include "engines/grim/smush/smush.h"
+#include "engines/grim/savegame.h"
+#include "engines/grim/registry.h"
 
-#include "engine/imuse/imuse.h"
+#include "engines/grim/imuse/imuse.h"
 
 // Entries in the system.controls table
 

engines/grim/grim.h

@@ -26,7 +26,7 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include "engine/textobject.h"
+#include "engines/grim/textobject.h"
 
 class Actor;
 class SaveGame;

engines/grim/imuse/imuse.cpp

@@ -25,10 +25,10 @@
 
 #include "common/timer.h"
 
-#include "engine/grim.h"
-#include "engine/savegame.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/savegame.h"
 
-#include "engine/imuse/imuse.h"
+#include "engines/grim/imuse/imuse.h"
 
 Imuse *g_imuse = NULL;
 

engines/grim/imuse/imuse.h

@@ -26,7 +26,7 @@
 #ifndef IMUSE_H
 #define IMUSE_H
 
-#include "engine/imuse/imuse_track.h"
+#include "engines/grim/imuse/imuse_track.h"
 
 #define MAX_IMUSE_TRACKS 16
 #define MAX_IMUSE_FADETRACKS 16

engines/grim/imuse/imuse_mcmp_mgr.cpp

@@ -25,9 +25,9 @@
 
 #include "common/file.h"
 
-#include "engine/grim.h"
+#include "engines/grim/grim.h"
 
-#include "engine/imuse/imuse_mcmp_mgr.h"
+#include "engines/grim/imuse/imuse_mcmp_mgr.h"
 
 uint16 imuseDestTable[5786];
 

engines/grim/imuse/imuse_music.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "engine/imuse/imuse.h"
-#include "engine/imuse/imuse_tables.h"
+#include "engines/grim/imuse/imuse.h"
+#include "engines/grim/imuse/imuse_tables.h"
 
 void Imuse::setMusicState(int stateId) {
 	int l, num = -1;

engines/grim/imuse/imuse_script.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "engine/imuse/imuse.h"
+#include "engines/grim/imuse/imuse.h"
 
 void Imuse::flushTrack(Track *track) {
 	track->toBeRemoved = true;

engines/grim/imuse/imuse_sndmgr.cpp

@@ -25,10 +25,10 @@
 
 #include "common/endian.h"
 
-#include "engine/resource.h"
+#include "engines/grim/resource.h"
 
-#include "engine/imuse/imuse_sndmgr.h"
-#include "engine/imuse/imuse_mcmp_mgr.h"
+#include "engines/grim/imuse/imuse_sndmgr.h"
+#include "engines/grim/imuse/imuse_mcmp_mgr.h"
 
 ImuseSndMgr::ImuseSndMgr() {
 	for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {

engines/grim/imuse/imuse_sndmgr.h

@@ -26,8 +26,8 @@
 #ifndef IMUSE_SNDMGR_H
 #define IMUSE_SNDMGR_H
 
-#include "mixer/mixer.h"
-#include "mixer/audiostream.h"
+#include "sound/mixer.h"
+#include "sound/audiostream.h"
 
 class McmpMgr;
 class Block;

engines/grim/imuse/imuse_tables.cpp

@@ -25,7 +25,7 @@
 
 #include "common/sys.h"
 
-#include "engine/imuse/imuse_tables.h"
+#include "engines/grim/imuse/imuse_tables.h"
 
 ImuseTable grimStateMusicTable[] = {
 	{0, 1000,   0, 0, 60, 127,   0, ""},

engines/grim/imuse/imuse_track.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "engine/imuse/imuse.h"
+#include "engines/grim/imuse/imuse.h"
 
 int Imuse::allocSlot(int priority) {
 	int l, lowest_priority = 127;

engines/grim/imuse/imuse_track.h

@@ -26,7 +26,7 @@
 #ifndef IMUSE_TRACK_H
 #define IMUSE_TRACK_H
 
-#include "engine/imuse/imuse_sndmgr.h"
+#include "engines/grim/imuse/imuse_sndmgr.h"
 
 enum {
 	kFlagUnsigned = 1 << 0,

engines/grim/keyframe.cpp

@@ -25,8 +25,8 @@
 
 #include "common/endian.h"
 
-#include "engine/keyframe.h"
-#include "engine/textsplit.h"
+#include "engines/grim/keyframe.h"
+#include "engines/grim/textsplit.h"
 
 KeyframeAnim::KeyframeAnim(const char *filename, const char *data, int len) :
 		Resource(filename) {

engines/grim/keyframe.h

@@ -26,7 +26,7 @@
 #ifndef KEYFRAME_H
 #define KEYFRAME_H
 
-#include "engine/model.h"
+#include "engines/grim/model.h"
 
 class KeyframeAnim : public Resource {
 public:

engines/grim/lab.cpp

@@ -26,8 +26,8 @@
 #include "common/endian.h"
 #include "common/file.h"
 
-#include "engine/lab.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lab.h"
+#include "engines/grim/lua/lua.h"
 
 static int sortCallback(const void *entry1, const void *entry2) {
 	return strcasecmp(((Lab::LabEntry *)entry1)->filename, ((Lab::LabEntry *)entry2)->filename);

engines/grim/lipsync.cpp

@@ -25,7 +25,7 @@
 
 #include "common/endian.h"
 
-#include "engine/lipsync.h"
+#include "engines/grim/lipsync.h"
 
 // A new define that'll be around when theres a configure script :)
 #undef DEBUG_VERBOSE

engines/grim/lipsync.h

@@ -26,7 +26,7 @@
 #ifndef LIPSYNC_H
 #define LIPSYNC_H
 
-#include "engine/resource.h"
+#include "engines/grim/resource.h"
 
 class LipSync : public Resource {
 public:

engines/grim/localize.cpp

@@ -27,8 +27,8 @@
 #include "common/str.h"
 #include "common/endian.h"
 
-#include "engine/localize.h"
-#include "engine/grim.h"
+#include "engines/grim/localize.h"
+#include "engines/grim/grim.h"
 
 Localizer *g_localizer = NULL;
 

engines/grim/lua.cpp

@@ -25,18 +25,18 @@
 
 #include "common/endian.h"
 
-#include "engine/lua.h"
-#include "engine/actor.h"
-#include "engine/registry.h"
-#include "engine/localize.h"
-#include "engine/colormap.h"
-#include "engine/costume.h"
-#include "engine/grim.h"
-#include "engine/smush/smush.h"
-#include "engine/savegame.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lauxlib.h"
-#include "engine/imuse/imuse.h"
+#include "engines/grim/lua.h"
+#include "engines/grim/actor.h"
+#include "engines/grim/registry.h"
+#include "engines/grim/localize.h"
+#include "engines/grim/colormap.h"
+#include "engines/grim/costume.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/smush/smush.h"
+#include "engines/grim/savegame.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/imuse/imuse.h"
 
 extern Imuse *g_imuse;
 

engines/grim/lua.h

@@ -26,7 +26,7 @@
 #ifndef LUA_HH
 #define LUA_HH
 
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lua.h"
 
 class Vector3d;
 

engines/grim/lua/lapi.cpp

@@ -5,20 +5,20 @@
 */
 
 
-#include "engine/lua/lapi.h"
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/ldo.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lgc.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/lua.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lvm.h"
+#include "engines/grim/lua/lapi.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lgc.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lvm.h"
 
 
 char lua_ident[] = "$Lua: " LUA_VERSION " " LUA_COPYRIGHT " $\n"

engines/grim/lua/lapi.h

@@ -8,8 +8,8 @@
 #define lapi_h
 
 
-#include "engine/lua/lua.h"
-#include "engine/lua/lobject.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/lobject.h"
 
 TObject *luaA_Address(lua_Object o);
 void luaA_pushobject(TObject *o);

engines/grim/lua/lauxlib.cpp

@@ -10,10 +10,10 @@
 ** function. With care, these functions can be used by other libraries.
 */
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lua.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lmem.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lmem.h"
 
 void luaL_argerror(int32 numarg, const char *extramsg) {
 	const char *funcname;

engines/grim/lua/lauxlib.h

@@ -9,7 +9,7 @@
 #define auxlib_h
 
 
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lua.h"
 
 
 struct luaL_reg {

engines/grim/lua/lbuffer.cpp

@@ -5,9 +5,9 @@
 */
 
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lstate.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lstate.h"
 
 
 /*-------------------------------------------------------

engines/grim/lua/lbuiltin.cpp

@@ -5,19 +5,19 @@
 */
 
 
-#include "engine/lua/lapi.h"
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lbuiltin.h"
-#include "engine/lua/ldo.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/ltask.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lapi.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lbuiltin.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/ltask.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/lua.h"
 
 
 static void pushstring(TaggedString *s) {

engines/grim/lua/ldo.cpp

@@ -5,21 +5,21 @@
 */
 
 
-#include "engine/lua/ldo.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lgc.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lopcodes.h"
-#include "engine/lua/lparser.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/ltask.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/lua.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lundump.h"
-#include "engine/lua/lvm.h"
-#include "engine/lua/lzio.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lgc.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lopcodes.h"
+#include "engines/grim/lua/lparser.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/ltask.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lundump.h"
+#include "engines/grim/lua/lvm.h"
+#include "engines/grim/lua/lzio.h"
 
 #include "common/file.h"
 

engines/grim/lua/ldo.h

@@ -8,8 +8,8 @@
 #define ldo_h
 
 
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
 
 
 #define MULT_RET        255

engines/grim/lua/lfunc.cpp

@@ -6,9 +6,9 @@
 
 
 
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lstate.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lstate.h"
 
 #define gcsizeproto(p)	5  /* approximate "weight" for a prototype */
 #define gcsizeclosure(c) 1  /* approximate "weight" for a closure */

engines/grim/lua/lfunc.h

@@ -8,7 +8,7 @@
 #define lfunc_h
 
 
-#include "engine/lua/lobject.h"
+#include "engines/grim/lua/lobject.h"
 
 
 TProtoFunc *luaF_newproto();

engines/grim/lua/lgc.cpp

@@ -5,16 +5,16 @@
 */
 
 
-#include "engine/lua/ldo.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lgc.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lgc.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/lua.h"
 
 static int32 markobject (TObject *o);
 

engines/grim/lua/liolib.cpp

@@ -9,15 +9,15 @@
 #include "common/fs.h"
 #include "common/system.h"
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lua.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lualib.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lualib.h"
 
-#include "engine/resource.h"
-#include "engine/cmd_line.h"
-#include "engine/grim.h"
-#include "engine/savegame.h"
+#include "engines/grim/resource.h"
+#include "engines/grim/cmd_line.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/savegame.h"
 
 #if defined(UNIX) || defined(__SYMBIAN32__)
 #include <sys/stat.h>

engines/grim/lua/llex.cpp

@@ -5,16 +5,16 @@
 */
 
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/llex.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lparser.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/lstx.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lzio.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/llex.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lparser.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/lstx.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lzio.h"
 
 
 int32 lua_debug = 0;

engines/grim/lua/llex.h

@@ -7,8 +7,8 @@
 #ifndef llex_h
 #define llex_h
 
-#include "engine/lua/lobject.h"
-#include "engine/lua/lzio.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lzio.h"
 
 #define MAX_IFS 5
 

engines/grim/lua/lmathlib.cpp

@@ -5,9 +5,9 @@
 */
 
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lua.h"
-#include "engine/lua/lualib.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/lualib.h"
 
 #ifndef LOCAL_PI
 #define LOCAL_PI          (3.14159265358979323846)

engines/grim/lua/lmem.cpp

@@ -5,9 +5,9 @@
 */
 
 
-#include "engine/lua/lmem.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lua.h"
 
 int32 luaM_growaux(void **block, int32 nelems, int32 size, const char *errormsg, int32 limit) {
 	if (nelems >= limit)

engines/grim/lua/lobject.cpp

@@ -4,8 +4,8 @@
 ** See Copyright Notice in lua.h
 */
 
-#include "engine/lua/lobject.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lua.h"
 
 const char *luaO_typenames[] = { // ORDER LUA_T
 	"userdata", "number", "string", "table", "function", "function", "task",

engines/grim/lua/lobject.h

@@ -7,10 +7,10 @@
 #ifndef lobject_h
 #define lobject_h
 
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lua.h"
 
 #ifdef LUA_DEBUG
-#include "engine/lua/lauxlib.h"
+#include "engines/grim/lua/lauxlib.h"
 #define LUA_INTERNALERROR(s)	luaL_verror("INTERNAL ERROR - %s [%s:%d]", (s), __FILE__, __LINE__)
 #define LUA_ASSERT(c, s)			{ if (!(c)) LUA_INTERNALERROR(s); }
 #else

engines/grim/lua/lrestore.cpp

@@ -1,19 +1,19 @@
 #include "common/endian.h"
 #include "common/debug.h"
 
-#include "engine/grim.h"
-#include "engine/savegame.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/savegame.h"
 
-#include "engine/lua/ltask.h"
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/ldo.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/lvm.h"
-#include "engine/lua/lopcodes.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/ltask.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/lvm.h"
+#include "engines/grim/lua/lopcodes.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/lua.h"
 
 RestoreCallback restoreCallbackPtr = NULL;
 

engines/grim/lua/lsave.cpp

@@ -1,19 +1,19 @@
-#include "engine/savegame.h"
-#include "engine/grim.h"
+#include "engines/grim/savegame.h"
+#include "engines/grim/grim.h"
 
 #include "common/endian.h"
 #include "common/debug.h"
 
-#include "engine/lua/ltask.h"
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/ldo.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/lvm.h"
-#include "engine/lua/lopcodes.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/ltask.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/lvm.h"
+#include "engines/grim/lua/lopcodes.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/lua.h"
 
 PointerId makeIdFromPointer(void *ptr) {
 	PointerId pointer;

engines/grim/lua/lstate.cpp

@@ -6,22 +6,22 @@
 
 #include "common/endian.h"
 
-#include "engine/actor.h"
+#include "engines/grim/actor.h"
 
-#include "engine/lua/lbuiltin.h"
-#include "engine/lua/ldo.h"
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lgc.h"
-#include "engine/lua/llex.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/ltask.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/lualib.h"
-#include "engine/lua/luadebug.h"
+#include "engines/grim/lua/lbuiltin.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lgc.h"
+#include "engines/grim/lua/llex.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/ltask.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/lualib.h"
+#include "engines/grim/lua/luadebug.h"
 
 LState *lua_state = NULL;
 

engines/grim/lua/lstate.h

@@ -7,7 +7,7 @@
 #ifndef lstate_h
 #define lstate_h
 
-#include "engine/lua/lobject.h"
+#include "engines/grim/lua/lobject.h"
 
 #include <setjmp.h>
 

engines/grim/lua/lstring.cpp

@@ -6,11 +6,11 @@
 
 #include "common/util.h"
 
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/lua.h"
 
 
 #define gcsizestring(l)	(1 + (l / 64))  // "weight" for a string with length 'l'

engines/grim/lua/lstring.h

@@ -8,7 +8,7 @@
 #define lstring_h
 
 
-#include "engine/lua/lobject.h"
+#include "engines/grim/lua/lobject.h"
 
 
 void luaS_init();

engines/grim/lua/lstrlib.cpp

@@ -5,9 +5,9 @@
 */
 
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lua.h"
-#include "engine/lua/lualib.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/lualib.h"
 
 static void addnchar(const char *s, int32 n) {
 	char *b = luaL_openspace(n);

engines/grim/lua/lstx.cpp

@@ -54,18 +54,18 @@ by  GNU Bison version 1.25
 */
 
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/ldo.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/llex.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lopcodes.h"
-#include "engine/lua/lparser.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/lua.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lzio.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/llex.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lopcodes.h"
+#include "engines/grim/lua/lparser.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lzio.h"
 
 
 int luaY_parse (void);

engines/grim/lua/ltable.cpp

@@ -4,12 +4,12 @@
 ** See Copyright Notice in lua.h
 */
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/lua.h"
 
 #define gcsize(n)		(1 + (n / 16))
 #define nuse(t)			((t)->nuse)

engines/grim/lua/ltable.h

@@ -7,7 +7,7 @@
 #ifndef ltable_h
 #define ltable_h
 
-#include "engine/lua/lobject.h"
+#include "engines/grim/lua/lobject.h"
 
 #define node(t, i)	(&(t)->node[i])
 #define ref(n)		(&(n)->ref)

engines/grim/lua/ltask.h

@@ -1,8 +1,8 @@
 #ifndef ltask_h
 #define ltask_h
 
-#include "engine/lua/lua.h"
-#include "engine/lua/lstate.h"
+#include "engines/grim/lua/lua.h"
+#include "engines/grim/lua/lstate.h"
 
 extern int32 task_tag;
 

engines/grim/lua/ltm.cpp

@@ -5,11 +5,11 @@
 */
 
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/ltm.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/ltm.h"
 
 
 const char *luaT_eventname[] = {  // ORDER IM

engines/grim/lua/ltm.h

@@ -8,8 +8,8 @@
 #define ltm_h
 
 
-#include "engine/lua/lobject.h"
-#include "engine/lua/lstate.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lstate.h"
 
 /*
 * WARNING: if you change the order of this enumeration,

engines/grim/lua/luadebug.h

@@ -9,7 +9,7 @@
 #define luadebug_h
 
 
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lua.h"
 
 typedef lua_Object lua_Function;
 

engines/grim/lua/lualib.h

@@ -8,7 +8,7 @@
 #ifndef lualib_h
 #define lualib_h
 
-#include "engine/lua/lua.h"
+#include "engines/grim/lua/lua.h"
 
 void lua_iolibopen();
 void lua_strlibopen();

engines/grim/lua/lundump.cpp

@@ -4,11 +4,11 @@
 ** See Copyright Notice in lua.h
 */
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/lundump.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/lundump.h"
 
 static float conv_float(const byte *data) {
 	const byte *udata = data;

engines/grim/lua/lundump.h

@@ -7,8 +7,8 @@
 #ifndef lundump_h
 #define lundump_h
 
-#include "engine/lua/lobject.h"
-#include "engine/lua/lzio.h"
+#include "engines/grim/lua/lobject.h"
+#include "engines/grim/lua/lzio.h"
 
 #define ID_CHUNK		27              // ESC
 #define ID_FUNCTION		'#'

engines/grim/lua/lvm.cpp

@@ -5,18 +5,18 @@
 */
 
 
-#include "engine/lua/lauxlib.h"
-#include "engine/lua/ldo.h"
-#include "engine/lua/lfunc.h"
-#include "engine/lua/lgc.h"
-#include "engine/lua/lmem.h"
-#include "engine/lua/lopcodes.h"
-#include "engine/lua/lstate.h"
-#include "engine/lua/lstring.h"
-#include "engine/lua/ltable.h"
-#include "engine/lua/ltm.h"
-#include "engine/lua/luadebug.h"
-#include "engine/lua/lvm.h"
+#include "engines/grim/lua/lauxlib.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lfunc.h"
+#include "engines/grim/lua/lgc.h"
+#include "engines/grim/lua/lmem.h"
+#include "engines/grim/lua/lopcodes.h"
+#include "engines/grim/lua/lstate.h"
+#include "engines/grim/lua/lstring.h"
+#include "engines/grim/lua/ltable.h"
+#include "engines/grim/lua/ltm.h"
+#include "engines/grim/lua/luadebug.h"
+#include "engines/grim/lua/lvm.h"
 
 #define skip_word(pc)	(pc += 2)
 #define get_word(pc)	((*((pc) + 1) << 8)|(*(pc)))

engines/grim/lua/lvm.h

@@ -8,8 +8,8 @@
 #define lvm_h
 
 
-#include "engine/lua/ldo.h"
-#include "engine/lua/lobject.h"
+#include "engines/grim/lua/ldo.h"
+#include "engines/grim/lua/lobject.h"
 
 
 #define tonumber(o) ((ttype(o) != LUA_T_NUMBER) && (luaV_tonumber(o) != 0))

engines/grim/lua/lzio.cpp

@@ -5,7 +5,7 @@
 */
 
 
-#include "engine/lua/lzio.h"
+#include "engines/grim/lua/lzio.h"
 
 #include "common/file.h"
 

engines/grim/main.cpp

@@ -26,20 +26,20 @@
 #include "common/fs.h"
 #include "common/events.h"
 
-#include "engine/lua.h"
-#include "engine/registry.h"
-#include "engine/localize.h"
-#include "engine/grim.h"
-#include "engine/version.h"
-#include "engine/cmd_line.h"
-#include "engine/smush/smush.h"
-#include "engine/imuse/imuse.h"
-#include "engine/lua/lualib.h"
+#include "engines/grim/lua.h"
+#include "engines/grim/registry.h"
+#include "engines/grim/localize.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/version.h"
+#include "engines/grim/cmd_line.h"
+#include "engines/grim/smush/smush.h"
+#include "engines/grim/imuse/imuse.h"
+#include "engines/grim/lua/lualib.h"
 
 #ifdef USE_OPENGL
-#include "engine/gfx_opengl.h"
+#include "engines/grim/gfx_opengl.h"
 #endif
-#include "engine/gfx_tinygl.h"
+#include "engines/grim/gfx_tinygl.h"
 
 // Hacky global toggles for experimental/debug code
 bool SHOWFPS_GLOBAL, TINYGL_GLOBAL;

engines/grim/material.cpp

@@ -25,8 +25,8 @@
 
 #include "common/endian.h"
 
-#include "engine/material.h"
-#include "engine/gfx_base.h"
+#include "engines/grim/material.h"
+#include "engines/grim/gfx_base.h"
 
 Material::Material(const char *filename, const char *data, int len, const CMap &cmap) :
 		Resource(filename), _cmap((CMap *) &cmap) {

engines/grim/material.h

@@ -26,7 +26,7 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H
 
-#include "engine/resource.h"
+#include "engines/grim/resource.h"
 
 class Material : public Resource {
 public:

engines/grim/matrix3.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "engine/matrix3.h"
+#include "engines/grim/matrix3.h"
 
 void Matrix3::setAsIdentity() {
 	_right.set(1.f, 0.f, 0.f);

engines/grim/matrix3.h

@@ -26,7 +26,7 @@
 #ifndef ENGINE_MATRIX3_H
 #define ENGINE_MATRIX3_H
 
-#include "engine/vector3d.h"
+#include "engines/grim/vector3d.h"
 
 // matrix 3 is a rotation matrix
 class Matrix3{

engines/grim/matrix4.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "engine/matrix4.h"
+#include "engines/grim/matrix4.h"
 
 Matrix4::Matrix4() {
 	_pos.set(0.f, 0.f, 0.f);

engines/grim/matrix4.h

@@ -26,7 +26,7 @@
 #ifndef ENGINE_MATRIX4_H
 #define ENGINE_MATRIX4_H
 
-#include "engine/matrix3.h"
+#include "engines/grim/matrix3.h"
 
 // matrix 4 is a rotation matrix + position
 class Matrix4 {

engines/grim/model.cpp

@@ -25,11 +25,11 @@
 
 #include "common/endian.h"
 
-#include "engine/model.h"
-#include "engine/actor.h"
-#include "engine/material.h"
-#include "engine/textsplit.h"
-#include "engine/gfx_base.h"
+#include "engines/grim/model.h"
+#include "engines/grim/actor.h"
+#include "engines/grim/material.h"
+#include "engines/grim/textsplit.h"
+#include "engines/grim/gfx_base.h"
 
 Model::Model(const char *filename, const char *data, int len, const CMap &cmap) :
 		Resource(filename), _numMaterials(0), _numGeosets(0) {

engines/grim/model.h

@@ -26,8 +26,8 @@
 #ifndef MODEL_H
 #define MODEL_H
 
-#include "engine/resource.h"
-#include "engine/matrix4.h"
+#include "engines/grim/resource.h"
+#include "engines/grim/matrix4.h"
 
 class TextSplitter;
 

engines/grim/objectstate.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "engine/objectstate.h"
+#include "engines/grim/objectstate.h"
 
 ObjectState::ObjectState(int setupID, ObjectState::Position pos, const char *bitmap, const char *zbitmap, bool visible) :
 		_setupID(setupID), _pos(pos) {

engines/grim/objectstate.h

@@ -26,7 +26,7 @@
 #ifndef OSTATE_H
 #define OSTATE_H
 
-#include "engine/bitmap.h"
+#include "engines/grim/bitmap.h"
 
 class ObjectState {
 public:

engines/grim/primitives.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "engine/gfx_base.h"
-#include "engine/primitives.h"
+#include "engines/grim/gfx_base.h"
+#include "engines/grim/primitives.h"
 
 PrimitiveObject::PrimitiveObject() {
 	memset(&_color, 0, sizeof(Color));

engines/grim/primitives.h

@@ -28,7 +28,7 @@
 
 #include "common/rect.h"
 
-#include "engine/color.h"
+#include "engines/grim/color.h"
 
 class PrimitiveObject {
 public:

engines/grim/registry.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "engine/registry.h"
-#include "engine/cmd_line.h"
+#include "engines/grim/registry.h"
+#include "engines/grim/cmd_line.h"
 
 Registry *g_registry = NULL;
 

engines/grim/resource.cpp

@@ -23,13 +23,13 @@
  *
  */
 
-#include "engine/resource.h"
-#include "engine/colormap.h"
-#include "engine/costume.h"
-#include "engine/keyframe.h"
-#include "engine/material.h"
-#include "engine/grim.h"
-#include "engine/lipsync.h"
+#include "engines/grim/resource.h"
+#include "engines/grim/colormap.h"
+#include "engines/grim/costume.h"
+#include "engines/grim/keyframe.h"
+#include "engines/grim/material.h"
+#include "engines/grim/grim.h"
+#include "engines/grim/lipsync.h"
 
 ResourceLoader *g_resourceloader = NULL;
 

engines/grim/resource.h

@@ -28,7 +28,7 @@
 
 #include "common/archive.h"
 
-#include "engine/lab.h"
+#include "engines/grim/lab.h"
 
 #include <map>
 

engines/grim/savegame.cpp

@@ -26,7 +26,7 @@
 #include "common/endian.h"
 #include "common/system.h"
 
-#include "engine/savegame.h"
+#include "engines/grim/savegame.h"
 
 #define SAVEGAME_HEADERTAG	'RSAV'
 #define SAVEGAME_FOOTERTAG	'ESAV'

engines/grim/scene.cpp

@@ -23,12 +23,12 @@
  *
  */
 
-#include "engine/scene.h"
-#include "engine/textsplit.h"
-#include "engine/colormap.h"
-#include "engine/grim.h"
+#include "engines/grim/scene.h"
+#include "engines/grim/textsplit.h"
+#include "engines/grim/colormap.h"
+#include "engines/grim/grim.h"
 
-#include "engine/imuse/imuse.h"
+#include "engines/grim/imuse/imuse.h"
 
 Scene::Scene(const char *name, const char *buf, int len) :
 		_locked(false), _name(name), _enableLights(false) {

engines/grim/scene.h

@@ -26,9 +26,9 @@
 #ifndef SCENE_H
 #define SCENE_H
 
-#include "engine/color.h"
-#include "engine/walkplane.h"
-#include "engine/objectstate.h"
+#include "engines/grim/color.h"
+#include "engines/grim/walkplane.h"
+#include "engines/grim/objectstate.h"
 
 // The Lua code calls this a "set".
 

engines/grim/smush/blocky16.cpp

@@ -26,7 +26,7 @@
 #include "common/endian.h"
 #include "common/debug.h"
 
-#include "engine/smush/blocky16.h"
+#include "engines/grim/smush/blocky16.h"
 
 #if defined(SYSTEM_NEED_ALIGNMENT)
 

engines/grim/smush/smush.cpp

@@ -27,8 +27,8 @@
 #include "common/timer.h"
 #include "common/file.h"
 
-#include "engine/smush/smush.h"
-#include "engine/grim.h"
+#include "engines/grim/smush/smush.h"
+#include "engines/grim/grim.h"
 
 #define SMUSH_LOOPMOVIE(x)		(x & 0x000001)
 #define SMUSH_ALTSPEED(x)		(x & 0x000004)

engines/grim/smush/smush.h

@@ -32,10 +32,10 @@
 #include <zlib.h>
 #endif
 
-#include "engine/smush/blocky16.h"
+#include "engines/grim/smush/blocky16.h"
 
-#include "mixer/mixer.h"
-#include "mixer/audiostream.h"
+#include "sound/mixer.h"
+#include "sound/audiostream.h"
 
 struct SavePos {
 	uint32 filePos;

engines/grim/textobject.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "engine/textobject.h"
+#include "engines/grim/textobject.h"
 
 Common::String parseMsgText(const char *msg, char *msgId);
 

engines/grim/textobject.h

@@ -26,8 +26,8 @@
 #ifndef TEXTOBJECT_H
 #define TEXTOBJECT_H
 
-#include "engine/font.h"
-#include "engine/gfx_base.h"
+#include "engines/grim/font.h"
+#include "engines/grim/gfx_base.h"
 
 struct TextObjectDefaults {
 	Color fgColor;

engines/grim/textsplit.cpp

@@ -25,7 +25,7 @@
 
 #include "common/debug.h"
 
-#include "engine/textsplit.h"
+#include "engines/grim/textsplit.h"
 
 // FIXME: Replace this with a proper parser (this is just too dodgy :)
 int residual_vsscanf(const char *str, int field_count, const char *format, va_list ap) {

engines/grim/version.cpp

@@ -18,8 +18,8 @@
  *
  */
 
-#include "engine/internal_version.h"
-#include "engine/version.h"
+#include "engines/grim/internal_version.h"
+#include "engines/grim/version.h"
 
 const char *gResidualVersion = RESIDUAL_VERSION;
 const char *gResidualBuildDate = __DATE__ " " __TIME__;