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

compilation fixes (compile at least for msvc9)

Browse source
This commit is contained in:
Pawel Kolodziejski 2008-01-26 11:47:23 +00:00
parent fd59de6afc
commit 852890611b
102 changed files with 1118 additions and 1042 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/debug.cpp
View file

@ -20,8 +20,8 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include <cstdarg> #include <cstdarg>
#include <cstdio> #include <cstdio>

6
common/debug.h
View file

@ -20,10 +20,10 @@
* *
*/ */
#include "bits.h" #include "common/platform.h"
#ifndef DEBUG_H #ifndef COMMON_DEBUG_H
#define DEBUG_H #define COMMON_DEBUG_H
enum enDebugLevels { enum enDebugLevels {
DEBUG_NONE, DEBUG_NONE,

2
common/matrix3.cpp
View file

@ -20,7 +20,7 @@
* *
*/ */
#include "matrix3.h" #include "common/matrix3.h"
#include <math.h> #include <math.h>

6
common/matrix3.h
View file

@ -20,10 +20,10 @@
* *
*/ */
#ifndef MATRIX3_HH #ifndef COMMON_MATRIX3_H
#define MATRIX3_HH #define COMMON_MATRIX3_H
#include "vector3d.h" #include "common/vector3d.h"
// matrix 3 is a rotation matrix // matrix 3 is a rotation matrix
class Matrix3{ class Matrix3{

2
common/matrix4.cpp
View file

@ -20,7 +20,7 @@
* *
*/ */
#include "matrix4.h" #include "common/matrix4.h"
Matrix4::Matrix4() { Matrix4::Matrix4() {
_pos.set(0.f, 0.f, 0.f); _pos.set(0.f, 0.f, 0.f);

8
common/matrix4.h
View file

@ -20,11 +20,11 @@
* *
*/ */
#ifndef MATRIX4_HH #ifndef COMMON_MATRIX4_H
#define MATRIX4_HH #define COMMON_MATRIX4_H
#include "vector3d.h" #include "common/vector3d.h"
#include "matrix3.h" #include "common/matrix3.h"
// matrix 4 is a rotation matrix + position // matrix 4 is a rotation matrix + position
class Matrix4 { class Matrix4 {

8
common/platform.h
View file

@ -20,11 +20,11 @@
* *
*/ */
#ifndef BITS_H #ifndef COMMON_PLATFORM_H
#define BITS_H #define COMMON_PLATFORM_H
#include "stdafx.h" #include "common/sys.h"
#include "vector3d.h" #include "common/vector3d.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

4
common/sys.h
View file

@ -20,8 +20,8 @@
* *
*/ */
#ifndef _STDAFX_H #ifndef COMMON_SYS_H
#define _STDAFX_H #define COMMON_SYS_H
typedef struct Mutex *MutexRef; typedef struct Mutex *MutexRef;

11
common/timer.cpp
View file

@ -20,11 +20,12 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "timer.h" #include "common/timer.h"
#include "driver.h"
#include "engine/backend/driver.h"
Timer *g_timer = NULL; Timer *g_timer = NULL;

4
common/timer.h
View file

@ -23,8 +23,8 @@
#ifndef COMMON_TIMER_H #ifndef COMMON_TIMER_H
#define COMMON_TIMER_H #define COMMON_TIMER_H
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#define MAX_TIMERS 3 #define MAX_TIMERS 3

4
common/vector3d.h
View file

@ -20,8 +20,8 @@
* *
*/ */
#ifndef VECTOR3D_HH #ifndef COMMON_VECTOR3D_H
#define VECTOR3D_HH #define COMMON_VECTOR3D_H
#include <cmath> #include <cmath>

1251
dists/msvc9/residual.vcproj
View file

File diff suppressed because it is too large Load diff

21
engine/actor.cpp
View file

@ -20,19 +20,20 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.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 "mixer/mixer.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 <cmath>
#include <cstring> #include <cstring>

9
engine/actor.h
View file

@ -23,10 +23,11 @@
#ifndef ACTOR_H #ifndef ACTOR_H
#define ACTOR_H #define ACTOR_H
#include "color.h" #include "common/vector3d.h"
#include "vector3d.h"
#include "resource.h" #include "engine/color.h"
#include "font.h" #include "engine/resource.h"
#include "engine/font.h"
#include <string> #include <string>
#include <list> #include <list>

23
engine/backend/driver.h
View file

@ -20,18 +20,19 @@
* *
*/ */
#ifndef DRIVER_H #ifndef BACKEND_DRIVER_H
#define DRIVER_H #define BACKEND_DRIVER_H
#include "bits.h" #include "common/platform.h"
#include "vector3d.h" #include "common/vector3d.h"
#include "color.h"
#include "model.h" #include "engine/color.h"
#include "scene.h" #include "engine/model.h"
#include "colormap.h" #include "engine/scene.h"
#include "font.h" #include "engine/colormap.h"
#include "primitives.h" #include "engine/font.h"
#include "actor.h" #include "engine/primitives.h"
#include "engine/actor.h"
class Material; class Material;
class Bitmap; class Bitmap;

10
engine/backend/sdl/driver_gl.cpp
View file

@ -20,10 +20,12 @@
* *
*/ */
#include "debug.h" #include "common/debug.h"
#include "colormap.h"
#include "material.h" #include "engine/colormap.h"
#include "driver_gl.h" #include "engine/material.h"
#include "engine/backend/sdl/driver_gl.h"
// Constructor. Should create the driver and open screens, etc. // Constructor. Should create the driver and open screens, etc.
DriverGL::DriverGL(int screenW, int screenH, int screenBPP, bool fullscreen) { DriverGL::DriverGL(int screenW, int screenH, int screenBPP, bool fullscreen) {

22
engine/backend/sdl/driver_gl.h
View file

@ -20,17 +20,19 @@
* *
*/ */
#ifndef DRIVER_GL_H #ifndef BACKEND_DRIVER_GL_H
#define DRIVER_GL_H #define BACKEND_DRIVER_GL_H
#include "bits.h" #include "common/platform.h"
#include "vector3d.h" #include "common/vector3d.h"
#include "color.h"
#include "model.h" #include "engine/color.h"
#include "colormap.h" #include "engine/model.h"
#include "bitmap.h" #include "engine/colormap.h"
#include "driver.h" #include "engine/bitmap.h"
#include "driver_sdl.h"
#include "engine/backend/driver.h"
#include "engine/backend/sdl/driver_sdl.h"
#include <SDL.h> #include <SDL.h>
#include <SDL_opengl.h> #include <SDL_opengl.h>

5
engine/backend/sdl/driver_sdl.cpp
View file

@ -20,8 +20,9 @@
* *
*/ */
#include "debug.h" #include "common/debug.h"
#include "driver_sdl.h"
#include "engine/backend/sdl/driver_sdl.h"
// NOTE: This is not a complete driver, it needs to be subclassed // NOTE: This is not a complete driver, it needs to be subclassed
// to provide rendering functionality. // to provide rendering functionality.

19
engine/backend/sdl/driver_sdl.h
View file

@ -20,16 +20,17 @@
* *
*/ */
#ifndef DRIVER_SDL_H #ifndef BACKEND_DRIVER_SDL_H
#define DRIVER_SDL_H #define BACKEND_DRIVER_SDL_H
#include "bits.h" #include "common/sys.h"
#include "vector3d.h" #include "common/vector3d.h"
#include "color.h"
#include "model.h" #include "engine/color.h"
#include "colormap.h" #include "engine/model.h"
#include "bitmap.h" #include "engine/colormap.h"
#include "driver.h" #include "engine/bitmap.h"
#include "engine/backend/driver.h"
#include <SDL.h> #include <SDL.h>

13
engine/backend/sdl/driver_tinygl.cpp
View file

@ -20,13 +20,14 @@
* *
*/ */
#include "debug.h" #include "common/debug.h"
#include "colormap.h"
#include "material.h"
#include "driver_tinygl.h"
#include "tinygl/gl.h" #include "engine/colormap.h"
#include "tinygl/zgl.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 // func below is from Mesa glu sources
static void lookAt(TGLfloat eyex, TGLfloat eyey, TGLfloat eyez, TGLfloat centerx, static void lookAt(TGLfloat eyex, TGLfloat eyey, TGLfloat eyez, TGLfloat centerx,

25
engine/backend/sdl/driver_tinygl.h
View file

@ -20,20 +20,21 @@
* *
*/ */
#ifndef DRIVER_TINYGL_H #ifndef BACKEND_DRIVER_TINYGL_H
#define DRIVER_TINYGL_H #define BACKEND_DRIVER_TINYGL_H
#include "bits.h" #include "common/platform.h"
#include "vector3d.h" #include "common/vector3d.h"
#include "color.h"
#include "model.h"
#include "colormap.h"
#include "bitmap.h"
#include "driver.h"
#include "driver_sdl.h"
#include "tinygl/gl.h" #include "engine/color.h"
#include "tinygl/zgl.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> #include <SDL.h>

13
engine/bitmap.cpp
View file

@ -20,12 +20,13 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "bitmap.h"
#include "smush.h" #include "engine/bitmap.h"
#include "driver.h" #include "engine/smush/smush.h"
#include "engine/backend/driver.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>

5
engine/bitmap.h
View file

@ -23,8 +23,9 @@
#ifndef BITMAP_H #ifndef BITMAP_H
#define BITMAP_H #define BITMAP_H
#include "resource.h" #include "common/debug.h"
#include "debug.h"
#include "engine/resource.h"
#include <cstring> #include <cstring>

2
engine/color.h
View file

@ -23,7 +23,7 @@
#ifndef COLOR_H #ifndef COLOR_H
#define COLOR_H #define COLOR_H
#include "bits.h" #include "common/platform.h"
class Color { class Color {
public: public:

5
engine/colormap.h
View file

@ -23,8 +23,9 @@
#ifndef COLORMAP_H #ifndef COLORMAP_H
#define COLORMAP_H #define COLORMAP_H
#include "debug.h" #include "common/debug.h"
#include "resource.h"
#include "engine/resource.h"
#include <cstring> #include <cstring>

25
engine/costume.cpp
View file

@ -20,19 +20,20 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/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 "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 <string>
#include <cstdio> #include <cstdio>

5
engine/costume.h
View file

@ -23,8 +23,9 @@
#ifndef COSTUME_H #ifndef COSTUME_H
#define COSTUME_H #define COSTUME_H
#include "matrix4.h" #include "common/matrix4.h"
#include "model.h"
#include "engine/model.h"
#include <string> #include <string>

25
engine/engine.cpp
View file

@ -20,19 +20,20 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.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 "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> #include <assert.h>

15
engine/engine.h
View file

@ -23,13 +23,14 @@
#ifndef ENGINE_H #ifndef ENGINE_H
#define ENGINE_H #define ENGINE_H
#include "bits.h" #include "common/sys.h"
#include "scene.h"
#include "textobject.h" #include "engine/scene.h"
#include "primitives.h" #include "engine/textobject.h"
#include "font.h" #include "engine/primitives.h"
#include "lua.h" #include "engine/font.h"
#include "savegame.h" #include "engine/lua.h"
#include "engine/savegame.h"
#include <cstdlib> #include <cstdlib>
#include <list> #include <list>

11
engine/font.cpp
View file

@ -20,11 +20,12 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "font.h"
#include "driver.h" #include "engine/font.h"
#include "engine/backend/driver.h"
#include <cstring> #include <cstring>

5
engine/font.h
View file

@ -23,8 +23,9 @@
#ifndef FONT_H #ifndef FONT_H
#define FONT_H #define FONT_H
#include "bits.h" #include "common/platform.h"
#include "resource.h"
#include "engine/resource.h"
#include <list> #include <list>

17
engine/imuse/imuse.cpp
View file

@ -20,18 +20,19 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "timer.h" #include "common/timer.h"
#include "engine.h"
#include "savegame.h" #include "engine/engine.h"
#include "engine/savegame.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"
#include "imuse/imuse.h" #include "engine/imuse/imuse.h"
#include "imuse/imuse_sndmgr.h" #include "engine/imuse/imuse_sndmgr.h"
Imuse *g_imuse = NULL; Imuse *g_imuse = NULL;

13
engine/imuse/imuse.h
View file

@ -23,16 +23,17 @@
#ifndef IMUSE_H #ifndef IMUSE_H
#define IMUSE_H #define IMUSE_H
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "lua.h"
#include "engine/lua.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"
#include "imuse/imuse_sndmgr.h" #include "engine/imuse/imuse_sndmgr.h"
#include "imuse/imuse_mcmp_mgr.h" #include "engine/imuse/imuse_mcmp_mgr.h"
#define MAX_IMUSE_TRACKS 16 #define MAX_IMUSE_TRACKS 16
#define MAX_IMUSE_FADETRACKS 16 #define MAX_IMUSE_FADETRACKS 16

13
engine/imuse/imuse_mcmp_mgr.cpp
View file

@ -20,13 +20,14 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "resource.h"
#include "engine.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]; uint16 imuseDestTable[5786];

10
engine/imuse/imuse_mcmp_mgr.h
View file

@ -23,15 +23,15 @@
#ifndef MCMP_MGR_H #ifndef MCMP_MGR_H
#define MCMP_MGR_H #define MCMP_MGR_H
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "timer.h" #include "common/timer.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"
#include "imuse/imuse_sndmgr.h" #include "engine/imuse/imuse_sndmgr.h"
class McmpMgr { class McmpMgr {
private: private:

8
engine/imuse/imuse_music.cpp
View file

@ -20,11 +20,11 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "imuse/imuse.h" #include "engine/imuse/imuse.h"
void Imuse::setMusicState(int stateId) { void Imuse::setMusicState(int stateId) {
int l, num = -1; int l, num = -1;

15
engine/imuse/imuse_script.cpp
View file

@ -20,17 +20,18 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "timer.h" #include "common/timer.h"
#include "driver.h"
#include "engine/backend/driver.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"
#include "imuse/imuse.h" #include "engine/imuse/imuse.h"
#include "imuse/imuse_sndmgr.h" #include "engine/imuse/imuse_sndmgr.h"
void Imuse::flushTracks() { void Imuse::flushTracks() {
// flushTracks should not lock the stack since all the functions // flushTracks should not lock the stack since all the functions

15
engine/imuse/imuse_sndmgr.cpp
View file

@ -20,17 +20,18 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "timer.h" #include "common/timer.h"
#include "resource.h"
#include "engine/resource.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"
#include "imuse/imuse_sndmgr.h" #include "engine/imuse/imuse_sndmgr.h"
#include "imuse/imuse_mcmp_mgr.h" #include "engine/imuse/imuse_mcmp_mgr.h"
ImuseSndMgr::ImuseSndMgr() { ImuseSndMgr::ImuseSndMgr() {
for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) { for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {

8
engine/imuse/imuse_sndmgr.h
View file

@ -23,10 +23,10 @@
#ifndef IMUSE_SNDMGR_H #ifndef IMUSE_SNDMGR_H
#define IMUSE_SNDMGR_H #define IMUSE_SNDMGR_H
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "timer.h" #include "common/timer.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"

8
engine/imuse/imuse_tables.cpp
View file

@ -20,11 +20,11 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "imuse/imuse.h" #include "engine/imuse/imuse.h"
ImuseTable grimStateMusicTable[] = { ImuseTable grimStateMusicTable[] = {
{0, 1000, 0, 0, 60, 127, 0, ""}, {0, 1000, 0, 0, 60, 127, 0, ""},

13
engine/imuse/imuse_track.cpp
View file

@ -20,16 +20,17 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "driver.h"
#include "engine/backend/driver.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"
#include "imuse/imuse.h" #include "engine/imuse/imuse.h"
#include "imuse/imuse_sndmgr.h" #include "engine/imuse/imuse_sndmgr.h"
int Imuse::allocSlot(int priority) { int Imuse::allocSlot(int priority) {
int l, lowest_priority = 127; int l, lowest_priority = 127;

11
engine/keyframe.cpp
View file

@ -20,11 +20,12 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "keyframe.h"
#include "textsplit.h" #include "engine/keyframe.h"
#include "engine/textsplit.h"
#include <cstring> #include <cstring>

7
engine/keyframe.h
View file

@ -23,9 +23,10 @@
#ifndef KEYFRAME_H #ifndef KEYFRAME_H
#define KEYFRAME_H #define KEYFRAME_H
#include "vector3d.h" #include "common/vector3d.h"
#include "resource.h"
#include "model.h" #include "engine/resource.h"
#include "engine/model.h"
class TextSplitter; class TextSplitter;

6
engine/lab.cpp
View file

@ -20,9 +20,9 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "lab.h" #include "engine/lab.h"
#include <algorithm> #include <algorithm>
#include <cstdlib> #include <cstdlib>

9
engine/lipsynch.cpp
View file

@ -20,10 +20,11 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "lipsynch.h"
#include "engine/lipsynch.h"
#include <cstring> #include <cstring>

4
engine/lipsynch.h
View file

@ -23,8 +23,8 @@
#ifndef LIPSYNCH_H #ifndef LIPSYNCH_H
#define LIPSYNCH_H #define LIPSYNCH_H
#include "bits.h" #include "common/platform.h"
#include "resource.h" #include "engine/resource.h"
#include <list> #include <list>

11
engine/localize.cpp
View file

@ -20,11 +20,12 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include "localize.h"
#include "registry.h" #include "engine/localize.h"
#include "engine.h" #include "engine/registry.h"
#include "engine/engine.h"
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>

39
engine/lua.cpp
View file

@ -20,26 +20,27 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/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 "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 <cstdio>
#include <cmath> #include <cmath>

8
engine/lua.h
View file

@ -23,10 +23,10 @@
#ifndef LUA_HH #ifndef LUA_HH
#define LUA_HH #define LUA_HH
#include "lua/lua.h" #include "engine/lua/lua.h"
#include "lua/lualib.h" #include "engine/lua/lualib.h"
#include "lua/luadebug.h" #include "engine/lua/luadebug.h"
#include "lua/lauxlib.h" #include "engine/lua/lauxlib.h"
// Register Residual builtin functions and structures // Register Residual builtin functions and structures
void register_lua(); void register_lua();

28
engine/main.cpp
View file

@ -20,22 +20,24 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include "bitmap.h"
#include "resource.h" #include "engine/bitmap.h"
#include "lua.h" #include "engine/resource.h"
#include "registry.h" #include "engine/lua.h"
#include "localize.h" #include "engine/registry.h"
#include "engine.h" #include "engine/localize.h"
#include "timer.h" #include "engine/engine.h"
#include "smush.h" #include "common/timer.h"
#include "driver_gl.h" #include "engine/smush/smush.h"
#include "driver_tinygl.h"
#include "engine/backend/sdl/driver_gl.h"
#include "engine/backend/sdl/driver_tinygl.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "imuse/imuse.h" #include "engine/imuse/imuse.h"
#include <SDL.h> #include <SDL.h>
#include <SDL_video.h> #include <SDL_video.h>

13
engine/material.cpp
View file

@ -20,12 +20,13 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "material.h"
#include "colormap.h" #include "engine/material.h"
#include "driver.h" #include "engine/colormap.h"
#include "engine/backend/driver.h"
Material::Material(const char *filename, const char *data, int len, const CMap &cmap) : Material::Material(const char *filename, const char *data, int len, const CMap &cmap) :
Resource(filename), _cmap((CMap *) &cmap) { Resource(filename), _cmap((CMap *) &cmap) {

2
engine/material.h
View file

@ -23,7 +23,7 @@
#ifndef MATERIAL_H #ifndef MATERIAL_H
#define MATERIAL_H #define MATERIAL_H
#include "resource.h" #include "engine/resource.h"
#include <cstring> #include <cstring>

17
engine/model.cpp
View file

@ -20,14 +20,15 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "model.h"
#include "resource.h" #include "engine/model.h"
#include "material.h" #include "engine/resource.h"
#include "textsplit.h" #include "engine/material.h"
#include "driver.h" #include "engine/textsplit.h"
#include "engine/backend/driver.h"
#include <cstring> #include <cstring>

7
engine/model.h
View file

@ -23,9 +23,10 @@
#ifndef MODEL_H #ifndef MODEL_H
#define MODEL_H #define MODEL_H
#include "vector3d.h" #include "common/vector3d.h"
#include "matrix4.h" #include "common/matrix4.h"
#include "resource.h"
#include "engine/resource.h"
#include <cstring> #include <cstring>

2
engine/objectstate.cpp
View file

@ -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) : ObjectState::ObjectState(int setupID, ObjectState::Position pos, const char *bitmap, const char *zbitmap, bool visible) :
_setupID(setupID), _pos(pos) { _setupID(setupID), _pos(pos) {

7
engine/objectstate.h
View file

@ -23,9 +23,10 @@
#ifndef OSTATE_H #ifndef OSTATE_H
#define OSTATE_H #define OSTATE_H
#include "vector3d.h" #include "common/vector3d.h"
#include "resource.h"
#include "bitmap.h" #include "engine/resource.h"
#include "engine/bitmap.h"
#include <string> #include <string>
#include <list> #include <list>

13
engine/primitives.cpp
View file

@ -20,12 +20,13 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include "font.h"
#include "color.h" #include "engine/font.h"
#include "driver.h" #include "engine/color.h"
#include "primitives.h" #include "engine/backend/driver.h"
#include "engine/primitives.h"
#include <string> #include <string>

11
engine/primitives.h
View file

@ -23,11 +23,12 @@
#ifndef PRIMITIVESOBJECT_H #ifndef PRIMITIVESOBJECT_H
#define PRIMITIVESOBJECT_H #define PRIMITIVESOBJECT_H
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include "font.h"
#include "color.h" #include "engine/font.h"
#include "driver.h" #include "engine/color.h"
#include "engine/backend/driver.h"
#include <string> #include <string>

7
engine/registry.cpp
View file

@ -20,9 +20,10 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "registry.h" #include "common/debug.h"
#include "debug.h"
#include "engine/registry.h"
#include <cstdlib> #include <cstdlib>

27
engine/resource.cpp
View file

@ -20,19 +20,20 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include "resource.h"
#include "registry.h" #include "engine/resource.h"
#include "bitmap.h" #include "engine/registry.h"
#include "colormap.h" #include "engine/bitmap.h"
#include "costume.h" #include "engine/colormap.h"
#include "font.h" #include "engine/costume.h"
#include "keyframe.h" #include "engine/font.h"
#include "material.h" #include "engine/keyframe.h"
#include "model.h" #include "engine/material.h"
#include "engine.h" #include "engine/model.h"
#include "lipsynch.h" #include "engine/engine.h"
#include "engine/lipsynch.h"
#include <cstring> #include <cstring>
#include <cctype> #include <cctype>

4
engine/resource.h
View file

@ -23,9 +23,9 @@
#ifndef RESOURCE_H #ifndef RESOURCE_H
#define RESOURCE_H #define RESOURCE_H
#include "lab.h" #include "engine/lab.h"
#include "map"
#include <map>
#include <list> #include <list>
#include <string> #include <string>

4
engine/savegame.cpp
View file

@ -20,8 +20,8 @@
* *
*/ */
#include "debug.h" #include "common/debug.h"
#include "savegame.h" #include "engine/savegame.h"
#define SAVEGAME_HEADERTAG 'RSAV' #define SAVEGAME_HEADERTAG 'RSAV'
#define SAVEGAME_FOOTERTAG 'ESAV' #define SAVEGAME_FOOTERTAG 'ESAV'

6
engine/savegame.h
View file

@ -23,8 +23,10 @@
#ifndef SAVEGAME_H #ifndef SAVEGAME_H
#define SAVEGAME_H #define SAVEGAME_H
#include "debug.h" #include "common/debug.h"
#include "lua.h"
#include "engine/lua.h"
#include <zlib.h> #include <zlib.h>
class SaveGame { class SaveGame {

23
engine/scene.cpp
View file

@ -20,18 +20,19 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "scene.h" #include "common/debug.h"
#include "textsplit.h" #include "common/vector3d.h"
#include "resource.h"
#include "debug.h"
#include "bitmap.h"
#include "colormap.h"
#include "vector3d.h"
#include "driver.h"
#include "engine.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> #include <cmath>

13
engine/scene.h
View file

@ -23,12 +23,13 @@
#ifndef SCENE_H #ifndef SCENE_H
#define SCENE_H #define SCENE_H
#include "vector3d.h" #include "common/vector3d.h"
#include "bitmap.h" #include "common/debug.h"
#include "color.h"
#include "debug.h" #include "engine/bitmap.h"
#include "walkplane.h" #include "engine/color.h"
#include "objectstate.h" #include "engine/walkplane.h"
#include "engine/objectstate.h"
#include <string> #include <string>

9
engine/smush/blocky16.cpp
View file

@ -20,10 +20,11 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "blocky16.h"
#include "engine/smush/blocky16.h"
#if defined(SYSTEM_NEED_ALIGNMENT) #if defined(SYSTEM_NEED_ALIGNMENT)

2
engine/smush/blocky16.h
View file

@ -23,7 +23,7 @@
#ifndef BLOCKY16_H #ifndef BLOCKY16_H
#define BLOCKY16_H #define BLOCKY16_H
#include "bits.h" #include "common/platform.h"
class Blocky16 { class Blocky16 {
private: private:

17
engine/smush/smush.cpp
View file

@ -20,14 +20,15 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "smush.h" #include "common/timer.h"
#include "timer.h"
#include "resource.h" #include "engine/smush/smush.h"
#include "engine.h" #include "engine/resource.h"
#include "driver.h" #include "engine/engine.h"
#include "engine/backend/driver.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"

9
engine/smush/smush.h
View file

@ -23,10 +23,11 @@
#ifndef SMUSH_PLAYER_H #ifndef SMUSH_PLAYER_H
#define SMUSH_PLAYER_H #define SMUSH_PLAYER_H
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "blocky16.h"
#include "engine/smush/blocky16.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"

6
engine/smush/vima.cpp
View file

@ -20,9 +20,9 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
static int16 imcTable1[] = { static int16 imcTable1[] = {
7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17,

11
engine/textobject.cpp
View file

@ -20,11 +20,12 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "textobject.h"
#include "engine.h" #include "engine/textobject.h"
#include "localize.h" #include "engine/engine.h"
#include "driver.h" #include "engine/localize.h"
#include "engine/backend/driver.h"
std::string parseMsgText(const char *msg, char *msgId); std::string parseMsgText(const char *msg, char *msgId);

9
engine/textobject.h
View file

@ -23,10 +23,11 @@
#ifndef TEXTOBJECT_H #ifndef TEXTOBJECT_H
#define TEXTOBJECT_H #define TEXTOBJECT_H
#include "debug.h" #include "common/debug.h"
#include "font.h"
#include "color.h" #include "engine/font.h"
#include "driver.h" #include "engine/color.h"
#include "engine/backend/driver.h"
#include <string> #include <string>

7
engine/textsplit.cpp
View file

@ -20,9 +20,10 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include "textsplit.h"
#include "engine/textsplit.h"
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>

3
engine/tinygl/api.cpp
View file

@ -1,5 +1,6 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
#include <stdio.h> #include <stdio.h>
// glVertex // glVertex

3
engine/tinygl/arrays.cpp
View file

@ -1,5 +1,6 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>

2
engine/tinygl/clear.cpp
View file

@ -1,5 +1,5 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
void glopClearColor(GLContext *c, TGLParam *p) { void glopClearColor(GLContext *c, TGLParam *p) {
c->clear_color.v[0] = p[1].f; c->clear_color.v[0] = p[1].f;

2
engine/tinygl/clip.cpp
View file

@ -1,5 +1,5 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
// fill triangle profile // fill triangle profile
// #define PROFILE // #define PROFILE

3
engine/tinygl/error.cpp
View file

@ -1,6 +1,7 @@
#include <stdarg.h> #include <stdarg.h>
#include "tinygl/zgl.h"
#include "engine/tinygl/zgl.h"
void gl_fatal_error(char *format, ...) { void gl_fatal_error(char *format, ...) {
va_list ap; va_list ap;

2
engine/tinygl/get.cpp
View file

@ -1,5 +1,5 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
void glGetIntegerv(int pname,int *params) { void glGetIntegerv(int pname,int *params) {
GLContext *c=gl_get_context(); GLContext *c=gl_get_context();

2
engine/tinygl/image_util.cpp
View file

@ -1,5 +1,5 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
// image conversion // image conversion

2
engine/tinygl/init.cpp
View file

@ -1,5 +1,5 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
GLContext *gl_ctx; GLContext *gl_ctx;

4
engine/tinygl/light.cpp
View file

@ -1,6 +1,6 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
#include "tinygl/msghandling.h" #include "engine/tinygl/msghandling.h"
void glopMaterial(GLContext *c, TGLParam *p) { void glopMaterial(GLContext *c, TGLParam *p) {
int mode = p[1].i; int mode = p[1].i;

8
engine/tinygl/list.cpp
View file

@ -1,22 +1,22 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
static char *op_table_str[] = { static char *op_table_str[] = {
#define ADD_OP(a, b, c) "gl" #a " " #c, #define ADD_OP(a, b, c) "gl" #a " " #c,
#include "opinfo.h" #include "engine/tinygl/opinfo.h"
}; };
static void (*op_table_func[])(GLContext *, TGLParam *) = { static void (*op_table_func[])(GLContext *, TGLParam *) = {
#define ADD_OP(a, b, c) glop ## a , #define ADD_OP(a, b, c) glop ## a ,
#include "opinfo.h" #include "engine/tinygl/opinfo.h"
}; };
static int op_table_size[] = { static int op_table_size[] = {
#define ADD_OP(a, b, c) b + 1 , #define ADD_OP(a, b, c) b + 1 ,
#include "opinfo.h" #include "engine/tinygl/opinfo.h"
}; };
GLContext *gl_get_context() { GLContext *gl_get_context() {

2
engine/tinygl/matrix.cpp
View file

@ -1,5 +1,5 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
void gl_print_matrix(const float *m) { void gl_print_matrix(const float *m) {
int i; int i;

2
engine/tinygl/memory.cpp
View file

@ -1,7 +1,7 @@
// Memory allocator for TinyGL // Memory allocator for TinyGL
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
// modify these functions so that they suit your needs // modify these functions so that they suit your needs

4
engine/tinygl/misc.cpp
View file

@ -1,6 +1,6 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
#include "msghandling.h" #include "engine/tinygl/msghandling.h"
void glopViewport(GLContext *c, TGLParam *p) { void glopViewport(GLContext *c, TGLParam *p) {
int xsize, ysize, xmin, ymin, xsize_req, ysize_req; int xsize, ysize, xmin, ymin, xsize_req, ysize_req;

2
engine/tinygl/select.cpp
View file

@ -1,5 +1,5 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
int glRenderMode(int mode) { int glRenderMode(int mode) {
GLContext *c = gl_get_context(); GLContext *c = gl_get_context();

5
engine/tinygl/specbuf.cpp
View file

@ -1,6 +1,7 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
#include "tinygl/msghandling.h" #include "engine/tinygl/msghandling.h"
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

2
engine/tinygl/texture.cpp
View file

@ -1,7 +1,7 @@
// Texture Manager // Texture Manager
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
static GLTexture *find_texture(GLContext *c, int h) { static GLTexture *find_texture(GLContext *c, int h) {
GLTexture *t; GLTexture *t;

3
engine/tinygl/vertex.cpp
View file

@ -1,5 +1,6 @@
#include "tinygl/zgl.h" #include "engine/tinygl/zgl.h"
#include <string.h> #include <string.h>
void glopNormal(GLContext *c, TGLParam *p) { void glopNormal(GLContext *c, TGLParam *p) {

3
engine/tinygl/zbuffer.cpp
View file

@ -5,7 +5,8 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include <string.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_open(int xsize, int ysize, int mode, void *frame_buffer) {
ZBuffer *zb; ZBuffer *zb;

7
engine/tinygl/zgl.h
View file

@ -5,9 +5,10 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>
#include "tinygl/gl.h"
#include "tinygl/zbuffer.h" #include "engine/tinygl/gl.h"
#include "tinygl/zmath.h" #include "engine/tinygl/zbuffer.h"
#include "engine/tinygl/zmath.h"
#define DEBUG #define DEBUG
/* #define NDEBUG */ /* #define NDEBUG */

11
engine/tinygl/zline.cpp
View file

@ -1,5 +1,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "tinygl/zbuffer.h"
#include "engine/tinygl/zbuffer.h"
#define ZCMP(z,zpix) ((z) >= (zpix)) #define ZCMP(z,zpix) ((z) >= (zpix))
@ -21,24 +22,24 @@ void ZB_plot(ZBuffer * zb, ZBufferPoint * p) {
#define INTERP_Z #define INTERP_Z
static void ZB_line_flat_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) { 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 // line with color interpolation
#define INTERP_Z #define INTERP_Z
#define INTERP_RGB #define INTERP_RGB
static void ZB_line_interp_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) { static void ZB_line_interp_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {
#include "zline.h" #include "engine/tinygl/zline.h"
} }
// no Z interpolation // no Z interpolation
static void ZB_line_flat(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) { static void ZB_line_flat(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2, int color) {
#include "zline.h" #include "engine/tinygl/zline.h"
} }
#define INTERP_RGB #define INTERP_RGB
static void ZB_line_interp(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) { 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) { void ZB_line_z(ZBuffer *zb, ZBufferPoint *p1, ZBufferPoint *p2) {

3
engine/tinygl/zmath.cpp
View file

@ -4,7 +4,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "tinygl/zmath.h"
#include "engine/tinygl/zmath.h"
void gl_M4_Id(M4 *a) { void gl_M4_Id(M4 *a) {
int i, j; int i, j;

9
engine/tinygl/ztriangle.cpp
View file

@ -1,6 +1,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "tinygl/zbuffer.h"
#include "engine/tinygl/zbuffer.h"
#define ZCMP(z, zpix) ((z) >= (zpix)) #define ZCMP(z, zpix) ((z) >= (zpix))
@ -23,7 +24,7 @@ void ZB_fillTriangleFlat(ZBuffer *zb, ZBufferPoint *p0,
z += dzdx; \ z += dzdx; \
} }
#include "ztriangle.h" #include "engine/tinygl/ztriangle.h"
} }
// Smooth filled triangle. // 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) { void ZB_setTexture(ZBuffer *zb, PIXEL *texture) {
@ -118,7 +119,7 @@ void ZB_fillTriangleMapping(ZBuffer *zb, ZBufferPoint *p0,
t += dtdx; \ t += dtdx; \
} }
#include "ztriangle.h" #include "engine/tinygl/ztriangle.h"
} }
void ZB_fillTriangleMappingPerspective(ZBuffer *zb, ZBufferPoint *p0, void ZB_fillTriangleMappingPerspective(ZBuffer *zb, ZBufferPoint *p0,

7
engine/walkplane.cpp
View file

@ -20,9 +20,10 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "walkplane.h"
#include "textsplit.h" #include "engine/walkplane.h"
#include "engine/textsplit.h"
void Sector::load(TextSplitter &ts) { void Sector::load(TextSplitter &ts) {
// float height = 12345.f; // Yaz: this is in the original code... // float height = 12345.f; // Yaz: this is in the original code...

4
engine/walkplane.h
View file

@ -23,8 +23,8 @@
#ifndef WALKPLANE_H #ifndef WALKPLANE_H
#define WALKPLANE_H #define WALKPLANE_H
#include "debug.h" #include "common/debug.h"
#include "vector3d.h" #include "common/vector3d.h"
#include <string> #include <string>

7
mixer/audiostream.cpp
View file

@ -20,9 +20,10 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "debug.h" #include "common/debug.h"
#include "driver.h"
#include "engine/backend/driver.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/audiostream.h" #include "mixer/audiostream.h"

4
mixer/audiostream.h
View file

@ -23,8 +23,8 @@
#ifndef AUDIOSTREAM_H #ifndef AUDIOSTREAM_H
#define AUDIOSTREAM_H #define AUDIOSTREAM_H
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
/** /**

9
mixer/mixer.cpp
View file

@ -20,10 +20,11 @@
* *
*/ */
#include "stdafx.h" #include "common/sys.h"
#include "bits.h" #include "common/platform.h"
#include "debug.h" #include "common/debug.h"
#include "driver.h"
#include "engine/backend/driver.h"
#include "mixer/mixer.h" #include "mixer/mixer.h"
#include "mixer/rate.h" #include "mixer/rate.h"

Some files were not shown because too many files have changed in this diff Show more