summaryrefslogtreecommitdiff
path: root/library/modules
diff options
context:
space:
mode:
authorPetr Mrázek2012-06-14 00:00:36 +0200
committerPetr Mrázek2012-06-14 00:00:36 +0200
commit52f9fe4a6a4dd788d902cad1a594ed5d8febcfd3 (patch)
tree683a0967e675423b0a747880d25a8f932d5ab914 /library/modules
parent5e011ac217ae2e0804fdab77a12cdcd94208bc62 (diff)
parent6d65683b02a7a78463d0b25e6cd56a7ae35d34cd (diff)
downloaddfhack-52f9fe4a6a4dd788d902cad1a594ed5d8febcfd3.tar.gz
dfhack-52f9fe4a6a4dd788d902cad1a594ed5d8febcfd3.tar.bz2
dfhack-52f9fe4a6a4dd788d902cad1a594ed5d8febcfd3.tar.xz
Merge https://github.com/danaris/dfhack
Conflicts: depends/clsocket
Diffstat (limited to 'library/modules')
-rw-r--r--library/modules/Gui.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 63ba811c..cd44401f 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -950,7 +950,7 @@ void Gui::showAnnouncement(std::string message, int color, bool bright)
new_rep->flags.bits.continuation = continued;
new_rep->flags.bits.announcement = true;
- int size = std::min(message.size(), 73U);
+ int size = std::min(message.size(), (size_t)73);
new_rep->text = message.substr(0, size);
message = message.substr(size);