Fix a few overlapping variable declarations.

Fixed with more specific (and longer) variable names.
Merge remote-tracking branch 'origin/pr/289'

Conflicts:
	src/cdogs.c
Fix crash when unknown char encountered (#138)

Credits has some accented characters