amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings about fabs(Scriptable<double>)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1276 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-12-31 15:25:34 +00:00
parent 311a743fa1
commit 10da8c7175
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/field.cpp
+7 -7
View File
@@ -132,7 +132,7 @@ inline bool is_set(const Scriptable<double>& x) {
return x.isScripted() || x < 100000; return x.isScripted() || x < 100000;
} }
inline bool is_setw(const Scriptable<double>& x) { inline bool is_setw(const Scriptable<double>& x) {
return x.isScripted() || fabs(x) > 0.001; return x.isScripted() || fabs(x()) > 0.001;
} }
int Style::update(Context& ctx) { int Style::update(Context& ctx) {
@@ -188,12 +188,12 @@ int Style::update(Context& ctx) {
bool Style::isVisible() const { bool Style::isVisible() const {
return visible return visible
&& (width) > 0 && (width()) > 0
&& fabs(left) < 100000 && fabs(left()) < 100000
&& fabs(right) < 100000 && fabs(right()) < 100000
&& (height) > 0 && (height()) > 0
&& fabs(top) < 100000 && fabs(top()) < 100000
&& fabs(bottom) < 100000; && fabs(bottom()) < 100000;
} }
bool Style::hasSize() const { bool Style::hasSize() const {
int h = is_setw(width) + is_set(left) + is_set(right); int h = is_setw(width) + is_set(left) + is_set(right);