[Scummvm-cvs-logs] CVS: scummvm/kyra codecs.cpp,1.8,1.9 codecs.h,1.4,1.5 cpsimage.cpp,1.4,1.5 font.cpp,1.5,1.6 kyra.cpp,1.23,1.24 kyra.h,1.8,1.9 palette.cpp,1.5,1.6 resource.cpp,1.8,1.9 resource.h,1.6,1.7 script.cpp,1.9,1.10 script.h,1.5,1.6 script_v1.cpp,1.7,1.8 sound.cpp,1.2,1.3 sound.h,1.2,1.3 wsamovie.cpp,1.5,1.6 wsamovie.h,1.4,1.5
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 9 08:07:10 CET 2005
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4688
Modified Files:
codecs.cpp codecs.h cpsimage.cpp font.cpp kyra.cpp kyra.h
palette.cpp resource.cpp resource.h script.cpp script.h
script_v1.cpp sound.cpp sound.h wsamovie.cpp wsamovie.h
Log Message:
Ensure the kyra legal headers match the rest of ScummVM
Index: codecs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/codecs.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- codecs.cpp 1 Jan 2005 16:09:07 -0000 1.8
+++ codecs.cpp 9 Jan 2005 16:06:28 -0000 1.9
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,7 +19,6 @@
*
*/
-
#include "stdafx.h"
#include "codecs.h"
Index: codecs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/codecs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- codecs.h 1 Jan 2005 16:09:07 -0000 1.4
+++ codecs.h 9 Jan 2005 16:06:29 -0000 1.5
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: cpsimage.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/cpsimage.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cpsimage.cpp 1 Jan 2005 16:09:07 -0000 1.4
+++ cpsimage.cpp 9 Jan 2005 16:06:29 -0000 1.5
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/font.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- font.cpp 1 Jan 2005 16:09:07 -0000 1.5
+++ font.cpp 9 Jan 2005 16:06:29 -0000 1.6
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kyra.cpp 1 Jan 2005 16:09:07 -0000 1.23
+++ kyra.cpp 9 Jan 2005 16:06:29 -0000 1.24
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: kyra.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kyra.h 1 Jan 2005 16:09:07 -0000 1.8
+++ kyra.h 9 Jan 2005 16:06:29 -0000 1.9
@@ -1,5 +1,5 @@
/* ScummVM - Scumm Interpreter
- * Copyright (C) 2003-2005 The ScummVM Team
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -8,7 +8,7 @@
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/palette.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palette.cpp 1 Jan 2005 16:09:07 -0000 1.5
+++ palette.cpp 9 Jan 2005 16:06:29 -0000 1.6
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/resource.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resource.cpp 1 Jan 2005 16:09:07 -0000 1.8
+++ resource.cpp 9 Jan 2005 16:06:29 -0000 1.9
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: resource.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/resource.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- resource.h 1 Jan 2005 16:09:07 -0000 1.6
+++ resource.h 9 Jan 2005 16:06:29 -0000 1.7
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- script.cpp 1 Jan 2005 16:09:07 -0000 1.9
+++ script.cpp 9 Jan 2005 16:06:29 -0000 1.10
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- script.h 1 Jan 2005 16:09:07 -0000 1.5
+++ script.h 9 Jan 2005 16:06:29 -0000 1.6
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,8 +19,8 @@
*
*/
-#ifndef VM_H
-#define VM_H
+#ifndef SCRIPT_H
+#define SCRIPT_H
namespace Kyra {
// TODO:
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- script_v1.cpp 1 Jan 2005 16:09:07 -0000 1.7
+++ script_v1.cpp 9 Jan 2005 16:06:29 -0000 1.8
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/sound.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound.cpp 14 Nov 2004 14:11:54 -0000 1.2
+++ sound.cpp 9 Jan 2005 16:06:29 -0000 1.3
@@ -1,3 +1,24 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
#include "sound.h"
#include "resource.h"
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/sound.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound.h 14 Nov 2004 14:11:54 -0000 1.2
+++ sound.h 9 Jan 2005 16:06:29 -0000 1.3
@@ -1,3 +1,24 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
#ifndef SOUND_H
#define SOUND_H
Index: wsamovie.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/wsamovie.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wsamovie.cpp 1 Jan 2005 16:09:07 -0000 1.5
+++ wsamovie.cpp 9 Jan 2005 16:06:29 -0000 1.6
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
* $Header$
*
*/
-
+
#include "stdafx.h"
#include "wsamovie.h"
#include "codecs.h"
Index: wsamovie.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/wsamovie.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wsamovie.h 1 Jan 2005 16:09:07 -0000 1.4
+++ wsamovie.h 9 Jan 2005 16:06:29 -0000 1.5
@@ -1,5 +1,5 @@
-/* ScummVM - Kyrandia Interpreter
- * Copyright (C) 2003-2005 The ScummVM project
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2004-2005 The ScummVM project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,8 +19,8 @@
*
*/
-#ifndef MOVIES_H
-#define MOVIES_H
+#ifndef WSAMOVIES_H
+#define WSAMOVIES_H
#include "resource.h"
More information about the Scummvm-git-logs
mailing list