diff options
-rw-r--r-- | kyra/codecs.cpp | 5 | ||||
-rw-r--r-- | kyra/codecs.h | 4 | ||||
-rw-r--r-- | kyra/cpsimage.cpp | 4 | ||||
-rw-r--r-- | kyra/font.cpp | 4 | ||||
-rw-r--r-- | kyra/kyra.cpp | 4 | ||||
-rw-r--r-- | kyra/kyra.h | 4 | ||||
-rw-r--r-- | kyra/palette.cpp | 4 | ||||
-rw-r--r-- | kyra/resource.cpp | 4 | ||||
-rw-r--r-- | kyra/resource.h | 4 | ||||
-rw-r--r-- | kyra/script.cpp | 4 | ||||
-rw-r--r-- | kyra/script.h | 8 | ||||
-rw-r--r-- | kyra/script_v1.cpp | 4 | ||||
-rw-r--r-- | kyra/sound.cpp | 21 | ||||
-rw-r--r-- | kyra/sound.h | 21 | ||||
-rw-r--r-- | kyra/wsamovie.cpp | 6 | ||||
-rw-r--r-- | kyra/wsamovie.h | 8 |
16 files changed, 75 insertions, 34 deletions
diff --git a/kyra/codecs.cpp b/kyra/codecs.cpp index 9c4907cf2e..5fb8b7055e 100644 --- a/kyra/codecs.cpp +++ b/kyra/codecs.cpp @@ -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" diff --git a/kyra/codecs.h b/kyra/codecs.h index 1e7bfe7b38..26868c319e 100644 --- a/kyra/codecs.h +++ b/kyra/codecs.h @@ -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 diff --git a/kyra/cpsimage.cpp b/kyra/cpsimage.cpp index 2e49b66926..e19476fa07 100644 --- a/kyra/cpsimage.cpp +++ b/kyra/cpsimage.cpp @@ -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 diff --git a/kyra/font.cpp b/kyra/font.cpp index 7f8e491a29..d6fa103659 100644 --- a/kyra/font.cpp +++ b/kyra/font.cpp @@ -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 diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index a748ad934a..b04a72045e 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -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 diff --git a/kyra/kyra.h b/kyra/kyra.h index 1ad1998859..dbead3a354 100644 --- a/kyra/kyra.h +++ b/kyra/kyra.h @@ -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 diff --git a/kyra/palette.cpp b/kyra/palette.cpp index 008754e3e2..63911f9268 100644 --- a/kyra/palette.cpp +++ b/kyra/palette.cpp @@ -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 diff --git a/kyra/resource.cpp b/kyra/resource.cpp index 8cddde21d9..da0c2bbed2 100644 --- a/kyra/resource.cpp +++ b/kyra/resource.cpp @@ -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 diff --git a/kyra/resource.h b/kyra/resource.h index 8b1f56bf11..514198fafb 100644 --- a/kyra/resource.h +++ b/kyra/resource.h @@ -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 diff --git a/kyra/script.cpp b/kyra/script.cpp index 1122a0614b..ed071df14c 100644 --- a/kyra/script.cpp +++ b/kyra/script.cpp @@ -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 diff --git a/kyra/script.h b/kyra/script.h index 3085d156d0..9cfdb48d21 100644 --- a/kyra/script.h +++ b/kyra/script.h @@ -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: diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index 7b7d048255..4ccc294b55 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -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 diff --git a/kyra/sound.cpp b/kyra/sound.cpp index 40b73efed1..7505c18672 100644 --- a/kyra/sound.cpp +++ b/kyra/sound.cpp @@ -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" diff --git a/kyra/sound.h b/kyra/sound.h index e9e33952fc..c0db6eed70 100644 --- a/kyra/sound.h +++ b/kyra/sound.h @@ -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 diff --git a/kyra/wsamovie.cpp b/kyra/wsamovie.cpp index 5ed640254e..767e8fa557 100644 --- a/kyra/wsamovie.cpp +++ b/kyra/wsamovie.cpp @@ -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" diff --git a/kyra/wsamovie.h b/kyra/wsamovie.h index 842b12cd25..b728dcb51f 100644 --- a/kyra/wsamovie.h +++ b/kyra/wsamovie.h @@ -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" |