Changed variable and function names
Changed ints to uints.
Merge branch 'master' of http://github.com/Riley1994/QTextAdventure into HandyAndy136/GenericNPC
Merged conflicts.