edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8171 from Zwelf/pr-simplify-base-hook

Browse source 
Simplify and fix HookBase calculation
This commit is contained in:
Dennis Felsing 2024-04-16 01:11:11 +00:00 committed by GitHub
parent 2e211c9a31 467a3187dc
commit 17110ace66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/game/gamecore.cpp
View file

@ -308,11 +308,16 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
}
else if(m_HookState == HOOK_FLYING)
{
vec2 HookBase = m_Pos;
if(m_NewHook)
{
HookBase = m_HookTeleBase;
}
vec2 NewPos = m_HookPos + m_HookDir * m_Tuning.m_HookFireSpeed;
if((!m_NewHook && distance(m_Pos, NewPos) > m_Tuning.m_HookLength) || (m_NewHook && distance(m_HookTeleBase, NewPos) > m_Tuning.m_HookLength))
if(distance(HookBase, NewPos) > m_Tuning.m_HookLength)
{
m_HookState = HOOK_RETRACT_START;
NewPos = m_Pos + normalize(NewPos - m_Pos) * m_Tuning.m_HookLength;
NewPos = HookBase + normalize(NewPos - HookBase) * m_Tuning.m_HookLength;
m_Reset = true;
}
@ -337,7 +342,7 @@ void CCharacterCore::Tick(bool UseInput, bool DoDeferredTick)
}
// Check against other players first
if(!this->m_HookHitDisabled && m_pWorld && m_Tuning.m_PlayerHooking)
if(!this->m_HookHitDisabled && m_pWorld && m_Tuning.m_PlayerHooking && (m_HookState == HOOK_FLYING || !m_NewHook))
{
float Distance = 0.0f;
for(int i = 0; i < MAX_CLIENTS; i++)

2
src/game/server/teehistorian.cpp
View file

@ -10,7 +10,7 @@
static const char TEEHISTORIAN_NAME[] = "teehistorian@ddnet.tw";
static const CUuid TEEHISTORIAN_UUID = CalculateUuid(TEEHISTORIAN_NAME);
static const char TEEHISTORIAN_VERSION[] = "2";
static const char TEEHISTORIAN_VERSION_MINOR[] = "6";
static const char TEEHISTORIAN_VERSION_MINOR[] = "7";
#define UUID(id, name) static const CUuid UUID_##id = CalculateUuid(name);
#include <engine/shared/teehistorian_ex_chunks.h>

2
src/test/teehistorian.cpp
View file

@ -105,7 +105,7 @@ protected:
void Expect(const unsigned char *pOutput, size_t OutputSize)
{
static CUuid TEEHISTORIAN_UUID = CalculateUuid("teehistorian@ddnet.tw");
static const char PREFIX1[] = "{\"comment\":\"teehistorian@ddnet.tw\",\"version\":\"2\",\"version_minor\":\"6\",\"game_uuid\":\"a1eb7182-796e-3b3e-941d-38ca71b2a4a8\",\"server_version\":\"DDNet test\",\"start_time\":\"";
static const char PREFIX1[] = "{\"comment\":\"teehistorian@ddnet.tw\",\"version\":\"2\",\"version_minor\":\"7\",\"game_uuid\":\"a1eb7182-796e-3b3e-941d-38ca71b2a4a8\",\"server_version\":\"DDNet test\",\"start_time\":\"";
static const char PREFIX2[] = "\",\"server_name\":\"server name\",\"server_port\":\"8303\",\"game_type\":\"game type\",\"map_name\":\"Kobra 3 Solo\",\"map_size\":\"903514\",\"map_sha256\":\"0123456789012345678901234567890123456789012345678901234567890123\",\"map_crc\":\"eceaf25c\",\"prng_description\":\"test-prng:02468ace\",\"config\":{},\"tuning\":{},\"uuids\":[";
static const char PREFIX3[] = "]}";