[Scummvm-cvs-logs] CVS: residual Makefile,1.20,1.21 Makefile.cross,1.13,1.14 Makefile.mingw,1.22,1.23 actor.cpp,1.35,1.36 actor.h,1.17,1.18 bitmap.cpp,1.28,1.29 bitmap.h,1.11,1.12 bits.h,1.17,1.18 blocky16.cpp,1.17,1.18 colormap.h,1.5,1.6 costume.cpp,1.21,1.22 costume.h,1.12,1.13 debug.cpp,1.6,1.7 debug.h,1.7,1.8 driver_gl.cpp,1.20,1.21 driver_gl.h,1.11,1.12 engine.cpp,1.52,1.53 engine.h,1.18,1.19 keyframe.cpp,1.8,1.9 lab.cpp,1.12,1.13 lipsynch.cpp,1.4,1.5 lipsynch.h,1.4,1.5 localize.cpp,1.8,1.9 lua.cpp,1.86,1.87 lua.h,1.6,1.7 main.cpp,1.41,1.42 material.cpp,1.11,1.12 material.h,1.7,1.8 matrix3.cpp,1.8,1.9 model.cpp,1.21,1.22 model.h,1.8,1.9 objectstate.h,1.7,1.8 registry.cpp,1.10,1.11 resource.cpp,1.19,1.20 resource.h,1.13,1.14 scene.cpp,1.30,1.31 scene.h,1.20,1.21 screen.cpp,1.16,1.17 smush.cpp,1.57,1.58 smush.h,1.23,1.24 stdafx.h,1.7,1.8 textobject.cpp,1.13,1.14 textobject.h,1.5,1.6 textsplit.cpp,1.9,1.10 timer.cpp,1.11,1.12 walkplane.h,1.10,1.11
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Jan 1 04:29:06 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: residual/mixer audiostream.cpp,1.5,1.6 audiostream.h,1.5,1.6 mixer.cpp,1.7,1.8 mixer.h,1.6,1.7 rate.cpp,1.4,1.5 rate.h,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: residual lua.cpp,1.87,1.88
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24066
Modified Files:
Makefile Makefile.cross Makefile.mingw actor.cpp actor.h
bitmap.cpp bitmap.h bits.h blocky16.cpp colormap.h costume.cpp
costume.h debug.cpp debug.h driver_gl.cpp driver_gl.h
engine.cpp engine.h keyframe.cpp lab.cpp lipsynch.cpp
lipsynch.h localize.cpp lua.cpp lua.h main.cpp material.cpp
material.h matrix3.cpp model.cpp model.h objectstate.h
registry.cpp resource.cpp resource.h scene.cpp scene.h
screen.cpp smush.cpp smush.h stdafx.h textobject.cpp
textobject.h textsplit.cpp timer.cpp walkplane.h
Log Message:
cleanup headers
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile 6 Oct 2004 19:13:52 -0000 1.20
+++ Makefile 1 Jan 2005 12:27:55 -0000 1.21
@@ -1,8 +1,7 @@
CXX = g++
CC = gcc
AR = ar rcu
-CXXFLAGS = -g -W -Wall -Ilua `sdl-config --cflags` -DUNIX \
- -Wno-multichar # -O2
+CXXFLAGS = -g -W -Wall -Ilua `sdl-config --cflags` -I. -DUNIX -Wno-multichar # -O2
LDFLAGS = -g -W -Wall # -O2
LIBS = `sdl-config --libs` -lz
Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.cross 6 Oct 2004 19:13:52 -0000 1.13
+++ Makefile.cross 1 Jan 2005 12:27:55 -0000 1.14
@@ -3,10 +3,9 @@
SDL_LIBS=-L/usr/i586-mingw32msvc/lib -lSDL
CXX = i586-mingw32msvc-g++
-CXXFLAGS = -W -Wall -Wno-multichar -Ilua $(SDL_CFLAGS) # -O2
+CXXFLAGS = -W -Wall -Wno-multichar -I. $(SDL_CFLAGS) # -O2
LDFLAGS = -W -Wall # -O2
-LIBS = -lmingw32 -lopengl32 -lglu32 -lgdi32 \
- $(SDL_LIBS) -lz
+LIBS = -lmingw32 -lopengl32 -lglu32 -lgdi32 $(SDL_LIBS) -lz
EXEEXT =.exe
include Makefile.common
Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.mingw 16 Dec 2004 06:41:57 -0000 1.22
+++ Makefile.mingw 1 Jan 2005 12:27:55 -0000 1.23
@@ -6,10 +6,9 @@
SDL_LIBS=`sdl-config --libs`
CXX = g++
-CXXFLAGS = -g -W -Wall -Wno-multichar -Ilua $(SDL_CFLAGS) # -O2
+CXXFLAGS = -g -W -Wall -Wno-multichar -I. $(SDL_CFLAGS) # -O2
LDFLAGS = -g -W -Wall # -O2
-LIBS = -lmingw32 -lopengl32 -lglu32 -lgdi32 \
- $(SDL_LIBS) -lz
+LIBS = -lmingw32 -lopengl32 -lglu32 -lgdi32 $(SDL_LIBS) -lz
EXEEXT =.exe
include Makefile.common
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/actor.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- actor.cpp 1 Jan 2005 10:23:15 -0000 1.35
+++ actor.cpp 1 Jan 2005 12:27:55 -0000 1.36
@@ -21,11 +21,13 @@
#include "costume.h"
#include "lipsynch.h"
#include "localize.h"
-#include <cmath>
-#include <cstring>
#include "driver_gl.h"
+
#include "mixer/mixer.h"
+#include <cmath>
+#include <cstring>
+
Actor::Actor(const char *name) :
_name(name), _talkColor(255, 255, 255), _pos(0, 0, 0),
_pitch(0), _yaw(0), _roll(0), _walkRate(0), _turnRate(0),
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/residual/actor.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- actor.h 1 Jan 2005 10:23:15 -0000 1.17
+++ actor.h 1 Jan 2005 12:27:55 -0000 1.18
@@ -21,6 +21,7 @@
#include "color.h"
#include "vector3d.h"
#include "resource.h"
+
#include <string>
#include <list>
Index: bitmap.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/bitmap.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- bitmap.cpp 1 Jan 2005 10:23:15 -0000 1.28
+++ bitmap.cpp 1 Jan 2005 12:27:55 -0000 1.29
@@ -16,15 +16,15 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include <cstdlib>
-#include <cstring>
-#include "bitmap.h"
#include "bits.h"
-#include "smush.h"
#include "debug.h"
-
+#include "bitmap.h"
+#include "smush.h"
#include "driver_gl.h"
+#include <cstdlib>
+#include <cstring>
+
#define BITMAP_TEXTURE_SIZE 256
static void decompress_codec3(const char *compressed, char *result);
Index: bitmap.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bitmap.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- bitmap.h 1 Jan 2005 10:23:15 -0000 1.11
+++ bitmap.h 1 Jan 2005 12:27:55 -0000 1.12
@@ -19,6 +19,7 @@
#define BITMAP_H
#include "resource.h"
+
#include <cstring>
#include <SDL_opengl.h>
Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- bits.h 1 Jan 2005 10:23:15 -0000 1.17
+++ bits.h 1 Jan 2005 12:27:55 -0000 1.18
@@ -18,12 +18,12 @@
#ifndef BITS_H
#define BITS_H
-#include <SDL_byteorder.h>
#include "stdafx.h"
#include "vector3d.h"
#include <stdlib.h>
#include <stdio.h>
+#include <SDL_byteorder.h>
// Use config.h, generated by configure
#if defined(HAVE_CONFIG_H)
Index: blocky16.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/blocky16.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- blocky16.cpp 1 Jan 2005 10:23:15 -0000 1.17
+++ blocky16.cpp 1 Jan 2005 12:27:55 -0000 1.18
@@ -17,8 +17,8 @@
#include "stdafx.h"
#include "bits.h"
-#include "blocky16.h"
#include "debug.h"
+#include "blocky16.h"
#if defined(SYSTEM_NEED_ALIGNMENT)
Index: colormap.h
===================================================================
RCS file: /cvsroot/scummvm/residual/colormap.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- colormap.h 1 Jan 2005 10:23:15 -0000 1.5
+++ colormap.h 1 Jan 2005 12:27:55 -0000 1.6
@@ -20,6 +20,7 @@
#include "debug.h"
#include "resource.h"
+
#include <cstring>
class CMap : public Resource {
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- costume.cpp 1 Jan 2005 10:23:15 -0000 1.21
+++ costume.cpp 1 Jan 2005 12:27:55 -0000 1.22
@@ -16,15 +16,16 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
+#include "debug.h"
#include "costume.h"
#include "textsplit.h"
-#include "debug.h"
#include "engine.h"
#include "colormap.h"
#include "keyframe.h"
#include "material.h"
#include "model.h"
#include "lua.h"
+
#include <string>
#include <cstdio>
#include <map>
Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/residual/costume.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- costume.h 1 Jan 2005 10:23:15 -0000 1.12
+++ costume.h 1 Jan 2005 12:27:55 -0000 1.13
@@ -18,9 +18,10 @@
#ifndef COSTUME_H
#define COSTUME_H
-#include <string>
#include "matrix4.h"
+#include <string>
+
class TextSplitter;
class Actor;
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/debug.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- debug.cpp 1 Jan 2005 10:23:15 -0000 1.6
+++ debug.cpp 1 Jan 2005 12:27:55 -0000 1.7
@@ -17,6 +17,7 @@
#include "stdafx.h"
#include "debug.h"
+
#include <cstdarg>
#include <cstdio>
#include <cstdlib>
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/residual/debug.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- debug.h 1 Jan 2005 10:23:15 -0000 1.7
+++ debug.h 1 Jan 2005 12:27:55 -0000 1.8
@@ -19,6 +19,7 @@
#ifndef DEBUG_H
#define DEBUG_H
+
// Hacky toggles for experimental / debug code (defined/set in main.cpp)
extern bool ZBUFFER_GLOBAL, SCREENBLOCKS_GLOBAL, SHOWFPS_GLOBAL;
@@ -27,4 +28,5 @@
const char *tag2str(uint32 tag);
void hexdump(const byte * data, int len, int bytesPerLine);
+
#endif
Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- driver_gl.cpp 1 Jan 2005 10:23:15 -0000 1.20
+++ driver_gl.cpp 1 Jan 2005 12:27:55 -0000 1.21
@@ -15,12 +15,12 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#include "driver_gl.h" // Driver interface
-#include "debug.h" // error(), warning(), etc
-#include "font.h" // builtin emergency font
+#include "debug.h"
#include "screen.h"
#include "colormap.h"
#include "material.h"
+#include "driver_gl.h"
+#include "font.h"
Driver *g_driver;
Index: driver_gl.h
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- driver_gl.h 1 Jan 2005 10:23:15 -0000 1.11
+++ driver_gl.h 1 Jan 2005 12:27:55 -0000 1.12
@@ -15,11 +15,6 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-// Driver:
-#include <SDL.h>
-#include <SDL_opengl.h>
-
-// Residual:
#include "bits.h"
#include "vector3d.h"
#include "color.h"
@@ -27,6 +22,9 @@
#include "colormap.h"
#include "bitmap.h"
+#include <SDL.h>
+#include <SDL_opengl.h>
+
#define BITMAP_TEXTURE_SIZE 256
class Driver {
Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- engine.cpp 1 Jan 2005 10:23:15 -0000 1.52
+++ engine.cpp 1 Jan 2005 12:27:55 -0000 1.53
@@ -22,14 +22,15 @@
#include "colormap.h"
#include "actor.h"
#include "textobject.h"
-#include <SDL.h>
-#include <SDL_timer.h>
-#include <assert.h>
#include "screen.h"
#include "smush.h"
+#include "driver_gl.h"
+
#include "imuse/imuse.h"
-#include "driver_gl.h"
+#include <SDL.h>
+#include <SDL_timer.h>
+#include <assert.h>
Engine *g_engine = NULL;
Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- engine.h 1 Jan 2005 10:23:15 -0000 1.18
+++ engine.h 1 Jan 2005 12:27:55 -0000 1.19
@@ -18,9 +18,11 @@
#ifndef ENGINE_H
#define ENGINE_H
+#include "bits.h"
#include "scene.h"
#include "textobject.h"
#include "lua.h"
+
#include <cstdlib>
#include <list>
#include <SDL_keysym.h>
Index: keyframe.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/keyframe.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- keyframe.cpp 1 Jan 2005 10:23:16 -0000 1.8
+++ keyframe.cpp 1 Jan 2005 12:27:55 -0000 1.9
@@ -16,10 +16,11 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include "keyframe.h"
-#include "debug.h"
#include "bits.h"
+#include "debug.h"
+#include "keyframe.h"
#include "textsplit.h"
+
#include <cstring>
KeyframeAnim::KeyframeAnim(const char *filename, const char *data, int len) :
Index: lab.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lab.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- lab.cpp 1 Jan 2005 10:23:16 -0000 1.12
+++ lab.cpp 1 Jan 2005 12:27:55 -0000 1.13
@@ -16,8 +16,9 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include "lab.h"
#include "bits.h"
+#include "lab.h"
+
#include <algorithm>
#include <cstdlib>
#include <cctype>
Index: lipsynch.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lipsynch.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lipsynch.cpp 1 Jan 2005 10:23:16 -0000 1.4
+++ lipsynch.cpp 1 Jan 2005 12:27:55 -0000 1.5
@@ -16,9 +16,10 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include "lipsynch.h"
#include "bits.h"
#include "debug.h"
+#include "lipsynch.h"
+
#include <cstring>
#include <SDL_endian.h>
Index: lipsynch.h
===================================================================
RCS file: /cvsroot/scummvm/residual/lipsynch.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lipsynch.h 1 Jan 2005 10:23:16 -0000 1.4
+++ lipsynch.h 1 Jan 2005 12:27:55 -0000 1.5
@@ -20,6 +20,7 @@
#include "bits.h"
#include "resource.h"
+
#include <list>
class LipSynch : public Resource {
Index: localize.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/localize.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- localize.cpp 1 Jan 2005 10:23:16 -0000 1.8
+++ localize.cpp 1 Jan 2005 12:27:55 -0000 1.9
@@ -16,9 +16,10 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
+#include "debug.h"
#include "localize.h"
#include "registry.h"
-#include "debug.h"
+
#include <cstdio>
#include <cstring>
Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- lua.cpp 1 Jan 2005 10:23:16 -0000 1.86
+++ lua.cpp 1 Jan 2005 12:27:55 -0000 1.87
@@ -16,9 +16,9 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
+#include "debug.h"
#include "lua.h"
#include "resource.h"
-#include "debug.h"
#include "actor.h"
#include "registry.h"
#include "localize.h"
@@ -28,11 +28,13 @@
#include "smush.h"
#include "textobject.h"
#include "objectstate.h"
+
#include "imuse/imuse.h"
-#include <SDL_keysym.h>
-#include <SDL_keyboard.h>
+
#include <cstdio>
#include <cmath>
+#include <SDL_keysym.h>
+#include <SDL_keyboard.h>
static int actor_tag, color_tag, sound_tag, text_tag, vbuffer_tag, object_tag;
Index: lua.h
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lua.h 1 Jan 2005 10:23:16 -0000 1.6
+++ lua.h 1 Jan 2005 12:27:56 -0000 1.7
@@ -18,10 +18,10 @@
#ifndef LUA_HH
#define LUA_HH
-#include <lua.h>
-#include <lualib.h>
-#include <luadebug.h>
-#include <lauxlib.h>
+#include "lua/lua.h"
+#include "lua/lualib.h"
+#include "lua/luadebug.h"
+#include "lua/lauxlib.h"
// Register Residual builtin functions and structures
void register_lua();
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- main.cpp 1 Jan 2005 10:23:16 -0000 1.41
+++ main.cpp 1 Jan 2005 12:27:56 -0000 1.42
@@ -16,25 +16,23 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include <SDL.h>
-#include <SDL_video.h>
+#include "debug.h"
#include "bitmap.h"
#include "resource.h"
-#include "debug.h"
#include "lua.h"
#include "registry.h"
#include "localize.h"
#include "engine.h"
#include "timer.h"
#include "smush.h"
+#include "driver_gl.h"
+
#include "mixer/mixer.h"
-#include "imuse/imuse.h"
-#include "driver_gl.h"
+#include "imuse/imuse.h"
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
+#include <SDL.h>
+#include <SDL_video.h>
// Hacky global toggles for experimental/debug code
bool ZBUFFER_GLOBAL, SCREENBLOCKS_GLOBAL, SHOWFPS_GLOBAL;
Index: material.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/material.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- material.cpp 1 Jan 2005 10:23:16 -0000 1.11
+++ material.cpp 1 Jan 2005 12:27:56 -0000 1.12
@@ -16,10 +16,10 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include "material.h"
-#include "colormap.h"
#include "bits.h"
#include "debug.h"
+#include "material.h"
+#include "colormap.h"
#include "driver_gl.h"
Material::Material(const char *filename, const char *data, int len, const CMap &cmap) :
Index: material.h
===================================================================
RCS file: /cvsroot/scummvm/residual/material.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- material.h 1 Jan 2005 10:23:16 -0000 1.7
+++ material.h 1 Jan 2005 12:27:56 -0000 1.8
@@ -19,9 +19,10 @@
#define MATERIAL_H
#include "resource.h"
+
+#include <cstring>
#include <SDL.h>
#include <SDL_opengl.h>
-#include <cstring>
class CMap;
Index: matrix3.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/matrix3.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- matrix3.cpp 1 Jan 2005 10:23:16 -0000 1.8
+++ matrix3.cpp 1 Jan 2005 12:27:56 -0000 1.9
@@ -15,9 +15,10 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#include <math.h>
#include "matrix3.h"
+#include <math.h>
+
void Matrix3::setAsIdentity() {
_right.set(1.f, 0.f, 0.f);
_up.set(0.f, 1.f, 0.f);
Index: model.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/model.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- model.cpp 1 Jan 2005 10:23:16 -0000 1.21
+++ model.cpp 1 Jan 2005 12:27:56 -0000 1.22
@@ -16,16 +16,17 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include "model.h"
#include "bits.h"
+#include "debug.h"
+#include "model.h"
#include "resource.h"
+#include "screen.h"
#include "material.h"
-#include "debug.h"
#include "textsplit.h"
+#include "driver_gl.h"
+
#include <cstring>
#include <SDL.h>
-#include "screen.h"
-#include "driver_gl.h"
Model::Model(const char *filename, const char *data, int len, const CMap &cmap) : Resource(filename) {
if (len >= 4 && std::memcmp(data, "LDOM", 4) == 0)
Index: model.h
===================================================================
RCS file: /cvsroot/scummvm/residual/model.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- model.h 1 Jan 2005 10:23:16 -0000 1.8
+++ model.h 1 Jan 2005 12:27:56 -0000 1.9
@@ -21,6 +21,7 @@
#include "vector3d.h"
#include "matrix4.h"
#include "resource.h"
+
#include <cstring>
class CMap;
Index: objectstate.h
===================================================================
RCS file: /cvsroot/scummvm/residual/objectstate.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- objectstate.h 1 Jan 2005 10:23:16 -0000 1.7
+++ objectstate.h 1 Jan 2005 12:27:56 -0000 1.8
@@ -21,10 +21,10 @@
#include "vector3d.h"
#include "resource.h"
#include "bitmap.h"
+
#include <string>
#include <list>
-
class ObjectState {
public:
enum Position {
Index: registry.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/registry.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- registry.cpp 1 Jan 2005 10:23:16 -0000 1.10
+++ registry.cpp 1 Jan 2005 12:27:56 -0000 1.11
@@ -18,6 +18,7 @@
#include "stdafx.h"
#include "registry.h"
#include "debug.h"
+
#include <cstdlib>
Registry *g_registry = NULL;
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- resource.cpp 1 Jan 2005 10:23:16 -0000 1.19
+++ resource.cpp 1 Jan 2005 12:27:56 -0000 1.20
@@ -16,6 +16,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
+#include "debug.h"
#include "resource.h"
#include "registry.h"
#include "bitmap.h"
@@ -25,7 +26,7 @@
#include "material.h"
#include "model.h"
#include "lipsynch.h"
-#include "debug.h"
+
#include <cstring>
#include <cctype>
#include <string>
Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- resource.h 1 Jan 2005 10:23:16 -0000 1.13
+++ resource.h 1 Jan 2005 12:27:56 -0000 1.14
@@ -20,6 +20,7 @@
#include "lab.h"
#include "map"
+
#include <list>
#include <string>
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- scene.cpp 1 Jan 2005 10:23:16 -0000 1.30
+++ scene.cpp 1 Jan 2005 12:27:56 -0000 1.31
@@ -23,11 +23,12 @@
#include "bitmap.h"
#include "colormap.h"
#include "vector3d.h"
-#include <SDL.h>
-#include <cmath>
#include "screen.h"
#include "driver_gl.h"
+#include <SDL.h>
+#include <cmath>
+
Scene::Scene(const char *name, const char *buf, int len) :
_name(name) {
TextSplitter ts(buf, len);
Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/residual/scene.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- scene.h 1 Jan 2005 10:23:16 -0000 1.20
+++ scene.h 1 Jan 2005 12:27:56 -0000 1.21
@@ -24,6 +24,7 @@
#include "debug.h"
#include "walkplane.h"
#include "objectstate.h"
+
#include <SDL.h>
#include <SDL_opengl.h>
#include <string>
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/screen.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- screen.cpp 1 Jan 2005 10:23:16 -0000 1.16
+++ screen.cpp 1 Jan 2005 12:27:56 -0000 1.17
@@ -16,6 +16,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "screen.h"
+
#include <string.h>
unsigned short int dataTemp[640 * 480];
Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- smush.cpp 1 Jan 2005 10:48:13 -0000 1.57
+++ smush.cpp 1 Jan 2005 12:27:56 -0000 1.58
@@ -18,16 +18,17 @@
#include "stdafx.h"
#include "bits.h"
#include "debug.h"
-#include <cstring>
-#include <zlib.h>
#include "smush.h"
#include "timer.h"
-#include "mixer/mixer.h"
#include "resource.h"
#include "engine.h"
-
#include "driver_gl.h"
+#include "mixer/mixer.h"
+
+#include <cstring>
+#include <zlib.h>
+
Smush *g_smush;
static uint16 smushDestTable[5786];
Index: smush.h
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- smush.h 1 Jan 2005 10:23:16 -0000 1.23
+++ smush.h 1 Jan 2005 12:27:56 -0000 1.24
@@ -18,15 +18,17 @@
#ifndef SMUSH_PLAYER_H
#define SMUSH_PLAYER_H
+#include "stdafx.h"
#include "bits.h"
#include "debug.h"
-#include <cstring>
-#include <zlib.h>
-
#include "blocky16.h"
+
#include "mixer/mixer.h"
#include "mixer/audiostream.h"
+#include <zlib.h>
+#include <cstring>
+
class zlibFile {
private:
FILE *_handle;
Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/residual/stdafx.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- stdafx.h 1 Jan 2005 10:23:16 -0000 1.7
+++ stdafx.h 1 Jan 2005 12:27:56 -0000 1.8
@@ -33,6 +33,10 @@
void unlockMutex(MutexRef mutex);
void deleteMutex(MutexRef mutex);
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+
#if defined(WIN32)
#ifdef _MSC_VER
Index: textobject.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/textobject.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- textobject.cpp 1 Jan 2005 10:23:16 -0000 1.13
+++ textobject.cpp 1 Jan 2005 12:27:56 -0000 1.14
@@ -19,7 +19,6 @@
#include "textobject.h"
#include "engine.h"
#include "localize.h"
-
#include "driver_gl.h"
TextObject::TextObject(const char *text, const int x, const int y, const Color& fgColor) :
Index: textobject.h
===================================================================
RCS file: /cvsroot/scummvm/residual/textobject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- textobject.h 1 Jan 2005 10:23:16 -0000 1.5
+++ textobject.h 1 Jan 2005 12:27:56 -0000 1.6
@@ -18,11 +18,12 @@
#ifndef TEXTOBJECT_H
#define TEXTOBJECT_H
-#include "color.h"
#include "debug.h"
+#include "color.h"
+
+#include <string>
#include <SDL.h>
#include <SDL_opengl.h>
-#include <string>
class TextObject {
public:
Index: textsplit.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/textsplit.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- textsplit.cpp 1 Jan 2005 10:23:16 -0000 1.9
+++ textsplit.cpp 1 Jan 2005 12:27:56 -0000 1.10
@@ -16,14 +16,14 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h"
-#include "textsplit.h"
#include "debug.h"
+#include "textsplit.h"
+
#include <cstdio>
#include <cstring>
#include <cctype>
#include <cstdarg>
-
// FIXME: Replace this with a proper parser (this is just too dodgy :)
int residual_vsscanf(const char *str, int field_count, const char *format, va_list ap) {
unsigned int f01 = va_arg(ap, long);
Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/timer.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- timer.cpp 1 Jan 2005 10:23:16 -0000 1.11
+++ timer.cpp 1 Jan 2005 12:27:56 -0000 1.12
@@ -17,8 +17,9 @@
#include "stdafx.h"
#include "bits.h"
-#include "timer.h"
#include "debug.h"
+#include "timer.h"
+
#include <SDL.h>
Timer *g_timer = NULL;
Index: walkplane.h
===================================================================
RCS file: /cvsroot/scummvm/residual/walkplane.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- walkplane.h 1 Jan 2005 10:23:16 -0000 1.10
+++ walkplane.h 1 Jan 2005 12:27:56 -0000 1.11
@@ -18,11 +18,12 @@
#ifndef WALKPLANE_H
#define WALKPLANE_H
-#include "vector3d.h"
#include "debug.h"
+#include "vector3d.h"
+
+#include <string>
#include <SDL.h>
#include <SDL_opengl.h>
-#include <string>
class TextSplitter;
- Previous message: [Scummvm-cvs-logs] CVS: residual/mixer audiostream.cpp,1.5,1.6 audiostream.h,1.5,1.6 mixer.cpp,1.7,1.8 mixer.h,1.6,1.7 rate.cpp,1.4,1.5 rate.h,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: residual lua.cpp,1.87,1.88
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list