From 8e5aed4bea1da6bd6ce3fd7d682df03cf9479574 Mon Sep 17 00:00:00 2001 From: Nicolas Hake Date: Sun, 9 Aug 2015 19:16:39 +0200 Subject: [PATCH] Update TRADEMARK and add trademark reference to credits (#1370) I don't like that the FMOD and Clonk trademarks are separated, but we don't have enough space in the credits screen to do it differently. --- TRADEMARK | 18 ++++++++++-------- src/gui/C4StartupAboutDlg.cpp | 3 +++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/TRADEMARK b/TRADEMARK index 52b17861a..1a5c46e6f 100644 --- a/TRADEMARK +++ b/TRADEMARK @@ -1,14 +1,16 @@ -Clonk Trademark License - 'Clonk' is a registered trademark of Matthes Bender. It may be used within -software products which are using source code from the OpenClonk project -with the following limitations: +software products which are using source code or game content as made public +on the Clonk website (or derived from such) with the following limitations: If the word 'Clonk' is used as the name of anything in your software product then you must include the following notice in a suitable place (e.g. credits -screen): "Clonk" is a registered trademark of Matthes Bender. +screen): 'Clonk' is a registered trademark of Matthes Bender. If the title of your software product contains the word 'Clonk' then you must -prefix the word with an added name of your choosing, e.g. 'MyClonk' or -'PortableClonk' and you must subtitle your project with the term 'An OpenClonk -project'. \ No newline at end of file +PREFIX the word with an added name of your choosing, e.g. 'MyClonk' or +'PortableClonk' and you must include the trademark notice above in a suitable +place (e.g. credits screen or splash screen). + +If you are making your source code or game content available to other parties +in a way which allows adaptation you must include a copy of this license along +with any other applicable licenses. diff --git a/src/gui/C4StartupAboutDlg.cpp b/src/gui/C4StartupAboutDlg.cpp index faecb752e..39f011255 100644 --- a/src/gui/C4StartupAboutDlg.cpp +++ b/src/gui/C4StartupAboutDlg.cpp @@ -48,6 +48,9 @@ C4StartupAboutDlg::C4StartupAboutDlg() : C4StartupDlg(LoadResStr("IDS_DLG_ABOUT" AddElement(btn = new C4GUI::CallbackButton(LoadResStr("IDS_BTN_CHECKFORUPDATES"), caButtons.GetGridCell(2,3,0,1,iButtonWidth,C4GUI_ButtonHgt,true), &C4StartupAboutDlg::OnUpdateBtn)); btn->SetToolTip(LoadResStr("IDS_DESC_CHECKONLINEFORNEWVERSIONS")); #endif + + AddElement(new C4GUI::Label("'Clonk' is a registered trademark of Matthes Bender.", + caButtons.GetFromBottom(rUseFont.GetLineHeight()))); } C4StartupAboutDlg::~C4StartupAboutDlg()