diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-01-21 02:00:23 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-01-21 02:00:30 -0500 |
| commit | 6e49e0f0b060758216e62aa16841e310ae4311de (patch) | |
| tree | db081a3e065f97a06ed3f2ff35a9c94667bf4439 /sigscript | |
| parent | b804a83e0cef19e9e0c95cfdecadf313a96146ad (diff) | |
| download | sigen-6e49e0f0b060758216e62aa16841e310ae4311de.tar.gz sigen-6e49e0f0b060758216e62aa16841e310ae4311de.tar.xz sigen-6e49e0f0b060758216e62aa16841e310ae4311de.zip | |
Fixing up Rules widget and reworked ATB in rules
Diffstat (limited to 'sigscript')
| -rw-r--r-- | sigscript/RulesWrapper.cpp | 12 | ||||
| -rw-r--r-- | sigscript/RulesWrapper.h | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sigscript/RulesWrapper.cpp b/sigscript/RulesWrapper.cpp index a5f78592..0eae7b5c 100644 --- a/sigscript/RulesWrapper.cpp +++ b/sigscript/RulesWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,15 +50,9 @@ bool Sigscript::RulesWrapper::criticalDomains() const return m_rules->criticalDomains(); } -bool Sigscript::RulesWrapper::useTurns() const +bool Sigscript::RulesWrapper::useATB() const { - return m_rules->useTurns(); -} - -bool Sigscript::RulesWrapper::pausedATB() const -{ - ALLOW_OVERRIDE_SO(rules, bool, pausedATB); - return m_rules->pausedATB(); + return m_rules->useATB(); } int Sigscript::RulesWrapper::numBoxes() const diff --git a/sigscript/RulesWrapper.h b/sigscript/RulesWrapper.h index e66c59be..1aa1a186 100644 --- a/sigscript/RulesWrapper.h +++ b/sigscript/RulesWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,8 +36,7 @@ class SIGSCRIPT_EXPORT RulesWrapper : public ObjectWrapper Q_SCRIPTABLE bool genderAllowed() const; Q_SCRIPTABLE bool breedingAllowed() const; Q_SCRIPTABLE bool criticalDomains() const; - Q_SCRIPTABLE bool useTurns() const; - Q_SCRIPTABLE bool pausedATB() const; + Q_SCRIPTABLE bool useATB() const; Q_SCRIPTABLE int numBoxes() const; Q_SCRIPTABLE int boxSize() const; Q_SCRIPTABLE int maxParty() const; |