diff options
| -rw-r--r-- | src/common/test/image_test.cpp | 4 | ||||
| -rw-r--r-- | src/object/object.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/test/image_test.cpp b/src/common/test/image_test.cpp index a98c9cc..09ae4c6 100644 --- a/src/common/test/image_test.cpp +++ b/src/common/test/image_test.cpp @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) if (! image.Load(argv[1])) { std::string err = image.GetError(); - printf("Error loading '%s': %s\n", err.c_str()); + printf("Error loading '%s': %s\n", argv[1], err.c_str()); return 1; } Gfx::Color color; @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) if (! image.SavePNG(argv[2])) { std::string err = image.GetError(); - printf("Error saving PNG '%s': %s\n", err.c_str()); + printf("Error saving PNG '%s': %s\n", argv[2], err.c_str()); return 2; } 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() |