Both. ;) He used the city wall as a step up onto the outer wall of the keep. My assumption was that the city wall would be shorter than the one circling the castle itself.