Feature: event onClientWaterCannonHit #477
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 14 commits
May 30, 2018 21:55
ghost
reviewed
Sep 16, 2018
| Arguments.PushNumber(pColPoint.Normal.fY); | ||
| Arguments.PushNumber(pColPoint.Normal.fZ); | ||
| Arguments.PushNumber(pColPoint.ucSurfaceTypeB); | ||
| /*if (&pEntity != nullptr) // seems to not work |
| @@ -6866,3 +6874,24 @@ void CClientGame::RemoveAnimationAssociationFromMap(CAnimBlendAssociationSAInter | |||
| { | |||
| m_mapOfCustomAnimationAssociations.erase(pAnimAssociation); | |||
| } | |||
|
|
|||
| void CClientGame::WaterCannonHitWorldHandler(CColPointSAInterface& pColPoint, CEntitySAInterface& pEntity) | |||
There was a problem hiding this comment.
what's the use of CEntitySAInterface& pEntity? you don't seem to access it.
ghost
reviewed
Sep 16, 2018
| settings.sScanSizeY = 0x50; | ||
| settings.usRenderSizeX = 0x50; | ||
| settings.usRenderSizeY = 0x55; | ||
| se |
There was a problem hiding this comment.
why do you have two asm blocks? you can simply put this code after popad in first asm block.
|
fixed along Saml1er tips. I think is ready to marge |
|
Great work! |
qaisjp
reviewed
Sep 25, 2018
| @@ -300,6 +300,9 @@ DWORD dwFUNC_CAEVehicleAudioEntity__ProcessAIProp = FUNC_CAEVehicleAudioEntity__ | |||
| #define HOOKPOS_CTaskSimpleSwim_ProcessSwimmingResistance 0x68A4EF | |||
| DWORD RETURN_CTaskSimpleSwim_ProcessSwimmingResistance = 0x68A50E; | |||
|
|
|||
| #define HOOKPOS_WatterCannonHitWorld 0x72932A | |||
|
Last commit renames event to
The source element is either the hit element or the root element for static world objects (you use model to identify it) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Event: onClientWaterCannonHit
Arguments: x, y, z, normalx, normaly, normalz, materialid
Pr including hack, that allow to hit water cannon to hit water cannon custom objects created by createObject function.
Test resource: testv2.zip
Test https://www.youtube.com/watch?v=jPCnYIqQJoY&feature=youtu.be
and 4 reasons for marge
Fire cannon https://www.youtube.com/watch?v=um7A9IThtDU&feature=youtu.be
Grenade cannon https://www.youtube.com/watch?v=f2M-180uMZk&feature=youtu.be
Teleport cannon https://www.youtube.com/watch?v=0AmnWL5RsYY&feature=youtu.be
Paint cannon https://www.youtube.com/watch?v=u5eaHl_SGZQ&feature=youtu.be
Thanks for Saml1er and Botder for helping with hook.