-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(gamestate/rdr3): GET_ENTITY_MODEL for objects & animals #2044
base: master
Are you sure you want to change the base?
Conversation
1c07f02
to
1e32597
Compare
bool m_unk6; // mostly false | ||
bool m_unk7; // mostly false | ||
uint32_t m_model; | ||
#if 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't add dead code to the project. I appreciate If you can finish research and add all fields needed to serialization.
if (m_createdBy != 3 && (m_createdBy > 0x12 || (409602 & (1 << m_createdBy)) == 0)) | ||
{ | ||
s.Serialize(32, m_model); | ||
#if 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here
} | ||
else | ||
{ | ||
#if 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And here
s.SerializeSigned(31, 27648.0f, dummy.dummyPosX); | ||
s.SerializeSigned(31, 27648.0f, dummy.dummyPosY); | ||
s.Serialize(31, 4416.0f, dummy.dummyPosZ); | ||
dummy.dummyPosZ -= 1700.0f; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please leave comment why you are manipulating Z coord
#endif | ||
} | ||
|
||
#if 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dead code again
{ | ||
ePopType m_popType; | ||
uint32_t m_model; | ||
#if 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dead code
|
||
s.Serialize(32, m_model); | ||
|
||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you describe idea of model replacement and this comment please?
} | ||
*/ | ||
|
||
#if 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dead code
This fix will add support of
GET_ENTITY_MODEL
on objects and animals on rdr3.Sample Lua code for testing:
CLIENT:
SERVER: