From 83531469d71e3cbbe976ff731f12d461cfa84e3e Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 25 Nov 2018 08:12:19 -0500 Subject: [PATCH 1/3] Print GPL license notice and SEGA disclaimer in console on start --- src/d_main.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/d_main.c b/src/d_main.c index 56def5d9..cb06466c 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -927,6 +927,20 @@ void D_SRB2Main(void) INT32 pstartmap = 1; boolean autostart = false; + // Print GPL notice for our console users (Linux) + CONS_Printf( + "\n\nSonic Robo Blast 2\n" + "Copyright (C) 1998-2018 by Sonic Team Junior\n\n" + "This program comes with ABSOLUTELY NO WARRANTY.\n\n" + "This is free software, and you are welcome to redistribute it\n" + "and/or modify it under the terms of the GNU General Public License\n" + "as published by the Free Software Foundation; either version 2 of\n" + "the License, or (at your option) any later version.\n" + "See the 'LICENSE.txt' file for details.\n\n" + "Sonic the Hedgehog and related characters are trademarks of SEGA.\n" + "We do not claim ownership of SEGA's intellectual property used\n" + "in this program.\n\n"); + // keep error messages until the final flush(stderr) #if !defined (PC_DOS) && !defined (_WIN32_WCE) && !defined(NOTERMIOS) if (setvbuf(stderr, NULL, _IOFBF, 1000)) From 8e7fc9afd89320f8fb2a0473fd63102be8f693fe Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 25 Nov 2018 08:12:34 -0500 Subject: [PATCH 2/3] Add README and LICENSE to cmake install --- assets/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt index 292e184c..6edb3df1 100644 --- a/assets/CMakeLists.txt +++ b/assets/CMakeLists.txt @@ -8,6 +8,9 @@ set(SRB2_ASSET_ALL ${CMAKE_CURRENT_SOURCE_DIR}/zones.dta ${CMAKE_CURRENT_SOURCE_DIR}/patch.dta ${CMAKE_CURRENT_SOURCE_DIR}/music.dta + ${CMAKE_CURRENT_SOURCE_DIR}/README.txt + ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt + ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE-3RD-PARTY.txt ) set(SRB2_ASSET_HASHED From e4d7ba39a96d8d85fe81996d90b87cbee98a0d04 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 25 Nov 2018 08:17:57 -0500 Subject: [PATCH 3/3] Whitespace --- src/d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index cb06466c..9b34ed94 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -931,9 +931,9 @@ void D_SRB2Main(void) CONS_Printf( "\n\nSonic Robo Blast 2\n" "Copyright (C) 1998-2018 by Sonic Team Junior\n\n" - "This program comes with ABSOLUTELY NO WARRANTY.\n\n" - "This is free software, and you are welcome to redistribute it\n" - "and/or modify it under the terms of the GNU General Public License\n" + "This program comes with ABSOLUTELY NO WARRANTY.\n\n" + "This is free software, and you are welcome to redistribute it\n" + "and/or modify it under the terms of the GNU General Public License\n" "as published by the Free Software Foundation; either version 2 of\n" "the License, or (at your option) any later version.\n" "See the 'LICENSE.txt' file for details.\n\n"