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

Load game UUID on /load

Browse source 
Fixes #2522 and #3144
This commit is contained in:
Zwelf 2020-10-19 15:21:23 +02:00
parent aa53f28449
commit 6d11c34d63
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game/server/save.cpp
View file

@ -320,7 +320,7 @@ int CSaveTee::FromString(const char *String)
"%f\t%f\t%f\t%f\t%f\t" "%f\t%f\t%f\t%f\t%f\t"
"%d\t" "%d\t"
"%d\t%d\t%d\t" "%d\t%d\t%d\t"
"%*s\t" // discard the game uuid "%36s\t"
"%d\t%d" "%d\t%d"
"%d\t%d\t%d\t%d\t" "%d\t%d\t%d\t%d\t"
"%d", "%d",
@ -351,6 +351,7 @@ int CSaveTee::FromString(const char *String)
&m_aCpCurrent[20], &m_aCpCurrent[21], &m_aCpCurrent[22], &m_aCpCurrent[23], &m_aCpCurrent[24], &m_aCpCurrent[20], &m_aCpCurrent[21], &m_aCpCurrent[22], &m_aCpCurrent[23], &m_aCpCurrent[24],
&m_NotEligibleForFinish, &m_NotEligibleForFinish,
&m_HasTelegunGun, &m_HasTelegunLaser, &m_HasTelegunGrenade, &m_HasTelegunGun, &m_HasTelegunLaser, &m_HasTelegunGrenade,
m_aGameUuid,
&m_HookedPlayer, &m_NewHook, &m_HookedPlayer, &m_NewHook,
&m_InputDirection, &m_InputJump, &m_InputFire, &m_InputHook, &m_InputDirection, &m_InputJump, &m_InputFire, &m_InputHook,
&m_ReloadTimer); &m_ReloadTimer);
@ -364,7 +365,7 @@ int CSaveTee::FromString(const char *String)
m_HasTelegunLaser = 0; m_HasTelegunLaser = 0;
m_HasTelegunGun = 0; m_HasTelegunGun = 0;
// fall through // fall through
case 100: case 101:
m_HookedPlayer = -1; m_HookedPlayer = -1;
m_NewHook = false; m_NewHook = false;
if(m_HookState == HOOK_GRABBED) if(m_HookState == HOOK_GRABBED)
@ -375,7 +376,7 @@ int CSaveTee::FromString(const char *String)
m_InputHook = 0; m_InputHook = 0;
m_ReloadTimer = 0; m_ReloadTimer = 0;
// fall through // fall through
case 107: case 108:
return 0; return 0;
default: default:
dbg_msg("load", "failed to load tee-string"); dbg_msg("load", "failed to load tee-string");