Dropping the gun is not sufficient to claim civilian status. Military bases are full of soldiers that may not be armed, or even awake. That lack of a gun does not suddenly grant them civilian status.
That's not what I said: I said that civilians who engage in fighting lose protection as civilians. Members of armed forces, whether currently armed or not, are legitimate targets (with certain exceptions; like the wounded, those who have surrendered etc).