Merge branch 'master' into simplesquirrel

.github/workflows/lint.yml

@@ -51,6 +51,7 @@ jobs:
       - name: Lint code with Cppcheck
         run: |
           ./danmar-cppcheck-*/cppcheck \
+            --check-level=exhaustive \
             --quiet --inline-suppr --language=c++ --error-exitcode=10 \
             -j"$(nproc)" --std=c++17 --enable=warning,style \
             --suppress=useStlAlgorithm  src/

data/levels/misc/credits.stl

@@ -60,7 +60,7 @@ stop_music(0);")
     )
     (camera
       (name "Camera")
-      (mode "normal")
+      (mode "manual")
     )
     (decal
       (name "PENNY")

src/badguy/corrupted_granito_big.cpp

@@ -41,6 +41,7 @@ CorruptedGranitoBig::CorruptedGranitoBig(const ReaderMapping& reader) :
   parse_type(reader);
 
   m_col.set_unisolid(true);
+  m_physic.enable_gravity(false);
 
   SoundManager::current()->preload("sounds/brick.wav");
 }
@@ -52,7 +53,7 @@ CorruptedGranitoBig::initialize()
 
   m_state = STATE_READY;
   set_action("idle", m_dir);
-  set_colgroup_active(COLGROUP_MOVING_STATIC);
+  set_colgroup_active(COLGROUP_STATIC);
 }
 
 void
@@ -80,9 +81,12 @@ CorruptedGranitoBig::draw(DrawingContext &context)
 void
 CorruptedGranitoBig::kill_fall()
 {
+  if (m_state == STATE_BROKEN)
+    return;
+
   m_state = STATE_BROKEN;
   set_action("broken", m_dir);
-  set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
+  set_colgroup_active(COLGROUP_DISABLED);
   m_col.set_unisolid(false);
 
   run_dead_script();

src/collision/collision_object.cpp

@@ -28,6 +28,7 @@ CollisionObject::CollisionObject(CollisionGroup group, CollisionListener& listen
   m_movement(0.0f, 0.0f),
   m_dest(),
   m_unisolid(false),
+  m_pressure(),
   m_objects_hit_bottom(),
   m_ground_movement_manager(nullptr)
 {

src/collision/collision_object.hpp

@@ -98,6 +98,11 @@ class CollisionObject
     return m_bbox.p1();
   }
 
+  Vector get_pressure() const
+  {
+    return m_pressure;
+  }
+
   /** moves entire object to a specific position, including all
       points those the object has, exactly like the object has
       spawned in that given pos instead.*/
@@ -164,6 +169,11 @@ class CollisionObject
       colliding with unisolid objects. */
   bool m_unisolid;
 
+  /**
+   * Contains the current pressure on this object
+   */
+  Vector m_pressure;
+
   /** Objects that were touching the top of this object at the last frame,
       if this object was static or moving static. */
   std::unordered_set<CollisionObject*> m_objects_hit_bottom;

src/collision/collision_system.cpp

@@ -57,7 +57,7 @@ CollisionSystem::remove(CollisionObject* object)
   m_objects.erase(
     std::find(m_objects.begin(), m_objects.end(),
               object));
-  
+
   // FIXME: This is a patch. A better way of fixing this is coming.
   for (auto* collision_object : m_objects) {
     collision_object->notify_object_removal(object);
@@ -121,7 +121,7 @@ collision::Constraints check_collisions(const Vector& obj_movement, const Rectf&
 
   if (!moving_obj_rect.overlaps(grown_other_obj_rect))
     return constraints;
-  
+
   const CollisionHit dummy;
 
   if (other_object != nullptr && moving_object != nullptr && !other_object->collides(*moving_object, dummy))
@@ -472,6 +472,7 @@ CollisionSystem::collision_static_constrains(CollisionObject& object)
         // later if we're really crushed or things will solve itself when
         // looking at the vertical constraints.
         pressure.y += object.get_bbox().get_height() - height;
+        object.m_pressure.y = pressure.y;
       } else {
         dest.set_bottom(constraints.get_position_bottom() - EPSILON);
         dest.set_top(dest.get_bottom() - object.get_bbox().get_height());
@@ -505,6 +506,7 @@ CollisionSystem::collision_static_constrains(CollisionObject& object)
         // later if we're really crushed or things will solve itself when
         // looking at the horizontal constraints.
         pressure.x += object.get_bbox().get_width() - width;
+        object.m_pressure.x = pressure.x;
       } else {
         float xmid = constraints.get_x_midpoint ();
         dest.set_left(xmid - object.get_bbox().get_width()/2);
@@ -585,6 +587,7 @@ CollisionSystem::update()
     }
 
     object->m_dest = object->get_bbox();
+    object->m_pressure = Vector(0, 0);
     object->m_dest.move(object->get_movement());
     object->clear_bottom_collision_list();
   }

src/object/player.cpp

@@ -1223,6 +1223,11 @@ Player::handle_horizontal_input()
     ax *= ICE_ACCELERATION_MULTIPLIER;
   }
 
+  if(get_collision_object()->get_pressure() != Vector(0.0f, 0.0f)) {
+    vx = 0.0f; vy = 0.0f;
+    ax = 0.0f; ay = 0.0f;
+  }
+
   m_physic.set_velocity(vx, vy);
   m_physic.set_acceleration(ax, ay);
 

src/supertux/statistics.cpp

@@ -484,18 +484,17 @@ Statistics::frags_to_string(int badguys, int total_badguys)
 std::string
 Statistics::time_to_string(float time)
 {
-  int time_csecs = static_cast<int>(time * 100);
-  int mins = (time_csecs / 6000);
-  int secs = (time_csecs % 6000) / 100;
-  int cscs = (time_csecs % 6000) % 100;
-
   std::ostringstream os;
   if (time == 0.0f)
   {
     os << "--:--:--";
   }
   else
   {
+    int time_csecs = static_cast<int>(time * 100);
+    int mins = (time_csecs / 6000);
+    int secs = (time_csecs % 6000) / 100;
+    int cscs = (time_csecs % 6000) % 100;
     os << std::setw(2) << std::setfill('0') << mins << ":" << std::setw(2) << std::setfill('0') << secs << "." << std::setw(2) << std::setfill('0') << cscs;
   }
 

src/supertux/world.cpp

@@ -54,16 +54,15 @@ World::from_directory(const std::string& directory)
     info.get("hide-from-contribs", world->m_hide_from_contribs, false);
     info.get("contrib-type", world->m_contrib_type, "user");
     info.get("title-level", world->m_title_level);
-    return world;
   }
   catch (const std::exception& err)
   {
     log_warning << "Failed to load " << info_filename << ":" << err.what() << std::endl;
 
     world->m_hide_from_contribs = true;
-
-    return world;
   }
+
+  return world;
 }
 
 std::unique_ptr<World>

src/supertux/world.hpp

@@ -20,6 +20,9 @@
 #include <memory>
 #include <string>
 
+#include "supertux/gameconfig.hpp"
+#include "supertux/globals.hpp"
+
 class World final
 {
   friend class EditorLevelsetMenu;
@@ -39,7 +42,7 @@ class World final
   std::string get_title() const { return m_title; }
   std::string get_description() const { return m_description; }
 
-  bool hide_from_contribs() const { return m_hide_from_contribs; }
+  bool hide_from_contribs() const { return m_hide_from_contribs && !g_config->developer_mode; }
 
   bool is_levelset() const { return m_is_levelset; }
   bool is_worldmap() const { return !m_is_levelset; }

src/video/bitmap_font.cpp

@@ -38,7 +38,7 @@ namespace {
 
 bool vline_empty(const SDLSurfacePtr& surface, int x, int start_y, int end_y, Uint8 threshold)
 {
-  Uint8* pixels = static_cast<Uint8*>(surface->pixels);
+  const Uint8* pixels = static_cast<Uint8*>(surface->pixels);
 
   for (int y = start_y; y < end_y; ++y)
   {

src/video/sdl/sdl_painter.cpp

@@ -592,10 +592,7 @@ SDLPainter::clear(const Color& color)
 void
 SDLPainter::set_clip_rect(const Rect& rect)
 {
-  m_cliprect = SDL_Rect{ rect.left,
-                         rect.top,
-                         rect.get_width(),
-                         rect.get_height() };
+  m_cliprect = rect.to_sdl();
 
   int ret = SDL_RenderSetClipRect(m_sdl_renderer, &*m_cliprect);
   if (ret < 0)

src/video/sdl/sdl_screen_renderer.cpp

@@ -62,8 +62,7 @@ SDLScreenRenderer::start_draw()
   const Rect& viewport = m_video_system.get_viewport().get_rect();
   const Vector& scale = m_video_system.get_viewport().get_scale();
 
-  SDL_Rect sdl_viewport = { viewport.left, viewport.top,
-                            viewport.get_width(), viewport.get_height() };
+  SDL_Rect sdl_viewport = viewport.to_sdl();
 
   // SetViewport() works in scaled screen coordinates, so we have to
   // reset it to 1.0, 1.0 to get meaningful results

src/video/sdl_surface_ptr.hpp

@@ -19,7 +19,7 @@
 
 #include <SDL.h>
 
-/** Simple Wrapper class around SDL_Surface that provides execption
+/** Simple Wrapper class around SDL_Surface that provides exception
     safety */
 class SDLSurfacePtr final
 {

src/worldmap/camera.cpp

@@ -31,7 +31,8 @@ const float CAMERA_PAN_TIME_MAX = 0.52213f;
 
 namespace worldmap {
 
-Camera::Camera() :
+Camera::Camera(WorldMapSector& worldmap_sector) :
+  m_worldmap_sector(worldmap_sector),
   m_camera_offset(0.0f, 0.0f),
   m_pan_startpos(0.0f, 0.0f),
   m_pan_time_full(0),
@@ -82,7 +83,7 @@ Camera::pan()
 Vector
 Camera::get_camera_pos_for_tux() const
 {
-  auto& tux = WorldMapSector::current()->get_singleton_by_type<Tux>();
+  auto& tux = m_worldmap_sector.get_singleton_by_type<Tux>();
 
   Vector camera_offset_(0.0f, 0.0f);
   Vector tux_pos = tux.get_pos();
@@ -94,8 +95,6 @@ Camera::get_camera_pos_for_tux() const
 void
 Camera::clamp_camera_position(Vector& c) const
 {
-  auto& worldmap_sector = *WorldMapSector::current();
-
   if (c.x < 0) {
     c.x = 0;
   }
@@ -104,20 +103,20 @@ Camera::clamp_camera_position(Vector& c) const
     c.y = 0;
   }
 
-  if (c.x > worldmap_sector.get_width() - static_cast<float>(SCREEN_WIDTH)) {
-    c.x = worldmap_sector.get_width() - static_cast<float>(SCREEN_WIDTH);
+  if (c.x > m_worldmap_sector.get_width() - static_cast<float>(SCREEN_WIDTH)) {
+    c.x = m_worldmap_sector.get_width() - static_cast<float>(SCREEN_WIDTH);
   }
 
-  if (c.y > worldmap_sector.get_height() - static_cast<float>(SCREEN_HEIGHT)) {
-    c.y = worldmap_sector.get_height() - static_cast<float>(SCREEN_HEIGHT);
+  if (c.y > m_worldmap_sector.get_height() - static_cast<float>(SCREEN_HEIGHT)) {
+    c.y = m_worldmap_sector.get_height() - static_cast<float>(SCREEN_HEIGHT);
   }
 
-  if (worldmap_sector.get_width() < static_cast<float>(SCREEN_WIDTH)) {
-    c.x = (worldmap_sector.get_width() - static_cast<float>(SCREEN_WIDTH)) / 2.0f;
+  if (m_worldmap_sector.get_width() < static_cast<float>(SCREEN_WIDTH)) {
+    c.x = (m_worldmap_sector.get_width() - static_cast<float>(SCREEN_WIDTH)) / 2.0f;
   }
 
-  if (worldmap_sector.get_height() < static_cast<float>(SCREEN_HEIGHT)) {
-    c.y = (worldmap_sector.get_height() - static_cast<float>(SCREEN_HEIGHT)) / 2.0f;
+  if (m_worldmap_sector.get_height() < static_cast<float>(SCREEN_HEIGHT)) {
+    c.y = (m_worldmap_sector.get_height() - static_cast<float>(SCREEN_HEIGHT)) / 2.0f;
   }
 }
 

src/worldmap/camera.hpp

@@ -22,10 +22,12 @@
 
 namespace worldmap {
 
+class WorldMapSector;
+
 class Camera
 {
 public:
-  Camera();
+  explicit Camera(WorldMapSector& worldmap_sector);
 
   void update(float dt_sec);
 
@@ -39,6 +41,7 @@ class Camera
   void clamp_camera_position(Vector& c) const;
 
 private:
+  WorldMapSector& m_worldmap_sector;
   Vector m_camera_offset;
 
   /** variables to track panning to a spawn point */

src/worldmap/worldmap_sector.cpp

@@ -64,7 +64,7 @@ WorldMapSector::current()
 WorldMapSector::WorldMapSector(WorldMap& parent) :
   Base::Sector("worldmap"),
   m_parent(parent),
-  m_camera(new Camera),
+  m_camera(new Camera(*this)),
   m_tux(&add<Tux>(&parent)),
   m_spawnpoints(),
   m_initial_fade_tilemap(),