summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-17 20:13:48 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-17 20:13:48 +0300
commitc2efedab22275302f0a10cc197424d345a021d18 (patch)
tree7488abbb3655451a3f6a1621e0708f72011af5f6 /src/gui
parent79aba82be3de5b6b571e2f59f7a34ded4b03160f (diff)
downloadplus-c2efedab22275302f0a10cc197424d345a021d18.tar.gz
plus-c2efedab22275302f0a10cc197424d345a021d18.tar.bz2
plus-c2efedab22275302f0a10cc197424d345a021d18.tar.xz
plus-c2efedab22275302f0a10cc197424d345a021d18.zip
Replace SDL int types to C++ types.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/gui/npcdialog.cpp1
-rw-r--r--src/gui/sdlfont.cpp6
-rw-r--r--src/gui/viewport.cpp4
4 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index feabd79d5..f513c31a1 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -368,7 +368,7 @@ void Gui::draw()
getTop()->draw(mGraphics);
int mouseX, mouseY;
- Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
+ uint8_t button = SDL_GetMouseState(&mouseX, &mouseY);
if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1))
&& mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0f)
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index c5143a136..e67213bd8 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -220,6 +220,7 @@ void NpcDialog::showCloseButton()
void NpcDialog::action(const gcn::ActionEvent &event)
{
+ logger->log(event.getId());
if (event.getId() == "ok")
{
if (mActionState == NPC_ACTION_NEXT)
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index b623337eb..e1310ef2e 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -69,9 +69,9 @@ class SDLTextChunk
void generate(TTF_Font *font, float alpha)
{
SDL_Color sdlCol;
- sdlCol.b = static_cast<Uint8>(color.b);
- sdlCol.r = static_cast<Uint8>(color.r);
- sdlCol.g = static_cast<Uint8>(color.g);
+ sdlCol.b = static_cast<uint8_t>(color.b);
+ sdlCol.r = static_cast<uint8_t>(color.r);
+ sdlCol.g = static_cast<uint8_t>(color.g);
getSafeUtf8String(text, strBuf);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 2a69428b4..c2429c550 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -284,12 +284,12 @@ void Viewport::logic()
void Viewport::_followMouse()
{
- Uint8 button = SDL_GetMouseState(&mMouseX, &mMouseY);
+ uint8_t button = SDL_GetMouseState(&mMouseX, &mMouseY);
// If the left button is dragged
if (mPlayerFollowMouse && button & SDL_BUTTON(1))
{
// We create a mouse event and send it to mouseDragged.
- Uint8 *keys = SDL_GetKeyState(nullptr);
+ uint8_t *keys = SDL_GetKeyState(nullptr);
gcn::MouseEvent mouseEvent(nullptr,
(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]),
false,