From af08c1647507ba553137cf7e555fa821ef464415 Mon Sep 17 00:00:00 2001 From: GustavoAndretto Date: Mon, 1 Aug 2022 16:45:29 -0300 Subject: [PATCH] Fix teleports: - Noatun -> Kephra - Khepra -> Noatun - Khepra -> KhepraBoss --- Projects/TMProject/TMFieldScene.cpp | 2 +- Projects/TMProject/TMGlobal.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Projects/TMProject/TMFieldScene.cpp b/Projects/TMProject/TMFieldScene.cpp index fcc7a4b3..b58ccd7f 100644 --- a/Projects/TMProject/TMFieldScene.cpp +++ b/Projects/TMProject/TMFieldScene.cpp @@ -7857,7 +7857,7 @@ int TMFieldScene::FrameMove(unsigned int dwServerTime) int x = (int)m_pMyHuman->m_vecPosition.x & 0xFFFC; int y = (int)m_pMyHuman->m_vecPosition.y & 0xFFFC; - for (int ll = 0; ll < 37; ++ll) + for (int ll = 0; ll < 42; ++ll) { if (g_TeleportTable[ll].nX == x && g_TeleportTable[ll].nY == y) { diff --git a/Projects/TMProject/TMGlobal.h b/Projects/TMProject/TMGlobal.h index 1a5bd0a9..67d6e56b 100644 --- a/Projects/TMProject/TMGlobal.h +++ b/Projects/TMProject/TMGlobal.h @@ -190,7 +190,7 @@ const static TMVector3 g_vecItemBillPos[28] = {0.76899999f, 0.509f, -1.143f}, }; -const static stTeleportPos g_TeleportTable[37] = +const static stTeleportPos g_TeleportTable[42] = { { 2116, 2100, 700, g_pMessageStringTable[209] }, { 2480, 1716, 700, g_pMessageStringTable[209] }, @@ -228,7 +228,12 @@ const static stTeleportPos g_TeleportTable[37] = { 3648, 3140, 700, g_pMessageStringTable[211] }, { 2480, 1648, 700, g_pMessageStringTable[301] }, { 1052, 1708, 0, g_pMessageStringTable[321] }, - { 1056, 1724, 0, g_pMessageStringTable[485] } + { 1056, 1724, 0, g_pMessageStringTable[485] }, + { 1312, 1900, 0, g_pMessageStringTable[322] }, // Noatun -> Kefra + { 2364, 4072, 0, g_pMessageStringTable[209] }, // Kefra -> Noatun + { 2360, 3892, 0, g_pMessageStringTable[322] }, // Kefra -> KefraBoss + { 2364, 3892, 0, g_pMessageStringTable[322] }, // Kefra -> KefraBoss + { 2368, 3892, 0, g_pMessageStringTable[322] } // Kefra -> KefraBoss }; static unsigned int g_dwFoodColor[7] =