Use references instead of pointers, move files to trigger folder

mrkubax10 · mrkubax10 · commit 4716e51eaa8f · 2021-12-02T19:07:51.000+01:00
diff --git a/src/editor/object_option.cpp b/src/editor/object_option.cpp
@@ -645,15 +645,15 @@ ButtonOption::add_to_menu(Menu& menu) const
   menu.add_entry(get_text(), m_callback);
 }
 
-StringArrayOption::StringArrayOption(const std::string& text, const std::string& key, std::vector<std::string>* items) :
+StringArrayOption::StringArrayOption(const std::string& text, const std::string& key, std::vector<std::string>& items) :
   ObjectOption(text, key, 0),
   m_items(items)
 {}
 
 void
 StringArrayOption::save(Writer& write) const
 {
-  write.write("strings", *m_items);
+  write.write("strings", m_items);
 }
 
 void
diff --git a/src/editor/object_option.hpp b/src/editor/object_option.hpp
@@ -446,13 +446,13 @@ class ButtonOption : public ObjectOption
 class StringArrayOption : public ObjectOption
 {
 public:
-  StringArrayOption(const std::string& text, const std::string& key, std::vector<std::string>* items);
+  StringArrayOption(const std::string& text, const std::string& key, std::vector<std::string>& items);
 
   virtual void save(Writer& write) const override;
-  virtual std::string to_string() const override { return {}; }
+  virtual std::string to_string() const override { return "text-area"; }
   virtual void add_to_menu(Menu& menu) const override;
 private:
-  std::vector<std::string>* m_items;
+  std::vector<std::string>& m_items;
 private:
   StringArrayOption(const StringArrayOption&) = delete;
   StringArrayOption& operator=(const StringArrayOption&) = delete;
diff --git a/src/editor/object_settings.cpp b/src/editor/object_settings.cpp
@@ -293,7 +293,7 @@ ObjectSettings::add_sexp(const std::string& text, const std::string& key, sexp::
 }
 
 void
-ObjectSettings::add_string_array(const std::string& text, const std::string& key, std::vector<std::string>* items)
+ObjectSettings::add_string_array(const std::string& text, const std::string& key, std::vector<std::string>& items)
 {
   add_option(std::make_unique<StringArrayOption>(text, key, items));
 }
diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
@@ -137,7 +137,7 @@ class ObjectSettings final
                 unsigned int flags = 0);
   void add_sexp(const std::string& text, const std::string& key,
                 sexp::Value& value, unsigned int flags = 0);
-  void add_string_array(const std::string& text, const std::string& key, std::vector<std::string>* items);
+  void add_string_array(const std::string& text, const std::string& key, std::vector<std::string>& items);
   void add_test_from_here();
   void add_particle_editor();
 
diff --git a/src/gui/item_string_array.cpp b/src/gui/item_string_array.cpp
@@ -19,7 +19,7 @@
 #include "gui/menu_manager.hpp"
 #include "gui/menu_string_array.hpp"
 
-ItemStringArray::ItemStringArray(const std::string& text, std::vector<std::string>* items, int id) :
+ItemStringArray::ItemStringArray(const std::string& text, std::vector<std::string>& items, int id) :
   MenuItem(text, id),
   m_items(items)
 {
diff --git a/src/gui/item_string_array.hpp b/src/gui/item_string_array.hpp
@@ -23,11 +23,11 @@
 class ItemStringArray final : public MenuItem
 {
 public:
-  ItemStringArray(const std::string& text, std::vector<std::string>* items, int id = -1);
+  ItemStringArray(const std::string& text, std::vector<std::string>& items, int id = -1);
 
   virtual void process_action(const MenuAction& action) override;
 private:
-  std::vector<std::string>* m_items;
+  std::vector<std::string>& m_items;
 private:
   ItemStringArray(const ItemStringArray&) = delete;
   ItemStringArray& operator=(const ItemStringArray&) = delete;
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
@@ -342,7 +342,7 @@ Menu::add_badguy_select(const std::string& text, std::vector<std::string>* badgu
 }
 
 ItemStringArray&
-Menu::add_string_array(const std::string& text, std::vector<std::string>* items, int id)
+Menu::add_string_array(const std::string& text, std::vector<std::string>& items, int id)
 {
   auto item = std::make_unique<ItemStringArray>(text, items, id);
   auto item_ptr = item.get();
diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
@@ -97,7 +97,7 @@ class Menu
     bool is_linear = false);
   ItemColorChannelOKLab& add_color_channel_oklab(Color* color, int channel);
   ItemPaths& add_path_settings(const std::string& text, PathObject& target, const std::string& path_ref);
-  ItemStringArray& add_string_array(const std::string& text, std::vector<std::string>* items, int id = -1);
+  ItemStringArray& add_string_array(const std::string& text, std::vector<std::string>& items, int id = -1);
 
   void process_input(const Controller& controller);
 
diff --git a/src/gui/menu_string_array.cpp b/src/gui/menu_string_array.cpp
@@ -19,7 +19,7 @@
 #include "gui/menu_item.hpp"
 #include "util/gettext.hpp"
 
-StringArrayMenu::StringArrayMenu(std::vector<std::string>* items) :
+StringArrayMenu::StringArrayMenu(std::vector<std::string>& items) :
   m_array_items(items),
   m_text()
 {
@@ -32,12 +32,12 @@ StringArrayMenu::menu_action(MenuItem& item)
   int id = item.get_id();
   if (id >= 0)
   {
-    m_array_items->erase(m_array_items->begin() + id);
+    m_array_items.erase(m_array_items.begin() + id);
     reload();
   }
   else if (id == -2 && m_text.length() > 0)
   {
-    m_array_items->push_back(m_text);
+    m_array_items.push_back(m_text);
     m_text = "";
     reload();
   }
@@ -49,9 +49,9 @@ StringArrayMenu::reload()
   clear();
   add_label(_("Edit string array"));
   add_hl();
-  for (unsigned int i = 0; i < m_array_items->size(); i++)
+  for (unsigned int i = 0; i < m_array_items.size(); i++)
   {
-    add_entry(i, m_array_items->at(i));
+    add_entry(i, m_array_items.at(i));
   }
   add_hl();
   add_textfield(_("Text"), &m_text);
diff --git a/src/gui/menu_string_array.hpp b/src/gui/menu_string_array.hpp
@@ -24,11 +24,11 @@
 class StringArrayMenu final : public Menu
 {
 public:
-  StringArrayMenu(std::vector<std::string>* items);
+  StringArrayMenu(std::vector<std::string>& items);
 
   virtual void menu_action(MenuItem& item) override;
 private:
-  std::vector<std::string>* m_array_items;
+  std::vector<std::string>& m_array_items;
   std::string m_text;
 
   void reload();
diff --git a/src/supertux/game_object_factory.cpp b/src/supertux/game_object_factory.cpp
@@ -115,7 +115,6 @@
 #include "object/spawnpoint.hpp"
 #include "object/spotlight.hpp"
 #include "object/text_array_object.hpp"
-#include "object/text_area.hpp"
 #include "object/textscroller.hpp"
 #include "object/thunderstorm.hpp"
 #include "object/tilemap.hpp"
@@ -132,6 +131,7 @@
 #include "trigger/secretarea_trigger.hpp"
 #include "trigger/sequence_trigger.hpp"
 #include "trigger/switch.hpp"
+#include "trigger/text_area.hpp"
 #include "util/reader_document.hpp"
 #include "util/reader_mapping.hpp"
 
diff --git a/src/trigger/text_area.cpp b/src/trigger/text_area.cpp
@@ -14,7 +14,7 @@
 //  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 "object/text_area.hpp"
+#include "trigger/text_area.hpp"
 
 #include "editor/editor.hpp"
 #include "object/player.hpp"
@@ -25,7 +25,7 @@
 #include "video/layer.hpp"
 
 TextArea::TextArea(const ReaderMapping& mapping) :
-  MovingObject(mapping),
+  TriggerBase(mapping),
   m_started(false),
   m_inside(false),
   m_once(false),
@@ -47,7 +47,6 @@ TextArea::TextArea(const ReaderMapping& mapping) :
   mapping.get("once", m_once);
   mapping.get("fade-delay", m_fade_delay);
   m_col.m_bbox.set_size(w, h);
-  m_col.m_group = COLGROUP_DISABLED;
 }
 
 TextArea::TextArea(const Vector& pos) :
@@ -64,13 +63,6 @@ TextArea::TextArea(const Vector& pos) :
 {
   m_col.m_bbox.set_pos(pos);
   m_col.m_bbox.set_size(32,32);
-  m_col.m_group = COLGROUP_DISABLED;
-}
-
-HitResponse
-TextArea::collision(GameObject& other, const CollisionHit& hit)
-{
-  return FORCE_MOVE;
 }
 
 void
@@ -81,20 +73,31 @@ TextArea::draw(DrawingContext& context)
 }
 
 void
-TextArea::update(float dt_sec)
+TextArea::event(Player& player, EventType type)
 {
-  if (m_col.m_bbox.contains(Sector::get().get_player().get_bbox()))
+  switch (type)
   {
-    if (!m_started && m_items.size() > 0 && !m_inside && (!m_once || !m_finished))
+  case EVENT_TOUCH:
+    if (!m_started && !m_fade_timer.started() && m_items.size() > 0 && !m_inside && (!m_once || !m_finished))
     {
       m_update_timer.start(m_delay + m_fade_delay * 2, true);
       m_started = true;
-      m_inside = true;
       m_text_id = 0;
     }
-  }
-  else if (!m_started)
+    m_inside = true;
+    break;
+  case EVENT_LOSETOUCH:
     m_inside = false;
+    break;
+  default:
+    break;
+  }
+}
+
+void
+TextArea::update(float dt_sec)
+{
+  TriggerBase::update(dt_sec);
   if (m_started)
   {
     TextObject& text_object = Sector::get().get_singleton_by_type<TextObject>();
@@ -123,11 +126,11 @@ TextArea::update(float dt_sec)
 ObjectSettings
 TextArea::get_settings()
 {
-  ObjectSettings settings = MovingObject::get_settings();
+  ObjectSettings settings = TriggerBase::get_settings();
   settings.add_bool(_("Once"), &m_once, "once");
   settings.add_float(_("Text change time"), &m_delay, "delay");
   settings.add_float(_("Fade time"), &m_fade_delay, "fade-delay");
-  settings.add_string_array(_("Texts"), "texts", &m_items);
+  settings.add_string_array(_("Texts"), "texts", m_items);
   return settings;
 }
 /* EOF */
diff --git a/src/trigger/text_area.hpp b/src/trigger/text_area.hpp
@@ -14,20 +14,20 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef HEADER_SUPERTUX_OBJECT_TEXT_AREA_HPP
-#define HEADER_SUPERTUX_OBJECT_TEXT_AREA_HPP
+#ifndef HEADER_SUPERTUX_TRIGGER_TEXT_AREA_HPP
+#define HEADER_SUPERTUX_TRIGGER_TEXT_AREA_HPP
 
-#include "supertux/moving_object.hpp"
+#include "trigger/trigger_base.hpp"
 #include "supertux/timer.hpp"
 
-class TextArea final : public MovingObject
+class TextArea final : public TriggerBase
 {
 public:
   TextArea(const ReaderMapping& mapping);
   TextArea(const Vector& pos);
 
-  virtual HitResponse collision(GameObject& other, const CollisionHit& hit) override;
   virtual void draw(DrawingContext& context) override;
+  virtual void event(Player& player, EventType type) override;
   virtual void update(float dt_sec) override;
 
   virtual ObjectSettings get_settings() override;

Original file line number	Diff line number	Diff line change
`@@ -645,15 +645,15 @@ ButtonOption::add_to_menu(Menu& menu) const`
`645`	`645`	`menu.add_entry(get_text(), m_callback);`
`646`	`646`	`}`
`647`	`647`
`648`		`-StringArrayOption::StringArrayOption(const std::string& text, const std::string& key, std::vector<std::string>* items) :`
	`648`	`+StringArrayOption::StringArrayOption(const std::string& text, const std::string& key, std::vector<std::string>& items) :`
`649`	`649`	`ObjectOption(text, key, 0),`
`650`	`650`	`m_items(items)`
`651`	`651`	`{}`
`652`	`652`
`653`	`653`	`void`
`654`	`654`	`StringArrayOption::save(Writer& write) const`
`655`	`655`	`{`
`656`		`- write.write("strings", *m_items);`
	`656`	`+ write.write("strings", m_items);`
`657`	`657`	`}`
`658`	`658`
`659`	`659`	`void`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ ObjectSettings::add_sexp(const std::string& text, const std::string& key, sexp::`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`void`
`296`		`-ObjectSettings::add_string_array(const std::string& text, const std::string& key, std::vector<std::string>* items)`
	`296`	`+ObjectSettings::add_string_array(const std::string& text, const std::string& key, std::vector<std::string>& items)`
`297`	`297`	`{`
`298`	`298`	`add_option(std::make_unique<StringArrayOption>(text, key, items));`
`299`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include "gui/menu_manager.hpp"`
`20`	`20`	`#include "gui/menu_string_array.hpp"`
`21`	`21`
`22`		`-ItemStringArray::ItemStringArray(const std::string& text, std::vector<std::string>* items, int id) :`
	`22`	`+ItemStringArray::ItemStringArray(const std::string& text, std::vector<std::string>& items, int id) :`
`23`	`23`	`MenuItem(text, id),`
`24`	`24`	`m_items(items)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ Menu::add_badguy_select(const std::string& text, std::vector<std::string>* badgu`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`ItemStringArray&`
`345`		`-Menu::add_string_array(const std::string& text, std::vector<std::string>* items, int id)`
	`345`	`+Menu::add_string_array(const std::string& text, std::vector<std::string>& items, int id)`
`346`	`346`	`{`
`347`	`347`	`auto item = std::make_unique<ItemStringArray>(text, items, id);`
`348`	`348`	`auto item_ptr = item.get();`