summaryrefslogtreecommitdiff
path: root/library/include
diff options
context:
space:
mode:
authorQuietust2012-09-13 14:30:44 -0500
committerQuietust2012-09-13 14:30:44 -0500
commit1d8c9a6a5feadfc03707677588031bf85631a7c6 (patch)
tree6a492801a2ff0f487ab046014d32bbe8517405fd /library/include
parentcae01250ff5bc3df14677371459ef3b8b6451a08 (diff)
parent24b93ea61fd1cb6ad69c2e3beab182f5f60646c7 (diff)
downloaddfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.gz
dfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.bz2
dfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.xz
Merge https://github.com/danaris/dfhack
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 591a0c3f..61d5dec4 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -518,7 +518,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);
}