Index by base classes in GameObjectManager::m_objects_by_type_index (#…

…2991)

* Index intermediate classes of GameObjects

This allows for much more efficient implementations of GameObjectManager's
get_object_count and get_objects_by_type. Now, for example, counting all
BadGuy objects does not require scanning through all the unrelated objects.

* Simplify GameObjectIterator<T>

Now it is only used on vectors containing only objects with T
as a base class.

src/badguy/angrystone.hpp

@@ -38,6 +38,7 @@ class AngryStone final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Angry Stone"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(AngryStone)); }
 
 protected:
   virtual std::vector<Direction> get_allowed_directions() const override;

src/badguy/badguy.hpp

@@ -68,6 +68,7 @@ class BadGuy : public MovingSprite,
   virtual std::string get_exposed_class_name() const override { return "BadGuy"; }
   static std::string display_name() { return _("Badguy"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return MovingSprite::get_class_types().add(typeid(Portable)).add(typeid(BadGuy)); }
 
   virtual std::string get_overlay_size() const { return "1x1"; }
 

src/badguy/bomb.hpp

@@ -25,6 +25,7 @@ class Bomb final : public BadGuy
 {
 public:
   Bomb(const Vector& pos, Direction dir, const std::string& custom_sprite = "images/creatures/mr_bomb/bomb.sprite" );
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Bomb)); }
   virtual bool is_saveable() const override {
     return false;
   }

src/badguy/bouncing_snowball.hpp

@@ -38,6 +38,7 @@ class BouncingSnowball final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Bouncing Snowball"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(BouncingSnowball)); }
 
   virtual GameObjectTypes get_types() const override;
   virtual std::string get_default_sprite_name() const override;

src/badguy/captainsnowball.hpp

@@ -31,6 +31,7 @@ class CaptainSnowball final : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Captain Snowball"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(CaptainSnowball)); }
   virtual bool is_snipable() const override { return true; }
 
   bool might_climb(int width, int height) const;

src/badguy/corrupted_granito.hpp

@@ -43,6 +43,7 @@ class CorruptedGranito final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Corrupted Granito"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(CorruptedGranito)); }
   virtual bool is_snipable() const override { return true; }
   virtual bool is_flammable() const override { return m_type != GRANITO; }
 

src/badguy/corrupted_granito_big.hpp

@@ -34,6 +34,7 @@ class CorruptedGranitoBig final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Corrupted Big Granito"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(CorruptedGranitoBig)); }
 
   virtual bool is_snipable()  const override { return false; }
   virtual bool is_freezable() const override { return false; }

src/badguy/crusher.hpp

@@ -70,6 +70,7 @@ class Crusher final : public MovingSprite
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Crusher"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return MovingSprite::get_class_types().add(typeid(Crusher)); }
 
   virtual ObjectSettings get_settings() override;
   GameObjectTypes get_types() const override;
@@ -115,6 +116,7 @@ class CrusherRoot : public MovingSprite
 {
 public:
   CrusherRoot(Vector position, Crusher::Direction direction, float delay, int layer);
+  virtual GameObjectClasses get_class_types() const override { return MovingSprite::get_class_types().add(typeid(CrusherRoot)); }
 
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit) override;
   virtual void update(float dt_sec) override;

src/badguy/crystallo.hpp

@@ -32,6 +32,7 @@ class Crystallo final : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Crystallo"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(Crystallo)); }
 
   virtual void active_update(float dt_sec) override;
   virtual bool is_flammable() const override;

src/badguy/dart.hpp

@@ -43,6 +43,7 @@ class Dart final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Dart"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Dart)); }
 
   virtual bool is_flammable() const override;
 

src/badguy/darttrap.hpp

@@ -34,6 +34,7 @@ class DartTrap final : public StickyBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Dart Trap"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return StickyBadguy::get_class_types().add(typeid(DartTrap)); }
 
   virtual ObjectSettings get_settings() override;
   virtual GameObjectTypes get_types() const override;

src/badguy/dispenser.hpp

@@ -66,6 +66,7 @@ class Dispenser final : public BadGuy
   virtual std::string get_exposed_class_name() const override { return "Dispenser"; }
   static std::string display_name() { return _("Dispenser"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Dispenser)); }
 
   virtual ObjectSettings get_settings() override;
   virtual GameObjectTypes get_types() const override;

src/badguy/dive_mine.hpp

@@ -49,6 +49,7 @@ class DiveMine final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Dive Mine"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(DiveMine)); }
 
 protected:
   virtual std::vector<Direction> get_allowed_directions() const override;

src/badguy/fish_chasing.hpp

@@ -33,6 +33,7 @@ class FishChasing final : public FishSwimming
   static std::string display_name() { return _("Chasing Fish"); }
   virtual std::string get_display_name() const override { return display_name(); }
   virtual std::string get_overlay_size() const override { return "2x2"; }
+  virtual GameObjectClasses get_class_types() const override { return FishSwimming::get_class_types().add(typeid(FishChasing)); }
   virtual ObjectSettings get_settings() override;
 
   std::string get_default_sprite_name() const override;

src/badguy/fish_harmless.hpp

@@ -29,6 +29,7 @@ class FishHarmless final : public FishSwimming
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Harmless Fish"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return FishSwimming::get_class_types().add(typeid(FishHarmless)); }
   virtual std::string get_overlay_size() const override { return "1x1"; }
 
   GameObjectTypes get_types() const override { return {}; }

src/badguy/fish_jumping.hpp

@@ -40,6 +40,7 @@ class FishJumping final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Jumping Fish"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(FishJumping)); }
 
 protected:
   virtual std::vector<Direction> get_allowed_directions() const override;

src/badguy/fish_swimming.hpp

@@ -40,6 +40,7 @@ class FishSwimming : public BadGuy
   static std::string display_name() { return _("Swimming Fish"); }
   virtual std::string get_display_name() const override { return display_name(); }
   virtual std::string get_overlay_size() const override { return "2x1"; }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(FishSwimming)); }
   virtual ObjectSettings get_settings() override;
 
   virtual GameObjectTypes get_types() const override;

src/badguy/flame.hpp

@@ -46,6 +46,7 @@ class Flame final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Flame"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Flame)); }
 
   virtual void stop_looping_sounds() override;
   virtual void play_looping_sounds() override;

src/badguy/flyingsnowball.hpp

@@ -32,6 +32,7 @@ class FlyingSnowBall final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Flying Snowball"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(FlyingSnowBall)); }
   virtual bool is_snipable() const override { return true; }
 
 protected:

src/badguy/ghosttree.hpp

@@ -42,6 +42,7 @@ class GhostTree final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Ghost Tree"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(GhostTree)); }
 
   virtual void on_flip(float height) override;
 

src/badguy/ghoul.hpp

@@ -30,6 +30,7 @@ class Ghoul final : public BadGuy,
   static std::string display_name() { return _("Ghoul"); }
   std::string get_class_name() const override { return class_name(); }
   std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Ghoul)); }
   bool is_freezable() const override;
   bool is_flammable() const override;
   virtual bool is_snipable() const override { return true; }

src/badguy/goldbomb.hpp

@@ -49,6 +49,7 @@ class GoldBomb final : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Gold Bomb"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(GoldBomb)); }
   virtual bool is_snipable() const override { return true; }
 
   virtual void stop_looping_sounds() override;

src/badguy/granito.hpp

@@ -51,6 +51,7 @@ class Granito : public WalkingBadguy
   virtual std::string get_exposed_class_name() const override { return "Granito"; }
   static std::string display_name() { return _("Granito"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(Granito)); }
 
   virtual bool is_snipable() const override { return false; }
   virtual bool is_freezable() const override { return false; }

src/badguy/granito_big.hpp

@@ -43,6 +43,7 @@ class GranitoBig final : public Granito
   virtual std::string get_exposed_class_name() const override { return "GranitoBig"; }
   static std::string display_name() { return _("Big Granito"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return Granito::get_class_types().add(typeid(GranitoBig)); }
 
   virtual ObjectSettings get_settings() override;
   virtual GameObjectTypes get_types() const override;

src/badguy/granito_giant.hpp

@@ -31,6 +31,7 @@ class GranitoGiant final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Giant Granito"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(GranitoGiant)); }
 
   virtual void kill_fall() override;
 

src/badguy/haywire.hpp

@@ -45,6 +45,7 @@ class Haywire final : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Haywire"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(Haywire)); }
   virtual bool is_snipable() const override { return true; }
 
   inline bool is_exploding() const { return m_is_exploding; }

src/badguy/igel.hpp

@@ -38,6 +38,7 @@ class Igel final : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Igel"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(Igel)); }
 
   virtual bool is_freezable() const override { return true; }
   virtual void unfreeze(bool melt = true) override;

src/badguy/jumpy.hpp

@@ -39,6 +39,7 @@ class Jumpy final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Jumpy"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Jumpy)); }
 
   GameObjectTypes get_types() const override;
   std::string get_default_sprite_name() const override;

src/badguy/kamikazesnowball.hpp

@@ -33,6 +33,7 @@ class KamikazeSnowball : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Kamikaze Snowball"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(KamikazeSnowball)); }
   virtual bool is_snipable() const override { return true; }
 
 protected:
@@ -63,6 +64,7 @@ class LeafShot final : public KamikazeSnowball
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Leafshot"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return KamikazeSnowball::get_class_types().add(typeid(LeafShot)); }
 
   virtual bool is_snipable() const override { return true; }
 

src/badguy/kugelblitz.hpp

@@ -39,6 +39,7 @@ class Kugelblitz final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Kugelblitz"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Kugelblitz)); }
 
   void explode();
 

src/badguy/livefire.hpp

@@ -37,6 +37,7 @@ class LiveFire : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Walking Flame"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(LiveFire)); }
 
 private:
   std::string death_sound;
@@ -70,6 +71,7 @@ class LiveFireAsleep final : public LiveFire
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Sleeping Flame"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return LiveFire::get_class_types().add(typeid(LiveFireAsleep)); }
 
 private:
   LiveFireAsleep(const LiveFireAsleep&) = delete;
@@ -88,6 +90,7 @@ class LiveFireDormant final : public LiveFire
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Dormant Flame"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return LiveFire::get_class_types().add(typeid(LiveFireDormant)); }
 
 private:
   LiveFireDormant(const LiveFireDormant&) = delete;

src/badguy/mole.hpp

@@ -37,6 +37,7 @@ class Mole final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Mole"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(Mole)); }
 
   virtual bool is_snipable() const override { return true; }
 

src/badguy/mole_rock.hpp

@@ -43,6 +43,7 @@ class MoleRock final : public BadGuy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Mole's rock"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return BadGuy::get_class_types().add(typeid(MoleRock)); }
 
 protected:
   const BadGuy* parent; /**< collisions with this BadGuy will be ignored */

src/badguy/mrbomb.hpp

@@ -39,6 +39,7 @@ class MrBomb final : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Mr. Bomb"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(MrBomb)); }
   virtual bool is_snipable() const override { return true; }
 
   GameObjectTypes get_types() const override;

src/badguy/mriceblock.hpp

@@ -48,6 +48,7 @@ class MrIceBlock : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Mr. Iceblock"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(MrIceBlock)); }
 
   virtual bool is_snipable() const override { return ice_state != ICESTATE_KICKED; }
   virtual bool is_freezable() const override;

src/badguy/mrtree.hpp

@@ -31,6 +31,7 @@ class MrTree final : public WalkingBadguy
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Mr. Tree"); }
   virtual std::string get_display_name() const override { return display_name(); }
+  virtual GameObjectClasses get_class_types() const override { return WalkingBadguy::get_class_types().add(typeid(MrTree)); }
 
   GameObjectTypes get_types() const override;
   std::string get_default_sprite_name() const override;