[Scummvm-cvs-logs] CVS: scummvm/kyra codecs.cpp,1.10,1.11 cpsimage.cpp,1.7,1.8 font.cpp,1.9,1.10 kyra.cpp,1.31,1.32 palette.cpp,1.7,1.8 resource.cpp,1.12,1.13 resource.h,1.8,1.9 script.cpp,1.13,1.14 script_v1.cpp,1.9,1.10 sound.cpp,1.4,1.5 sound.h,1.3,1.4 wsamovie.cpp,1.8,1.9 wsamovie.h,1.5,1.6

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Fri Jun 24 09:03:51 CEST 2005


Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6750

Modified Files:
	codecs.cpp cpsimage.cpp font.cpp kyra.cpp palette.cpp 
	resource.cpp resource.h script.cpp script_v1.cpp sound.cpp 
	sound.h wsamovie.cpp wsamovie.h 
Log Message:
For consistency, specify directory when including files.


Index: codecs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/codecs.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- codecs.cpp	24 Jun 2005 15:22:43 -0000	1.10
+++ codecs.cpp	24 Jun 2005 16:01:42 -0000	1.11
@@ -20,7 +20,7 @@
  */
 
 #include "common/stdafx.h"
-#include "codecs.h"
+#include "kyra/codecs.h"
 
 /*****************************************************************************
  * decode.c - Decoding routines for format80, format40, format20 

Index: cpsimage.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/cpsimage.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cpsimage.cpp	24 Jun 2005 15:22:43 -0000	1.7
+++ cpsimage.cpp	24 Jun 2005 16:01:42 -0000	1.8
@@ -20,8 +20,8 @@
  */
 
 #include "common/stdafx.h"
-#include "resource.h"
-#include "codecs.h"
+#include "kyra/resource.h"
+#include "kyra/codecs.h"
 
 #include "common/stream.h"
 

Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/font.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- font.cpp	24 Jun 2005 15:22:43 -0000	1.9
+++ font.cpp	24 Jun 2005 16:01:42 -0000	1.10
@@ -20,7 +20,7 @@
  */
 
 #include "common/stdafx.h"
-#include "resource.h"
+#include "kyra/resource.h"
 #include "common/stream.h"
 #include "common/array.h"
 

Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kyra.cpp	24 Jun 2005 15:22:43 -0000	1.31
+++ kyra.cpp	24 Jun 2005 16:01:42 -0000	1.32
@@ -31,11 +31,11 @@
 #include "common/config-manager.h"
 #include "sound/mididrv.h"
 
-#include "kyra.h"
-#include "resource.h"
-#include "script.h"
-#include "wsamovie.h"
-#include "sound.h"
+#include "kyra/kyra.h"
+#include "kyra/resource.h"
+#include "kyra/script.h"
+#include "kyra/wsamovie.h"
+#include "kyra/sound.h"
 
 struct KyraGameSettings {
 	const char *name;

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/palette.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- palette.cpp	24 Jun 2005 15:22:43 -0000	1.7
+++ palette.cpp	24 Jun 2005 16:01:42 -0000	1.8
@@ -20,10 +20,10 @@
  */
 
 #include "common/stdafx.h"
-#include "resource.h"
+#include "kyra/resource.h"
 
 #include "common/stream.h"
-#include "codecs.h"
+#include "kyra/codecs.h"
 
 namespace Kyra {
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/resource.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- resource.cpp	24 Jun 2005 15:22:43 -0000	1.12
+++ resource.cpp	24 Jun 2005 16:01:42 -0000	1.13
@@ -20,11 +20,11 @@
  */
 
 #include "common/stdafx.h"
-#include "resource.h"
-#include "wsamovie.h"
+#include "kyra/resource.h"
+#include "kyra/wsamovie.h"
 
 #include "common/file.h"
-#include "script.h"
+#include "kyra/script.h"
 
 namespace Kyra {
 Resourcemanager::Resourcemanager(KyraEngine* engine) {

Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/resource.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resource.h	8 May 2005 21:49:42 -0000	1.8
+++ resource.h	24 Jun 2005 16:01:42 -0000	1.9
@@ -28,7 +28,7 @@
 #include "common/list.h"
 #include "common/map.h"
 
-#include "kyra.h"
+#include "kyra/kyra.h"
 
 namespace Kyra {
 

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- script.cpp	24 Jun 2005 15:22:43 -0000	1.13
+++ script.cpp	24 Jun 2005 16:01:42 -0000	1.14
@@ -20,9 +20,9 @@
  */
 
 #include "common/stdafx.h"
-#include "kyra.h"
-#include "script.h"
-#include "resource.h"
+#include "kyra/kyra.h"
+#include "kyra/script.h"
+#include "kyra/resource.h"
 
 #include "common/stream.h"
 #include "common/util.h"

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- script_v1.cpp	24 Jun 2005 15:22:43 -0000	1.9
+++ script_v1.cpp	24 Jun 2005 16:01:42 -0000	1.10
@@ -21,8 +21,8 @@
 
 #include "common/stdafx.h"
 
-#include "kyra.h"
-#include "script.h"
+#include "kyra/kyra.h"
+#include "kyra/script.h"
 
 namespace Kyra {
 // Command procs

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/sound.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound.cpp	3 Apr 2005 22:01:22 -0000	1.4
+++ sound.cpp	24 Jun 2005 16:01:42 -0000	1.5
@@ -19,8 +19,8 @@
  *
  */
 
-#include "sound.h"
-#include "resource.h"
+#include "kyra/sound.h"
+#include "kyra/resource.h"
 
 namespace Kyra {
 	MusicPlayer::MusicPlayer(MidiDriver* driver, KyraEngine* engine) {

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/sound.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound.h	9 Jan 2005 16:06:29 -0000	1.3
+++ sound.h	24 Jun 2005 16:01:42 -0000	1.4
@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
-#include "kyra.h"
+#include "kyra/kyra.h"
 
 namespace Kyra {
 	class MusicPlayer : public MidiDriver {

Index: wsamovie.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/wsamovie.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wsamovie.cpp	24 Jun 2005 15:22:44 -0000	1.8
+++ wsamovie.cpp	24 Jun 2005 16:01:42 -0000	1.9
@@ -20,8 +20,8 @@
  */
 
 #include "common/stdafx.h"
-#include "wsamovie.h"
-#include "codecs.h"
+#include "kyra/wsamovie.h"
+#include "kyra/codecs.h"
 
 #include "common/stream.h"
 

Index: wsamovie.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/wsamovie.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wsamovie.h	9 Jan 2005 16:06:29 -0000	1.5
+++ wsamovie.h	24 Jun 2005 16:01:42 -0000	1.6
@@ -22,7 +22,7 @@
 #ifndef WSAMOVIES_H
 #define WSAMOVIES_H
 
-#include "resource.h"
+#include "kyra/resource.h"
 
 namespace Kyra {
 





More information about the Scummvm-git-logs mailing list