OnlineCop / kq-fork

Fork of KQ r910. Just for fun.
GNU General Public License v2.0
15 stars 9 forks source link

s_item items[] and s_spell magic[] changes #142

Closed OnlineCop closed 2 years ago

OnlineCop commented 2 years ago

Changes Magic Numbers to enum Values

This builds off of #141 to address issues in #124.

This PR may require a lot of changes to the values, so feel free to critique it heavily.

OnlineCop commented 2 years ago

NOTE

This looks like it's showing the WHOLE commit history, from 9f4d599 to a7a04ac.

*You don't need to review any of those!**

Just the last one: afe99f9 (or whatever "res.cpp: Fill out s_item[] and s_spell[]" and its descendants become).

pedro-w commented 2 years ago

Is this ready to go in now, @OnlineCop ? Can you see if rebasing against road_to_1.0 will get rid of all those extra historical commits, they make me nervous!

pedro-w commented 2 years ago

I tried rebasing with

git checkout upstream/dev/onlinecop/124_eResistance_0_based
git rebase upstream/road_to_1.0

it worked, the "res.cpp: Fill out s_item[] and s_spell[]" commit was the only one left, sitting on top of "upstream/road_to_1.0"

OnlineCop commented 2 years ago

Alright; pushed.

The values are almost entirely the same as before (if you had been going through the values previously), but with the names eTarget::TGT_NONE, eResitance::R_NONE, and eEquipment::EQP_NONE instead of the MAX_* or TOTAL_* names.

pedro-w commented 2 years ago

As far as I can tell this is OK, obviously there's no way to be 100% sure!