-
-
Notifications
You must be signed in to change notification settings - Fork 425
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
Update colshape and marker hit detection when attaching #1327
Conversation
does this fix markers too? |
I haven't tested with markers - it's getting pretty late so I'll investigate that tomorrow. |
I've implemented this for markers too (it had the same issue as colshapes). |
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.
lgtm
have you tried overloading qaisjp@EdinburPro: ~/Documents/mtasa-blue git:(master) ✗
➜ ag "void AttachTo"
Server/mods/deathmatch/logic/CBlip.h
33: void AttachTo(CElement* pElement);
Client/mods/deathmatch/logic/CClientPickup.h
109: void AttachTo(CClientEntity* pEntity) override;
Client/mods/deathmatch/logic/CClientObject.h
51: void AttachTo(CClientEntity* pEntity) override;
qaisjp@EdinburPro: ~/Documents/mtasa-blue git:(master) ✗
➜ ag "::AttachTo"
Server/mods/deathmatch/logic/CBlip.cpp
162:void CBlip::AttachTo(CElement* pElement)
164: CElement::AttachTo(pElement);
Server/mods/deathmatch/logic/CElement.cpp
1080:void CElement::AttachTo(CElement* pElement)
Client/mods/deathmatch/logic/CClientPickup.cpp
95:void CClientPickup::AttachTo(CClientEntity* pEntity)
97: CClientEntity::AttachTo(pEntity);
Client/mods/deathmatch/logic/CClientCamera.cpp
292:void CClientCamera::AttachTo(CElement* pElement)
301: CClientEntity::AttachTo(pElement);
Client/mods/deathmatch/logic/CClientObject.cpp
177:void CClientObject::AttachTo(CClientEntity* pEntity)
179: CClientEntity::AttachTo(pEntity);
Client/mods/deathmatch/logic/CClientEntity.cpp
605:void CClientEntity::AttachTo(CClientEntity* pEntity) |
I've changed the implementation as suggested. |
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.
Nice work! @qaisjp looks good. Should we merge it?
@saml1er there's a problem with a crash upon exiting MTA which seems to have been introduced by these changes. I'm still investigating - see below:
|
I've fixed the crash mentioned above with the latest commit. Ready to go. |
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.
- Reverts "Fix crash from multitheftauto#1363 (multitheftauto#1364)" (fee420d). - Reverts "Update colshape and marker hit detection when attaching (multitheftauto#1327)" (3b95ff4).
Fixes #1317