From 602500ffe32004dc0437ed55ac2d25ec69fc9e25 Mon Sep 17 00:00:00 2001
From: Javier Sancho <jsf@jsancho.org>
Date: Thu, 4 Jun 2020 09:28:29 +0200
Subject: [PATCH] license
---
dungeon-master/generators/town.scm | 4 +--
dungeon-master/geom.scm | 4 +--
dungeon-master/geom/bowyer-watson.scm | 4 +--
dungeon-master/geom/point.scm | 4 +--
dungeon-master/geom/triangle.scm | 4 +--
dungeon-master/geom/voronoi.scm | 4 +--
src/generators.h | 4 +--
src/main.cpp | 41 +++++++++------------------
src/mods.cpp | 4 +--
src/mods.h | 4 +--
src/paths.cpp | 4 +--
src/paths.h | 4 +--
tests/bowyer-watson.scm | 4 +--
tests/point.scm | 4 +--
tests/triangle.scm | 4 +--
15 files changed, 42 insertions(+), 55 deletions(-)
diff --git a/dungeon-master/generators/town.scm b/dungeon-master/generators/town.scm
index feb38a0..7e93636 100644
--- a/dungeon-master/generators/town.scm
+++ b/dungeon-master/generators/town.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (dungeon-master generators town)
diff --git a/dungeon-master/geom.scm b/dungeon-master/geom.scm
index 0180279..466d369 100644
--- a/dungeon-master/geom.scm
+++ b/dungeon-master/geom.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (dungeon-master geom)
diff --git a/dungeon-master/geom/bowyer-watson.scm b/dungeon-master/geom/bowyer-watson.scm
index fe7c036..1445539 100644
--- a/dungeon-master/geom/bowyer-watson.scm
+++ b/dungeon-master/geom/bowyer-watson.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (dungeon-master geom bowyer-watson)
diff --git a/dungeon-master/geom/point.scm b/dungeon-master/geom/point.scm
index d13cdf7..72ca1bb 100644
--- a/dungeon-master/geom/point.scm
+++ b/dungeon-master/geom/point.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (dungeon-master geom point)
diff --git a/dungeon-master/geom/triangle.scm b/dungeon-master/geom/triangle.scm
index 109f7fe..6f7ccf8 100644
--- a/dungeon-master/geom/triangle.scm
+++ b/dungeon-master/geom/triangle.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (dungeon-master geom triangle)
diff --git a/dungeon-master/geom/voronoi.scm b/dungeon-master/geom/voronoi.scm
index 86b0fef..553beec 100644
--- a/dungeon-master/geom/voronoi.scm
+++ b/dungeon-master/geom/voronoi.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (dungeon-master geom voronoi)
diff --git a/src/generators.h b/src/generators.h
index b07637d..e88309d 100644
--- a/src/generators.h
+++ b/src/generators.h
@@ -1,4 +1,4 @@
-/* Dungeon Master --- Adventure generator for GNU Guile
+/* Dungeon Master --- RPG Adventure Generator
Copyright © 2019 Javier Sancho <jsf@jsancho.org>
Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+ along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libguile.h>
diff --git a/src/main.cpp b/src/main.cpp
index c469aa1..b86ab1e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-/* Dungeon Master --- Adventure generator for GNU Guile
+/* Dungeon Master --- RPG Adventure Generator
Copyright © 2019 Javier Sancho <jsf@jsancho.org>
Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,51 +12,38 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+ along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
*/
#include <irrlicht/irrlicht.h>
-#include "paths.h"
-
-#include <iostream>
using namespace irr;
using namespace core;
using namespace video;
using namespace gui;
-int main()
+int main ()
{
- std::set<std::string> paths = get_data_paths();
- for (std::set<std::string>::iterator it=paths.begin(); it!=paths.end(); it++)
- std::cout << *it << std::endl;
IrrlichtDevice* device =
- createDevice(EDT_OPENGL,
- dimension2d<u32>(640, 480), 16,
- false, false, false, 0);
+ createDevice (video::EDT_OPENGL, core::dimension2d<u32> (640, 480));
+
if (!device)
return 1;
- device->setWindowCaption(L"Dungeon Master");
+ device->setWindowCaption (L"Dungeon Master");
- IVideoDriver* driver = device->getVideoDriver();
- IGUIEnvironment* env = device->getGUIEnvironment();
+ IVideoDriver* driver = device->getVideoDriver ();
+ IGUIEnvironment* guienv = device->getGUIEnvironment ();
- env->addStaticText(L"Dungeon Master", rect<s32>(150,20,350,40), true);
+ guienv->addStaticText (L"Aqui va el texto", rect<s32> (10, 10, 260, 22));
- IGUITabControl* tab = env->addTabControl(rect<s32>(50, 60, 850, 600));
- tab->addTab(L"First");
- tab->addTab(L"Second");
- tab->addTab(L"Third");
-
- while (device->run())
+ while (device->run ())
{
- driver->beginScene(true, true, SColor(0, 200, 200, 200));
- env->drawAll();
- driver->endScene();
+ driver->beginScene (true, true, SColor(255, 100, 101, 140));
+ guienv->drawAll ();
+ driver->endScene ();
}
- device->drop();
-
+ device->drop ();
return 0;
}
diff --git a/src/mods.cpp b/src/mods.cpp
index c6fa4b6..06a5b2f 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -1,4 +1,4 @@
-/* Dungeon Master --- Adventure generator for GNU Guile
+/* Dungeon Master --- RPG Adventure Generator
Copyright © 2019 Javier Sancho <jsf@jsancho.org>
Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+ along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
*/
#include <dirent.h>
diff --git a/src/mods.h b/src/mods.h
index a948772..59da012 100644
--- a/src/mods.h
+++ b/src/mods.h
@@ -1,4 +1,4 @@
-/* Dungeon Master --- Adventure generator for GNU Guile
+/* Dungeon Master --- RPG Adventure Generator
Copyright © 2019 Javier Sancho <jsf@jsancho.org>
Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+ along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
*/
void load_mods();
diff --git a/src/paths.cpp b/src/paths.cpp
index 1cebcc8..a175232 100644
--- a/src/paths.cpp
+++ b/src/paths.cpp
@@ -1,4 +1,4 @@
-/* Dungeon Master --- Adventure generator for GNU Guile
+/* Dungeon Master --- RPG Adventure Generator
Copyright © 2019 Javier Sancho <jsf@jsancho.org>
Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+ along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
*/
#include <unistd.h>
diff --git a/src/paths.h b/src/paths.h
index e1e7bec..2325eae 100644
--- a/src/paths.h
+++ b/src/paths.h
@@ -1,4 +1,4 @@
-/* Dungeon Master --- Adventure generator for GNU Guile
+/* Dungeon Master --- RPG Adventure Generator
Copyright © 2019 Javier Sancho <jsf@jsancho.org>
Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+ along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
*/
#include <set>
diff --git a/tests/bowyer-watson.scm b/tests/bowyer-watson.scm
index c8c3188..5074925 100644
--- a/tests/bowyer-watson.scm
+++ b/tests/bowyer-watson.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (test-bowyer-watson)
diff --git a/tests/point.scm b/tests/point.scm
index e88e96a..a6f8565 100644
--- a/tests/point.scm
+++ b/tests/point.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (test-point)
diff --git a/tests/triangle.scm b/tests/triangle.scm
index 57cfb1e..7b4d365 100644
--- a/tests/triangle.scm
+++ b/tests/triangle.scm
@@ -1,4 +1,4 @@
-;;; Dungeon Master --- Adventure generator for GNU Guile
+;;; Dungeon Master --- RPG Adventure Generator
;;; Copyright © 2019 Javier Sancho <jsf@jsancho.org>
;;;
;;; Dungeon Master is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@
;;; General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
-;;; along with Haunt. If not, see <http://www.gnu.org/licenses/>.
+;;; along with Dungeon Master. If not, see <http://www.gnu.org/licenses/>.
(define-module (test-triangle)
--
2.39.5