From 4db690b0c615f1fcb456d92d4b804e5174f6cfef Mon Sep 17 00:00:00 2001 From: Nicolas Hake Date: Mon, 16 Feb 2015 18:36:18 +0100 Subject: [PATCH] Add copyright header to files that were missing it --- src/graphics/C4Shader.cpp | 14 ++++++++++++++ src/graphics/C4Shader.h | 14 ++++++++++++++ src/gui/C4GfxErrorDlg.h | 7 +++++-- src/landscape/C4LandscapeRender.cpp | 14 ++++++++++++++ src/landscape/C4LandscapeRender.h | 15 +++++++++++++++ src/landscape/C4LandscapeRenderClassic.cpp | 15 +++++++++++++++ src/landscape/fow/C4FoW.cpp | 14 ++++++++++++++ src/landscape/fow/C4FoW.h | 14 ++++++++++++++ src/landscape/fow/C4FoWAmbient.cpp | 14 ++++++++++++++ src/landscape/fow/C4FoWAmbient.h | 14 ++++++++++++++ src/landscape/fow/C4FoWBeam.cpp | 14 ++++++++++++++ src/landscape/fow/C4FoWBeam.h | 15 +++++++++++++++ src/landscape/fow/C4FoWBeamTriangle.h | 15 +++++++++++++++ src/landscape/fow/C4FoWDrawStrategy.cpp | 14 ++++++++++++++ src/landscape/fow/C4FoWDrawStrategy.h | 15 +++++++++++++++ src/landscape/fow/C4FoWLight.cpp | 14 ++++++++++++++ src/landscape/fow/C4FoWLight.h | 14 ++++++++++++++ src/landscape/fow/C4FoWLightSection.cpp | 14 ++++++++++++++ src/landscape/fow/C4FoWLightSection.h | 15 +++++++++++++++ src/landscape/fow/C4FoWRegion.cpp | 14 ++++++++++++++ src/landscape/fow/C4FoWRegion.h | 15 +++++++++++++++ src/platform/C4AppDelegate+MainMenuActions.h | 15 +++++++++++++++ src/platform/C4SoundIncludes.h | 17 ++++++++++++++++- src/platform/CocoaKeycodeMap.h | 15 +++++++++++++++ src/platform/StdSchedulerPoll.cpp | 16 ++++++++++++++++ src/platform/StdSchedulerWin32.cpp | 16 ++++++++++++++++ 26 files changed, 370 insertions(+), 3 deletions(-) diff --git a/src/graphics/C4Shader.cpp b/src/graphics/C4Shader.cpp index cbc87cd2f..47c83b52f 100644 --- a/src/graphics/C4Shader.cpp +++ b/src/graphics/C4Shader.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4Shader.h" diff --git a/src/graphics/C4Shader.h b/src/graphics/C4Shader.h index 5a7240cb4..b1ba886f2 100644 --- a/src/graphics/C4Shader.h +++ b/src/graphics/C4Shader.h @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ // Shader implementation somewhere in the middle between easy and extensible. diff --git a/src/gui/C4GfxErrorDlg.h b/src/gui/C4GfxErrorDlg.h index 2c43d7f43..166498ea2 100644 --- a/src/gui/C4GfxErrorDlg.h +++ b/src/gui/C4GfxErrorDlg.h @@ -4,8 +4,11 @@ * This file is ineligible for copyright and therefore in the public domain, * because it does not reach the required threshold of originality. * - * "Clonk" is a registered trademark of Matthes Bender. - * See clonk_trademark_license.txt for full license. + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license text + * for the above reference. */ void ShowGfxErrorDialog(); diff --git a/src/landscape/C4LandscapeRender.cpp b/src/landscape/C4LandscapeRender.cpp index b3d59341d..b5a412fcb 100644 --- a/src/landscape/C4LandscapeRender.cpp +++ b/src/landscape/C4LandscapeRender.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2011-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4LandscapeRender.h" diff --git a/src/landscape/C4LandscapeRender.h b/src/landscape/C4LandscapeRender.h index c0436054d..852b7e60e 100644 --- a/src/landscape/C4LandscapeRender.h +++ b/src/landscape/C4LandscapeRender.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/ + * Copyright (c) 2009-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #ifndef C4LANDSCAPE_RENDER_H #define C4LANDSCAPE_RENDER_H diff --git a/src/landscape/C4LandscapeRenderClassic.cpp b/src/landscape/C4LandscapeRenderClassic.cpp index 2f66d2902..ab3d64470 100644 --- a/src/landscape/C4LandscapeRenderClassic.cpp +++ b/src/landscape/C4LandscapeRenderClassic.cpp @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/ + * Copyright (c) 2009-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4LandscapeRender.h" diff --git a/src/landscape/fow/C4FoW.cpp b/src/landscape/fow/C4FoW.cpp index a7df44619..1dcddb629 100644 --- a/src/landscape/fow/C4FoW.cpp +++ b/src/landscape/fow/C4FoW.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4FoW.h" diff --git a/src/landscape/fow/C4FoW.h b/src/landscape/fow/C4FoW.h index cc8536ed4..4006f6eda 100644 --- a/src/landscape/fow/C4FoW.h +++ b/src/landscape/fow/C4FoW.h @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #ifndef C4FOW_H #define C4FOW_H diff --git a/src/landscape/fow/C4FoWAmbient.cpp b/src/landscape/fow/C4FoWAmbient.cpp index b1286b8fc..6e0ec0934 100644 --- a/src/landscape/fow/C4FoWAmbient.cpp +++ b/src/landscape/fow/C4FoWAmbient.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4FoWAmbient.h" diff --git a/src/landscape/fow/C4FoWAmbient.h b/src/landscape/fow/C4FoWAmbient.h index 6735b5e17..ded91b919 100644 --- a/src/landscape/fow/C4FoWAmbient.h +++ b/src/landscape/fow/C4FoWAmbient.h @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #ifndef C4FOWAMBIENT_H #define C4FOWAMBIENT_H diff --git a/src/landscape/fow/C4FoWBeam.cpp b/src/landscape/fow/C4FoWBeam.cpp index 30d753a65..3d72a4778 100644 --- a/src/landscape/fow/C4FoWBeam.cpp +++ b/src/landscape/fow/C4FoWBeam.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4FoWBeam.h" diff --git a/src/landscape/fow/C4FoWBeam.h b/src/landscape/fow/C4FoWBeam.h index 6c7a6b9c7..c479beee2 100644 --- a/src/landscape/fow/C4FoWBeam.h +++ b/src/landscape/fow/C4FoWBeam.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #ifndef C4FOWBEAM_H #define C4FOWBEAM_H diff --git a/src/landscape/fow/C4FoWBeamTriangle.h b/src/landscape/fow/C4FoWBeamTriangle.h index 52558841a..ad7cab419 100644 --- a/src/landscape/fow/C4FoWBeamTriangle.h +++ b/src/landscape/fow/C4FoWBeamTriangle.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #ifndef C4FOWBEAMTRIANGLE_H #define C4FOWBEAMTRIANGLE_H diff --git a/src/landscape/fow/C4FoWDrawStrategy.cpp b/src/landscape/fow/C4FoWDrawStrategy.cpp index dbd895ea8..d66e458e0 100644 --- a/src/landscape/fow/C4FoWDrawStrategy.cpp +++ b/src/landscape/fow/C4FoWDrawStrategy.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4FoWDrawStrategy.h" diff --git a/src/landscape/fow/C4FoWDrawStrategy.h b/src/landscape/fow/C4FoWDrawStrategy.h index f90ad9390..35f7bba70 100644 --- a/src/landscape/fow/C4FoWDrawStrategy.h +++ b/src/landscape/fow/C4FoWDrawStrategy.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #ifndef C4FOWDRAWSTRATEGY_H #define C4FOWDRAWSTRATEGY_H diff --git a/src/landscape/fow/C4FoWLight.cpp b/src/landscape/fow/C4FoWLight.cpp index 4daa510da..223aeb525 100644 --- a/src/landscape/fow/C4FoWLight.cpp +++ b/src/landscape/fow/C4FoWLight.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4FoWLight.h" diff --git a/src/landscape/fow/C4FoWLight.h b/src/landscape/fow/C4FoWLight.h index 2e2677db0..4b2dd6ef9 100644 --- a/src/landscape/fow/C4FoWLight.h +++ b/src/landscape/fow/C4FoWLight.h @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #ifndef C4FOWLIGHT_H #define C4FOWLIGHT_H diff --git a/src/landscape/fow/C4FoWLightSection.cpp b/src/landscape/fow/C4FoWLightSection.cpp index 30e94b612..add7fdfb2 100644 --- a/src/landscape/fow/C4FoWLightSection.cpp +++ b/src/landscape/fow/C4FoWLightSection.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4FoWLightSection.h" diff --git a/src/landscape/fow/C4FoWLightSection.h b/src/landscape/fow/C4FoWLightSection.h index a3b6be75c..86256004e 100644 --- a/src/landscape/fow/C4FoWLightSection.h +++ b/src/landscape/fow/C4FoWLightSection.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #ifndef C4FOWLIGHTSECTION_H #define C4FOWLIGHTSECTION_H diff --git a/src/landscape/fow/C4FoWRegion.cpp b/src/landscape/fow/C4FoWRegion.cpp index 96bed3f73..25434ae43 100644 --- a/src/landscape/fow/C4FoWRegion.cpp +++ b/src/landscape/fow/C4FoWRegion.cpp @@ -1,3 +1,17 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ #include "C4Include.h" #include "C4FoWRegion.h" diff --git a/src/landscape/fow/C4FoWRegion.h b/src/landscape/fow/C4FoWRegion.h index 9e2058eed..20e33a6d3 100644 --- a/src/landscape/fow/C4FoWRegion.h +++ b/src/landscape/fow/C4FoWRegion.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #ifndef C4FOWREGION_H #define C4FOWREGION_H diff --git a/src/platform/C4AppDelegate+MainMenuActions.h b/src/platform/C4AppDelegate+MainMenuActions.h index 03392020a..3bc8a47e9 100644 --- a/src/platform/C4AppDelegate+MainMenuActions.h +++ b/src/platform/C4AppDelegate+MainMenuActions.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2009-2015, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #import #import "C4AppDelegate.h" diff --git a/src/platform/C4SoundIncludes.h b/src/platform/C4SoundIncludes.h index 42abb2c14..507baccb1 100644 --- a/src/platform/C4SoundIncludes.h +++ b/src/platform/C4SoundIncludes.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2014, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + // Put all the terrible walls of includes for sound toolkits here #ifndef INC_C4SoundIncludes @@ -37,4 +52,4 @@ typedef void* C4SoundHandle; #endif -#endif \ No newline at end of file +#endif diff --git a/src/platform/CocoaKeycodeMap.h b/src/platform/CocoaKeycodeMap.h index ad6a3dac6..1e88fc801 100644 --- a/src/platform/CocoaKeycodeMap.h +++ b/src/platform/CocoaKeycodeMap.h @@ -1,3 +1,18 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2010-2012, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #define K(k,s,a) {k+CocoaKeycodeOffset,s,a} const C4KeyCodeMapEntry KeyCodeMap [] = { diff --git a/src/platform/StdSchedulerPoll.cpp b/src/platform/StdSchedulerPoll.cpp index d26e991e0..79bae5e6c 100644 --- a/src/platform/StdSchedulerPoll.cpp +++ b/src/platform/StdSchedulerPoll.cpp @@ -1,3 +1,19 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/ + * Copyright (c) 2009-2013, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + #include "C4Include.h" #include "StdScheduler.h" diff --git a/src/platform/StdSchedulerWin32.cpp b/src/platform/StdSchedulerWin32.cpp index 8eea81942..477c9fac1 100644 --- a/src/platform/StdSchedulerWin32.cpp +++ b/src/platform/StdSchedulerWin32.cpp @@ -1,3 +1,19 @@ +/* + * OpenClonk, http://www.openclonk.org + * + * Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de/ + * Copyright (c) 2009-2013, The OpenClonk Team and contributors + * + * Distributed under the terms of the ISC license; see accompanying file + * "COPYING" for details. + * + * "Clonk" is a registered trademark of Matthes Bender, used with permission. + * See accompanying file "TRADEMARK" for details. + * + * To redistribute this file separately, substitute the full license texts + * for the above references. + */ + // Events are Windows-specific #include #include