From 831aea796efe776bf079c576c7a575b8caa8de3b Mon Sep 17 00:00:00 2001 From: GreYFoX Date: Mon, 25 Jul 2011 21:15:51 +0200 Subject: [PATCH] Saving hitting status on pause --- src/game/server/player.cpp | 2 ++ src/game/server/player.h | 1 + src/game/version.h | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp index 4aaa7eba3..9d98629b5 100644 --- a/src/game/server/player.cpp +++ b/src/game/server/player.cpp @@ -358,6 +358,7 @@ void CPlayer::LoadCharacter() m_pCharacter->m_EndlessHook = m_PauseInfo.m_EndlessHook; m_pCharacter->m_TeleCheckpoint = m_PauseInfo.m_TeleCheckpoint; m_pCharacter->m_CpActive = m_PauseInfo.m_CpActive; + m_pCharacter->m_Hit = m_PauseInfo.m_Hit; for(int i = 0; i < NUM_CHECKPOINTS; i++) m_pCharacter->m_CpCurrent[i] = m_PauseInfo.m_CpCurrent[i]; ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams.m_Core.Team(GetCID(), m_PauseInfo.m_Team); @@ -385,6 +386,7 @@ void CPlayer::SaveCharacter() m_PauseInfo.m_PauseTime = Server()->Tick(); m_PauseInfo.m_TeleCheckpoint = m_pCharacter->m_TeleCheckpoint; m_PauseInfo.m_CpActive = m_pCharacter->m_CpActive; + m_PauseInfo.m_Hit = m_pCharacter->m_Hit; for(int i = 0; i < NUM_CHECKPOINTS; i++) m_PauseInfo.m_CpCurrent[i] = m_pCharacter->m_CpCurrent[i]; //m_PauseInfo.m_RefreshTime = m_pCharacter->m_RefreshTime; diff --git a/src/game/server/player.h b/src/game/server/player.h index db40cbc9b..0d3597520 100644 --- a/src/game/server/player.h +++ b/src/game/server/player.h @@ -133,6 +133,7 @@ public: int m_TeleCheckpoint; int m_CpActive; float m_CpCurrent[25]; + int m_Hit; } m_PauseInfo; int m_ForcePauseTime; bool m_InfoSaved; diff --git a/src/game/version.h b/src/game/version.h index 0e58e824a..071b36970 100644 --- a/src/game/version.h +++ b/src/game/version.h @@ -3,6 +3,6 @@ #ifndef GAME_VERSION_H #define GAME_VERSION_H #include "generated/nethash.cpp" -#define GAME_VERSION "0.6 trunk, 1.082a" +#define GAME_VERSION "0.6 trunk, 1.083a" #define GAME_NETVERSION "0.6 626fce9a778df4d4" #endif