diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-26 17:47:11 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-04-08 13:44:29 +0200 |
| commit | 8aa84d089e4233e17a6263cb0cf629331e63d051 (patch) | |
| tree | fa46597046c977f17fd8f0d5a68a26b0bf320e47 /src/gui | |
| parent | 59919635523d41f3a15120c83db4b7d080c155de (diff) | |
| download | mana-8aa84d089e4233e17a6263cb0cf629331e63d051.tar.gz mana-8aa84d089e4233e17a6263cb0cf629331e63d051.tar.bz2 mana-8aa84d089e4233e17a6263cb0cf629331e63d051.tar.xz mana-8aa84d089e4233e17a6263cb0cf629331e63d051.zip | |
Compile fixes for MSYS2 UCRT64
Also added instructions for installing the dependencies on MSYS2.
The selection of the default language is commented out for now. It will
be fixed in another change.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/npcdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/truetypefont.h | 4 |
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> |