From 7b187d0295dfec6e3f7b1b72f597fad84485cc1a Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 23 Aug 2016 22:27:12 +0300 Subject: [PATCH 01/11] Fix visual glitch when jumping without adjusting camera afterwards --- apps/openmw/mwmp/LocalPlayer.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index 14db9b527..776ce93ff 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -133,6 +133,9 @@ void LocalPlayer::updatePosition(bool forceUpdate) static bool posChanged = false; + static bool isJumping = false; + static bool sentJumpEnd = true; + ESM::Position _pos = player.getRefData().getPosition(); const bool isChangedPos = (move.mPosition[0] != 0 || move.mPosition[1] != 0 || move.mPosition[2] != 0 @@ -142,6 +145,9 @@ void LocalPlayer::updatePosition(bool forceUpdate) { posChanged = isChangedPos; + if (!isJumping && !world->isOnGround(player) && !world->isFlying(player)) { + isJumping = true; + } (*Position()) = _pos; @@ -151,6 +157,18 @@ void LocalPlayer::updatePosition(bool forceUpdate) GetNetworking()->GetPacket(ID_GAME_UPDATE_POS)->Send(this); } + else if (isJumping && world->isOnGround(player)) { + + isJumping = false; + sentJumpEnd = false; + } + // Packet with jump end position has to be sent one tick after above check + else if (!sentJumpEnd) { + + sentJumpEnd = true; + (*Position()) = _pos; + GetNetworking()->GetPacket(ID_GAME_UPDATE_POS)->Send(this); + } } From d6083552f1cd780f89be4edbc0229b8f771c5136 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 23 Aug 2016 23:47:05 +0300 Subject: [PATCH 02/11] Add tes3mp icon --- files/tes3mp/tes3mp.ico | Bin 0 -> 5430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 files/tes3mp/tes3mp.ico diff --git a/files/tes3mp/tes3mp.ico b/files/tes3mp/tes3mp.ico new file mode 100644 index 0000000000000000000000000000000000000000..7938659633bd88c19b45dec5e40db465de3604a8 GIT binary patch literal 5430 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 literal 0 HcmV?d00001 From d31046204f58fcb3e65b96d6dfbc7574b6fa276f Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 23 Aug 2016 23:50:20 +0300 Subject: [PATCH 03/11] Use tes3mp icon for executable --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9630527de..5d00b2765 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,8 +497,8 @@ if(WIN32) SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmw.org") SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmw.org") SET(CPACK_NSIS_INSTALLED_ICON_NAME "openmw-launcher.exe") - SET(CPACK_NSIS_MUI_ICON "${OpenMW_SOURCE_DIR}/files/windows/openmw.ico") - SET(CPACK_NSIS_MUI_UNIICON "${OpenMW_SOURCE_DIR}/files/windows/openmw.ico") + SET(CPACK_NSIS_MUI_ICON "${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp.ico") + SET(CPACK_NSIS_MUI_UNIICON "${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp.ico") SET(CPACK_PACKAGE_ICON "${OpenMW_SOURCE_DIR}\\\\files\\\\openmw.bmp") SET(VCREDIST32 "${OpenMW_BINARY_DIR}/vcredist_x86.exe") From d24b4d0a2de7bf6ebcadda00cdf13e9306989da3 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 00:46:32 +0300 Subject: [PATCH 04/11] Disable New, Save and Load buttons in main menu --- apps/openmw/mwgui/mainmenu.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp index 258f0dfb0..9a8701c28 100644 --- a/apps/openmw/mwgui/mainmenu.cpp +++ b/apps/openmw/mwgui/mainmenu.cpp @@ -211,6 +211,8 @@ namespace MWGui if (state==MWBase::StateManager::State_Running) buttons.push_back("return"); + /* Disabled by tes3mp + buttons.push_back("newgame"); if (state==MWBase::StateManager::State_Running && @@ -221,6 +223,7 @@ namespace MWGui if (MWBase::Environment::get().getStateManager()->characterBegin()!= MWBase::Environment::get().getStateManager()->characterEnd()) buttons.push_back("loadgame"); + */ buttons.push_back("options"); From 53855639727a3b6c25769c6f993e2d984662a8ac Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 02:53:39 +0300 Subject: [PATCH 05/11] Let players inform others about Lua script-induced cell & pos changes --- apps/openmw-mp/Script/Functions/Translocations.cpp | 4 ---- apps/openmw/mwmp/LocalPlayer.cpp | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/openmw-mp/Script/Functions/Translocations.cpp b/apps/openmw-mp/Script/Functions/Translocations.cpp index 40c623a93..78d5f0ea0 100644 --- a/apps/openmw-mp/Script/Functions/Translocations.cpp +++ b/apps/openmw-mp/Script/Functions/Translocations.cpp @@ -58,7 +58,6 @@ void ScriptFunctions::SetPos(unsigned short pid, double x, double y, double z) n player->Position()->pos[2] = z; mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_UPDATE_POS)->Send(player, false); - mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_UPDATE_POS)->Send(player, true); } void ScriptFunctions::SetCell(unsigned short pid, const char *name) noexcept @@ -80,7 +79,6 @@ void ScriptFunctions::SetCell(unsigned short pid, const char *name) noexcept cout << " in to cell \"" << player->GetCell()->mName << "\"" << endl; mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_CELL)->Send(player, false); - mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_CELL)->Send(player, true); } const char* ScriptFunctions::GetCell(unsigned short pid) noexcept @@ -109,7 +107,6 @@ void ScriptFunctions::SetExterior(unsigned short pid, int x, int y) noexcept player->GetCell()->mCellId.mIndex.mY = y; mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_CELL)->Send(player, false); - mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_CELL)->Send(player, true); } int ScriptFunctions::GetExteriorX(unsigned short pid) noexcept @@ -182,5 +179,4 @@ void ScriptFunctions::SetAngle(unsigned short pid, double x, double y, double z) player->Position()->rot[2] = z; mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_UPDATE_POS)->Send(player, false); - mwmp::Networking::Get().GetController()->GetPacket(ID_GAME_UPDATE_POS)->Send(player, true); } diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index 776ce93ff..89a123a99 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -180,6 +180,8 @@ void LocalPlayer::setPosition() world->getPlayer().setTeleported(true); world->moveObject(player, Position()->pos[0], Position()->pos[1], Position()->pos[2]); world->rotateObject(player, Position()->rot[0], Position()->rot[1], Position()->rot[2]); + + updatePosition(true); } void LocalPlayer::setCell() From f93e382b8bf1af7c7afedcc4eb974c005e080943 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 04:01:05 +0300 Subject: [PATCH 06/11] Use tes3mp icon for executable, part 2 --- apps/openmw/CMakeLists.txt | 2 +- files/tes3mp/tes3mp.rc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 files/tes3mp/tes3mp.rc diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index cf4f20f80..15950e00e 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -3,7 +3,7 @@ set(GAME main.cpp engine.cpp - ${CMAKE_SOURCE_DIR}/files/windows/openmw.rc + ${CMAKE_SOURCE_DIR}/files/tes3mp/tes3mp.rc ) if (ANDROID) diff --git a/files/tes3mp/tes3mp.rc b/files/tes3mp/tes3mp.rc new file mode 100644 index 000000000..9895e8c8b --- /dev/null +++ b/files/tes3mp/tes3mp.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "tes3mp.ico" From d830937f4ed92e9621dcdbe693846981c575dd9d Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 04:48:35 +0300 Subject: [PATCH 07/11] Fix typo in method name "getGUIConroller" --- apps/openmw/mwmp/Main.cpp | 8 ++++---- apps/openmw/mwmp/Main.hpp | 2 +- apps/openmw/mwmp/Networking.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp index ad2a5f684..83a1e19ea 100644 --- a/apps/openmw/mwmp/Main.cpp +++ b/apps/openmw/mwmp/Main.cpp @@ -130,7 +130,7 @@ void Main::Frame(float dt) Players::Update(dt); get().UpdateWorld(dt); - get().getGUIConroller()->update(dt); + get().getGUIController()->update(dt); } @@ -152,7 +152,7 @@ void Main::UpdateWorld(float dt) const mNetworking->Connect(server, port); player.getClass().getCreatureStats(player).getSpells().add("fireball"); mLocalPlayer->updateBaseStats(true); - get().getGUIConroller()->setChatVisible(true); + get().getGUIController()->setChatVisible(true); } else mLocalPlayer->Update(); @@ -174,7 +174,7 @@ LocalPlayer *Main::getLocalPlayer() const } -GUIController *Main::getGUIConroller() const +GUIController *Main::getGUIController() const { return mGUIController; } @@ -182,6 +182,6 @@ GUIController *Main::getGUIConroller() const void Main::PressedKey(int key) { if (pMain == nullptr) return; - if (get().getGUIConroller()->pressedKey(key)) + if (get().getGUIController()->pressedKey(key)) return; // if any gui bind pressed } \ No newline at end of file diff --git a/apps/openmw/mwmp/Main.hpp b/apps/openmw/mwmp/Main.hpp index e1753e8dc..82c8c7b11 100644 --- a/apps/openmw/mwmp/Main.hpp +++ b/apps/openmw/mwmp/Main.hpp @@ -19,7 +19,7 @@ namespace mwmp Networking *getNetworking() const; LocalPlayer *getLocalPlayer() const; - GUIController *getGUIConroller() const; + GUIController *getGUIController() const; void UpdateWorld(float dt) const; diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 35a853812..c50dbb332 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -559,11 +559,11 @@ void Networking::ReceiveMessage(RakNet::Packet *packet) getLocalPlayer()->guiMessageBox.label.c_str()); if (getLocalPlayer()->guiMessageBox.type == BasePlayer::GUIMessageBox::MessageBox) - Main::get().getGUIConroller()->ShowMessageBox(getLocalPlayer()->guiMessageBox); + Main::get().getGUIController()->ShowMessageBox(getLocalPlayer()->guiMessageBox); else if (getLocalPlayer()->guiMessageBox.type == BasePlayer::GUIMessageBox::CustomMessageBox) - Main::get().getGUIConroller()->ShowCustomMessageBox(getLocalPlayer()->guiMessageBox); + Main::get().getGUIController()->ShowCustomMessageBox(getLocalPlayer()->guiMessageBox); else if (getLocalPlayer()->guiMessageBox.type == BasePlayer::GUIMessageBox::InputDialog) - Main::get().getGUIConroller()->ShowInputBox(getLocalPlayer()->guiMessageBox); + Main::get().getGUIController()->ShowInputBox(getLocalPlayer()->guiMessageBox); } break; } From 63eebd3d18a3f8cccd8d1497f58b682fa2aa4394 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 05:32:40 +0300 Subject: [PATCH 08/11] Respawn players in Fort Pelagiad instead of ToddTest for the time being --- apps/openmw/mwmp/Networking.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index c50dbb332..c3c007dbd 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -410,8 +410,8 @@ void Networking::ReceiveMessage(RakNet::Packet *packet) MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); player.getClass().getCreatureStats(player).resurrect(); ESM::Position pos; - MWBase::Environment::get().getWorld()->findInteriorPosition("ToddTest", pos); - MWBase::Environment::get().getWorld()->changeToInteriorCell("ToddTest", pos, true); + MWBase::Environment::get().getWorld()->findInteriorPosition("Pelagiad, Fort Pelagiad", pos); + MWBase::Environment::get().getWorld()->changeToInteriorCell("Pelagiad, Fort Pelagiad", pos, true); (*getLocalPlayer()->Position()) = pos; (*getLocalPlayer()->GetCell()) = *player.getCell()->getCell(); myPacket->Send(getLocalPlayer(), serverAddr); From 77aff346e946c12002b80779de270c401e80b345 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 05:55:02 +0300 Subject: [PATCH 09/11] Fix typo in method name "getGUIConroller", part 2 --- apps/openmw/mwmp/Networking.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index c3c007dbd..a6eec5b17 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -477,7 +477,7 @@ void Networking::ReceiveMessage(RakNet::Packet *packet) myPacket->Packet(&bsIn, pl, false); message = *pl->ChatMessage(); } - Main::get().getGUIConroller()->PrintChatMessage(message); + Main::get().getGUIController()->PrintChatMessage(message); break; } case ID_GAME_CHARGEN: From abaa8cac724d370ff1f9f8ac3b539d036f1b24ab Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 06:23:32 +0300 Subject: [PATCH 10/11] Spawn players in Pelagiad on startup --- apps/openmw/mwworld/worldimp.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 5e3779f80..f46e7acff 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -257,6 +257,9 @@ namespace MWWorld if (!getPlayerPtr().isInCell()) { ESM::Position pos; + + /* Disabled by tes3mp + const int cellSize = 8192; pos.pos[0] = cellSize/2; pos.pos[1] = cellSize/2; @@ -265,6 +268,11 @@ namespace MWWorld pos.rot[1] = 0; pos.rot[2] = 0; mWorldScene->changeToExteriorCell(pos, true); + */ + + findExteriorPosition("Pelagiad", pos); + changeToExteriorCell(pos, true); + fixPosition(getPlayerPtr()); } } From 486de67d84cbdf409e39bc952e91f925876cacf0 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 Aug 2016 06:38:38 +0300 Subject: [PATCH 11/11] Make handshake log message less confusing --- apps/openmw-mp/Networking.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp index 8af8e9595..5cf1ffeba 100644 --- a/apps/openmw-mp/Networking.cpp +++ b/apps/openmw-mp/Networking.cpp @@ -115,9 +115,8 @@ void Networking::Update(RakNet::Packet *packet) if (!player->isHandshaked()) { - LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Wrong auth for player %d, name: %s", - player->GetID(), - player->Npc()->mName.c_str()); + LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Have not completed handshake with player %d", + player->GetID()); //KickPlayer(player->guid); return; }