summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/npcdialog.cpp2
-rw-r--r--src/gui/truetypefont.h4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 8150a01a..90d3e37e 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -407,7 +407,7 @@ void NpcDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
{
action(gcn::ActionEvent(mNextButton, mNextButton->getActionEventId()));
}
- if (mouseEvent.getSource() == mTextBox && isDoubleClick((int)(long)mTextBox))
+ if (mouseEvent.getSource() == mTextBox && isDoubleClick((int)(intptr_t)mTextBox))
{
if (mActionState == NPC_ACTION_NEXT || mActionState == NPC_ACTION_CLOSE)
action(gcn::ActionEvent(mNextButton,
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index b3ebcc73..9aa308b1 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -25,11 +25,7 @@
#include <guichan/font.hpp>
-#ifdef __WIN32__
-#include <SDL/SDL_ttf.h>
-#else
#include <SDL_ttf.h>
-#endif
#include <list>
#include <string>