aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gfx.cpp11
-rw-r--r--main.cpp22
-rw-r--r--sdl.cpp22
-rw-r--r--smush.h22
-rw-r--r--sound/fmopl.cpp2
-rw-r--r--sound/fmopl.h1
-rw-r--r--sound/imuse.h21
-rw-r--r--sound/mididrv.h22
-rw-r--r--sound/mixer.cpp22
-rw-r--r--sound/mixer.h22
-rw-r--r--system.h22
11 files changed, 189 insertions, 0 deletions
diff --git a/gfx.cpp b/gfx.cpp
index 45dab3fea3..0f890f8b96 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<colorMax;i++)
{
+
readComp1=*(curPtr++);
+
readComp2=*(curPtr++);
+
readComp3=*(curPtr++);
+
+
colorComp1=((readComp1)*c)>>8;
colorComp2=((readComp2)*d)>>8;
colorComp3=((readComp3)*e)>>8;
diff --git a/main.cpp b/main.cpp
index 48873357d9..dc5dba6929 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 cc46433356..29a386580c 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 e3b753d019..d1a2523bf1 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 b01ecab0c9..86ffaa6f00 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 d331ff14c4..6f19329552 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 fc2cacbd0d..5a836f9888 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 228e36ee7e..693226b612 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 2ed358d2fe..ec8c0caae3 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 df3b0eea64..272cdb670f 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 ab4928289d..2581ad49bd 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 {