[Scummvm-cvs-logs] CVS: scummvm/sword1 control.h,1.15,1.16 debug.cpp,1.3,1.4 eventman.cpp,1.4,1.5 eventman.h,1.3,1.4 logic.cpp,1.38,1.39 logic.h,1.11,1.12 memman.cpp,1.5,1.6 menu.cpp,1.20,1.21 menu.h,1.8,1.9 mouse.cpp,1.24,1.25 mouse.h,1.13,1.14 music.cpp,1.29,1.30 objectman.cpp,1.8,1.9 objectman.h,1.7,1.8 resman.h,1.8,1.9 router.cpp,1.10,1.11 router.h,1.6,1.7 screen.h,1.16,1.17 sound.cpp,1.31,1.32 sword1.cpp,1.55,1.56 sword1.h,1.14,1.15 text.cpp,1.8,1.9 text.h,1.3,1.4
Chris Apers
chrilith at users.sourceforge.net
Thu Oct 21 05:49:53 CEST 2004
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19433
Modified Files:
control.h debug.cpp eventman.cpp eventman.h logic.cpp logic.h
memman.cpp menu.cpp menu.h mouse.cpp mouse.h music.cpp
objectman.cpp objectman.h resman.h router.cpp router.h
screen.h sound.cpp sword1.cpp sword1.h text.cpp text.h
Log Message:
Make PalmOS happy
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- control.h 25 Jun 2004 22:39:21 -0000 1.15
+++ control.h 21 Oct 2004 12:43:48 -0000 1.16
@@ -23,7 +23,7 @@
#define BSCONTROL_H
#include "scummsys.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
class OSystem;
class SaveFileManager;
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/debug.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debug.cpp 11 Jan 2004 15:47:41 -0000 1.3
+++ debug.cpp 21 Oct 2004 12:43:48 -0000 1.4
@@ -20,8 +20,8 @@
*/
#include "stdafx.h"
-#include "debug.h"
#include "common/util.h"
+#include "sword1/debug.h"
namespace Sword1 {
Index: eventman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/eventman.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- eventman.cpp 11 Jan 2004 15:47:41 -0000 1.4
+++ eventman.cpp 21 Oct 2004 12:43:48 -0000 1.5
@@ -20,8 +20,8 @@
*/
#include "stdafx.h"
-#include "eventman.h"
-#include "sworddefs.h"
+#include "sword1/eventman.h"
+#include "sword1/sworddefs.h"
#include "common/util.h"
namespace Sword1 {
Index: eventman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/eventman.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- eventman.h 11 Jan 2004 15:47:41 -0000 1.3
+++ eventman.h 21 Oct 2004 12:43:48 -0000 1.4
@@ -22,7 +22,7 @@
#ifndef BSEVENTMAN_H
#define BSEVENTMAN_H
-#include "object.h"
+#include "sword1/object.h"
namespace Sword1 {
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- logic.cpp 12 Mar 2004 08:21:01 -0000 1.38
+++ logic.cpp 21 Oct 2004 12:43:48 -0000 1.39
@@ -20,21 +20,22 @@
*/
#include "stdafx.h"
-#include "logic.h"
-#include "text.h"
-#include "sound.h"
-#include "eventman.h"
-#include "menu.h"
#include "common/util.h"
-#include "router.h"
-#include "screen.h"
-#include "mouse.h"
-#include "sword1.h"
-#include "music.h"
-#include "swordres.h"
-#include "animation.h"
-#include "debug.h"
+#include "sword1/logic.h"
+#include "sword1/text.h"
+#include "sword1/sound.h"
+#include "sword1/eventman.h"
+#include "sword1/menu.h"
+#include "sword1/router.h"
+#include "sword1/screen.h"
+#include "sword1/mouse.h"
+#include "sword1/sword1.h"
+#include "sword1/music.h"
+#include "sword1/swordres.h"
+#include "sword1/animation.h"
+
+#include "sword1/debug.h"
namespace Sword1 {
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- logic.h 18 Jan 2004 05:52:04 -0000 1.11
+++ logic.h 21 Oct 2004 12:43:48 -0000 1.12
@@ -23,8 +23,8 @@
#define BSLOGIC_H
// combination of logic.c and scr_int.c
-#include "sworddefs.h"
-#include "objectman.h"
+#include "sword1/sworddefs.h"
+#include "sword1/objectman.h"
#include "common/util.h"
#include "sound/mixer.h"
Index: memman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/memman.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- memman.cpp 11 Jan 2004 15:47:41 -0000 1.5
+++ memman.cpp 21 Oct 2004 12:43:48 -0000 1.6
@@ -20,7 +20,7 @@
*/
#include "stdafx.h"
-#include "memman.h"
+#include "sword1/memman.h"
#include "common/util.h"
namespace Sword1 {
Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- menu.cpp 11 Jan 2004 15:47:41 -0000 1.20
+++ menu.cpp 21 Oct 2004 12:43:48 -0000 1.21
@@ -20,14 +20,14 @@
*/
#include "stdafx.h"
-#include "menu.h"
-#include "resman.h"
+#include "sword1/menu.h"
+#include "sword1/resman.h"
#include "scummsys.h"
#include "common/util.h"
#include "system.h"
-#include "mouse.h"
-#include "screen.h"
-#include "logic.h"
+#include "sword1/mouse.h"
+#include "sword1/screen.h"
+#include "sword1/logic.h"
namespace Sword1 {
Index: menu.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- menu.h 11 Jan 2004 15:47:41 -0000 1.8
+++ menu.h 21 Oct 2004 12:43:48 -0000 1.9
@@ -22,8 +22,8 @@
#ifndef BSMENU_H
#define BSMENU_H
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
namespace Sword1 {
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mouse.cpp 28 Mar 2004 16:30:49 -0000 1.24
+++ mouse.cpp 21 Oct 2004 12:43:48 -0000 1.25
@@ -20,16 +20,16 @@
*/
#include "stdafx.h"
-#include "mouse.h"
-#include "menu.h"
-#include "screen.h"
-#include "logic.h"
-#include "resman.h"
-#include "objectman.h"
-#include "sworddefs.h"
+#include "sword1/mouse.h"
+#include "sword1/menu.h"
+#include "sword1/screen.h"
+#include "sword1/logic.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
+#include "sword1/sworddefs.h"
#include "system.h"
-#include "swordres.h"
-#include "menu.h"
+#include "sword1/swordres.h"
+#include "sword1/menu.h"
namespace Sword1 {
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mouse.h 12 May 2004 06:21:44 -0000 1.13
+++ mouse.h 21 Oct 2004 12:43:48 -0000 1.14
@@ -23,8 +23,8 @@
#define BSMOUSE_H
#include "scummsys.h"
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
class OSystem;
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- music.cpp 17 Oct 2004 19:40:05 -0000 1.29
+++ music.cpp 21 Oct 2004 12:43:48 -0000 1.30
@@ -20,7 +20,7 @@
*/
#include "stdafx.h"
-#include "music.h"
+#include "sword1/music.h"
#include "sound/mixer.h"
#include "common/util.h"
#include "common/file.h"
Index: objectman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- objectman.cpp 21 Oct 2004 06:44:25 -0000 1.8
+++ objectman.cpp 21 Oct 2004 12:43:48 -0000 1.9
@@ -20,12 +20,12 @@
*/
#include "stdafx.h"
-#include "objectman.h"
+#include "sword1/objectman.h"
#include "scummsys.h"
#include "common/util.h"
-#include "sworddefs.h"
-#include "swordres.h"
-#include "sword1.h"
+#include "sword1/sworddefs.h"
+#include "sword1/swordres.h"
+#include "sword1/sword1.h"
namespace Sword1 {
Index: objectman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- objectman.h 21 Oct 2004 06:44:25 -0000 1.7
+++ objectman.h 21 Oct 2004 12:43:48 -0000 1.8
@@ -25,8 +25,8 @@
#define OBJECTMAN_H
#include "resman.h"
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
namespace Sword1 {
@@ -63,4 +63,3 @@
} // End of namespace Sword1
#endif //OBJECTMAN_H
-
Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resman.h 11 Jan 2004 15:47:41 -0000 1.8
+++ resman.h 21 Oct 2004 12:43:48 -0000 1.9
@@ -22,9 +22,9 @@
#ifndef RESMAN_H
#define RESMAN_H
-#include "memman.h"
+#include "sword1/memman.h"
#include "file.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
namespace Sword1 {
Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- router.cpp 11 Jan 2004 15:47:41 -0000 1.10
+++ router.cpp 21 Oct 2004 12:43:48 -0000 1.11
@@ -20,13 +20,13 @@
*/
#include "stdafx.h"
-#include "router.h"
+#include "sword1/router.h"
#include "common/util.h"
#include "scummsys.h"
-#include "swordres.h"
-#include "sworddefs.h"
-#include "objectman.h"
-#include "resman.h"
+#include "sword1/swordres.h"
+#include "sword1/sworddefs.h"
+#include "sword1/objectman.h"
+#include "sword1/resman.h"
namespace Sword1 {
Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- router.h 11 Jan 2004 15:47:41 -0000 1.6
+++ router.h 21 Oct 2004 12:43:48 -0000 1.7
@@ -23,7 +23,7 @@
#define BSROUTER_H
#include "scummsys.h"
-#include "object.h"
+#include "sword1/object.h"
namespace Sword1 {
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- screen.h 18 Jan 2004 05:52:04 -0000 1.16
+++ screen.h 21 Oct 2004 12:43:48 -0000 1.17
@@ -22,7 +22,7 @@
#ifndef BSSCREEN_H
#define BSSCREEN_H
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
class OSystem;
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- sound.cpp 14 Oct 2004 09:18:20 -0000 1.31
+++ sound.cpp 21 Oct 2004 12:43:48 -0000 1.32
@@ -20,11 +20,11 @@
*/
#include "stdafx.h"
-#include "sound.h"
+#include "sword1/sound.h"
#include "common/util.h"
-#include "resman.h"
-#include "logic.h"
-#include "sword1.h"
+#include "sword1/resman.h"
+#include "sword1/logic.h"
+#include "sword1/sword1.h"
namespace Sword1 {
Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- sword1.cpp 14 Oct 2004 06:36:05 -0000 1.55
+++ sword1.cpp 21 Oct 2004 12:43:48 -0000 1.56
@@ -29,17 +29,17 @@
#include "common/file.h"
#include "common/timer.h"
-#include "memman.h"
-#include "resman.h"
-#include "objectman.h"
-#include "mouse.h"
-#include "logic.h"
-#include "sound.h"
-#include "screen.h"
-#include "swordres.h"
-#include "menu.h"
-#include "music.h"
-#include "control.h"
+#include "sword1/memman.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
+#include "sword1/mouse.h"
+#include "sword1/logic.h"
+#include "sword1/sound.h"
+#include "sword1/screen.h"
+#include "sword1/swordres.h"
+#include "sword1/menu.h"
+#include "sword1/music.h"
+#include "sword1/control.h"
#include "gui/message.h"
#include "gui/newgui.h"
Index: sword1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sword1.h 31 Aug 2004 07:52:47 -0000 1.14
+++ sword1.h 21 Oct 2004 12:43:49 -0000 1.15
@@ -25,7 +25,7 @@
#include "base/engine.h"
#include "common/util.h"
#include "base/gameDetector.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
namespace Sword1 {
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/text.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- text.cpp 11 Jan 2004 15:47:41 -0000 1.8
+++ text.cpp 21 Oct 2004 12:43:49 -0000 1.9
@@ -20,12 +20,12 @@
*/
#include "stdafx.h"
-#include "text.h"
-#include "resman.h"
-#include "objectman.h"
+#include "sword1/text.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
#include "common/util.h"
-#include "swordres.h"
-#include "sworddefs.h"
+#include "sword1/swordres.h"
+#include "sword1/sworddefs.h"
namespace Sword1 {
Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/text.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- text.h 11 Jan 2004 15:47:41 -0000 1.3
+++ text.h 21 Oct 2004 12:43:49 -0000 1.4
@@ -22,8 +22,8 @@
#ifndef BSTEXT_H
#define BSTEXT_H
-#include "object.h"
-#include "sworddefs.h"
+#include "sword1/object.h"
+#include "sword1/sworddefs.h"
namespace Sword1 {
More information about the Scummvm-git-logs
mailing list