license

diff --git a/dungeon-master/generators/town.scm b/dungeon-master/generators/town.scm
index feb38a0a36ab55f265f353ce79ff6d38c3b342b6..7e93636a28c5c7fcd42c725b047a6a5f678e13bc 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (dungeon-master generators town)

diff --git a/dungeon-master/geom.scm b/dungeon-master/geom.scm
index 018027962fce67431dfff837ebda905321f69814..466d369b5bec16a10761fe74614736857feabac6 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (dungeon-master geom)

diff --git a/dungeon-master/geom/bowyer-watson.scm b/dungeon-master/geom/bowyer-watson.scm
index fe7c036c211c4328bb36061816b96e921484ac2c..14455394d4b7c640c55dbc5865784c0278397754 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (dungeon-master geom bowyer-watson)

diff --git a/dungeon-master/geom/point.scm b/dungeon-master/geom/point.scm
index d13cdf75e8e413a7b084a790d4147c70a9125e8b..72ca1bbe00ae662ae9d97ba448c721424bb745c9 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (dungeon-master geom point)

diff --git a/dungeon-master/geom/triangle.scm b/dungeon-master/geom/triangle.scm
index 109f7fe6a5893c5e6bad06850d658eaed9af9ec9..6f7ccf8634bd6032a83219de46d3bf0912a9229d 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (dungeon-master geom triangle)

diff --git a/dungeon-master/geom/voronoi.scm b/dungeon-master/geom/voronoi.scm
index 86b0fef7cdc72cd63f83afa1ee756b815aa09f9e..553beec920999f056c9526e25e7b7027579d2485 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (dungeon-master geom voronoi)

diff --git a/src/generators.h b/src/generators.h
index b07637da642d7ba57825be3250a65623d0ae0055..e88309d65c742f1a88f2284010bdab564301932f 100644 (file)
--- 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
    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
    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>
 */
 
 #include <libguile.h>

diff --git a/src/main.cpp b/src/main.cpp
index c469aa1ae3cc7230b283aa2f4eacf6fc7d71c101..b86ab1e2cb0b35a42886f4bc597e7e7c65d9472c 100644 (file)
--- 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
    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
    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 <irrlicht/irrlicht.h>

-#include "paths.h"
-
-#include <iostream>

 
 using namespace irr;
 using namespace core;
 using namespace video;
 using namespace gui;
 
 
 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 =
   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;
 
   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;
 }
   return 0;
 }

diff --git a/src/mods.cpp b/src/mods.cpp
index c6fa4b6d7f0c29cc67e33250e912c7f32cb59b0e..06a5b2fc67244e76eeda8296fb355410165ac159 100644 (file)
--- 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
    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
    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>
 */
 
 #include <dirent.h>

diff --git a/src/mods.h b/src/mods.h
index a948772e70b89c9d17b39dcb1979b67fa76f2e38..59da0123d25d9a2c21039c6dce64497b4bade454 100644 (file)
--- 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
    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
    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();
 */
 
 void load_mods();

diff --git a/src/paths.cpp b/src/paths.cpp
index 1cebcc8f603aca440cc0428f553e15790e698406..a1752328abcd5a736c76ad8f54e7b9397f6705df 100644 (file)
--- 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
    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
    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>
 */
 
 #include <unistd.h>

diff --git a/src/paths.h b/src/paths.h
index e1e7bec4ce16631f139d4d3b7f298ea096b1e451..2325eae09cd163d573115b09c4b388aa3f7ee647 100644 (file)
--- 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
    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
    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>
 */
 
 #include <set>

diff --git a/tests/bowyer-watson.scm b/tests/bowyer-watson.scm
index c8c3188c57b796aeceb713727c59b6f7e4c389a9..5074925fc037284c1b027feb828821a6c59c936e 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (test-bowyer-watson)

diff --git a/tests/point.scm b/tests/point.scm
index e88e96a0392cd448cf25d5d10d8d95de9e4d6f04..a6f85655d29bdef88000092ae2b9d331215b0646 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (test-point)

diff --git a/tests/triangle.scm b/tests/triangle.scm
index 57cfb1eaf6fb2877727651b20c8980659bb75dc2..7b4d365c6cb8dcd7ca5a45aee260a160c4e71251 100644 (file)
--- 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
 ;;; 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
 ;;; 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)
 
 
 (define-module (test-triangle)