diff options
| author | Didier Raboud <odyx@debian.org> | 2013-01-20 14:14:01 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-01-20 14:14:31 +0100 |
| commit | 2a79bba69805e9c71e4b55465ee8bfbd581046ba (patch) | |
| tree | 33c9af16db12f656786ac0f253db0b3aec0ebb43 /src/object | |
| parent | 0923f4ad561fa2f2ee3631a4df053f35c153c4a6 (diff) | |
| parent | b50f9ae8b7efe9ae4b198a4f1072a384919c6c08 (diff) | |
| download | colobot-2a79bba69805e9c71e4b55465ee8bfbd581046ba.tar.gz colobot-2a79bba69805e9c71e4b55465ee8bfbd581046ba.tar.bz2 colobot-2a79bba69805e9c71e4b55465ee8bfbd581046ba.zip | |
Merge branch 'dev' into debian
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/object.cpp b/src/object/object.cpp index afa7815..9615866 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -6243,12 +6243,12 @@ void CObject::SetViewFromHere(Math::Vector &eye, float &dirH, float &dirV, void CObject::SetCharacter(Character* character) { - memcpy(&m_character, character, sizeof(m_character)); + memcpy(&m_character, character, sizeof(Character)); } void CObject::GetCharacter(Character* character) { - memcpy(character, &m_character, sizeof(character)); + memcpy(character, &m_character, sizeof(Character)); } Character* CObject::GetCharacter() |