search

Manuel-K / devilutionX-QOL-patches

QOL improvements for devilutionX
25 stars 4 forks source link

Fix patching infernity_common_v01.patch post v1.0.1 #8

Closed yuripourre closed 4 years ago

yuripourre commented 4 years ago

The problem is related to infernity_common_v01.patch.

Please do not merge yet, it is not fully working.

The patch file was created with:

git diff -w > infernity_common_v01.patch

Manuel-K commented 4 years ago

I assume that this is necessary for the current master of devilutionX, right?

yuripourre commented 4 years ago

Yes, I am trying to patch the current devilutionX master. Originally I thought the problem was missing headers but then I realized that the patch: infernity_common_v01.patch is not applied.

I opened an issue for that #9

yuripourre commented 4 years ago

@Manuel-K the current code is working with the latest devilutionX. The problem was ^M after each line. I still don't know how to prevent the inclusion of ^M (new line characters) so the patch lost the header.

If you could add the header back would be awesome. :sweat_smile:

Closes #9

yuripourre commented 4 years ago

Added headers, this patch is now working. Fell free to make any changes.

yuripourre commented 4 years ago

Thank you for reviews and requests, solved.

Manuel-K commented 4 years ago

This has been made obsolete by upstream with the fast release of 1.0.2, 1.0.3 and 1.1.0.

Manuel-K commented 4 years ago

Thank you for you work.