Rather than tracking down every path through which an object can have its type set to OBJ_NONE without clearing its control_type, add an explicit check that the type is OBJ_ROBOT.