From 9809c863730b998c9b1b75f9d7ed2fcd3f989dd0 Mon Sep 17 00:00:00 2001 From: James Brown Date: Sun, 21 Apr 2002 17:46:42 +0000 Subject: [PATCH] Add boilerplate license to some files, to satisfy Debian types :) fmopl.c/fmopl.h are infringing on the GPL at the moment. We either need to replace these, or get permission to relicense them, before 0.2.0 svn-id: r4036 --- gfx.cpp | 11 +++++++++++ main.cpp | 22 ++++++++++++++++++++++ sdl.cpp | 22 ++++++++++++++++++++++ smush.h | 22 ++++++++++++++++++++++ sound/fmopl.cpp | 2 ++ sound/fmopl.h | 1 + sound/imuse.h | 21 +++++++++++++++++++++ sound/mididrv.h | 22 ++++++++++++++++++++++ sound/mixer.cpp | 22 ++++++++++++++++++++++ sound/mixer.h | 22 ++++++++++++++++++++++ system.h | 22 ++++++++++++++++++++++ 11 files changed, 189 insertions(+) diff --git a/gfx.cpp b/gfx.cpp index 45dab3fea3b..0f890f8b96e 100644 --- a/gfx.cpp +++ b/gfx.cpp @@ -2640,16 +2640,22 @@ CHECK_HEAP; } + /* Yazoo: This function create the specialPalette used for semi-transparency in SamnMax */ + void Scumm::createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax) { byte *palPtr; byte *curPtr; byte *searchPtr; + + byte readComp1; + byte readComp2; + byte readComp3; int colorComp1; @@ -2677,11 +2683,16 @@ void Scumm::createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, in for(i=colorMin;i>8; colorComp2=((readComp2)*d)>>8; colorComp3=((readComp3)*e)>>8; diff --git a/main.cpp b/main.cpp index 48873357d95..dc5dba69292 100644 --- a/main.cpp +++ b/main.cpp @@ -1,3 +1,25 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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 "stdafx.h" #include "scumm.h" #include "mididrv.h" diff --git a/sdl.cpp b/sdl.cpp index cc464333567..29a386580c7 100644 --- a/sdl.cpp +++ b/sdl.cpp @@ -1,3 +1,25 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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 "stdafx.h" #include "scumm.h" #include "mididrv.h" diff --git a/smush.h b/smush.h index e3b753d019b..d1a2523bf11 100644 --- a/smush.h +++ b/smush.h @@ -1,3 +1,25 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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$ + * + */ + struct PersistentCodecData37 { byte *deltaBuf; byte *deltaBufs[2]; diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp index b01ecab0c95..86ffaa6f00e 100644 --- a/sound/fmopl.cpp +++ b/sound/fmopl.cpp @@ -6,6 +6,8 @@ ** Modified for ScummVM by Ludvig Strigeus ** Version 0.37a (modified) ** +** ENDER: This file is not GPL. Need to replace or have +** relicensed before 0.2.0 release. */ #include "stdafx.h" diff --git a/sound/fmopl.h b/sound/fmopl.h index d331ff14c45..6f19329552a 100644 --- a/sound/fmopl.h +++ b/sound/fmopl.h @@ -1,3 +1,4 @@ +/* ENDER: Not GPLed. Replace or relicense before 0.2.0 */ #ifndef __FMOPL_H_ #define __FMOPL_H_ diff --git a/sound/imuse.h b/sound/imuse.h index fc2cacbd0df..5a836f9888f 100644 --- a/sound/imuse.h +++ b/sound/imuse.h @@ -1,3 +1,24 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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$ + * + */ //WARNING: These is only the public interface to the IMUSE class //This is safe as long as none of the methods are virtual, diff --git a/sound/mididrv.h b/sound/mididrv.h index 228e36ee7e4..693226b612b 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -1,3 +1,25 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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$ + * + */ + struct MidiEvent { uint32 delta; uint32 event; diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 2ed358d2fe1..ec8c0caae3c 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -1,3 +1,25 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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 "stdafx.h" #include "scumm.h" diff --git a/sound/mixer.h b/sound/mixer.h index df3b0eea641..272cdb670f9 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -1,3 +1,25 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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 _mixer_h_included #define _mixer_h_included diff --git a/system.h b/system.h index ab4928289d2..2581ad49bda 100644 --- a/system.h +++ b/system.h @@ -1,3 +1,25 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2002 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$ + * + */ + /* Interface to what's below ScummVM */ class OSystem {