Uses correct software license

dungeons-of-moria · Jun 2, 2021 · 72bb92b · 72bb92b
1 parent 60466e0
commit 72bb92b
Show file tree

Hide file tree

Showing 83 changed files with 722 additions and 601 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -4,12 +4,12 @@ Robert Alan Koeneke created Moria from 1981-86. James E. Wilson took
 the VMS Moria sources and created Umoria from 1987-94.
 
 In 2008 Moria/Umoria was re-licensed under the GNU General Public License
-version 2.0. All new additions to the code will fall under this license.
+version 3.0-or-later. All new additions to the code will fall under this license.
 
 
 ## Umoria 5.7.x
 
-Michael R. Cook [-MRC-] (GPL v2)
+Michael R. Cook [-MRC-] (GPL-3.0-or-later)
   Umoria restoration project:
     Windows and macOS support
     deprecation of old computer systems (Amiga, Atari ST, etc.)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,23 @@ Tracking all changes since the 5.6.0 release.
 ## HEAD
 
 
+
+Fix incorrect license.
+
+Umoria 5.6 was released under a GPL-3.0-or-later license but I had accidentally
+changed the license to GPL-2.0 in a commit from the very early days of the project:
+https://github.com/dungeons-of-moria/umoria/commit/df109c5f55f6792dfd79055524728206f3a05247
+
+The license has been corrected to GPL-3.0-or-later.
+
+
+## Minor Changes
+
+* Refactor keyboard input code.
+* Refactor ui_inventory.
+
+
+
 ## 5.7.14 (2021-02-27)
 
 - Revert to Moria keys as default.
@@ -285,7 +302,7 @@ and macOS.
 
 ## 5.6.0 (2008-10-13)
 
-Umoria is released under a new GPL v2 license. More information is available
-on the [free-moria](http://free-moria.sourceforge.net/) website.
+Umoria released under a new GPL-3.0-or-later license by David Grabiner.
+More information is available on the [free-moria](http://free-moria.sourceforge.net/) website.
 
 All previous changes can be found in the [historical/CHANGELOG](historical/CHANGELOG).
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -120,10 +120,10 @@ For details on how to contribute to the Umoria project, please read our
 
 ## License Information
 
-Umoria is released under the [GNU General Public License v2.0](LICENSE).
+Umoria is released under the [GNU General Public License v3.0](LICENSE).
 
 In 2007 Ben Asselstine and Ben Shadwick started the
 [_free-moria_](http://free-moria.sourceforge.net/) project to re-license
-UMoria 5.5.2 under GPL v2 by obtaining permission from all the contributing
-authors. A year later, they finally succeeded in their goal and in late 2008
-the Moria maintainer, David Grabiner, released Umoria 5.6 under a GPL v2 license.
+UMoria 5.5.2 under GPL-2 by obtaining permission from all the contributing
+authors. A year later they succeeded in their goal and in late 2008 official
+maintainer David Grabiner released Umoria 5.6 under a GPL-3.0-or-later license.
diff --git a/data/splash.txt.in b/data/splash.txt.in
@@ -14,7 +14,7 @@
                                 Umoria ${umoria_version}
 
 
-                Umoria is free software released under GPL v2
+                Umoria is free software released under GPL-3.0
                     and comes with ABSOLUTELY NO WARRANTY
 
       For more information: https://github.com/dungeons-of-moria/umoria
diff --git a/data/versions.txt.in b/data/versions.txt.in
@@ -19,7 +19,7 @@ Bug reports and contributions can be made to the Umoria repository:
 https://github.com/dungeons-of-moria/umoria
 
 
-               Umoria is free software released under GPL v2.0
+               Umoria is free software released under GPL-3.0
 
                             VMS Moria Version 4.8
 
@@ -39,7 +39,7 @@ VMS Moria Modules :
       V3.0  Internal Help & Misc   - RAK
       V4.0  Source Release Version - RAK
 
-    Umoria is free software released under GNU General Public License v2.0
+    Umoria is free software released under GNU General Public License v3.0
                    See LICENSE and AUTHORS for more details
 
                Copyright (c) Robert A. Koeneke, James E. Wilson
diff --git a/src/character.cpp b/src/character.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Generate a new player character
 

diff --git a/src/character.h b/src/character.h
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 

diff --git a/src/config.cpp b/src/config.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // clang-format off
 #include "headers.h"

diff --git a/src/config.h b/src/config.h
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Basic Configuration
 

diff --git a/src/curses.h b/src/curses.h
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Sets up curses for the correct system.
 

diff --git a/src/data_creatures.cpp b/src/data_creatures.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Creatures must be defined here
 

diff --git a/src/data_player.cpp b/src/data_player.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Player character data
 

diff --git a/src/data_recall.cpp b/src/data_recall.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Player's memory: monster descriptions
 

diff --git a/src/data_store_owners.cpp b/src/data_store_owners.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Store owner's speech text
 

diff --git a/src/data_stores.cpp b/src/data_stores.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Store data
 

diff --git a/src/data_tables.cpp b/src/data_tables.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Data tables for attack/RNG/etc.
 

diff --git a/src/data_treasure.cpp b/src/data_treasure.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Treasure data
 

diff --git a/src/dice.cpp b/src/dice.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "headers.h"
 

diff --git a/src/dice.h b/src/dice.h
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 

diff --git a/src/dungeon.cpp b/src/dungeon.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // The main command interpreter, updating player status
 

diff --git a/src/dungeon.h b/src/dungeon.h
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 

diff --git a/src/dungeon_generate.cpp b/src/dungeon_generate.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Initialize/create a dungeon or town level
 

diff --git a/src/dungeon_los.cpp b/src/dungeon_los.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // LOS (line-of-sight) and Looking functions
 

diff --git a/src/dungeon_tile.h b/src/dungeon_tile.h
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 

diff --git a/src/game.cpp b/src/game.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Game initialization and maintenance related functions
 

diff --git a/src/game.h b/src/game.h
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 

diff --git a/src/game_death.cpp b/src/game_death.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Code executed when player dies
 

diff --git a/src/game_files.cpp b/src/game_files.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Misc code to access files used by Moria
 

diff --git a/src/game_objects.cpp b/src/game_objects.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Game object management
 

diff --git a/src/game_run.cpp b/src/game_run.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) 1981-86 Robert A. Koeneke
 // Copyright (c) 1987-94 James E. Wilson
 //
-// This work is free software released under the GNU General Public License
-// version 2.0, and comes with ABSOLUTELY NO WARRANTY.
-//
-// See LICENSE and AUTHORS for more information.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // Run the game: the main loop