Make saplings only grow on dirt or grass, make jungle tree trunks only replace air

[oweals/minetest.git] / src / guiCreateWorld.cpp

diff --git a/src/guiCreateWorld.cpp b/src/guiCreateWorld.cpp
index 159e736c36e5d929a109ff3c93661b64b2dedb66..8ac3fb17c0e8dc8df95045c6e057ed00abe7632f 100644 (file)
--- a/src/guiCreateWorld.cpp
+++ b/src/guiCreateWorld.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -27,8 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIStaticText.h>
 #include <IGUIFont.h>
 #include <IGUIListBox.h>
-
 #include "gettext.h"
+#include "util/string.h"
 
 enum
 {
@@ -155,14 +155,14 @@ void GUICreateWorld::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 120, 30);
                rect = rect + v2s32(170, 140) + topleft;
-               Environment->addButton(rect, this, GUI_ID_CANCEL,
-                       wgettext("Cancel"));
+               Environment->addButton(rect, this, GUI_ID_CREATE,
+                       wgettext("Create"));
        }
        {
                core::rect<s32> rect(0, 0, 120, 30);
                rect = rect + v2s32(300, 140) + topleft;
-               Environment->addButton(rect, this, GUI_ID_CREATE,
-                       wgettext("Create"));
+               Environment->addButton(rect, this, GUI_ID_CANCEL,
+                       wgettext("Cancel"));
        }
        changeCtype("C");
 }