marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Savegames: Do not clear player control data immediately after loading (#596)

Günther Brammer 2011-09-22 20:00:17 +02:00
parent 6a03498136
commit a3ade134fe
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/control/C4PlayerControl.cpp
View File

@ -1206,8 +1206,6 @@ void C4PlayerControl::Clear()
void C4PlayerControl::RegisterKeyset(int32_t iPlr, C4PlayerControlAssignmentSet *pKeyset)
{
// clear any previous settings
Clear();
// setup
pControlSet = pKeyset;
this->iPlr = iPlr;

5
src/game/player/C4Player.cpp
View File

@ -298,6 +298,7 @@ bool C4Player::Init(int32_t iNumber, int32_t iAtClient, const char *szAtClientNa
}
// Init control method before scenario init, because script callbacks may need to know it!
ClearControl();
InitControl();
// defaultdisabled controls
@ -1211,7 +1212,7 @@ bool C4Player::LoadRuntimeData(C4Group &hGroup, C4ValueNumbers * numbers)
const char *pSource;
// Use loaded game text component
if (!(pSource = Game.GameText.GetData())) return false;
// safety: Do nothing if playeer section is not even present (could kill initialized values)
// safety: Do nothing if player section is not even present (could kill initialized values)
if (!SSearch(pSource, FormatString("[Player%i]", ID).getData())) return false;
// Compile (Search player section - runtime data is stored by unique player ID)
// Always compile exact. Exact data will not be present for savegame load, so it does not matter
@ -1430,8 +1431,6 @@ void C4Player::ClearControl()
void C4Player::InitControl()
{
// clear any previous
ClearControl();
// Check local control
if (AtClient == ::Control.ClientID())
if (!GetInfo() || GetInfo()->GetType() == C4PT_User)