Clean up obj-ui.c

Fix a compiler warning.
Clean up melee2.c

Some more whitespace.