Merge branch 'master' into textbox-fix

Author: weluvgoatz

CMakeLists.txt

@@ -930,7 +930,7 @@ target_link_libraries(supertux2 supertux2_lib Boost::filesystem Boost::locale)
 set_target_properties(supertux2_lib PROPERTIES OUTPUT_NAME supertux2_lib)
 set_target_properties(supertux2_lib PROPERTIES COMPILE_FLAGS "${SUPERTUX2_EXTRA_WARNING_FLAGS}")
 if(EMSCRIPTEN)
-  target_link_options(supertux2 PUBLIC -sEXPORTED_FUNCTIONS=['_main','_set_resolution','_save_config','_onDownloadProgress','_onDownloadFinished','_onDownloadError','_onDownloadAborted'] PUBLIC -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap'] PUBLIC -sEXTRA_EXPORTED_RUNTIME_METHODS=['ccall','cwrap'])
+  target_link_options(supertux2 PUBLIC -sEXPORTED_FUNCTIONS=['_main','_set_resolution','_save_config','_onDownloadProgress','_onDownloadFinished','_onDownloadError','_onDownloadAborted','_getExceptionMessage'] PUBLIC -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap'] PUBLIC -sEXTRA_EXPORTED_RUNTIME_METHODS=['ccall','cwrap'])
 endif(EMSCRIPTEN)
 
 if(WIN32 AND NOT VCPKG_BUILD)

data/levels/bonus2/level17.stl

@@ -4,17 +4,16 @@
   (author "Marek Moeckel")
   (license "GPL 2+ / CC-by-sa 3.0")
   (target-time 55)
+  (icon "")
+  (icon-locked "")
   (sector
     (name "main")
     (ambient-light
       (color 1 1 1)
     )
     (background
-      (scroll-offset-y 345)
       (color 1 1 1)
-      (x 11776)
-      (y 832)
-      (alignment "top")
+      (alignment "bottom")
       (scroll-speed-x 0.5)
       (scroll-speed-y 0.5)
       (speed 0.5)
@@ -24,10 +23,8 @@
       (z-pos -290)
     )
     (background
-      (scroll-offset-y -265)
+      (scroll-offset-y -10)
       (color 1 1 1)
-      (x 12288)
-      (y 800)
       (alignment "top")
       (scroll-speed-x 0.5)
       (scroll-speed-y 0.5)
@@ -208,6 +205,7 @@
     (path
       (name "c1c8f4db-1cbf-46bf-b0b1-96a47db6910c")
       (path
+        (adapt_speed #f)
         (node
           (x 2272)
           (y 512)
@@ -217,6 +215,7 @@
     (path
       (name "2a08bac6-b9f3-478c-ba9f-ff946cd7235b")
       (path
+        (adapt_speed #f)
         (node
           (x 4704)
           (y 608)
@@ -226,6 +225,7 @@
     (path
       (name "736a59ab-bd63-4bec-b6fd-6c0beddf20db")
       (path
+        (adapt_speed #f)
         (node
           (x 10688)
           (y 544)
@@ -235,6 +235,7 @@
     (path
       (name "d895a7d0-d5b3-46d8-980f-46d22e280c6d")
       (path
+        (adapt_speed #f)
         (node
           (x 12544)
           (y 448)
@@ -377,6 +378,9 @@
       (x 10030)
       (y 425)
     )
+    (textobject
+      (name "Text")
+    )
     (tilemap
       (solid #f)
       (z-pos -100)
@@ -466,6 +470,12 @@
       )
     )
     (tilemap
+      (handle
+        (scale_x 0)
+        (scale_y 0)
+        (offset_x 0)
+        (offset_y 0)
+      )
       (solid #f)
       (z-pos 100)
       (name "s1")
@@ -481,6 +491,12 @@
       )
     )
     (tilemap
+      (handle
+        (scale_x 0)
+        (scale_y 0)
+        (offset_x 0)
+        (offset_y 0)
+      )
       (solid #f)
       (z-pos 100)
       (name "s2")
@@ -496,6 +512,12 @@
       )
     )
     (tilemap
+      (handle
+        (scale_x 0)
+        (scale_y 0)
+        (offset_x 0)
+        (offset_y 0)
+      )
       (solid #f)
       (z-pos 100)
       (name "s3")
@@ -513,6 +535,12 @@
       )
     )
     (tilemap
+      (handle
+        (scale_x 0)
+        (scale_y 0)
+        (offset_x 0)
+        (offset_y 0)
+      )
       (solid #f)
       (z-pos 0)
       (name "frgrd")

data/levels/bonus2/level2.stl

@@ -4,6 +4,8 @@
   (author "Kevin")
   (license "GPL 2+ / CC-by-sa 3.0")
   (target-time 350)
+  (icon "")
+  (icon-locked "")
   (sector
     (name "main")
     (ambient-light
@@ -18,8 +20,6 @@
     )
     (background
       (color 1 1 1)
-      (x 736)
-      (y 448)
       (scroll-speed-x 0.5)
       (scroll-speed-y 0.5)
       (speed 0.5)
@@ -30,8 +30,6 @@
     )
     (background
       (color 1 1 1)
-      (x 832)
-      (y 416)
       (scroll-speed-x 0.5)
       (scroll-speed-y 0.5)
       (speed 0.5)
@@ -80,6 +78,12 @@
       (name "Camera")
       (mode "autoscroll")
       (path-ref "4fecb608-cc73-4761-9b95-0f2ed114a61a")
+      (handle
+        (scale_x 0)
+        (scale_y 0)
+        (offset_x 0)
+        (offset_y 0)
+      )
     )
     (coin
       (x 2080)
@@ -642,19 +646,11 @@
         (node
           (x 0)
           (y 0)
-          (bezier_before_x 0)
-          (bezier_before_y 0)
-          (bezier_after_x 0)
-          (bezier_after_y 0)
           (time 250)
         )
         (node
           (x 22848)
           (y 0)
-          (bezier_before_x 22848)
-          (bezier_before_y 0)
-          (bezier_after_x 22848)
-          (bezier_after_y 0)
         )
       )
     )
@@ -898,6 +894,9 @@
       (x 20994)
       (y 255)
     )
+    (textobject
+      (name "Text")
+    )
     (tilemap
       (solid #f)
       (z-pos -100)

mk/emscripten/template.html.in

@@ -341,8 +341,10 @@
     };
 
     Module.setStatus("Downloading...");
-    window.onerror = function (e) {
-      Module.setStatus("Oops!<br><br>An error occured and SuperTux crashed.<br><br><pre>" + e + "</pre>");
+    window.onerror = function (message, source, line, col, error) {
+      if (typeof error == "number")
+        message = Module.ccall('getExceptionMessage', 'string', ['number'], [error]);
+      Module.setStatus("Oops!<br><br>An error occured and SuperTux crashed.<br><br><pre>" + message + "</pre>");
       spinnerElement.style.display = "none";
       Module.setStatus = function (e) {
         if (e)

src/physfs/util.cpp

@@ -60,6 +60,23 @@ bool remove(const std::string& filename)
   return PHYSFS_delete(filename.c_str()) == 0;
 }
 
+void
+remove_with_content(const std::string& filename)
+{
+  char** files = PHYSFS_enumerateFiles(filename.c_str());
+
+  for (const char* const* file = files; *file != nullptr; file++)
+  {
+    std::string path = FileSystem::join(filename, *file);
+    if (is_directory(path))
+      remove_with_content(path);
+    PHYSFS_delete(path.c_str());
+  }
+
+  PHYSFS_delete(filename.c_str());
+  PHYSFS_freeList(files);
+}
+
 } // namespace physfsutil
 
 /* EOF */

src/physfs/util.hpp

@@ -31,6 +31,9 @@ bool is_directory(const std::string& path);
 
 bool remove(const std::string& filenam);
 
+/** Removes directory with content */
+void remove_with_content(const std::string& filename);
+
 } // namespace physfsutil
 
 #endif

src/port/emscripten.hpp

@@ -15,6 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Export functions for emscripten
+// If you add functions here, make sure to make CMakeLists.txt export them!
 #ifdef __EMSCRIPTEN__
 
 #include <emscripten.h>
@@ -35,6 +36,7 @@ void onDownloadProgress(int id, int loaded, int total);
 void onDownloadFinished(int id);
 void onDownloadError(int id);
 void onDownloadAborted(int id);
+const char* getExceptionMessage(intptr_t address);
 
 EMSCRIPTEN_KEEPALIVE // This is probably not useful, I just want ppl to know it exists
 void
@@ -75,6 +77,12 @@ onDownloadAborted(int id)
   AddonManager::current()->onDownloadAborted(id);
 }
 
+const char*
+getExceptionMessage(intptr_t address)
+{
+  return reinterpret_cast<std::exception*>(address)->what();
+}
+
 } // extern "C"
 
 void

src/supertux/menu/editor_delete_levelset_menu.cpp

@@ -0,0 +1,87 @@
+//  SuperTux
+//  Copyright (C) 2021 mrkubax10 <[email protected]>
+//
+//  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 3 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.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "supertux/menu/editor_delete_levelset_menu.hpp"
+
+#include "editor/editor.hpp"
+#include "gui/dialog.hpp"
+#include "physfs/util.hpp"
+#include "supertux/menu/editor_levelset_select_menu.hpp"
+#include "supertux/world.hpp"
+#include "util/gettext.hpp"
+#include "util/log.hpp"
+
+EditorDeleteLevelsetMenu::EditorDeleteLevelsetMenu(EditorLevelsetSelectMenu* editor_levelset_select_menu) :
+  m_editor_levelset_select_menu(editor_levelset_select_menu)
+{
+  refresh();
+}
+
+void
+EditorDeleteLevelsetMenu::refresh()
+{
+  clear();
+
+  add_label(_("Delete World"));
+  add_hl();
+
+  unsigned int i = 0;
+  std::vector<std::string>& contrib_worlds = m_editor_levelset_select_menu->get_contrib_worlds();
+  for(std::string& level_world : contrib_worlds)
+  {
+    std::unique_ptr<World> world = World::from_directory(level_world);
+    if (world->hide_from_contribs())
+    {
+      continue;
+    }
+    if (!world->is_levelset() && !world->is_worldmap())
+    {
+      log_warning << level_world << ": unknown World type" << std::endl;
+      continue;
+    }
+    auto title = world->get_title();
+    if (title.empty())
+    {
+      continue;
+    }
+    add_entry(i++, title);
+  }
+
+  add_hl();
+
+  add_back(_("Back"));
+}
+
+void
+EditorDeleteLevelsetMenu::menu_action(MenuItem& item)
+{
+  int id = item.get_id();
+
+  if (id >= 0)
+  {
+    std::vector<std::string>& contrib_worlds = m_editor_levelset_select_menu->get_contrib_worlds();
+    if (Editor::is_active() && Editor::current()->get_world() && Editor::current()->get_world()->get_basedir() == contrib_worlds[id])
+      Dialog::show_message(_("You cannot delete the world that you are editing"));
+    else
+    {
+      physfsutil::remove_with_content(contrib_worlds[id]);
+      m_editor_levelset_select_menu->reload_menu();
+      refresh();
+    }
+  }
+}
+
+/* EOF */