[Scummvm-cvs-logs] CVS: scummvm/sword1 control.h,1.20,1.21 credits.cpp,1.14,1.15 debug.cpp,1.5,1.6 debug.h,1.5,1.6 eventman.cpp,1.6,1.7 logic.cpp,1.52,1.53 memman.cpp,1.8,1.9 memman.h,1.5,1.6 menu.cpp,1.25,1.26 mouse.cpp,1.28,1.29 mouse.h,1.16,1.17 music.cpp,1.44,1.45 music.h,1.21,1.22 object.h,1.6,1.7 objectman.cpp,1.10,1.11 resman.cpp,1.30,1.31 router.cpp,1.13,1.14 router.h,1.8,1.9 screen.cpp,1.53,1.54 sound.cpp,1.45,1.46 staticres.cpp,1.10,1.11 sword1.cpp,1.87,1.88 text.cpp,1.12,1.13
Max Horn
fingolfin at users.sourceforge.net
Fri Jun 24 08:26:44 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/test/common array.h,1.2,1.3 list.h,1.2,1.3 map.h,1.1,1.2 str.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/fs/posix posix-fs.cpp,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17960/sword1
Modified Files:
control.h credits.cpp debug.cpp debug.h eventman.cpp logic.cpp
memman.cpp memman.h menu.cpp mouse.cpp mouse.h music.cpp
music.h object.h objectman.cpp resman.cpp router.cpp router.h
screen.cpp sound.cpp staticres.cpp sword1.cpp text.cpp
Log Message:
When including files from common/, explicitly use the common/ prefix
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- control.h 10 May 2005 23:17:38 -0000 1.20
+++ control.h 24 Jun 2005 15:23:49 -0000 1.21
@@ -22,7 +22,7 @@
#ifndef BSCONTROL_H
#define BSCONTROL_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "sword1/sworddefs.h"
class OSystem;
Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- credits.cpp 11 May 2005 00:01:37 -0000 1.14
+++ credits.cpp 24 Jun 2005 15:23:49 -0000 1.15
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/credits.h"
#include "sword1/screen.h"
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/debug.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- debug.cpp 1 Jan 2005 16:09:24 -0000 1.5
+++ debug.cpp 24 Jun 2005 15:23:49 -0000 1.6
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "common/util.h"
#include "sword1/debug.h"
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/debug.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- debug.h 1 Jan 2005 16:09:24 -0000 1.5
+++ debug.h 24 Jun 2005 15:23:49 -0000 1.6
@@ -22,7 +22,7 @@
#ifndef BSDEBUG_H
#define BSDEBUG_H
-#include "scummsys.h"
+#include "common/scummsys.h"
namespace Sword1 {
Index: eventman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/eventman.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- eventman.cpp 1 Jan 2005 16:09:24 -0000 1.6
+++ eventman.cpp 24 Jun 2005 15:23:49 -0000 1.7
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/eventman.h"
#include "sword1/sworddefs.h"
#include "common/util.h"
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- logic.cpp 10 May 2005 23:48:46 -0000 1.52
+++ logic.cpp 24 Jun 2005 15:23:49 -0000 1.53
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "common/util.h"
#include "sword1/logic.h"
Index: memman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/memman.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- memman.cpp 1 Jan 2005 16:09:24 -0000 1.8
+++ memman.cpp 24 Jun 2005 15:23:49 -0000 1.9
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/memman.h"
#include "common/util.h"
Index: memman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/memman.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- memman.h 1 Jan 2005 16:09:24 -0000 1.5
+++ memman.h 24 Jun 2005 15:23:50 -0000 1.6
@@ -22,7 +22,7 @@
#ifndef MEMMAN_H
#define MEMMAN_H
-#include "scummsys.h"
+#include "common/scummsys.h"
namespace Sword1 {
Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- menu.cpp 1 Jan 2005 16:09:24 -0000 1.25
+++ menu.cpp 24 Jun 2005 15:23:50 -0000 1.26
@@ -19,12 +19,12 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/menu.h"
#include "sword1/resman.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "common/util.h"
-#include "system.h"
+#include "common/system.h"
#include "sword1/mouse.h"
#include "sword1/screen.h"
#include "sword1/logic.h"
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mouse.cpp 1 Jan 2005 16:09:24 -0000 1.28
+++ mouse.cpp 24 Jun 2005 15:23:50 -0000 1.29
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/mouse.h"
#include "sword1/menu.h"
#include "sword1/screen.h"
@@ -27,7 +27,7 @@
#include "sword1/resman.h"
#include "sword1/objectman.h"
#include "sword1/sworddefs.h"
-#include "system.h"
+#include "common/system.h"
#include "sword1/swordres.h"
#include "sword1/menu.h"
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mouse.h 1 Jan 2005 16:09:24 -0000 1.16
+++ mouse.h 24 Jun 2005 15:23:50 -0000 1.17
@@ -22,7 +22,7 @@
#ifndef BSMOUSE_H
#define BSMOUSE_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "sword1/sworddefs.h"
#include "sword1/object.h"
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- music.cpp 11 May 2005 00:01:37 -0000 1.44
+++ music.cpp 24 Jun 2005 15:23:50 -0000 1.45
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/music.h"
Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- music.h 11 May 2005 00:01:37 -0000 1.21
+++ music.h 24 Jun 2005 15:23:50 -0000 1.22
@@ -22,7 +22,7 @@
#ifndef BSMUSIC_H
#define BSMUSIC_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "common/mutex.h"
#include "common/file.h"
#include "sound/audiostream.h"
Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/object.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- object.h 1 Jan 2005 16:09:25 -0000 1.6
+++ object.h 24 Jun 2005 15:23:50 -0000 1.7
@@ -22,7 +22,7 @@
#ifndef BSOBJECT_H
#define BSOBJECT_H
-#include "scummsys.h"
+#include "common/scummsys.h"
namespace Sword1 {
Index: objectman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- objectman.cpp 1 Jan 2005 16:09:25 -0000 1.10
+++ objectman.cpp 24 Jun 2005 15:23:50 -0000 1.11
@@ -19,9 +19,9 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/objectman.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "common/util.h"
#include "sword1/sworddefs.h"
#include "sword1/swordres.h"
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- resman.cpp 10 May 2005 22:56:22 -0000 1.30
+++ resman.cpp 24 Jun 2005 15:23:50 -0000 1.31
@@ -19,8 +19,8 @@
*
*/
-#include "stdafx.h"
-#include "scummsys.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
#include "sword1/memman.h"
#include "sword1/resman.h"
#include "sword1/sworddefs.h"
Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- router.cpp 8 May 2005 21:49:52 -0000 1.13
+++ router.cpp 24 Jun 2005 15:23:50 -0000 1.14
@@ -19,10 +19,10 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/router.h"
#include "common/util.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "sword1/swordres.h"
#include "sword1/sworddefs.h"
#include "sword1/objectman.h"
Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- router.h 9 Nov 2004 04:06:09 -0000 1.8
+++ router.h 24 Jun 2005 15:23:50 -0000 1.9
@@ -22,7 +22,7 @@
#ifndef BSROUTER_H
#define BSROUTER_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "sword1/object.h"
namespace Sword1 {
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- screen.cpp 11 Mar 2005 15:30:26 -0000 1.53
+++ screen.cpp 24 Jun 2005 15:23:50 -0000 1.54
@@ -19,9 +19,9 @@
*
*/
-#include "stdafx.h"
-#include "scummsys.h"
-#include "system.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/system.h"
#include "common/util.h"
#include "sword1/screen.h"
#include "sword1/logic.h"
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- sound.cpp 10 May 2005 23:48:47 -0000 1.45
+++ sound.cpp 24 Jun 2005 15:23:50 -0000 1.46
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/sound.h"
#include "common/util.h"
#include "sword1/resman.h"
Index: staticres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/staticres.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- staticres.cpp 1 Jan 2005 16:09:25 -0000 1.10
+++ staticres.cpp 24 Jun 2005 15:23:50 -0000 1.11
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/sworddefs.h"
#include "sword1/swordres.h"
#include "sword1/screen.h"
Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- sword1.cpp 10 May 2005 23:48:47 -0000 1.87
+++ sword1.cpp 24 Jun 2005 15:23:51 -0000 1.88
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1.h"
#include "backends/fs/fs.h"
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/text.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- text.cpp 8 May 2005 21:49:52 -0000 1.12
+++ text.cpp 24 Jun 2005 15:23:51 -0000 1.13
@@ -19,7 +19,7 @@
*
*/
-#include "stdafx.h"
+#include "common/stdafx.h"
#include "sword1/text.h"
#include "sword1/resman.h"
#include "sword1/objectman.h"
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/test/common array.h,1.2,1.3 list.h,1.2,1.3 map.h,1.1,1.2 str.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/fs/posix posix-fs.cpp,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list