[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.75,1.76 main.cpp,1.7,1.8 sdl.cpp,1.98,1.99 smush.h,1.2,1.3 system.h,1.14,1.15

James Brown ender at users.sourceforge.net
Sun Apr 21 10:47:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv5116

Modified Files:
	gfx.cpp main.cpp sdl.cpp smush.h system.h 
Log Message:
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



Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** gfx.cpp	21 Apr 2002 13:13:26 -0000	1.75
--- gfx.cpp	21 Apr 2002 17:46:41 -0000	1.76
***************
*** 2640,2645 ****
  }
  
! 
! /* 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)
--- 2640,2647 ----
  }
  
! 
! 
! /* 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)
***************
*** 2647,2654 ****
  	byte *palPtr;
  	byte *curPtr;
! 	byte *searchPtr;
! 
! 	byte readComp1;
! 	byte readComp2;
  	byte readComp3;
  
--- 2649,2660 ----
  	byte *palPtr;
  	byte *curPtr;
! 	byte *searchPtr;
! 
! 
! 
! 	byte readComp1;
! 
! 	byte readComp2;
! 
  	byte readComp3;
  
***************
*** 2677,2685 ****
  
  	for(i=colorMin;i<colorMax;i++)
! 	{
! 		readComp1=*(curPtr++);
! 		readComp2=*(curPtr++);
! 		readComp3=*(curPtr++);
! 
  
  		colorComp1=((readComp1)*c)>>8;
--- 2683,2696 ----
  
  	for(i=colorMin;i<colorMax;i++)
! 	{
! 
! 		readComp1=*(curPtr++);
! 
! 		readComp2=*(curPtr++);
! 
! 		readComp3=*(curPtr++);
! 
! 
! 
  
  		colorComp1=((readComp1)*c)>>8;

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** main.cpp	16 Apr 2002 12:07:16 -0000	1.7
--- main.cpp	21 Apr 2002 17:46:41 -0000	1.8
***************
*** 1,2 ****
--- 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$
+  *
+  */
+ 
  #include "stdafx.h"
  #include "scumm.h"

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** sdl.cpp	20 Apr 2002 16:26:32 -0000	1.98
--- sdl.cpp	21 Apr 2002 17:46:41 -0000	1.99
***************
*** 1,2 ****
--- 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$
+  *
+  */
+ 
  #include "stdafx.h"
  #include "scumm.h"

Index: smush.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/smush.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** smush.h	25 Mar 2002 22:46:32 -0000	1.2
--- smush.h	21 Apr 2002 17:46:41 -0000	1.3
***************
*** 1,2 ****
--- 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$
+  *
+  */
+ 
  struct PersistentCodecData37 {
          byte *deltaBuf;

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/system.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** system.h	20 Apr 2002 17:41:42 -0000	1.14
--- system.h	21 Apr 2002 17:46:41 -0000	1.15
***************
*** 1,2 ****
--- 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$
+  *
+  */
+ 
  /* Interface to what's below ScummVM */
  





More information about the Scummvm-git-logs mailing list