summaryrefslogtreecommitdiff
path: root/library/include
diff options
context:
space:
mode:
authorTimothy Collett2012-09-10 09:19:21 -0400
committerTimothy Collett2012-09-10 09:19:21 -0400
commit274d6038adce5797b58cee78a330eb5d639bf59e (patch)
treea80b541fe5352594f5e2d82da50f0d38ddbfedfe /library/include
parent270351f510db516811117ab746a563560102c14b (diff)
downloaddfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.gz
dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.bz2
dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.xz
Merge further changes (???)
Diffstat (limited to 'library/include')
-rw-r--r--library/include/DataDefs.h2
-rw-r--r--library/include/RemoteTools.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 1d485156..7f4d94c8 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -506,7 +506,7 @@ namespace DFHack {
template<class T>
inline const char *enum_item_raw_key(T val) {
typedef df::enum_traits<T> traits;
- return traits::is_valid(val) ? traits::key_table[val - traits::first_item_value] : NULL;
+ return traits::is_valid(val) ? traits::key_table[(short)val - traits::first_item_value] : NULL;
}
/**
diff --git a/library/include/RemoteTools.h b/library/include/RemoteTools.h
index 65884bad..e87e8026 100644
--- a/library/include/RemoteTools.h
+++ b/library/include/RemoteTools.h
@@ -88,7 +88,7 @@ namespace DFHack
{
typedef df::enum_traits<T> traits;
int base = traits::first_item;
- int size = traits::last_item - base + 1;
+ int size = (int)traits::last_item - base + 1;
describeEnum(pf, base, size, traits::key_table);
}