Ah, right - I didn't look as closely at that file because the changes merged fine. It was just hardware/joystick.cpp that had problems, so that's where I spent most of my time looking. Now the question is, did privateer just plain not support > 2 axes, 2 buttons, or does it expect them to be …

This patch doesn't merge with the latest CVS code, so I went through and started applying it manually. While I was doing so, I noticed a lot of problems with the code - you removed all of the bounds checking (ie, all the "if (which < 2)" in the JOYSTICK_* functions), without actually changing the …