[Scummvm-cvs-logs] SF.net SVN: scummvm: [30641] residual/trunk
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sat Jan 26 12:47:23 CET 2008
Revision: 30641
http://scummvm.svn.sourceforge.net/scummvm/?rev=30641&view=rev
Author: aquadran
Date: 2008-01-26 03:47:23 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
compilation fixes (compile at least for msvc9)
Modified Paths:
--------------
residual/trunk/common/debug.cpp
residual/trunk/common/debug.h
residual/trunk/common/matrix3.cpp
residual/trunk/common/matrix3.h
residual/trunk/common/matrix4.cpp
residual/trunk/common/matrix4.h
residual/trunk/common/platform.h
residual/trunk/common/sys.h
residual/trunk/common/timer.cpp
residual/trunk/common/timer.h
residual/trunk/common/vector3d.h
residual/trunk/dists/msvc9/residual.vcproj
residual/trunk/engine/actor.cpp
residual/trunk/engine/actor.h
residual/trunk/engine/backend/driver.h
residual/trunk/engine/backend/sdl/driver_gl.cpp
residual/trunk/engine/backend/sdl/driver_gl.h
residual/trunk/engine/backend/sdl/driver_sdl.cpp
residual/trunk/engine/backend/sdl/driver_sdl.h
residual/trunk/engine/backend/sdl/driver_tinygl.cpp
residual/trunk/engine/backend/sdl/driver_tinygl.h
residual/trunk/engine/bitmap.cpp
residual/trunk/engine/bitmap.h
residual/trunk/engine/color.h
residual/trunk/engine/colormap.h
residual/trunk/engine/costume.cpp
residual/trunk/engine/costume.h
residual/trunk/engine/engine.cpp
residual/trunk/engine/engine.h
residual/trunk/engine/font.cpp
residual/trunk/engine/font.h
residual/trunk/engine/imuse/imuse.cpp
residual/trunk/engine/imuse/imuse.h
residual/trunk/engine/imuse/imuse_mcmp_mgr.cpp
residual/trunk/engine/imuse/imuse_mcmp_mgr.h
residual/trunk/engine/imuse/imuse_music.cpp
residual/trunk/engine/imuse/imuse_script.cpp
residual/trunk/engine/imuse/imuse_sndmgr.cpp
residual/trunk/engine/imuse/imuse_sndmgr.h
residual/trunk/engine/imuse/imuse_tables.cpp
residual/trunk/engine/imuse/imuse_track.cpp
residual/trunk/engine/keyframe.cpp
residual/trunk/engine/keyframe.h
residual/trunk/engine/lab.cpp
residual/trunk/engine/lipsynch.cpp
residual/trunk/engine/lipsynch.h
residual/trunk/engine/localize.cpp
residual/trunk/engine/lua.cpp
residual/trunk/engine/lua.h
residual/trunk/engine/main.cpp
residual/trunk/engine/material.cpp
residual/trunk/engine/material.h
residual/trunk/engine/model.cpp
residual/trunk/engine/model.h
residual/trunk/engine/objectstate.cpp
residual/trunk/engine/objectstate.h
residual/trunk/engine/primitives.cpp
residual/trunk/engine/primitives.h
residual/trunk/engine/registry.cpp
residual/trunk/engine/resource.cpp
residual/trunk/engine/resource.h
residual/trunk/engine/savegame.cpp
residual/trunk/engine/savegame.h
residual/trunk/engine/scene.cpp
residual/trunk/engine/scene.h
residual/trunk/engine/smush/blocky16.cpp
residual/trunk/engine/smush/blocky16.h
residual/trunk/engine/smush/smush.cpp
residual/trunk/engine/smush/smush.h
residual/trunk/engine/smush/vima.cpp
residual/trunk/engine/textobject.cpp
residual/trunk/engine/textobject.h
residual/trunk/engine/textsplit.cpp
residual/trunk/engine/tinygl/api.cpp
residual/trunk/engine/tinygl/arrays.cpp
residual/trunk/engine/tinygl/clear.cpp
residual/trunk/engine/tinygl/clip.cpp
residual/trunk/engine/tinygl/error.cpp
residual/trunk/engine/tinygl/get.cpp
residual/trunk/engine/tinygl/image_util.cpp
residual/trunk/engine/tinygl/init.cpp
residual/trunk/engine/tinygl/light.cpp
residual/trunk/engine/tinygl/list.cpp
residual/trunk/engine/tinygl/matrix.cpp
residual/trunk/engine/tinygl/memory.cpp
residual/trunk/engine/tinygl/misc.cpp
residual/trunk/engine/tinygl/select.cpp
residual/trunk/engine/tinygl/specbuf.cpp
residual/trunk/engine/tinygl/texture.cpp
residual/trunk/engine/tinygl/vertex.cpp
residual/trunk/engine/tinygl/zbuffer.cpp
residual/trunk/engine/tinygl/zgl.h
residual/trunk/engine/tinygl/zline.cpp
residual/trunk/engine/tinygl/zmath.cpp
residual/trunk/engine/tinygl/ztriangle.cpp
residual/trunk/engine/walkplane.cpp
residual/trunk/engine/walkplane.h
residual/trunk/mixer/audiostream.cpp
residual/trunk/mixer/audiostream.h
residual/trunk/mixer/mixer.cpp
residual/trunk/mixer/mixer.h
residual/trunk/mixer/rate.cpp
Modified: residual/trunk/common/debug.cpp
===================================================================
--- residual/trunk/common/debug.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/debug.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,8 +20,8 @@
*
*/
-#include "stdafx.h"
-#include "debug.h"
+#include "common/sys.h"
+#include "common/debug.h"
#include <cstdarg>
#include <cstdio>
Modified: residual/trunk/common/debug.h
===================================================================
--- residual/trunk/common/debug.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/debug.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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,
Modified: residual/trunk/common/matrix3.cpp
===================================================================
--- residual/trunk/common/matrix3.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/matrix3.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,7 +20,7 @@
*
*/
-#include "matrix3.h"
+#include "common/matrix3.h"
#include <math.h>
Modified: residual/trunk/common/matrix3.h
===================================================================
--- residual/trunk/common/matrix3.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/matrix3.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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{
Modified: residual/trunk/common/matrix4.cpp
===================================================================
--- residual/trunk/common/matrix4.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/matrix4.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,7 +20,7 @@
*
*/
-#include "matrix4.h"
+#include "common/matrix4.h"
Matrix4::Matrix4() {
_pos.set(0.f, 0.f, 0.f);
Modified: residual/trunk/common/matrix4.h
===================================================================
--- residual/trunk/common/matrix4.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/matrix4.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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 {
Modified: residual/trunk/common/platform.h
===================================================================
--- residual/trunk/common/platform.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/platform.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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 <stdlib.h>
#include <stdio.h>
Modified: residual/trunk/common/sys.h
===================================================================
--- residual/trunk/common/sys.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/sys.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,8 +20,8 @@
*
*/
-#ifndef _STDAFX_H
-#define _STDAFX_H
+#ifndef COMMON_SYS_H
+#define COMMON_SYS_H
typedef struct Mutex *MutexRef;
Modified: residual/trunk/common/timer.cpp
===================================================================
--- residual/trunk/common/timer.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/timer.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,12 +20,13 @@
*
*/
-#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;
Timer::Timer() :
Modified: residual/trunk/common/timer.h
===================================================================
--- residual/trunk/common/timer.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/timer.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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
Modified: residual/trunk/common/vector3d.h
===================================================================
--- residual/trunk/common/vector3d.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/common/vector3d.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,8 +20,8 @@
*
*/
-#ifndef VECTOR3D_HH
-#define VECTOR3D_HH
+#ifndef COMMON_VECTOR3D_H
+#define COMMON_VECTOR3D_H
#include <cmath>
Modified: residual/trunk/dists/msvc9/residual.vcproj
===================================================================
--- residual/trunk/dists/msvc9/residual.vcproj 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/dists/msvc9/residual.vcproj 2008-01-26 11:47:23 UTC (rev 30641)
@@ -188,686 +188,697 @@
</References>
<Files>
<Filter
- Name="RSC"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ Name="common"
>
<File
- RelativePath="..\..\COPYING"
+ RelativePath="..\..\common\debug.cpp"
>
</File>
<File
- RelativePath="..\..\README"
+ RelativePath="..\..\common\debug.h"
>
</File>
<File
- RelativePath="..\..\residual.rc"
+ RelativePath="..\..\common\matrix3.cpp"
>
</File>
- </Filter>
- <Filter
- Name="3dmath"
- >
<File
- RelativePath="..\..\matrix3.cpp"
+ RelativePath="..\..\common\matrix3.h"
>
</File>
<File
- RelativePath="..\..\matrix3.h"
+ RelativePath="..\..\common\matrix4.cpp"
>
</File>
<File
- RelativePath="..\..\matrix4.cpp"
+ RelativePath="..\..\common\matrix4.h"
>
</File>
<File
- RelativePath="..\..\matrix4.h"
+ RelativePath="..\..\common\platform.h"
>
</File>
<File
- RelativePath="..\..\vector3d.h"
+ RelativePath="..\..\common\sys.h"
>
</File>
- </Filter>
- <Filter
- Name="mixer"
- >
<File
- RelativePath="..\..\mixer\audiostream.cpp"
+ RelativePath="..\..\common\timer.cpp"
>
</File>
<File
- RelativePath="..\..\mixer\audiostream.h"
+ RelativePath="..\..\common\timer.h"
>
</File>
<File
- RelativePath="..\..\mixer\mixer.cpp"
+ RelativePath="..\..\common\vector3d.h"
>
</File>
+ </Filter>
+ <Filter
+ Name="dists"
+ >
<File
- RelativePath="..\..\mixer\mixer.h"
+ RelativePath="..\residual.rc"
>
</File>
- <File
- RelativePath="..\..\mixer\rate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\mixer\rate.h"
- >
- </File>
</Filter>
<Filter
- Name="lua"
+ Name="engine"
>
<File
- RelativePath="..\..\lua\lapi.cpp"
+ RelativePath="..\..\engine\actor.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lapi.h"
+ RelativePath="..\..\engine\actor.h"
>
</File>
<File
- RelativePath="..\..\lua\lauxlib.cpp"
+ RelativePath="..\..\engine\bitmap.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lauxlib.h"
+ RelativePath="..\..\engine\bitmap.h"
>
</File>
<File
- RelativePath="..\..\lua\lbuffer.cpp"
+ RelativePath="..\..\engine\color.h"
>
</File>
<File
- RelativePath="..\..\lua\lbuiltin.cpp"
+ RelativePath="..\..\engine\colormap.h"
>
</File>
<File
- RelativePath="..\..\lua\lbuiltin.h"
+ RelativePath="..\..\engine\costume.cpp"
>
</File>
<File
- RelativePath="..\..\lua\ldo.cpp"
+ RelativePath="..\..\engine\costume.h"
>
</File>
<File
- RelativePath="..\..\lua\ldo.h"
+ RelativePath="..\..\engine\engine.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lfunc.cpp"
+ RelativePath="..\..\engine\engine.h"
>
</File>
<File
- RelativePath="..\..\lua\lfunc.h"
+ RelativePath="..\..\engine\font.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lgc.cpp"
+ RelativePath="..\..\engine\font.h"
>
</File>
<File
- RelativePath="..\..\lua\lgc.h"
+ RelativePath="..\..\engine\keyframe.cpp"
>
</File>
<File
- RelativePath="..\..\lua\liolib.cpp"
+ RelativePath="..\..\engine\keyframe.h"
>
</File>
<File
- RelativePath="..\..\lua\llex.cpp"
+ RelativePath="..\..\engine\lab.cpp"
>
</File>
<File
- RelativePath="..\..\lua\llex.h"
+ RelativePath="..\..\engine\lab.h"
>
</File>
<File
- RelativePath="..\..\lua\lmathlib.cpp"
+ RelativePath="..\..\engine\lipsynch.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lmem.cpp"
+ RelativePath="..\..\engine\lipsynch.h"
>
</File>
<File
- RelativePath="..\..\lua\lmem.h"
+ RelativePath="..\..\engine\localize.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lobject.cpp"
+ RelativePath="..\..\engine\localize.h"
>
</File>
<File
- RelativePath="..\..\lua\lobject.h"
+ RelativePath="..\..\engine\lua.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lopcodes.h"
+ RelativePath="..\..\engine\lua.h"
>
</File>
<File
- RelativePath="..\..\lua\lparser.cpp"
+ RelativePath="..\..\engine\main.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lparser.h"
+ RelativePath="..\..\engine\material.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lrestore.cpp"
+ RelativePath="..\..\engine\material.h"
>
</File>
<File
- RelativePath="..\..\lua\lsave.cpp"
+ RelativePath="..\..\engine\model.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lstate.cpp"
+ RelativePath="..\..\engine\model.h"
>
</File>
<File
- RelativePath="..\..\lua\lstate.h"
+ RelativePath="..\..\engine\objectstate.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lstring.cpp"
+ RelativePath="..\..\engine\objectstate.h"
>
</File>
<File
- RelativePath="..\..\lua\lstring.h"
+ RelativePath="..\..\engine\primitives.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lstrlib.cpp"
+ RelativePath="..\..\engine\primitives.h"
>
</File>
<File
- RelativePath="..\..\lua\ltable.cpp"
+ RelativePath="..\..\engine\registry.cpp"
>
</File>
<File
- RelativePath="..\..\lua\ltable.h"
+ RelativePath="..\..\engine\registry.h"
>
</File>
<File
- RelativePath="..\..\lua\ltask.cpp"
+ RelativePath="..\..\engine\resource.cpp"
>
</File>
<File
- RelativePath="..\..\lua\ltask.h"
+ RelativePath="..\..\engine\resource.h"
>
</File>
<File
- RelativePath="..\..\lua\ltm.cpp"
+ RelativePath="..\..\engine\savegame.cpp"
>
</File>
<File
- RelativePath="..\..\lua\ltm.h"
+ RelativePath="..\..\engine\savegame.h"
>
</File>
<File
- RelativePath="..\..\lua\lua.h"
+ RelativePath="..\..\engine\scene.cpp"
>
</File>
<File
- RelativePath="..\..\lua\luadebug.h"
+ RelativePath="..\..\engine\scene.h"
>
</File>
<File
- RelativePath="..\..\lua\lualib.h"
+ RelativePath="..\..\engine\textobject.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lundump.cpp"
+ RelativePath="..\..\engine\textobject.h"
>
</File>
<File
- RelativePath="..\..\lua\lundump.h"
+ RelativePath="..\..\engine\textsplit.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lvm.cpp"
+ RelativePath="..\..\engine\textsplit.h"
>
</File>
<File
- RelativePath="..\..\lua\lvm.h"
+ RelativePath="..\..\engine\walkplane.cpp"
>
</File>
<File
- RelativePath="..\..\lua\lzio.cpp"
+ RelativePath="..\..\engine\walkplane.h"
>
</File>
- <File
- RelativePath="..\..\lua\lzio.h"
+ <Filter
+ Name="lua"
>
- </File>
- </Filter>
- <Filter
- Name="imuse"
- >
- <File
- RelativePath="..\..\imuse\imuse.cpp"
+ <File
+ RelativePath="..\..\engine\lua\lapi.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lapi.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lauxlib.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lauxlib.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lbuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lbuiltin.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lbuiltin.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ldo.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ldo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lfunc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lfunc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lgc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lgc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\liolib.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\llex.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\llex.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lmathlib.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lmem.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lmem.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lobject.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lobject.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lopcodes.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lparser.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lparser.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lrestore.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lsave.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lstate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lstate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lstring.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lstring.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lstrlib.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ltable.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ltable.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ltask.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ltask.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ltm.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\ltm.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lua.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\luadebug.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lualib.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lundump.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lundump.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lvm.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lvm.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lzio.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\lua\lzio.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="tinygl"
>
- </File>
- <File
- RelativePath="..\..\imuse\imuse.h"
+ <File
+ RelativePath="..\..\engine\tinygl\api.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\arrays.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\clear.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\clip.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\error.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\get.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\gl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\image_util.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\init.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\light.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\list.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\matrix.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\memory.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\misc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\msghandling.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\msghandling.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\opinfo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\select.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\specbuf.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\specbuf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\texture.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\vertex.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\zbuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\zbuffer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\zgl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\zline.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\zline.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\zmath.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\zmath.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\ztriangle.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\tinygl\ztriangle.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="imuse"
>
- </File>
- <File
- RelativePath="..\..\imuse\imuse_mcmp_mgr.cpp"
+ <File
+ RelativePath="..\..\engine\imuse\imuse.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_mcmp_mgr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_mcmp_mgr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_music.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_script.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_sndmgr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_sndmgr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_tables.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\imuse\imuse_track.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="smush"
>
- </File>
- <File
- RelativePath="..\..\imuse\imuse_mcmp_mgr.h"
+ <File
+ RelativePath="..\..\engine\smush\blocky16.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\smush\blocky16.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\smush\smush.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\smush\smush.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\smush\vima.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="backend"
>
- </File>
- <File
- RelativePath="..\..\imuse\imuse_music.cpp"
- >
- </File>
- <File
- RelativePath="..\..\imuse\imuse_script.cpp"
- >
- </File>
- <File
- RelativePath="..\..\imuse\imuse_sndmgr.cpp"
- >
- </File>
- <File
- RelativePath="..\..\imuse\imuse_sndmgr.h"
- >
- </File>
- <File
- RelativePath="..\..\imuse\imuse_tables.cpp"
- >
- </File>
- <File
- RelativePath="..\..\imuse\imuse_track.cpp"
- >
- </File>
+ <File
+ RelativePath="..\..\engine\backend\driver.h"
+ >
+ </File>
+ <Filter
+ Name="sdl"
+ >
+ <File
+ RelativePath="..\..\engine\backend\sdl\driver_gl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\backend\sdl\driver_gl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\backend\sdl\driver_sdl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\backend\sdl\driver_sdl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\backend\sdl\driver_tinygl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engine\backend\sdl\driver_tinygl.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
</Filter>
<Filter
- Name="tinygl"
+ Name="mixer"
>
<File
- RelativePath="..\..\tinygl\api.cpp"
+ RelativePath="..\..\mixer\audiostream.cpp"
>
</File>
<File
- RelativePath="..\..\tinygl\arrays.cpp"
+ RelativePath="..\..\mixer\audiostream.h"
>
</File>
<File
- RelativePath="..\..\tinygl\clear.cpp"
+ RelativePath="..\..\mixer\mixer.cpp"
>
</File>
<File
- RelativePath="..\..\tinygl\clip.cpp"
+ RelativePath="..\..\mixer\mixer.h"
>
</File>
<File
- RelativePath="..\..\tinygl\error.cpp"
+ RelativePath="..\..\mixer\rate.cpp"
>
</File>
<File
- RelativePath="..\..\tinygl\get.cpp"
+ RelativePath="..\..\mixer\rate.h"
>
</File>
- <File
- RelativePath="..\..\tinygl\gl.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\image_util.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\init.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\light.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\list.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\matrix.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\memory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\misc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\msghandling.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\msghandling.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\opinfo.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\select.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\specbuf.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\specbuf.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\texture.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\vertex.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\zbuffer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\zbuffer.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\zgl.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\zline.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\zline.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\zmath.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\zmath.h"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\ztriangle.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tinygl\ztriangle.h"
- >
- </File>
</Filter>
<File
- RelativePath="..\..\actor.cpp"
+ RelativePath="..\..\README"
>
</File>
- <File
- RelativePath="..\..\actor.h"
- >
- </File>
- <File
- RelativePath="..\..\bitmap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\bitmap.h"
- >
- </File>
- <File
- RelativePath="..\..\bits.h"
- >
- </File>
- <File
- RelativePath="..\..\blocky16.cpp"
- >
- </File>
- <File
- RelativePath="..\..\blocky16.h"
- >
- </File>
- <File
- RelativePath="..\..\color.h"
- >
- </File>
- <File
- RelativePath="..\..\colormap.h"
- >
- </File>
- <File
- RelativePath="..\..\costume.cpp"
- >
- </File>
- <File
- RelativePath="..\..\costume.h"
- >
- </File>
- <File
- RelativePath="..\..\debug.cpp"
- >
- </File>
- <File
- RelativePath="..\..\debug.h"
- >
- </File>
- <File
- RelativePath="..\..\driver.h"
- >
- </File>
- <File
- RelativePath="..\..\driver_gl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\driver_gl.h"
- >
- </File>
- <File
- RelativePath="..\..\driver_sdl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\driver_sdl.h"
- >
- </File>
- <File
- RelativePath="..\..\driver_tinygl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\driver_tinygl.h"
- >
- </File>
- <File
- RelativePath="..\..\engine.cpp"
- >
- </File>
- <File
- RelativePath="..\..\engine.h"
- >
- </File>
- <File
- RelativePath="..\..\font.cpp"
- >
- </File>
- <File
- RelativePath="..\..\font.h"
- >
- </File>
- <File
- RelativePath="..\..\keyframe.cpp"
- >
- </File>
- <File
- RelativePath="..\..\keyframe.h"
- >
- </File>
- <File
- RelativePath="..\..\lab.cpp"
- >
- </File>
- <File
- RelativePath="..\..\lab.h"
- >
- </File>
- <File
- RelativePath="..\..\lipsynch.cpp"
- >
- </File>
- <File
- RelativePath="..\..\lipsynch.h"
- >
- </File>
- <File
- RelativePath="..\..\localize.cpp"
- >
- </File>
- <File
- RelativePath="..\..\localize.h"
- >
- </File>
- <File
- RelativePath="..\..\lua.cpp"
- >
- </File>
- <File
- RelativePath="..\..\lua.h"
- >
- </File>
- <File
- RelativePath="..\..\main.cpp"
- >
- </File>
- <File
- RelativePath="..\..\material.cpp"
- >
- </File>
- <File
- RelativePath="..\..\material.h"
- >
- </File>
- <File
- RelativePath="..\..\model.cpp"
- >
- </File>
- <File
- RelativePath="..\..\model.h"
- >
- </File>
- <File
- RelativePath="..\..\objectstate.cpp"
- >
- </File>
- <File
- RelativePath="..\..\objectstate.h"
- >
- </File>
- <File
- RelativePath="..\..\primitives.cpp"
- >
- </File>
- <File
- RelativePath="..\..\primitives.h"
- >
- </File>
- <File
- RelativePath="..\..\registry.cpp"
- >
- </File>
- <File
- RelativePath="..\..\registry.h"
- >
- </File>
- <File
- RelativePath="..\..\resource.cpp"
- >
- </File>
- <File
- RelativePath="..\..\resource.h"
- >
- </File>
- <File
- RelativePath="..\..\savegame.cpp"
- >
- </File>
- <File
- RelativePath="..\..\savegame.h"
- >
- </File>
- <File
- RelativePath="..\..\scene.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scene.h"
- >
- </File>
- <File
- RelativePath="..\..\smush.cpp"
- >
- </File>
- <File
- RelativePath="..\..\smush.h"
- >
- </File>
- <File
- RelativePath="..\..\stdafx.h"
- >
- </File>
- <File
- RelativePath="..\..\textobject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\textobject.h"
- >
- </File>
- <File
- RelativePath="..\..\textsplit.cpp"
- >
- </File>
- <File
- RelativePath="..\..\textsplit.h"
- >
- </File>
- <File
- RelativePath="..\..\timer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\timer.h"
- >
- </File>
- <File
- RelativePath="..\..\vima.cpp"
- >
- </File>
- <File
- RelativePath="..\..\walkplane.cpp"
- >
- </File>
- <File
- RelativePath="..\..\walkplane.h"
- >
- </File>
</Files>
<Globals>
</Globals>
Modified: residual/trunk/engine/actor.cpp
===================================================================
--- residual/trunk/engine/actor.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/actor.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,20 +20,21 @@
*
*/
-#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 <cmath>
#include <cstring>
Modified: residual/trunk/engine/actor.h
===================================================================
--- residual/trunk/engine/actor.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/actor.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,11 +23,12 @@
#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 <string>
#include <list>
Modified: residual/trunk/engine/backend/driver.h
===================================================================
--- residual/trunk/engine/backend/driver.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/backend/driver.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,19 +20,20 @@
*
*/
-#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;
Modified: residual/trunk/engine/backend/sdl/driver_gl.cpp
===================================================================
--- residual/trunk/engine/backend/sdl/driver_gl.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/backend/sdl/driver_gl.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,11 +20,13 @@
*
*/
-#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) {
char GLDriver[1024];
Modified: residual/trunk/engine/backend/sdl/driver_gl.h
===================================================================
--- residual/trunk/engine/backend/sdl/driver_gl.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/backend/sdl/driver_gl.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,18 +20,20 @@
*
*/
-#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 <SDL.h>
#include <SDL_opengl.h>
Modified: residual/trunk/engine/backend/sdl/driver_sdl.cpp
===================================================================
--- residual/trunk/engine/backend/sdl/driver_sdl.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/backend/sdl/driver_sdl.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,9 +20,10 @@
*
*/
-#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.
Modified: residual/trunk/engine/backend/sdl/driver_sdl.h
===================================================================
--- residual/trunk/engine/backend/sdl/driver_sdl.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/backend/sdl/driver_sdl.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,17 +20,18 @@
*
*/
-#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 <SDL.h>
// NOTE: This is not a complete driver, it needs to be subclassed
Modified: residual/trunk/engine/backend/sdl/driver_tinygl.cpp
===================================================================
--- residual/trunk/engine/backend/sdl/driver_tinygl.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/backend/sdl/driver_tinygl.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,14 +20,15 @@
*
*/
-#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,
TGLfloat centery, TGLfloat centerz, TGLfloat upx, TGLfloat upy, TGLfloat upz) {
Modified: residual/trunk/engine/backend/sdl/driver_tinygl.h
===================================================================
--- residual/trunk/engine/backend/sdl/driver_tinygl.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/backend/sdl/driver_tinygl.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,21 +20,22 @@
*
*/
-#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 <SDL.h>
class DriverTinyGL : public DriverSDL {
Modified: residual/trunk/engine/bitmap.cpp
===================================================================
--- residual/trunk/engine/bitmap.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/bitmap.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,13 +20,14 @@
*
*/
-#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 <cstdlib>
#include <cstring>
Modified: residual/trunk/engine/bitmap.h
===================================================================
--- residual/trunk/engine/bitmap.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/bitmap.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,9 +23,10 @@
#ifndef BITMAP_H
#define BITMAP_H
-#include "resource.h"
-#include "debug.h"
+#include "common/debug.h"
+#include "engine/resource.h"
+
#include <cstring>
class Bitmap : public Resource {
Modified: residual/trunk/engine/color.h
===================================================================
--- residual/trunk/engine/color.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/color.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,7 +23,7 @@
#ifndef COLOR_H
#define COLOR_H
-#include "bits.h"
+#include "common/platform.h"
class Color {
public:
Modified: residual/trunk/engine/colormap.h
===================================================================
--- residual/trunk/engine/colormap.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/colormap.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,9 +23,10 @@
#ifndef COLORMAP_H
#define COLORMAP_H
-#include "debug.h"
-#include "resource.h"
+#include "common/debug.h"
+#include "engine/resource.h"
+
#include <cstring>
class CMap : public Resource {
Modified: residual/trunk/engine/costume.cpp
===================================================================
--- residual/trunk/engine/costume.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/costume.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,20 +20,21 @@
*
*/
-#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 <string>
#include <cstdio>
#include <map>
Modified: residual/trunk/engine/costume.h
===================================================================
--- residual/trunk/engine/costume.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/costume.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,9 +23,10 @@
#ifndef COSTUME_H
#define COSTUME_H
-#include "matrix4.h"
-#include "model.h"
+#include "common/matrix4.h"
+#include "engine/model.h"
+
#include <string>
#define DEFAULT_COLORMAP "item.cmp"
Modified: residual/trunk/engine/engine.cpp
===================================================================
--- residual/trunk/engine/engine.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/engine.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,20 +20,21 @@
*
*/
-#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 <assert.h>
// CHAR_KEY tests to see whether a keycode is for
Modified: residual/trunk/engine/engine.h
===================================================================
--- residual/trunk/engine/engine.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/engine.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,14 +23,15 @@
#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 <cstdlib>
#include <list>
Modified: residual/trunk/engine/font.cpp
===================================================================
--- residual/trunk/engine/font.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/font.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,12 +20,13 @@
*
*/
-#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 <cstring>
Font::Font(const char *filename, const char *data, int /*len*/) :
Modified: residual/trunk/engine/font.h
===================================================================
--- residual/trunk/engine/font.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/font.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,9 +23,10 @@
#ifndef FONT_H
#define FONT_H
-#include "bits.h"
-#include "resource.h"
+#include "common/platform.h"
+#include "engine/resource.h"
+
#include <list>
class Font : public Resource {
Modified: residual/trunk/engine/imuse/imuse.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/engine/imuse/imuse.h
===================================================================
--- residual/trunk/engine/imuse/imuse.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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
Modified: residual/trunk/engine/imuse/imuse_mcmp_mgr.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_mcmp_mgr.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_mcmp_mgr.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,14 +20,15 @@
*
*/
-#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];
McmpMgr::McmpMgr() {
Modified: residual/trunk/engine/imuse/imuse_mcmp_mgr.h
===================================================================
--- residual/trunk/engine/imuse/imuse_mcmp_mgr.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_mcmp_mgr.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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:
Modified: residual/trunk/engine/imuse/imuse_music.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_music.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_music.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/engine/imuse/imuse_script.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_script.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_script.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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
Modified: residual/trunk/engine/imuse/imuse_sndmgr.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_sndmgr.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_sndmgr.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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++) {
Modified: residual/trunk/engine/imuse/imuse_sndmgr.h
===================================================================
--- residual/trunk/engine/imuse/imuse_sndmgr.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_sndmgr.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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"
Modified: residual/trunk/engine/imuse/imuse_tables.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_tables.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_tables.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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, ""},
Modified: residual/trunk/engine/imuse/imuse_track.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_track.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/imuse/imuse_track.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/engine/keyframe.cpp
===================================================================
--- residual/trunk/engine/keyframe.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/keyframe.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,12 +20,13 @@
*
*/
-#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 <cstring>
KeyframeAnim::KeyframeAnim(const char *filename, const char *data, int len) :
Modified: residual/trunk/engine/keyframe.h
===================================================================
--- residual/trunk/engine/keyframe.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/keyframe.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,10 +23,11 @@
#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;
class KeyframeAnim : public Resource {
Modified: residual/trunk/engine/lab.cpp
===================================================================
--- residual/trunk/engine/lab.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/lab.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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 <algorithm>
#include <cstdlib>
Modified: residual/trunk/engine/lipsynch.cpp
===================================================================
--- residual/trunk/engine/lipsynch.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/lipsynch.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,11 +20,12 @@
*
*/
-#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 <cstring>
// A new define that'll be around when theres a configure script :)
Modified: residual/trunk/engine/lipsynch.h
===================================================================
--- residual/trunk/engine/lipsynch.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/lipsynch.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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 <list>
Modified: residual/trunk/engine/localize.cpp
===================================================================
--- residual/trunk/engine/localize.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/localize.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,12 +20,13 @@
*
*/
-#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 <cstdio>
#include <cstring>
Modified: residual/trunk/engine/lua.cpp
===================================================================
--- residual/trunk/engine/lua.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/lua.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,27 +20,28 @@
*
*/
-#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 <cstdio>
#include <cmath>
#include <zlib.h>
Modified: residual/trunk/engine/lua.h
===================================================================
--- residual/trunk/engine/lua.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/lua.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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();
Modified: residual/trunk/engine/main.cpp
===================================================================
--- residual/trunk/engine/main.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/main.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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 <SDL.h>
#include <SDL_video.h>
Modified: residual/trunk/engine/material.cpp
===================================================================
--- residual/trunk/engine/material.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/material.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,13 +20,14 @@
*
*/
-#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) {
if (len < 4 || memcmp(data, "MAT ", 4) != 0)
Modified: residual/trunk/engine/material.h
===================================================================
--- residual/trunk/engine/material.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/material.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,7 +23,7 @@
#ifndef MATERIAL_H
#define MATERIAL_H
-#include "resource.h"
+#include "engine/resource.h"
#include <cstring>
Modified: residual/trunk/engine/model.cpp
===================================================================
--- residual/trunk/engine/model.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/model.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,15 +20,16 @@
*
*/
-#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 <cstring>
Model::Model(const char *filename, const char *data, int len, const CMap &cmap) :
Modified: residual/trunk/engine/model.h
===================================================================
--- residual/trunk/engine/model.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/model.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,10 +23,11 @@
#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 <cstring>
class CMap;
Modified: residual/trunk/engine/objectstate.cpp
===================================================================
--- residual/trunk/engine/objectstate.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/objectstate.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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) {
Modified: residual/trunk/engine/objectstate.h
===================================================================
--- residual/trunk/engine/objectstate.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/objectstate.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,10 +23,11 @@
#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 <string>
#include <list>
Modified: residual/trunk/engine/primitives.cpp
===================================================================
--- residual/trunk/engine/primitives.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/primitives.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,13 +20,14 @@
*
*/
-#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 <string>
PrimitiveObject::PrimitiveObject() {
Modified: residual/trunk/engine/primitives.h
===================================================================
--- residual/trunk/engine/primitives.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/primitives.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,12 +23,13 @@
#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 <string>
class PrimitiveObject {
Modified: residual/trunk/engine/registry.cpp
===================================================================
--- residual/trunk/engine/registry.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/registry.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,10 +20,11 @@
*
*/
-#include "stdafx.h"
-#include "registry.h"
-#include "debug.h"
+#include "common/sys.h"
+#include "common/debug.h"
+#include "engine/registry.h"
+
#include <cstdlib>
Registry *g_registry = NULL;
Modified: residual/trunk/engine/resource.cpp
===================================================================
--- residual/trunk/engine/resource.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/resource.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,20 +20,21 @@
*
*/
-#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 <cstring>
#include <cctype>
#include <string>
Modified: residual/trunk/engine/resource.h
===================================================================
--- residual/trunk/engine/resource.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/resource.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,9 +23,9 @@
#ifndef RESOURCE_H
#define RESOURCE_H
-#include "lab.h"
-#include "map"
+#include "engine/lab.h"
+#include <map>
#include <list>
#include <string>
Modified: residual/trunk/engine/savegame.cpp
===================================================================
--- residual/trunk/engine/savegame.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/savegame.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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'
Modified: residual/trunk/engine/savegame.h
===================================================================
--- residual/trunk/engine/savegame.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/savegame.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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 <zlib.h>
class SaveGame {
Modified: residual/trunk/engine/scene.cpp
===================================================================
--- residual/trunk/engine/scene.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/scene.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,19 +20,20 @@
*
*/
-#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 <cmath>
Scene::Scene(const char *name, const char *buf, int len) :
Modified: residual/trunk/engine/scene.h
===================================================================
--- residual/trunk/engine/scene.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/scene.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,13 +23,14 @@
#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 <string>
class CMap;
Modified: residual/trunk/engine/smush/blocky16.cpp
===================================================================
--- residual/trunk/engine/smush/blocky16.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/smush/blocky16.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,11 +20,12 @@
*
*/
-#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)
#define COPY_4X1_LINE(dst, src) \
Modified: residual/trunk/engine/smush/blocky16.h
===================================================================
--- residual/trunk/engine/smush/blocky16.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/smush/blocky16.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,7 +23,7 @@
#ifndef BLOCKY16_H
#define BLOCKY16_H
-#include "bits.h"
+#include "common/platform.h"
class Blocky16 {
private:
Modified: residual/trunk/engine/smush/smush.cpp
===================================================================
--- residual/trunk/engine/smush/smush.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/smush/smush.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,15 +20,16 @@
*
*/
-#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"
#include <cstring>
Modified: residual/trunk/engine/smush/smush.h
===================================================================
--- residual/trunk/engine/smush/smush.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/smush/smush.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,11 +23,12 @@
#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"
Modified: residual/trunk/engine/smush/vima.cpp
===================================================================
--- residual/trunk/engine/smush/vima.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/smush/vima.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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,
Modified: residual/trunk/engine/textobject.cpp
===================================================================
--- residual/trunk/engine/textobject.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/textobject.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,12 +20,13 @@
*
*/
-#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);
TextObjectDefaults sayLineDefaults;
Modified: residual/trunk/engine/textobject.h
===================================================================
--- residual/trunk/engine/textobject.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/textobject.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,11 +23,12 @@
#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 <string>
struct TextObjectDefaults {
Modified: residual/trunk/engine/textsplit.cpp
===================================================================
--- residual/trunk/engine/textsplit.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/textsplit.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,10 +20,11 @@
*
*/
-#include "stdafx.h"
-#include "debug.h"
-#include "textsplit.h"
+#include "common/sys.h"
+#include "common/debug.h"
+#include "engine/textsplit.h"
+
#include <cstdio>
#include <cstring>
#include <cctype>
Modified: residual/trunk/engine/tinygl/api.cpp
===================================================================
--- residual/trunk/engine/tinygl/api.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/api.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,6 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
+
#include <stdio.h>
// glVertex
Modified: residual/trunk/engine/tinygl/arrays.cpp
===================================================================
--- residual/trunk/engine/tinygl/arrays.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/arrays.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,6 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
+
#include <assert.h>
#include <stdio.h>
Modified: residual/trunk/engine/tinygl/clear.cpp
===================================================================
--- residual/trunk/engine/tinygl/clear.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/clear.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/engine/tinygl/clip.cpp
===================================================================
--- residual/trunk/engine/tinygl/clip.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/clip.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,5 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
// fill triangle profile
// #define PROFILE
Modified: residual/trunk/engine/tinygl/error.cpp
===================================================================
--- residual/trunk/engine/tinygl/error.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/error.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,7 +1,8 @@
#include <stdarg.h>
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
+
void gl_fatal_error(char *format, ...) {
va_list ap;
Modified: residual/trunk/engine/tinygl/get.cpp
===================================================================
--- residual/trunk/engine/tinygl/get.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/get.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,5 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
void glGetIntegerv(int pname,int *params) {
GLContext *c=gl_get_context();
Modified: residual/trunk/engine/tinygl/image_util.cpp
===================================================================
--- residual/trunk/engine/tinygl/image_util.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/image_util.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,5 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
// image conversion
Modified: residual/trunk/engine/tinygl/init.cpp
===================================================================
--- residual/trunk/engine/tinygl/init.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/init.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,5 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
GLContext *gl_ctx;
Modified: residual/trunk/engine/tinygl/light.cpp
===================================================================
--- residual/trunk/engine/tinygl/light.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/light.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/engine/tinygl/list.cpp
===================================================================
--- residual/trunk/engine/tinygl/list.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/list.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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() {
Modified: residual/trunk/engine/tinygl/matrix.cpp
===================================================================
--- residual/trunk/engine/tinygl/matrix.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/matrix.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,5 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
void gl_print_matrix(const float *m) {
int i;
Modified: residual/trunk/engine/tinygl/memory.cpp
===================================================================
--- residual/trunk/engine/tinygl/memory.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/memory.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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
Modified: residual/trunk/engine/tinygl/misc.cpp
===================================================================
--- residual/trunk/engine/tinygl/misc.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/misc.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/engine/tinygl/select.cpp
===================================================================
--- residual/trunk/engine/tinygl/select.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/select.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,5 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
int glRenderMode(int mode) {
GLContext *c = gl_get_context();
Modified: residual/trunk/engine/tinygl/specbuf.cpp
===================================================================
--- residual/trunk/engine/tinygl/specbuf.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/specbuf.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,6 +1,7 @@
-#include "tinygl/zgl.h"
-#include "tinygl/msghandling.h"
+#include "engine/tinygl/zgl.h"
+#include "engine/tinygl/msghandling.h"
+
#include <math.h>
#include <stdlib.h>
Modified: residual/trunk/engine/tinygl/texture.cpp
===================================================================
--- residual/trunk/engine/tinygl/texture.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/texture.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/engine/tinygl/vertex.cpp
===================================================================
--- residual/trunk/engine/tinygl/vertex.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/vertex.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,5 +1,6 @@
-#include "tinygl/zgl.h"
+#include "engine/tinygl/zgl.h"
+
#include <string.h>
void glopNormal(GLContext *c, TGLParam *p) {
Modified: residual/trunk/engine/tinygl/zbuffer.cpp
===================================================================
--- residual/trunk/engine/tinygl/zbuffer.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/zbuffer.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -5,8 +5,9 @@
#include <stdio.h>
#include <assert.h>
#include <string.h>
-#include "tinygl/zbuffer.h"
+#include "engine/tinygl/zbuffer.h"
+
ZBuffer *ZB_open(int xsize, int ysize, int mode, void *frame_buffer) {
ZBuffer *zb;
int size;
Modified: residual/trunk/engine/tinygl/zgl.h
===================================================================
--- residual/trunk/engine/tinygl/zgl.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/zgl.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -5,10 +5,11 @@
#include <stdio.h>
#include <math.h>
#include <assert.h>
-#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 */
Modified: residual/trunk/engine/tinygl/zline.cpp
===================================================================
--- residual/trunk/engine/tinygl/zline.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/zline.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,6 +1,7 @@
#include <stdlib.h>
-#include "tinygl/zbuffer.h"
+#include "engine/tinygl/zbuffer.h"
+
#define ZCMP(z,zpix) ((z) >= (zpix))
void ZB_plot(ZBuffer * zb, ZBufferPoint * p) {
@@ -21,24 +22,24 @@
#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) {
Modified: residual/trunk/engine/tinygl/zmath.cpp
===================================================================
--- residual/trunk/engine/tinygl/zmath.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/zmath.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -4,8 +4,9 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include "tinygl/zmath.h"
+#include "engine/tinygl/zmath.h"
+
void gl_M4_Id(M4 *a) {
int i, j;
for (i = 0; i < 4; i++) {
Modified: residual/trunk/engine/tinygl/ztriangle.cpp
===================================================================
--- residual/trunk/engine/tinygl/ztriangle.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/tinygl/ztriangle.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -1,7 +1,8 @@
#include <stdlib.h>
-#include "tinygl/zbuffer.h"
+#include "engine/tinygl/zbuffer.h"
+
#define ZCMP(z, zpix) ((z) >= (zpix))
void ZB_fillTriangleFlat(ZBuffer *zb, ZBufferPoint *p0,
@@ -23,7 +24,7 @@
z += dzdx; \
}
-#include "ztriangle.h"
+#include "engine/tinygl/ztriangle.h"
}
// Smooth filled triangle.
@@ -89,7 +90,7 @@
} \
}
-#include "ztriangle.h"
+#include "engine/tinygl/ztriangle.h"
}
void ZB_setTexture(ZBuffer *zb, PIXEL *texture) {
@@ -118,7 +119,7 @@
t += dtdx; \
}
-#include "ztriangle.h"
+#include "engine/tinygl/ztriangle.h"
}
void ZB_fillTriangleMappingPerspective(ZBuffer *zb, ZBufferPoint *p0,
Modified: residual/trunk/engine/walkplane.cpp
===================================================================
--- residual/trunk/engine/walkplane.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/walkplane.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,10 +20,11 @@
*
*/
-#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...
char buf[256];
Modified: residual/trunk/engine/walkplane.h
===================================================================
--- residual/trunk/engine/walkplane.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/engine/walkplane.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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 <string>
Modified: residual/trunk/mixer/audiostream.cpp
===================================================================
--- residual/trunk/mixer/audiostream.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/mixer/audiostream.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,10 +20,11 @@
*
*/
-#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"
Modified: residual/trunk/mixer/audiostream.h
===================================================================
--- residual/trunk/mixer/audiostream.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/mixer/audiostream.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -23,8 +23,8 @@
#ifndef AUDIOSTREAM_H
#define AUDIOSTREAM_H
-#include "stdafx.h"
-#include "bits.h"
+#include "common/sys.h"
+#include "common/platform.h"
/**
Modified: residual/trunk/mixer/mixer.cpp
===================================================================
--- residual/trunk/mixer/mixer.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/mixer/mixer.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -20,11 +20,12 @@
*
*/
-#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"
#include "mixer/audiostream.h"
Modified: residual/trunk/mixer/mixer.h
===================================================================
--- residual/trunk/mixer/mixer.h 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/mixer/mixer.h 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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;
Modified: residual/trunk/mixer/rate.cpp
===================================================================
--- residual/trunk/mixer/rate.cpp 2008-01-26 11:41:18 UTC (rev 30640)
+++ residual/trunk/mixer/rate.cpp 2008-01-26 11:47:23 UTC (rev 30641)
@@ -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"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list