Restructured calling code to make variables more obvious. Fixed ordering issue with game_do_command_p