ok some things i might have got wrong, but please take a look into it nonetheless:
attack.cpp: the fix for h2h isnt in anymore (skill = 29 instead of 2

attack.cpp: avatar now would proc 2x since you forgot to remove old code
client.cpp: line 2549 - you missed one part of the xp-fix?
client.cpp: changed CheckUsedName param#1 to const char, but not all calls to that functions are updated
client_process.cpp: line2381 - wrong cast to NPC (--> should be client)
loottables.cpp: did you miss trump's loot fix, or didn't i get it?
take care,
neo