search

Retera / WarsmashModEngine

An emulation engine to improve Warcraft III modding
GNU Affero General Public License v3.0
192 stars 37 forks source link

Some more natives from common.j #35

Closed tdauth closed 3 months ago

tdauth commented 1 year ago

Hi, just starting to get into the code and adding some more natives.

Btw. I am not sure about when to check if a parameter is null or not. For example, natives like SetResourceAmount do not check for null values. What will happen if the whichUnit parameter is null in the JASS script?

There seems to be a mixture of float and double types for JASS real, so I needed to overload a method.

I am using the lambda pattern which has been suggested in the other pull request.

Retera commented 1 year ago

There was another sitting PR to change everything in Jass2 file to lambda notation. I got that merged so that we can catch up with what you were doing here but it created some merge conflicts. Is that easy to resolve on your side or do you want me to resolve them here? It looked like git was getting a little bit confused by it all, even though we know humanly that probably what you want to do is take the "changed to lambdas" new version of what's there and add your new lambda functions.

tdauth commented 1 year ago

I will rebase as soon as possible.

tdauth commented 1 year ago

Rebased/merged.

Retera commented 3 months ago

I tried to use the GitHub button to resolve conflicts, and I thought it would block me but it looks as though it pushed the conflict resolution to your fork instead of here on the original repo of mine. I suppose your fork might have inherited some sort of permission for me to modify it, but that seems a little silly to me and really I was anticipating it would generate some error here on GitHub and offer to create me a new branch with the conflict resolutions that I told it to do.

I'm going to merge this PR in the hopes that it avoids further confusion. Sorry for delay in merging since the PR was created last year.