diff --git a/src/fragglescript/t_cmd.cpp b/src/fragglescript/t_cmd.cpp index db3fcd033..0fbb5a146 100644 --- a/src/fragglescript/t_cmd.cpp +++ b/src/fragglescript/t_cmd.cpp @@ -1,41 +1,29 @@ -/* -** t_cmd.cpp -** Emulation for selected Legacy console commands -** Unfortunately Legacy allows full access of FS to the console -** so everything that gets used by some map has to be emulated... -** -**--------------------------------------------------------------------------- -** Copyright 2005 Christoph Oelckers -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -**--------------------------------------------------------------------------- -** -*/ - - - +//--------------------------------------------------------------------------- +// +// Copyright(C) 2005-2017 Christoph Oelckers +// +// 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 3 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 +// +//-------------------------------------------------------------------------- +// +// Emulation for selected Legacy console commands +// Unfortunately Legacy allows full access of FS to the console +// so everything that gets used by some map has to be emulated... +// +//--------------------------------------------------------------------------- +// #include diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp index 181d20d30..90c8fbe5a 100644 --- a/src/fragglescript/t_func.cpp +++ b/src/fragglescript/t_func.cpp @@ -33,19 +33,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// #include "templates.h" #include "p_local.h" diff --git a/src/fragglescript/t_load.cpp b/src/fragglescript/t_load.cpp index e27735425..3fca69aad 100644 --- a/src/fragglescript/t_load.cpp +++ b/src/fragglescript/t_load.cpp @@ -1,36 +1,27 @@ -/* -** t_load.cpp -** FraggleScript loader -** -**--------------------------------------------------------------------------- -** Copyright 2002-2005 Christoph Oelckers -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions -** are met: -** -** 1. Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** 3. The name of the author may not be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -**--------------------------------------------------------------------------- -** -*/ +//--------------------------------------------------------------------------- +// +// Copyright(C) 2002-2017 Christoph Oelckers +// +// 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 3 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 +// +//-------------------------------------------------------------------------- +// +// FraggleScript loader +// +//--------------------------------------------------------------------------- +// #include "w_wad.h" diff --git a/src/fragglescript/t_oper.cpp b/src/fragglescript/t_oper.cpp index f25f719e7..761a0d22e 100644 --- a/src/fragglescript/t_oper.cpp +++ b/src/fragglescript/t_oper.cpp @@ -28,19 +28,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// /* includes ************************/ #include "t_script.h" diff --git a/src/fragglescript/t_parse.cpp b/src/fragglescript/t_parse.cpp index 28330e9e9..6b9af0773 100644 --- a/src/fragglescript/t_parse.cpp +++ b/src/fragglescript/t_parse.cpp @@ -29,19 +29,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// /* includes ************************/ #include diff --git a/src/fragglescript/t_prepro.cpp b/src/fragglescript/t_prepro.cpp index c770e94af..4b00a3177 100644 --- a/src/fragglescript/t_prepro.cpp +++ b/src/fragglescript/t_prepro.cpp @@ -37,19 +37,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// /* includes ************************/ diff --git a/src/fragglescript/t_script.cpp b/src/fragglescript/t_script.cpp index 47447d988..3c62d4d3a 100644 --- a/src/fragglescript/t_script.cpp +++ b/src/fragglescript/t_script.cpp @@ -31,19 +31,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// #include "t_script.h" #include "p_lnspec.h" diff --git a/src/fragglescript/t_script.h b/src/fragglescript/t_script.h index 11977f9d2..80751003c 100644 --- a/src/fragglescript/t_script.h +++ b/src/fragglescript/t_script.h @@ -20,19 +20,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// #ifndef __T_SCRIPT_H__ #define __T_SCRIPT_H__ diff --git a/src/fragglescript/t_spec.cpp b/src/fragglescript/t_spec.cpp index 7703398ed..61cab3cb6 100644 --- a/src/fragglescript/t_spec.cpp +++ b/src/fragglescript/t_spec.cpp @@ -27,19 +27,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// #include "t_script.h" diff --git a/src/fragglescript/t_variable.cpp b/src/fragglescript/t_variable.cpp index d0a0c8b9f..47735d26f 100644 --- a/src/fragglescript/t_variable.cpp +++ b/src/fragglescript/t_variable.cpp @@ -38,19 +38,6 @@ // //--------------------------------------------------------------------------- // -// FraggleScript is from SMMU which is under the GPL. Technically, -// therefore, combining the FraggleScript code with the non-free -// ZDoom code is a violation of the GPL. -// -// As this may be a problem for you, I hereby grant an exception to my -// copyright on the SMMU source (including FraggleScript). You may use -// any code from SMMU in (G)ZDoom, provided that: -// -// * For any binary release of the port, the source code is also made -// available. -// * The copyright notice is kept on any file containing my code. -// -// #include "t_script.h" #include "a_pickups.h"