summaryrefslogtreecommitdiff
path: root/src/map/magic-interpreter.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-08-13 14:55:49 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-08-27 11:29:45 -0700
commit9951ad78c80e144c166a7d476cad7ffdf84332a9 (patch)
tree9f5498a9a3c23b62dc928288e72081e99f958f46 /src/map/magic-interpreter.hpp
parent749fec734c4583153fb2dbc80f1d21db2c2ab457 (diff)
downloadtmwa-9951ad78c80e144c166a7d476cad7ffdf84332a9.tar.gz
tmwa-9951ad78c80e144c166a7d476cad7ffdf84332a9.tar.bz2
tmwa-9951ad78c80e144c166a7d476cad7ffdf84332a9.tar.xz
tmwa-9951ad78c80e144c166a7d476cad7ffdf84332a9.zip
Debug debugging
Diffstat (limited to 'src/map/magic-interpreter.hpp')
-rw-r--r--src/map/magic-interpreter.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/magic-interpreter.hpp b/src/map/magic-interpreter.hpp
index 526617f..3bb600c 100644
--- a/src/map/magic-interpreter.hpp
+++ b/src/map/magic-interpreter.hpp
@@ -87,10 +87,10 @@ struct area_t : AreaVariantBase
area_t& operator = (area_t&&) = default;
area_t& operator = (const area_t&) = delete;
- area_t(location_t v, int sz) : AreaVariantBase(std::move(v)), size(sz) {}
- area_t(AreaUnion v, int sz) : AreaVariantBase(std::move(v)), size(sz) {}
- area_t(AreaRect v, int sz) : AreaVariantBase(std::move(v)), size(sz) {}
- area_t(AreaBar v, int sz) : AreaVariantBase(std::move(v)), size(sz) {}
+ area_t(location_t v) : AreaVariantBase(std::move(v)), size(1) {}
+ area_t(AreaUnion v) : AreaVariantBase(std::move(v)), size(v.a_union[0]->size + v.a_union[1]->size) {}
+ area_t(AreaRect v) : AreaVariantBase(std::move(v)), size(v.width * v.height) {}
+ area_t(AreaBar v) : AreaVariantBase(std::move(v)), size((v.width * 2 + 1) * v.depth) {}
};
struct ValUndef