Release 0.44

master
Kasi 2018-05-11 04:38:30 +01:00
parent 5e536db6d9
commit a959448a94
10 changed files with 60 additions and 58 deletions

View File

@ -32,7 +32,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::DecorativeObject() const; operator Internal::DecorativeObject() const;
}; };

View File

@ -32,7 +32,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::GameObject() const; operator Internal::GameObject() const;
}; };

View File

@ -34,7 +34,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::GroundItem() const; operator Internal::GroundItem() const;
}; };

View File

@ -32,7 +32,8 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::GroundObject() const; operator Internal::GroundObject() const;
}; };

View File

@ -36,7 +36,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::NPC() const; operator Internal::NPC() const;
}; };

View File

@ -35,7 +35,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::Player() const; operator Internal::Player() const;
}; };

View File

@ -32,7 +32,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::WallObject() const; operator Internal::WallObject() const;
}; };

View File

@ -19,6 +19,7 @@ namespace Interactable
Widget(const Widget& W); Widget(const Widget& W);
bool IsHidden() const; bool IsHidden() const;
bool IsVisible() const;
std::vector<std::int32_t> GetNormalizedItemIDs() const; std::vector<std::int32_t> GetNormalizedItemIDs() const;
Box GetBox() const; Box GetBox() const;
@ -26,7 +27,7 @@ namespace Interactable
bool Interact(const Button& B = BUTTON_LEFT) const; bool Interact(const Button& B = BUTTON_LEFT) const;
bool Interact(const std::string& Option) const; bool Interact(const std::string& Option) const;
bool Interact(const std::vector<std::string>& Options) const; bool Interact(const std::vector<std::string>& Options, bool RequireAll = true) const;
operator Internal::Widget() const; operator Internal::Widget() const;
}; };

View File

@ -166,7 +166,7 @@ class Menu
* std::string [2] = Target that was found * std::string [2] = Target that was found
* @see Menu::IndexOf(const std::string& Option) * @see Menu::IndexOf(const std::string& Option)
*/ */
static std::tuple<std::int32_t, std::string, std::string> FindOption(const std::vector<std::string>& Options); static std::tuple<std::int32_t, std::string, std::string> FindOption(const std::vector<std::string>& Options, bool RequireAll = true);
/** /**
* @brief Looks for a menu option containing the passed Option, and returns information of all options that were found * @brief Looks for a menu option containing the passed Option, and returns information of all options that were found
@ -190,7 +190,7 @@ class Menu
* std::string [2] = Target that was found * std::string [2] = Target that was found
* @see Menu::IndexOf(const std::string& Option) * @see Menu::IndexOf(const std::string& Option)
*/ */
static std::vector<std::tuple<std::int32_t, std::string, std::string>> FindOptions(const std::vector<std::string>& Options); static std::vector<std::tuple<std::int32_t, std::string, std::string>> FindOptions(const std::vector<std::string>& Options, bool RequireAll = true);
/** /**

Binary file not shown.