add uigame

CMakeLists.txt

@@ -79,6 +79,7 @@ SET(SOURCES
     src/otclient/ui/uiitem.cpp
     src/otclient/ui/uicreature.cpp
     src/otclient/ui/uimap.cpp
+    src/otclient/ui/uigame.cpp
 
     # otclient net
     src/otclient/net/protocollogin.cpp

modules/game/game.otui

@@ -1,4 +1,4 @@
-UIWidget
+UIGame
   id: gameRootInterface
   anchors.fill: parent
   anchors.top: topMenu.bottom
@@ -23,4 +23,4 @@ UIWidget
     anchors.left: parent.left
     anchors.right: rightPanel.left
     anchors.top: parent.top
-    anchors.bottom: bottomPanel.top
+    anchors.bottom: bottomPanel.top

src/otclient/luascript/luafunctions.cpp

@@ -36,6 +36,7 @@
 #include <otclient/ui/uiitem.h>
 #include <otclient/ui/uicreature.h>
 #include <otclient/ui/uimap.h>
+#include <otclient/ui/uigame.h>
 #include <otclient/core/outfit.h>
 
 #include "luavaluecasts.h"
@@ -88,6 +89,9 @@ void OTClient::registerLuaFunctions()
     g_lua.registerClass<UIMap, UIWidget>();
     g_lua.bindClassStaticFunction<UIMap>("create", &UIWidget::create<UIMap>);
 
+    g_lua.registerClass<UIGame, UIWidget>();
+    g_lua.bindClassStaticFunction<UIGame>("create", &UIWidget::create<UIGame>);
+
 #ifdef FORBIDDEN_FUNCTIONS
     g_lua.bindClassStaticFunction<Game>("talkChannel", std::bind(&Game::talkChannel, &g_game, _1, _2, _3));
     g_lua.bindClassStaticFunction<Game>("talkPrivate", std::bind(&Game::talkPrivate, &g_game, _1, _2, _3));

src/otclient/ui/uigame.cpp

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "uigame.h"
+#include <otclient/core/game.h>
+#include <framework/ui/uilineedit.h>
+
+bool UIGame::onKeyPress(uchar keyCode, char keyChar, int keyboardModifiers)
+{
+    UILineEditPtr chatLineEdit = std::dynamic_pointer_cast<UILineEdit>(getParent()->recursiveGetChildById("chatLineEdit"));
+
+    if(keyboardModifiers == Fw::KeyboardNoModifier) {
+        if(keyCode == Fw::KeyUp || keyCode == Fw::KeyNumpad8) {
+            g_game.walk(Otc::North);
+            return true;
+        } else if(keyCode == Fw::KeyRight || keyCode == Fw::KeyNumpad6) {
+            g_game.walk(Otc::East);
+            return true;
+        } else if(keyCode == Fw::KeyDown || keyCode == Fw::KeyNumpad2) {
+            g_game.walk(Otc::South);
+            return true;
+        } else if(keyCode == Fw::KeyLeft || keyCode == Fw::KeyNumpad4) {
+            g_game.walk(Otc::West);
+            return true;
+        } else if(keyCode == Fw::KeyNumpad9) {
+            g_game.walk(Otc::NorthEast);
+            return true;
+        } else if(keyCode == Fw::KeyNumpad3) {
+            g_game.walk(Otc::SouthEast);
+            return true;
+        } else if(keyCode == Fw::KeyNumpad1) {
+            g_game.walk(Otc::SouthWest);
+            return true;
+        } else if(keyCode == Fw::KeyNumpad7) {
+            g_game.walk(Otc::NorthWest);
+            return true;
+        } else if(keyCode == Fw::KeyReturn || keyCode == Fw::KeyEnter) {
+            g_game.talkChannel(1, 0, chatLineEdit->getText());
+            chatLineEdit->clearText();
+            return true;
+        } else if(keyCode == Fw::KeyDelete) {
+            chatLineEdit->removeCharacter(true);
+            return true;
+        } else if(keyCode == Fw::KeyBackspace) {
+            chatLineEdit->removeCharacter(false);
+            return true;
+        } else if(keyCode == Fw::KeyRight) {
+            chatLineEdit->moveCursor(true);
+            return true;
+        } else if(keyCode == Fw::KeyLeft) {
+            chatLineEdit->moveCursor(false);
+            return true;
+        } else if(keyCode == Fw::KeyHome) {
+            chatLineEdit->setCursorPos(0);
+            return true;
+        } else if(keyCode == Fw::KeyEnd) {
+            chatLineEdit->setCursorPos(chatLineEdit->getText().length());
+            return true;
+        }
+    } else if(keyboardModifiers == Fw::KeyboardCtrlModifier) {
+        if(keyCode == Fw::KeyUp || keyCode == Fw::KeyNumpad8) {
+            g_game.turn(Otc::North);
+            return true;
+        } else if(keyCode == Fw::KeyRight || keyCode == Fw::KeyNumpad6) {
+            g_game.turn(Otc::East);
+            return true;
+        } else if(keyCode == Fw::KeyDown || keyCode == Fw::KeyNumpad2) {
+            g_game.turn(Otc::South);
+            return true;
+        } else if(keyCode == Fw::KeyLeft || keyCode == Fw::KeyNumpad4) {
+            g_game.turn(Otc::West);
+            return true;
+        }
+    } else if(keyboardModifiers == Fw::KeyboardShiftModifier) {
+        if(keyCode == Fw::KeyRight || keyCode == Fw::KeyNumpad6) {
+            chatLineEdit->moveCursor(true);
+            return true;
+        } else if(keyCode == Fw::KeyLeft || keyCode == Fw::KeyNumpad4) {
+            chatLineEdit->moveCursor(false);
+            return true;
+        }
+    }
+
+    if(keyChar != 0) {
+        chatLineEdit->appendText(std::string(1, keyChar));
+        return true;
+    }
+
+    return UIWidget::onKeyPress(keyCode, keyChar, keyboardModifiers);
+}

src/otclient/ui/uigame.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef UIGAME_H
+#define UIGAME_H
+
+#include "declarations.h"
+#include <framework/ui/uiwidget.h>
+
+class UIGame : public UIWidget
+{
+protected:
+    virtual bool onKeyPress(uchar keyCode, char keyChar, int keyboardModifiers);
+
+};
+
+#endif

src/otclient/ui/uimap.cpp

@@ -22,11 +22,8 @@
 
 #include "uimap.h"
 #include <otclient/core/map.h>
-#include <otclient/core/game.h>
 #include <framework/otml/otml.h>
 #include <framework/graphics/graphics.h>
-#include <framework/ui/uilineedit.h>
-#include <otclient/core/localplayer.h>
 #include <otclient/core/tile.h>
 
 UIMap::UIMap()
@@ -38,99 +35,13 @@ void UIMap::render()
 {
     renderSelf();
 
-    if(g_game.isOnline()) {
+    g_graphics.bindColor(Fw::black);
-        g_graphics.bindColor(Fw::black);
+    g_graphics.drawBoundingRect(m_mapRect.expanded(1));
-        g_graphics.drawBoundingRect(m_mapRect.expanded(1));
+    g_map.draw(m_mapRect);
-        g_map.draw(m_mapRect);
-    }
 
     renderChildren();
 }
 
-bool UIMap::onKeyPress(uchar keyCode, char keyChar, int keyboardModifiers)
-{
-    UILineEditPtr chatLineEdit = std::dynamic_pointer_cast<UILineEdit>(getParent()->recursiveGetChildById("chatLineEdit"));
-
-    if(keyboardModifiers == Fw::KeyboardNoModifier) {
-        if(keyCode == Fw::KeyUp || keyCode == Fw::KeyNumpad8) {
-            g_game.walk(Otc::North);
-            return true;
-        } else if(keyCode == Fw::KeyRight || keyCode == Fw::KeyNumpad6) {
-            g_game.walk(Otc::East);
-            return true;
-        } else if(keyCode == Fw::KeyDown || keyCode == Fw::KeyNumpad2) {
-            g_game.walk(Otc::South);
-            return true;
-        } else if(keyCode == Fw::KeyLeft || keyCode == Fw::KeyNumpad4) {
-            g_game.walk(Otc::West);
-            return true;
-        } else if(keyCode == Fw::KeyNumpad9) {
-            g_game.walk(Otc::NorthEast);
-            return true;
-        } else if(keyCode == Fw::KeyNumpad3) {
-            g_game.walk(Otc::SouthEast);
-            return true;
-        } else if(keyCode == Fw::KeyNumpad1) {
-            g_game.walk(Otc::SouthWest);
-            return true;
-        } else if(keyCode == Fw::KeyNumpad7) {
-            g_game.walk(Otc::NorthWest);
-            return true;
-        } else if(keyCode == Fw::KeyReturn || keyCode == Fw::KeyEnter) {
-            g_game.talkChannel(1, 0, chatLineEdit->getText());
-            chatLineEdit->clearText();
-            return true;
-        } else if(keyCode == Fw::KeyDelete) {
-            chatLineEdit->removeCharacter(true);
-            return true;
-        } else if(keyCode == Fw::KeyBackspace) {
-            chatLineEdit->removeCharacter(false);
-            return true;
-        } else if(keyCode == Fw::KeyRight) {
-            chatLineEdit->moveCursor(true);
-            return true;
-        } else if(keyCode == Fw::KeyLeft) {
-            chatLineEdit->moveCursor(false);
-            return true;
-        } else if(keyCode == Fw::KeyHome) {
-            chatLineEdit->setCursorPos(0);
-            return true;
-        } else if(keyCode == Fw::KeyEnd) {
-            chatLineEdit->setCursorPos(chatLineEdit->getText().length());
-            return true;
-        }
-    } else if(keyboardModifiers == Fw::KeyboardCtrlModifier) {
-        if(keyCode == Fw::KeyUp || keyCode == Fw::KeyNumpad8) {
-            g_game.turn(Otc::North);
-            return true;
-        } else if(keyCode == Fw::KeyRight || keyCode == Fw::KeyNumpad6) {
-            g_game.turn(Otc::East);
-            return true;
-        } else if(keyCode == Fw::KeyDown || keyCode == Fw::KeyNumpad2) {
-            g_game.turn(Otc::South);
-            return true;
-        } else if(keyCode == Fw::KeyLeft || keyCode == Fw::KeyNumpad4) {
-            g_game.turn(Otc::West);
-            return true;
-        }
-    } else if(keyboardModifiers == Fw::KeyboardShiftModifier) {
-        if(keyCode == Fw::KeyRight || keyCode == Fw::KeyNumpad6) {
-            chatLineEdit->moveCursor(true);
-            return true;
-        } else if(keyCode == Fw::KeyLeft || keyCode == Fw::KeyNumpad4) {
-            chatLineEdit->moveCursor(false);
-            return true;
-        }
-    }
-
-    if(keyChar != 0) {
-        chatLineEdit->appendText(std::string(1, keyChar));
-        return true;
-    }
-
-    return UIWidget::onKeyPress(keyCode, keyChar, keyboardModifiers);
-}
-
 void UIMap::onStyleApply(const OTMLNodePtr& styleNode)
 {
     for(OTMLNodePtr node : styleNode->children()) {
@@ -151,7 +62,7 @@ bool UIMap::onMousePress(const Point& mousePos, Fw::MouseButton button)
         PointF relativeMousePos = PointF(relativeStretchMousePos.x, relativeStretchMousePos.y) / stretchFactor;
 
         PointF tilePosF = relativeMousePos / Map::NUM_TILE_PIXELS;
-        Position tilePos = Position(1 + (int)tilePosF.x - Map::PLAYER_OFFSET_X, 1 + (int)tilePosF.y - Map::PLAYER_OFFSET_Y, 0) + g_game.getLocalPlayer()->getPosition();
+        Position tilePos = Position(1 + (int)tilePosF.x - Map::PLAYER_OFFSET_X, 1 + (int)tilePosF.y - Map::PLAYER_OFFSET_Y, 0) + g_map.getCentralPosition();
 
         TilePtr tile = g_map.getTile(tilePos);
         tile->useItem();

src/otclient/ui/uimap.h

@@ -34,7 +34,7 @@ public:
 
 protected:
     virtual void onStyleApply(const OTMLNodePtr& styleNode);
-    virtual bool onKeyPress(uchar keyCode, char keyChar, int keyboardModifiers);
+
     virtual bool onMousePress(const Point& mousePos, Fw::MouseButton button);
     virtual void onGeometryUpdate(const Rect& oldRect, const Rect& newRect);