diff --git a/common/debug.cpp b/common/debug.cpp index 005da9b82b4..292f5439593 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -20,8 +20,8 @@ * */ -#include "stdafx.h" -#include "debug.h" +#include "common/sys.h" +#include "common/debug.h" #include #include diff --git a/common/debug.h b/common/debug.h index 927e91bafbd..2963d9c2d0f 100644 --- a/common/debug.h +++ b/common/debug.h @@ -20,10 +20,10 @@ * */ -#include "bits.h" +#include "common/platform.h" -#ifndef DEBUG_H -#define DEBUG_H +#ifndef COMMON_DEBUG_H +#define COMMON_DEBUG_H enum enDebugLevels { DEBUG_NONE, diff --git a/common/matrix3.cpp b/common/matrix3.cpp index ca8cb1b38f5..642088fe1b2 100644 --- a/common/matrix3.cpp +++ b/common/matrix3.cpp @@ -20,7 +20,7 @@ * */ -#include "matrix3.h" +#include "common/matrix3.h" #include diff --git a/common/matrix3.h b/common/matrix3.h index 901bca0fe6d..2c2925e2031 100644 --- a/common/matrix3.h +++ b/common/matrix3.h @@ -20,10 +20,10 @@ * */ -#ifndef MATRIX3_HH -#define MATRIX3_HH +#ifndef COMMON_MATRIX3_H +#define COMMON_MATRIX3_H -#include "vector3d.h" +#include "common/vector3d.h" // matrix 3 is a rotation matrix class Matrix3{ diff --git a/common/matrix4.cpp b/common/matrix4.cpp index d6ea831236d..50150030fbd 100644 --- a/common/matrix4.cpp +++ b/common/matrix4.cpp @@ -20,7 +20,7 @@ * */ -#include "matrix4.h" +#include "common/matrix4.h" Matrix4::Matrix4() { _pos.set(0.f, 0.f, 0.f); diff --git a/common/matrix4.h b/common/matrix4.h index 3a4744e8ad3..f8695cf239a 100644 --- a/common/matrix4.h +++ b/common/matrix4.h @@ -20,11 +20,11 @@ * */ -#ifndef MATRIX4_HH -#define MATRIX4_HH +#ifndef COMMON_MATRIX4_H +#define COMMON_MATRIX4_H -#include "vector3d.h" -#include "matrix3.h" +#include "common/vector3d.h" +#include "common/matrix3.h" // matrix 4 is a rotation matrix + position class Matrix4 { diff --git a/common/platform.h b/common/platform.h index bead8a09fba..ea0c48c0130 100644 --- a/common/platform.h +++ b/common/platform.h @@ -20,11 +20,11 @@ * */ -#ifndef BITS_H -#define BITS_H +#ifndef COMMON_PLATFORM_H +#define COMMON_PLATFORM_H -#include "stdafx.h" -#include "vector3d.h" +#include "common/sys.h" +#include "common/vector3d.h" #include #include diff --git a/common/sys.h b/common/sys.h index cca07284c46..16b4c4b3e94 100644 --- a/common/sys.h +++ b/common/sys.h @@ -20,8 +20,8 @@ * */ -#ifndef _STDAFX_H -#define _STDAFX_H +#ifndef COMMON_SYS_H +#define COMMON_SYS_H typedef struct Mutex *MutexRef; diff --git a/common/timer.cpp b/common/timer.cpp index 73e4ab169cb..9790700fcec 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -20,11 +20,12 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "timer.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" +#include "common/timer.h" + +#include "engine/backend/driver.h" Timer *g_timer = NULL; diff --git a/common/timer.h b/common/timer.h index c70f5bad75c..cc6e55b015c 100644 --- a/common/timer.h +++ b/common/timer.h @@ -23,8 +23,8 @@ #ifndef COMMON_TIMER_H #define COMMON_TIMER_H -#include "stdafx.h" -#include "bits.h" +#include "common/sys.h" +#include "common/platform.h" #define MAX_TIMERS 3 diff --git a/common/vector3d.h b/common/vector3d.h index b43fa387d81..f6d4c863ea0 100644 --- a/common/vector3d.h +++ b/common/vector3d.h @@ -20,8 +20,8 @@ * */ -#ifndef VECTOR3D_HH -#define VECTOR3D_HH +#ifndef COMMON_VECTOR3D_H +#define COMMON_VECTOR3D_H #include diff --git a/dists/msvc9/residual.vcproj b/dists/msvc9/residual.vcproj index 5de82179fea..490e8c5b828 100644 --- a/dists/msvc9/residual.vcproj +++ b/dists/msvc9/residual.vcproj @@ -188,45 +188,664 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine/actor.cpp b/engine/actor.cpp index c3cd7e41530..661adcb84b3 100644 --- a/engine/actor.cpp +++ b/engine/actor.cpp @@ -20,19 +20,20 @@ * */ -#include "stdafx.h" -#include "actor.h" -#include "engine.h" -#include "costume.h" -#include "lipsynch.h" -#include "localize.h" -#include "driver.h" -#include "smush.h" -#include "walkplane.h" +#include "common/sys.h" #include "mixer/mixer.h" -#include "imuse/imuse.h" +#include "engine/actor.h" +#include "engine/engine.h" +#include "engine/costume.h" +#include "engine/lipsynch.h" +#include "engine/localize.h" +#include "engine/smush/smush.h" +#include "engine/walkplane.h" +#include "engine/imuse/imuse.h" + +#include "backend/driver.h" #include #include diff --git a/engine/actor.h b/engine/actor.h index fd83ab38ac4..cd71ab0bd6b 100644 --- a/engine/actor.h +++ b/engine/actor.h @@ -23,10 +23,11 @@ #ifndef ACTOR_H #define ACTOR_H -#include "color.h" -#include "vector3d.h" -#include "resource.h" -#include "font.h" +#include "common/vector3d.h" + +#include "engine/color.h" +#include "engine/resource.h" +#include "engine/font.h" #include #include diff --git a/engine/backend/driver.h b/engine/backend/driver.h index af564016d4d..0c2a57632bb 100644 --- a/engine/backend/driver.h +++ b/engine/backend/driver.h @@ -20,18 +20,19 @@ * */ -#ifndef DRIVER_H -#define DRIVER_H +#ifndef BACKEND_DRIVER_H +#define BACKEND_DRIVER_H -#include "bits.h" -#include "vector3d.h" -#include "color.h" -#include "model.h" -#include "scene.h" -#include "colormap.h" -#include "font.h" -#include "primitives.h" -#include "actor.h" +#include "common/platform.h" +#include "common/vector3d.h" + +#include "engine/color.h" +#include "engine/model.h" +#include "engine/scene.h" +#include "engine/colormap.h" +#include "engine/font.h" +#include "engine/primitives.h" +#include "engine/actor.h" class Material; class Bitmap; diff --git a/engine/backend/sdl/driver_gl.cpp b/engine/backend/sdl/driver_gl.cpp index 73434d13373..3671eaba888 100644 --- a/engine/backend/sdl/driver_gl.cpp +++ b/engine/backend/sdl/driver_gl.cpp @@ -20,10 +20,12 @@ * */ -#include "debug.h" -#include "colormap.h" -#include "material.h" -#include "driver_gl.h" +#include "common/debug.h" + +#include "engine/colormap.h" +#include "engine/material.h" + +#include "engine/backend/sdl/driver_gl.h" // Constructor. Should create the driver and open screens, etc. DriverGL::DriverGL(int screenW, int screenH, int screenBPP, bool fullscreen) { diff --git a/engine/backend/sdl/driver_gl.h b/engine/backend/sdl/driver_gl.h index 19eb24f3642..e622449fe5a 100644 --- a/engine/backend/sdl/driver_gl.h +++ b/engine/backend/sdl/driver_gl.h @@ -20,17 +20,19 @@ * */ -#ifndef DRIVER_GL_H -#define DRIVER_GL_H +#ifndef BACKEND_DRIVER_GL_H +#define BACKEND_DRIVER_GL_H -#include "bits.h" -#include "vector3d.h" -#include "color.h" -#include "model.h" -#include "colormap.h" -#include "bitmap.h" -#include "driver.h" -#include "driver_sdl.h" +#include "common/platform.h" +#include "common/vector3d.h" + +#include "engine/color.h" +#include "engine/model.h" +#include "engine/colormap.h" +#include "engine/bitmap.h" + +#include "engine/backend/driver.h" +#include "engine/backend/sdl/driver_sdl.h" #include #include diff --git a/engine/backend/sdl/driver_sdl.cpp b/engine/backend/sdl/driver_sdl.cpp index 6d0ef982a8a..c54b363ec74 100644 --- a/engine/backend/sdl/driver_sdl.cpp +++ b/engine/backend/sdl/driver_sdl.cpp @@ -20,8 +20,9 @@ * */ -#include "debug.h" -#include "driver_sdl.h" +#include "common/debug.h" + +#include "engine/backend/sdl/driver_sdl.h" // NOTE: This is not a complete driver, it needs to be subclassed // to provide rendering functionality. diff --git a/engine/backend/sdl/driver_sdl.h b/engine/backend/sdl/driver_sdl.h index 8c821c6744d..1968bd10c3d 100644 --- a/engine/backend/sdl/driver_sdl.h +++ b/engine/backend/sdl/driver_sdl.h @@ -20,16 +20,17 @@ * */ -#ifndef DRIVER_SDL_H -#define DRIVER_SDL_H +#ifndef BACKEND_DRIVER_SDL_H +#define BACKEND_DRIVER_SDL_H -#include "bits.h" -#include "vector3d.h" -#include "color.h" -#include "model.h" -#include "colormap.h" -#include "bitmap.h" -#include "driver.h" +#include "common/sys.h" +#include "common/vector3d.h" + +#include "engine/color.h" +#include "engine/model.h" +#include "engine/colormap.h" +#include "engine/bitmap.h" +#include "engine/backend/driver.h" #include diff --git a/engine/backend/sdl/driver_tinygl.cpp b/engine/backend/sdl/driver_tinygl.cpp index c2f39212d59..09fa0582a24 100644 --- a/engine/backend/sdl/driver_tinygl.cpp +++ b/engine/backend/sdl/driver_tinygl.cpp @@ -20,13 +20,14 @@ * */ -#include "debug.h" -#include "colormap.h" -#include "material.h" -#include "driver_tinygl.h" +#include "common/debug.h" -#include "tinygl/gl.h" -#include "tinygl/zgl.h" +#include "engine/colormap.h" +#include "engine/material.h" +#include "engine/backend/sdl/driver_tinygl.h" + +#include "engine/tinygl/gl.h" +#include "engine/tinygl/zgl.h" // func below is from Mesa glu sources static void lookAt(TGLfloat eyex, TGLfloat eyey, TGLfloat eyez, TGLfloat centerx, diff --git a/engine/backend/sdl/driver_tinygl.h b/engine/backend/sdl/driver_tinygl.h index 682c9b604d0..ebe7f69aec4 100644 --- a/engine/backend/sdl/driver_tinygl.h +++ b/engine/backend/sdl/driver_tinygl.h @@ -20,20 +20,21 @@ * */ -#ifndef DRIVER_TINYGL_H -#define DRIVER_TINYGL_H +#ifndef BACKEND_DRIVER_TINYGL_H +#define BACKEND_DRIVER_TINYGL_H -#include "bits.h" -#include "vector3d.h" -#include "color.h" -#include "model.h" -#include "colormap.h" -#include "bitmap.h" -#include "driver.h" -#include "driver_sdl.h" +#include "common/platform.h" +#include "common/vector3d.h" -#include "tinygl/gl.h" -#include "tinygl/zgl.h" +#include "engine/color.h" +#include "engine/model.h" +#include "engine/colormap.h" +#include "engine/bitmap.h" +#include "engine/backend/driver.h" +#include "engine/backend/sdl/driver_sdl.h" + +#include "engine/tinygl/gl.h" +#include "engine/tinygl/zgl.h" #include diff --git a/engine/bitmap.cpp b/engine/bitmap.cpp index 7a3441fc5b7..9a48b1e8194 100644 --- a/engine/bitmap.cpp +++ b/engine/bitmap.cpp @@ -20,12 +20,13 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "bitmap.h" -#include "smush.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/bitmap.h" +#include "engine/smush/smush.h" +#include "engine/backend/driver.h" #include #include diff --git a/engine/bitmap.h b/engine/bitmap.h index 6e91cb5d1b1..854cd12cbfd 100644 --- a/engine/bitmap.h +++ b/engine/bitmap.h @@ -23,8 +23,9 @@ #ifndef BITMAP_H #define BITMAP_H -#include "resource.h" -#include "debug.h" +#include "common/debug.h" + +#include "engine/resource.h" #include diff --git a/engine/color.h b/engine/color.h index c86f3feec93..e2b2bc7b87b 100644 --- a/engine/color.h +++ b/engine/color.h @@ -23,7 +23,7 @@ #ifndef COLOR_H #define COLOR_H -#include "bits.h" +#include "common/platform.h" class Color { public: diff --git a/engine/colormap.h b/engine/colormap.h index 835a5450ad3..f43ba8d95e9 100644 --- a/engine/colormap.h +++ b/engine/colormap.h @@ -23,8 +23,9 @@ #ifndef COLORMAP_H #define COLORMAP_H -#include "debug.h" -#include "resource.h" +#include "common/debug.h" + +#include "engine/resource.h" #include diff --git a/engine/costume.cpp b/engine/costume.cpp index 460ffc0a666..979e63c5e73 100644 --- a/engine/costume.cpp +++ b/engine/costume.cpp @@ -20,19 +20,20 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "colormap.h" -#include "costume.h" -#include "actor.h" -#include "textsplit.h" -#include "engine.h" -#include "keyframe.h" -#include "material.h" -#include "model.h" -#include "lua.h" +#include "common/sys.h" +#include "common/debug.h" -#include "imuse/imuse.h" +#include "engine/colormap.h" +#include "engine/costume.h" +#include "engine/actor.h" +#include "engine/textsplit.h" +#include "engine/engine.h" +#include "engine/keyframe.h" +#include "engine/material.h" +#include "engine/model.h" +#include "engine/lua.h" + +#include "engine/imuse/imuse.h" #include #include diff --git a/engine/costume.h b/engine/costume.h index e906aca4017..bdb80f161dd 100644 --- a/engine/costume.h +++ b/engine/costume.h @@ -23,8 +23,9 @@ #ifndef COSTUME_H #define COSTUME_H -#include "matrix4.h" -#include "model.h" +#include "common/matrix4.h" + +#include "engine/model.h" #include diff --git a/engine/engine.cpp b/engine/engine.cpp index 793d2a81ba2..71be4077e5d 100644 --- a/engine/engine.cpp +++ b/engine/engine.cpp @@ -20,19 +20,20 @@ * */ -#include "stdafx.h" -#include "engine.h" -#include "scene.h" -#include "lua.h" -#include "colormap.h" -#include "actor.h" -#include "textobject.h" -#include "smush.h" -#include "driver.h" -#include "savegame.h" -#include "lipsynch.h" +#include "common/sys.h" -#include "imuse/imuse.h" +#include "engine/engine.h" +#include "engine/scene.h" +#include "engine/lua.h" +#include "engine/colormap.h" +#include "engine/actor.h" +#include "engine/textobject.h" +#include "engine/smush/smush.h" +#include "engine/backend/driver.h" +#include "engine/savegame.h" +#include "engine/lipsynch.h" + +#include "engine/imuse/imuse.h" #include diff --git a/engine/engine.h b/engine/engine.h index 969cbfb1e13..673c198191d 100644 --- a/engine/engine.h +++ b/engine/engine.h @@ -23,13 +23,14 @@ #ifndef ENGINE_H #define ENGINE_H -#include "bits.h" -#include "scene.h" -#include "textobject.h" -#include "primitives.h" -#include "font.h" -#include "lua.h" -#include "savegame.h" +#include "common/sys.h" + +#include "engine/scene.h" +#include "engine/textobject.h" +#include "engine/primitives.h" +#include "engine/font.h" +#include "engine/lua.h" +#include "engine/savegame.h" #include #include diff --git a/engine/font.cpp b/engine/font.cpp index c191cdf7fd4..17f196dc993 100644 --- a/engine/font.cpp +++ b/engine/font.cpp @@ -20,11 +20,12 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "font.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/font.h" +#include "engine/backend/driver.h" #include diff --git a/engine/font.h b/engine/font.h index ec3f9749975..30c1b427cbd 100644 --- a/engine/font.h +++ b/engine/font.h @@ -23,8 +23,9 @@ #ifndef FONT_H #define FONT_H -#include "bits.h" -#include "resource.h" +#include "common/platform.h" + +#include "engine/resource.h" #include diff --git a/engine/imuse/imuse.cpp b/engine/imuse/imuse.cpp index 2f37ff5c219..09726344138 100644 --- a/engine/imuse/imuse.cpp +++ b/engine/imuse/imuse.cpp @@ -20,18 +20,19 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "timer.h" -#include "engine.h" -#include "savegame.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" +#include "common/timer.h" + +#include "engine/engine.h" +#include "engine/savegame.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" -#include "imuse/imuse.h" -#include "imuse/imuse_sndmgr.h" +#include "engine/imuse/imuse.h" +#include "engine/imuse/imuse_sndmgr.h" Imuse *g_imuse = NULL; diff --git a/engine/imuse/imuse.h b/engine/imuse/imuse.h index c348008319d..2a01c9b9eb3 100644 --- a/engine/imuse/imuse.h +++ b/engine/imuse/imuse.h @@ -23,16 +23,17 @@ #ifndef IMUSE_H #define IMUSE_H -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "lua.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/lua.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" -#include "imuse/imuse_sndmgr.h" -#include "imuse/imuse_mcmp_mgr.h" +#include "engine/imuse/imuse_sndmgr.h" +#include "engine/imuse/imuse_mcmp_mgr.h" #define MAX_IMUSE_TRACKS 16 #define MAX_IMUSE_FADETRACKS 16 diff --git a/engine/imuse/imuse_mcmp_mgr.cpp b/engine/imuse/imuse_mcmp_mgr.cpp index 44df331c00d..69cd3d7953d 100644 --- a/engine/imuse/imuse_mcmp_mgr.cpp +++ b/engine/imuse/imuse_mcmp_mgr.cpp @@ -20,13 +20,14 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "resource.h" -#include "engine.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" -#include "imuse/imuse_mcmp_mgr.h" +#include "engine/resource.h" +#include "engine/engine.h" + +#include "engine/imuse/imuse_mcmp_mgr.h" uint16 imuseDestTable[5786]; diff --git a/engine/imuse/imuse_mcmp_mgr.h b/engine/imuse/imuse_mcmp_mgr.h index e35e0cb9f6a..6add6ba4f6a 100644 --- a/engine/imuse/imuse_mcmp_mgr.h +++ b/engine/imuse/imuse_mcmp_mgr.h @@ -23,15 +23,15 @@ #ifndef MCMP_MGR_H #define MCMP_MGR_H -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "timer.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" +#include "common/timer.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" -#include "imuse/imuse_sndmgr.h" +#include "engine/imuse/imuse_sndmgr.h" class McmpMgr { private: diff --git a/engine/imuse/imuse_music.cpp b/engine/imuse/imuse_music.cpp index 5131e6a2ddd..27b9a1ff7ef 100644 --- a/engine/imuse/imuse_music.cpp +++ b/engine/imuse/imuse_music.cpp @@ -20,11 +20,11 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" -#include "imuse/imuse.h" +#include "engine/imuse/imuse.h" void Imuse::setMusicState(int stateId) { int l, num = -1; diff --git a/engine/imuse/imuse_script.cpp b/engine/imuse/imuse_script.cpp index 6dab9da798d..fb2aa333c62 100644 --- a/engine/imuse/imuse_script.cpp +++ b/engine/imuse/imuse_script.cpp @@ -20,17 +20,18 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "timer.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" +#include "common/timer.h" + +#include "engine/backend/driver.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" -#include "imuse/imuse.h" -#include "imuse/imuse_sndmgr.h" +#include "engine/imuse/imuse.h" +#include "engine/imuse/imuse_sndmgr.h" void Imuse::flushTracks() { // flushTracks should not lock the stack since all the functions diff --git a/engine/imuse/imuse_sndmgr.cpp b/engine/imuse/imuse_sndmgr.cpp index c67c8a265ae..ce55658e0a4 100644 --- a/engine/imuse/imuse_sndmgr.cpp +++ b/engine/imuse/imuse_sndmgr.cpp @@ -20,17 +20,18 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "timer.h" -#include "resource.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" +#include "common/timer.h" + +#include "engine/resource.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" -#include "imuse/imuse_sndmgr.h" -#include "imuse/imuse_mcmp_mgr.h" +#include "engine/imuse/imuse_sndmgr.h" +#include "engine/imuse/imuse_mcmp_mgr.h" ImuseSndMgr::ImuseSndMgr() { for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) { diff --git a/engine/imuse/imuse_sndmgr.h b/engine/imuse/imuse_sndmgr.h index b2e00304cb2..69587a4f365 100644 --- a/engine/imuse/imuse_sndmgr.h +++ b/engine/imuse/imuse_sndmgr.h @@ -23,10 +23,10 @@ #ifndef IMUSE_SNDMGR_H #define IMUSE_SNDMGR_H -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "timer.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" +#include "common/timer.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" diff --git a/engine/imuse/imuse_tables.cpp b/engine/imuse/imuse_tables.cpp index 1a3cf760e79..9c1c282ceb0 100644 --- a/engine/imuse/imuse_tables.cpp +++ b/engine/imuse/imuse_tables.cpp @@ -20,11 +20,11 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" -#include "imuse/imuse.h" +#include "engine/imuse/imuse.h" ImuseTable grimStateMusicTable[] = { {0, 1000, 0, 0, 60, 127, 0, ""}, diff --git a/engine/imuse/imuse_track.cpp b/engine/imuse/imuse_track.cpp index 55309b69516..71826454745 100644 --- a/engine/imuse/imuse_track.cpp +++ b/engine/imuse/imuse_track.cpp @@ -20,16 +20,17 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/backend/driver.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" -#include "imuse/imuse.h" -#include "imuse/imuse_sndmgr.h" +#include "engine/imuse/imuse.h" +#include "engine/imuse/imuse_sndmgr.h" int Imuse::allocSlot(int priority) { int l, lowest_priority = 127; diff --git a/engine/keyframe.cpp b/engine/keyframe.cpp index b80b7ff1862..ee9475ed693 100644 --- a/engine/keyframe.cpp +++ b/engine/keyframe.cpp @@ -20,11 +20,12 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "keyframe.h" -#include "textsplit.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/keyframe.h" +#include "engine/textsplit.h" #include diff --git a/engine/keyframe.h b/engine/keyframe.h index 0db402893bf..b1214cd092a 100644 --- a/engine/keyframe.h +++ b/engine/keyframe.h @@ -23,9 +23,10 @@ #ifndef KEYFRAME_H #define KEYFRAME_H -#include "vector3d.h" -#include "resource.h" -#include "model.h" +#include "common/vector3d.h" + +#include "engine/resource.h" +#include "engine/model.h" class TextSplitter; diff --git a/engine/lab.cpp b/engine/lab.cpp index 1db82600ac9..a8f0d07416a 100644 --- a/engine/lab.cpp +++ b/engine/lab.cpp @@ -20,9 +20,9 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "lab.h" +#include "common/sys.h" +#include "common/platform.h" +#include "engine/lab.h" #include #include diff --git a/engine/lipsynch.cpp b/engine/lipsynch.cpp index 93c1366c652..19ea82ad6e4 100644 --- a/engine/lipsynch.cpp +++ b/engine/lipsynch.cpp @@ -20,10 +20,11 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "lipsynch.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/lipsynch.h" #include diff --git a/engine/lipsynch.h b/engine/lipsynch.h index a2b0aaa2c6f..a7d379bd3b8 100644 --- a/engine/lipsynch.h +++ b/engine/lipsynch.h @@ -23,8 +23,8 @@ #ifndef LIPSYNCH_H #define LIPSYNCH_H -#include "bits.h" -#include "resource.h" +#include "common/platform.h" +#include "engine/resource.h" #include diff --git a/engine/localize.cpp b/engine/localize.cpp index 821d7deeb1b..9af70dfd0a6 100644 --- a/engine/localize.cpp +++ b/engine/localize.cpp @@ -20,11 +20,12 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "localize.h" -#include "registry.h" -#include "engine.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/localize.h" +#include "engine/registry.h" +#include "engine/engine.h" #include #include diff --git a/engine/lua.cpp b/engine/lua.cpp index ee582567d2f..a8db3a3d0a6 100644 --- a/engine/lua.cpp +++ b/engine/lua.cpp @@ -20,26 +20,27 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "lua.h" -#include "resource.h" -#include "actor.h" -#include "registry.h" -#include "localize.h" -#include "color.h" -#include "colormap.h" -#include "costume.h" -#include "engine.h" -#include "smush.h" -#include "textobject.h" -#include "objectstate.h" -#include "font.h" -#include "primitives.h" -#include "savegame.h" -#include "lipsynch.h" +#include "common/sys.h" +#include "common/debug.h" -#include "imuse/imuse.h" +#include "engine/lua.h" +#include "engine/resource.h" +#include "engine/actor.h" +#include "engine/registry.h" +#include "engine/localize.h" +#include "engine/color.h" +#include "engine/colormap.h" +#include "engine/costume.h" +#include "engine/engine.h" +#include "engine/smush/smush.h" +#include "engine/textobject.h" +#include "engine/objectstate.h" +#include "engine/font.h" +#include "engine/primitives.h" +#include "engine/savegame.h" +#include "engine/lipsynch.h" + +#include "engine/imuse/imuse.h" #include #include diff --git a/engine/lua.h b/engine/lua.h index c56dcc44ca9..34f19ea0bac 100644 --- a/engine/lua.h +++ b/engine/lua.h @@ -23,10 +23,10 @@ #ifndef LUA_HH #define LUA_HH -#include "lua/lua.h" -#include "lua/lualib.h" -#include "lua/luadebug.h" -#include "lua/lauxlib.h" +#include "engine/lua/lua.h" +#include "engine/lua/lualib.h" +#include "engine/lua/luadebug.h" +#include "engine/lua/lauxlib.h" // Register Residual builtin functions and structures void register_lua(); diff --git a/engine/main.cpp b/engine/main.cpp index d9d0a446300..ad188ffa155 100644 --- a/engine/main.cpp +++ b/engine/main.cpp @@ -20,22 +20,24 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "bitmap.h" -#include "resource.h" -#include "lua.h" -#include "registry.h" -#include "localize.h" -#include "engine.h" -#include "timer.h" -#include "smush.h" -#include "driver_gl.h" -#include "driver_tinygl.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/bitmap.h" +#include "engine/resource.h" +#include "engine/lua.h" +#include "engine/registry.h" +#include "engine/localize.h" +#include "engine/engine.h" +#include "common/timer.h" +#include "engine/smush/smush.h" + +#include "engine/backend/sdl/driver_gl.h" +#include "engine/backend/sdl/driver_tinygl.h" #include "mixer/mixer.h" -#include "imuse/imuse.h" +#include "engine/imuse/imuse.h" #include #include diff --git a/engine/material.cpp b/engine/material.cpp index 40622f173ae..68ba59ec3a5 100644 --- a/engine/material.cpp +++ b/engine/material.cpp @@ -20,12 +20,13 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "material.h" -#include "colormap.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/material.h" +#include "engine/colormap.h" +#include "engine/backend/driver.h" Material::Material(const char *filename, const char *data, int len, const CMap &cmap) : Resource(filename), _cmap((CMap *) &cmap) { diff --git a/engine/material.h b/engine/material.h index 596da6836e8..62a4b158cd4 100644 --- a/engine/material.h +++ b/engine/material.h @@ -23,7 +23,7 @@ #ifndef MATERIAL_H #define MATERIAL_H -#include "resource.h" +#include "engine/resource.h" #include diff --git a/engine/model.cpp b/engine/model.cpp index ec449a13a6f..b437f59e9f7 100644 --- a/engine/model.cpp +++ b/engine/model.cpp @@ -20,14 +20,15 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "model.h" -#include "resource.h" -#include "material.h" -#include "textsplit.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/model.h" +#include "engine/resource.h" +#include "engine/material.h" +#include "engine/textsplit.h" +#include "engine/backend/driver.h" #include diff --git a/engine/model.h b/engine/model.h index 20ac1d37d66..fdd6d7cf4a9 100644 --- a/engine/model.h +++ b/engine/model.h @@ -23,9 +23,10 @@ #ifndef MODEL_H #define MODEL_H -#include "vector3d.h" -#include "matrix4.h" -#include "resource.h" +#include "common/vector3d.h" +#include "common/matrix4.h" + +#include "engine/resource.h" #include diff --git a/engine/objectstate.cpp b/engine/objectstate.cpp index d1dce550f7b..be3ecbea4c6 100644 --- a/engine/objectstate.cpp +++ b/engine/objectstate.cpp @@ -20,7 +20,7 @@ * */ -#include "objectstate.h" +#include "engine/objectstate.h" ObjectState::ObjectState(int setupID, ObjectState::Position pos, const char *bitmap, const char *zbitmap, bool visible) : _setupID(setupID), _pos(pos) { diff --git a/engine/objectstate.h b/engine/objectstate.h index 27d97a73958..7536bea98e4 100644 --- a/engine/objectstate.h +++ b/engine/objectstate.h @@ -23,9 +23,10 @@ #ifndef OSTATE_H #define OSTATE_H -#include "vector3d.h" -#include "resource.h" -#include "bitmap.h" +#include "common/vector3d.h" + +#include "engine/resource.h" +#include "engine/bitmap.h" #include #include diff --git a/engine/primitives.cpp b/engine/primitives.cpp index 6ed09bac478..104267e2612 100644 --- a/engine/primitives.cpp +++ b/engine/primitives.cpp @@ -20,12 +20,13 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "font.h" -#include "color.h" -#include "driver.h" -#include "primitives.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/font.h" +#include "engine/color.h" +#include "engine/backend/driver.h" +#include "engine/primitives.h" #include diff --git a/engine/primitives.h b/engine/primitives.h index 3fa573c0e6d..71d95943f42 100644 --- a/engine/primitives.h +++ b/engine/primitives.h @@ -23,11 +23,12 @@ #ifndef PRIMITIVESOBJECT_H #define PRIMITIVESOBJECT_H -#include "stdafx.h" -#include "debug.h" -#include "font.h" -#include "color.h" -#include "driver.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/font.h" +#include "engine/color.h" +#include "engine/backend/driver.h" #include diff --git a/engine/registry.cpp b/engine/registry.cpp index c234d545e84..3c4eb0f9a69 100644 --- a/engine/registry.cpp +++ b/engine/registry.cpp @@ -20,9 +20,10 @@ * */ -#include "stdafx.h" -#include "registry.h" -#include "debug.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/registry.h" #include diff --git a/engine/resource.cpp b/engine/resource.cpp index e1ea3ee6721..b0d9f399758 100644 --- a/engine/resource.cpp +++ b/engine/resource.cpp @@ -20,19 +20,20 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "resource.h" -#include "registry.h" -#include "bitmap.h" -#include "colormap.h" -#include "costume.h" -#include "font.h" -#include "keyframe.h" -#include "material.h" -#include "model.h" -#include "engine.h" -#include "lipsynch.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/resource.h" +#include "engine/registry.h" +#include "engine/bitmap.h" +#include "engine/colormap.h" +#include "engine/costume.h" +#include "engine/font.h" +#include "engine/keyframe.h" +#include "engine/material.h" +#include "engine/model.h" +#include "engine/engine.h" +#include "engine/lipsynch.h" #include #include diff --git a/engine/resource.h b/engine/resource.h index e78df20b62d..bd89a0e8c9f 100644 --- a/engine/resource.h +++ b/engine/resource.h @@ -23,9 +23,9 @@ #ifndef RESOURCE_H #define RESOURCE_H -#include "lab.h" -#include "map" +#include "engine/lab.h" +#include #include #include diff --git a/engine/savegame.cpp b/engine/savegame.cpp index d42f8711f88..ad517308fde 100644 --- a/engine/savegame.cpp +++ b/engine/savegame.cpp @@ -20,8 +20,8 @@ * */ -#include "debug.h" -#include "savegame.h" +#include "common/debug.h" +#include "engine/savegame.h" #define SAVEGAME_HEADERTAG 'RSAV' #define SAVEGAME_FOOTERTAG 'ESAV' diff --git a/engine/savegame.h b/engine/savegame.h index e188861d5c3..c14d86e0426 100644 --- a/engine/savegame.h +++ b/engine/savegame.h @@ -23,8 +23,10 @@ #ifndef SAVEGAME_H #define SAVEGAME_H -#include "debug.h" -#include "lua.h" +#include "common/debug.h" + +#include "engine/lua.h" + #include class SaveGame { diff --git a/engine/scene.cpp b/engine/scene.cpp index 5cb0174c9ed..88ce29513ec 100644 --- a/engine/scene.cpp +++ b/engine/scene.cpp @@ -20,18 +20,19 @@ * */ -#include "stdafx.h" -#include "scene.h" -#include "textsplit.h" -#include "resource.h" -#include "debug.h" -#include "bitmap.h" -#include "colormap.h" -#include "vector3d.h" -#include "driver.h" -#include "engine.h" +#include "common/sys.h" +#include "common/debug.h" +#include "common/vector3d.h" -#include "imuse/imuse.h" +#include "engine/scene.h" +#include "engine/textsplit.h" +#include "engine/resource.h" +#include "engine/bitmap.h" +#include "engine/colormap.h" +#include "engine/backend/driver.h" +#include "engine/engine.h" + +#include "engine/imuse/imuse.h" #include diff --git a/engine/scene.h b/engine/scene.h index add8e436af9..6b850ec93bb 100644 --- a/engine/scene.h +++ b/engine/scene.h @@ -23,12 +23,13 @@ #ifndef SCENE_H #define SCENE_H -#include "vector3d.h" -#include "bitmap.h" -#include "color.h" -#include "debug.h" -#include "walkplane.h" -#include "objectstate.h" +#include "common/vector3d.h" +#include "common/debug.h" + +#include "engine/bitmap.h" +#include "engine/color.h" +#include "engine/walkplane.h" +#include "engine/objectstate.h" #include diff --git a/engine/smush/blocky16.cpp b/engine/smush/blocky16.cpp index d36c49b32a8..00474c173b0 100644 --- a/engine/smush/blocky16.cpp +++ b/engine/smush/blocky16.cpp @@ -20,10 +20,11 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "blocky16.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/smush/blocky16.h" #if defined(SYSTEM_NEED_ALIGNMENT) diff --git a/engine/smush/blocky16.h b/engine/smush/blocky16.h index c6a2eff4384..dcb189beda4 100644 --- a/engine/smush/blocky16.h +++ b/engine/smush/blocky16.h @@ -23,7 +23,7 @@ #ifndef BLOCKY16_H #define BLOCKY16_H -#include "bits.h" +#include "common/platform.h" class Blocky16 { private: diff --git a/engine/smush/smush.cpp b/engine/smush/smush.cpp index 398411004f8..ede88c08101 100644 --- a/engine/smush/smush.cpp +++ b/engine/smush/smush.cpp @@ -20,14 +20,15 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "smush.h" -#include "timer.h" -#include "resource.h" -#include "engine.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" +#include "common/timer.h" + +#include "engine/smush/smush.h" +#include "engine/resource.h" +#include "engine/engine.h" +#include "engine/backend/driver.h" #include "mixer/mixer.h" diff --git a/engine/smush/smush.h b/engine/smush/smush.h index c2d2a36093a..897a77b96f5 100644 --- a/engine/smush/smush.h +++ b/engine/smush/smush.h @@ -23,10 +23,11 @@ #ifndef SMUSH_PLAYER_H #define SMUSH_PLAYER_H -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "blocky16.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/smush/blocky16.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" diff --git a/engine/smush/vima.cpp b/engine/smush/vima.cpp index f9b1f2d408e..bae4a63dc08 100644 --- a/engine/smush/vima.cpp +++ b/engine/smush/vima.cpp @@ -20,9 +20,9 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" static int16 imcTable1[] = { 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, diff --git a/engine/textobject.cpp b/engine/textobject.cpp index b565b17198e..0f303339b42 100644 --- a/engine/textobject.cpp +++ b/engine/textobject.cpp @@ -20,11 +20,12 @@ * */ -#include "stdafx.h" -#include "textobject.h" -#include "engine.h" -#include "localize.h" -#include "driver.h" +#include "common/sys.h" + +#include "engine/textobject.h" +#include "engine/engine.h" +#include "engine/localize.h" +#include "engine/backend/driver.h" std::string parseMsgText(const char *msg, char *msgId); diff --git a/engine/textobject.h b/engine/textobject.h index eb31dfd8131..a732e30c6bc 100644 --- a/engine/textobject.h +++ b/engine/textobject.h @@ -23,10 +23,11 @@ #ifndef TEXTOBJECT_H #define TEXTOBJECT_H -#include "debug.h" -#include "font.h" -#include "color.h" -#include "driver.h" +#include "common/debug.h" + +#include "engine/font.h" +#include "engine/color.h" +#include "engine/backend/driver.h" #include diff --git a/engine/textsplit.cpp b/engine/textsplit.cpp index 2fdad375715..731d54f687d 100644 --- a/engine/textsplit.cpp +++ b/engine/textsplit.cpp @@ -20,9 +20,10 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "textsplit.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/textsplit.h" #include #include diff --git a/engine/tinygl/api.cpp b/engine/tinygl/api.cpp index c3d9d21b24f..27a79249af8 100644 --- a/engine/tinygl/api.cpp +++ b/engine/tinygl/api.cpp @@ -1,5 +1,6 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" + #include // glVertex diff --git a/engine/tinygl/arrays.cpp b/engine/tinygl/arrays.cpp index 182a3de5815..2aef7675e27 100644 --- a/engine/tinygl/arrays.cpp +++ b/engine/tinygl/arrays.cpp @@ -1,5 +1,6 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" + #include #include diff --git a/engine/tinygl/clear.cpp b/engine/tinygl/clear.cpp index 87151892a7a..5c085e040ae 100644 --- a/engine/tinygl/clear.cpp +++ b/engine/tinygl/clear.cpp @@ -1,5 +1,5 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" void glopClearColor(GLContext *c, TGLParam *p) { c->clear_color.v[0] = p[1].f; diff --git a/engine/tinygl/clip.cpp b/engine/tinygl/clip.cpp index a335941d7ad..ecb591ef10e 100644 --- a/engine/tinygl/clip.cpp +++ b/engine/tinygl/clip.cpp @@ -1,5 +1,5 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" // fill triangle profile // #define PROFILE diff --git a/engine/tinygl/error.cpp b/engine/tinygl/error.cpp index e4e7d79a320..400b42de495 100644 --- a/engine/tinygl/error.cpp +++ b/engine/tinygl/error.cpp @@ -1,6 +1,7 @@ #include -#include "tinygl/zgl.h" + +#include "engine/tinygl/zgl.h" void gl_fatal_error(char *format, ...) { va_list ap; diff --git a/engine/tinygl/get.cpp b/engine/tinygl/get.cpp index c4743fbc713..61dd06d7b3a 100644 --- a/engine/tinygl/get.cpp +++ b/engine/tinygl/get.cpp @@ -1,5 +1,5 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" void glGetIntegerv(int pname,int *params) { GLContext *c=gl_get_context(); diff --git a/engine/tinygl/image_util.cpp b/engine/tinygl/image_util.cpp index c0f8f36e35f..0c348d1273e 100644 --- a/engine/tinygl/image_util.cpp +++ b/engine/tinygl/image_util.cpp @@ -1,5 +1,5 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" // image conversion diff --git a/engine/tinygl/init.cpp b/engine/tinygl/init.cpp index f7faa051061..f716795a203 100644 --- a/engine/tinygl/init.cpp +++ b/engine/tinygl/init.cpp @@ -1,5 +1,5 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" GLContext *gl_ctx; diff --git a/engine/tinygl/light.cpp b/engine/tinygl/light.cpp index a6c633e2480..068ad63a6e3 100644 --- a/engine/tinygl/light.cpp +++ b/engine/tinygl/light.cpp @@ -1,6 +1,6 @@ -#include "tinygl/zgl.h" -#include "tinygl/msghandling.h" +#include "engine/tinygl/zgl.h" +#include "engine/tinygl/msghandling.h" void glopMaterial(GLContext *c, TGLParam *p) { int mode = p[1].i; diff --git a/engine/tinygl/list.cpp b/engine/tinygl/list.cpp index 659e8178df9..ce2c1c2d276 100644 --- a/engine/tinygl/list.cpp +++ b/engine/tinygl/list.cpp @@ -1,22 +1,22 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" static char *op_table_str[] = { #define ADD_OP(a, b, c) "gl" #a " " #c, -#include "opinfo.h" +#include "engine/tinygl/opinfo.h" }; static void (*op_table_func[])(GLContext *, TGLParam *) = { #define ADD_OP(a, b, c) glop ## a , -#include "opinfo.h" +#include "engine/tinygl/opinfo.h" }; static int op_table_size[] = { #define ADD_OP(a, b, c) b + 1 , -#include "opinfo.h" +#include "engine/tinygl/opinfo.h" }; GLContext *gl_get_context() { diff --git a/engine/tinygl/matrix.cpp b/engine/tinygl/matrix.cpp index 0346359ce77..8fe19582535 100644 --- a/engine/tinygl/matrix.cpp +++ b/engine/tinygl/matrix.cpp @@ -1,5 +1,5 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" void gl_print_matrix(const float *m) { int i; diff --git a/engine/tinygl/memory.cpp b/engine/tinygl/memory.cpp index f94d9b35ec2..d3077f1e01c 100644 --- a/engine/tinygl/memory.cpp +++ b/engine/tinygl/memory.cpp @@ -1,7 +1,7 @@ // Memory allocator for TinyGL -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" // modify these functions so that they suit your needs diff --git a/engine/tinygl/misc.cpp b/engine/tinygl/misc.cpp index 9151498f48c..ede3f214585 100644 --- a/engine/tinygl/misc.cpp +++ b/engine/tinygl/misc.cpp @@ -1,6 +1,6 @@ -#include "tinygl/zgl.h" -#include "msghandling.h" +#include "engine/tinygl/zgl.h" +#include "engine/tinygl/msghandling.h" void glopViewport(GLContext *c, TGLParam *p) { int xsize, ysize, xmin, ymin, xsize_req, ysize_req; diff --git a/engine/tinygl/select.cpp b/engine/tinygl/select.cpp index 28ba3e7971a..957d72f86ef 100644 --- a/engine/tinygl/select.cpp +++ b/engine/tinygl/select.cpp @@ -1,5 +1,5 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" int glRenderMode(int mode) { GLContext *c = gl_get_context(); diff --git a/engine/tinygl/specbuf.cpp b/engine/tinygl/specbuf.cpp index d13d8186f5d..5bf0dbda187 100644 --- a/engine/tinygl/specbuf.cpp +++ b/engine/tinygl/specbuf.cpp @@ -1,6 +1,7 @@ -#include "tinygl/zgl.h" -#include "tinygl/msghandling.h" +#include "engine/tinygl/zgl.h" +#include "engine/tinygl/msghandling.h" + #include #include diff --git a/engine/tinygl/texture.cpp b/engine/tinygl/texture.cpp index 11fa47495a9..4c4e252cc38 100644 --- a/engine/tinygl/texture.cpp +++ b/engine/tinygl/texture.cpp @@ -1,7 +1,7 @@ // Texture Manager -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" static GLTexture *find_texture(GLContext *c, int h) { GLTexture *t; diff --git a/engine/tinygl/vertex.cpp b/engine/tinygl/vertex.cpp index 64576d48bcf..7b9018fa6de 100644 --- a/engine/tinygl/vertex.cpp +++ b/engine/tinygl/vertex.cpp @@ -1,5 +1,6 @@ -#include "tinygl/zgl.h" +#include "engine/tinygl/zgl.h" + #include void glopNormal(GLContext *c, TGLParam *p) { diff --git a/engine/tinygl/zbuffer.cpp b/engine/tinygl/zbuffer.cpp index abb30715cf2..1a73c389e96 100644 --- a/engine/tinygl/zbuffer.cpp +++ b/engine/tinygl/zbuffer.cpp @@ -5,7 +5,8 @@ #include #include #include -#include "tinygl/zbuffer.h" + +#include "engine/tinygl/zbuffer.h" ZBuffer *ZB_open(int xsize, int ysize, int mode, void *frame_buffer) { ZBuffer *zb; diff --git a/engine/tinygl/zgl.h b/engine/tinygl/zgl.h index 9dbd4ad98ad..ed6f3c8182c 100644 --- a/engine/tinygl/zgl.h +++ b/engine/tinygl/zgl.h @@ -5,9 +5,10 @@ #include #include #include -#include "tinygl/gl.h" -#include "tinygl/zbuffer.h" -#include "tinygl/zmath.h" + +#include "engine/tinygl/gl.h" +#include "engine/tinygl/zbuffer.h" +#include "engine/tinygl/zmath.h" #define DEBUG /* #define NDEBUG */ diff --git a/engine/tinygl/zline.cpp b/engine/tinygl/zline.cpp index 178ae058da3..548e2766aba 100644 --- a/engine/tinygl/zline.cpp +++ b/engine/tinygl/zline.cpp @@ -1,5 +1,6 @@ #include -#include "tinygl/zbuffer.h" + +#include "engine/tinygl/zbuffer.h" #define ZCMP(z,zpix) ((z) >= (zpix)) @@ -21,24 +22,24 @@ void ZB_plot(ZBuffer * zb, ZBufferPoint * p) { #define INTERP_Z static void ZB_line_flat_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) { -#include "zline.h" +#include "engine/tinygl/zline.h" } // line with color interpolation #define INTERP_Z #define INTERP_RGB static void ZB_line_interp_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) { -#include "zline.h" +#include "engine/tinygl/zline.h" } // no Z interpolation static void ZB_line_flat(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) { -#include "zline.h" +#include "engine/tinygl/zline.h" } #define INTERP_RGB static void ZB_line_interp(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) { -#include "zline.h" +#include "engine/tinygl/zline.h" } void ZB_line_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) { diff --git a/engine/tinygl/zmath.cpp b/engine/tinygl/zmath.cpp index e7763a4d19f..8a6d68896b2 100644 --- a/engine/tinygl/zmath.cpp +++ b/engine/tinygl/zmath.cpp @@ -4,7 +4,8 @@ #include #include #include -#include "tinygl/zmath.h" + +#include "engine/tinygl/zmath.h" void gl_M4_Id(M4 *a) { int i, j; diff --git a/engine/tinygl/ztriangle.cpp b/engine/tinygl/ztriangle.cpp index 815bb402783..6829fb883ae 100644 --- a/engine/tinygl/ztriangle.cpp +++ b/engine/tinygl/ztriangle.cpp @@ -1,6 +1,7 @@ #include -#include "tinygl/zbuffer.h" + +#include "engine/tinygl/zbuffer.h" #define ZCMP(z, zpix) ((z) >= (zpix)) @@ -23,7 +24,7 @@ void ZB_fillTriangleFlat(ZBuffer *zb, ZBufferPoint *p0, z += dzdx; \ } -#include "ztriangle.h" +#include "engine/tinygl/ztriangle.h" } // Smooth filled triangle. @@ -89,7 +90,7 @@ void ZB_fillTriangleSmooth(ZBuffer *zb, ZBufferPoint *p0, } \ } -#include "ztriangle.h" +#include "engine/tinygl/ztriangle.h" } void ZB_setTexture(ZBuffer *zb, PIXEL *texture) { @@ -118,7 +119,7 @@ void ZB_fillTriangleMapping(ZBuffer *zb, ZBufferPoint *p0, t += dtdx; \ } -#include "ztriangle.h" +#include "engine/tinygl/ztriangle.h" } void ZB_fillTriangleMappingPerspective(ZBuffer *zb, ZBufferPoint *p0, diff --git a/engine/walkplane.cpp b/engine/walkplane.cpp index 5dfd5b388f9..573b527ed1f 100644 --- a/engine/walkplane.cpp +++ b/engine/walkplane.cpp @@ -20,9 +20,10 @@ * */ -#include "stdafx.h" -#include "walkplane.h" -#include "textsplit.h" +#include "common/sys.h" + +#include "engine/walkplane.h" +#include "engine/textsplit.h" void Sector::load(TextSplitter &ts) { // float height = 12345.f; // Yaz: this is in the original code... diff --git a/engine/walkplane.h b/engine/walkplane.h index 08d0ea5d148..88c912ba2bd 100644 --- a/engine/walkplane.h +++ b/engine/walkplane.h @@ -23,8 +23,8 @@ #ifndef WALKPLANE_H #define WALKPLANE_H -#include "debug.h" -#include "vector3d.h" +#include "common/debug.h" +#include "common/vector3d.h" #include diff --git a/mixer/audiostream.cpp b/mixer/audiostream.cpp index 397ea279756..fb4341e91e3 100644 --- a/mixer/audiostream.cpp +++ b/mixer/audiostream.cpp @@ -20,9 +20,10 @@ * */ -#include "stdafx.h" -#include "debug.h" -#include "driver.h" +#include "common/sys.h" +#include "common/debug.h" + +#include "engine/backend/driver.h" #include "mixer/mixer.h" #include "mixer/audiostream.h" diff --git a/mixer/audiostream.h b/mixer/audiostream.h index ec08e6158dd..cf020a73577 100644 --- a/mixer/audiostream.h +++ b/mixer/audiostream.h @@ -23,8 +23,8 @@ #ifndef AUDIOSTREAM_H #define AUDIOSTREAM_H -#include "stdafx.h" -#include "bits.h" +#include "common/sys.h" +#include "common/platform.h" /** diff --git a/mixer/mixer.cpp b/mixer/mixer.cpp index 8b5b7e8042a..09d1a1f20f5 100644 --- a/mixer/mixer.cpp +++ b/mixer/mixer.cpp @@ -20,10 +20,11 @@ * */ -#include "stdafx.h" -#include "bits.h" -#include "debug.h" -#include "driver.h" +#include "common/sys.h" +#include "common/platform.h" +#include "common/debug.h" + +#include "engine/backend/driver.h" #include "mixer/mixer.h" #include "mixer/rate.h" diff --git a/mixer/mixer.h b/mixer/mixer.h index 85d33f30f2a..65307a20b83 100644 --- a/mixer/mixer.h +++ b/mixer/mixer.h @@ -23,8 +23,8 @@ #ifndef SOUND_MIXER_H #define SOUND_MIXER_H -#include "stdafx.h" -#include "bits.h" +#include "common/sys.h" +#include "common/platform.h" class AudioStream; class Channel; diff --git a/mixer/rate.cpp b/mixer/rate.cpp index 326adc450af..204de1d26e3 100644 --- a/mixer/rate.cpp +++ b/mixer/rate.cpp @@ -28,8 +28,8 @@ * improvments over the original code were made. */ -#include "stdafx.h" -#include "debug.h" +#include "common/sys.h" +#include "common/debug.h" #include "mixer/rate.h" #include "mixer/audiostream.h"