Skip to content
This repository has been archived by the owner on Apr 2, 2023. It is now read-only.

Commit

Permalink
Remove unnecessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
@foxtacles
foxtacles committed Dec 21, 2013
1 parent 608a887 commit e7eee15
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 22 deletions.
2 changes: 1 addition & 1 deletion source/GameFactory.hpp
View file
Expand Up @@ -642,7 +642,7 @@ class FactoryWrapper : protected FactoryWrapperPtr<typename rBases<D>::type, D>,
: FactoryWrapperPtr<base_class, derived_class>(ptr),
FactoryWrapper<base_class>(ptr, type) {}
FactoryWrapper(Base* base, unsigned int type, derived_class* casted = nullptr) noexcept
: FactoryWrapperPtr<base_class, derived_class>(FactoryWrapper<Base>::validate<derived_class>(type) ? (casted = Utils::static_or_dynamic_cast<derived_class>(base)) : (casted = nullptr)),
: FactoryWrapperPtr<base_class, derived_class>(FactoryWrapper<Base>::validate<derived_class>(type) ? (casted = Utils::static_or_dynamic_cast<derived_class>(base)) : (casted = nullptr)),
FactoryWrapper<base_class>(casted, type) {}
template<typename T> FactoryWrapper(const FactoryWrapper<T>& p) noexcept : FactoryWrapper(p.operator->(), p.GetType()) {}
template<typename T> FactoryWrapper(FactoryWrapper<T>&& p) noexcept : FactoryWrapper(p.operator->(), p.GetType()) { GameFactory::Free(p); }
Expand Down
28 changes: 7 additions & 21 deletions source/vaultserver/Script.cpp
View file
Expand Up @@ -2679,9 +2679,7 @@ const char* Script::GetListItemText(NetworkID id) noexcept

NetworkID (Script::CreateWindow)(double posX, double posY, double sizeX, double sizeY, bool visible, bool locked, const char* text) noexcept
{
NetworkID id = GameFactory::Operate<Window, RETURN_VALIDATED>(GameFactory::Create<Window, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text), [](Window* window) {
return window->GetNetworkID();
});
NetworkID id = GameFactory::Create<Window, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text);

if (!id)
return id;
Expand Down Expand Up @@ -2904,9 +2902,7 @@ bool Script::SetWindowText(NetworkID id, const char* text) noexcept

NetworkID Script::CreateButton(double posX, double posY, double sizeX, double sizeY, bool visible, bool locked, const char* text) noexcept
{
NetworkID id = GameFactory::Operate<Button, RETURN_VALIDATED>(GameFactory::Create<Button, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text), [](Button* button) {
return button->GetNetworkID();
});
NetworkID id = GameFactory::Create<Button, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text);

if (!id)
return id;
Expand All @@ -2918,9 +2914,7 @@ NetworkID Script::CreateButton(double posX, double posY, double sizeX, double si

NetworkID Script::CreateText(double posX, double posY, double sizeX, double sizeY, bool visible, bool locked, const char* text) noexcept
{
NetworkID id = GameFactory::Operate<Text, RETURN_VALIDATED>(GameFactory::Create<Text, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text), [](Text* text) {
return text->GetNetworkID();
});
NetworkID id = GameFactory::Create<Text, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text);

if (!id)
return id;
Expand All @@ -2932,9 +2926,7 @@ NetworkID Script::CreateText(double posX, double posY, double sizeX, double size

NetworkID Script::CreateEdit(double posX, double posY, double sizeX, double sizeY, bool visible, bool locked, const char* text) noexcept
{
NetworkID id = GameFactory::Operate<Edit, RETURN_VALIDATED>(GameFactory::Create<Edit, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text), [](Edit* edit) {
return edit->GetNetworkID();
});
NetworkID id = GameFactory::Create<Edit, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text);

if (!id)
return id;
Expand Down Expand Up @@ -3009,9 +3001,7 @@ bool Script::SetEditValidation(NetworkID id, const char* validation) noexcept

NetworkID Script::CreateCheckbox(double posX, double posY, double sizeX, double sizeY, bool visible, bool locked, const char* text) noexcept
{
NetworkID id = GameFactory::Operate<Checkbox, RETURN_VALIDATED>(GameFactory::Create<Checkbox, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text), [](Checkbox* checkbox) {
return checkbox->GetNetworkID();
});
NetworkID id = GameFactory::Create<Checkbox, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text);

if (!id)
return id;
Expand Down Expand Up @@ -3043,9 +3033,7 @@ bool Script::SetCheckboxSelected(NetworkID id, bool selected) noexcept

NetworkID Script::CreateRadioButton(double posX, double posY, double sizeX, double sizeY, bool visible, bool locked, const char* text) noexcept
{
NetworkID id = GameFactory::Operate<RadioButton, RETURN_VALIDATED>(GameFactory::Create<RadioButton, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text), [](RadioButton* radiobutton) {
return radiobutton->GetNetworkID();
});
NetworkID id = GameFactory::Create<RadioButton, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text);

if (!id)
return id;
Expand Down Expand Up @@ -3129,9 +3117,7 @@ bool Script::SetRadioButtonGroup(NetworkID id, unsigned int group)

NetworkID Script::CreateList(double posX, double posY, double sizeX, double sizeY, bool visible, bool locked, const char* text) noexcept
{
NetworkID id = GameFactory::Operate<List, RETURN_VALIDATED>(GameFactory::Create<List, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text), [](List* list) {
return list->GetNetworkID();
});
NetworkID id = GameFactory::Create<List, FailPolicy::Return>(posX, posY, sizeX, sizeY, visible, locked, text);

if (!id)
return id;
Expand Down

0 comments on commit e7eee15

Please sign in to comment.