I'm trying to find

A version of Zorro I saw when I was younger. I remember the film being amazing but I can't renember whose in it. I remember the musical score being very very adventurous and I remember a scene at the begining when the man who will soon become Zorro is with his comrades who are members of the Spanish army I think and they are in a tavern, Zorro (soon to be Zorro) stands up and gives a little speech as he drinks something then he tells then that they would always remember him and with that he takes his sword and throws it up towards the cieling and it stick into the wood. I also remember that the sword Zorro used in this movie (the I'm trying to find) was taken off of his fathers wall and it had a special name or some sort of signifigant meaning to his family. The last scene I clearly remember is when the final duel comes between Zorro and the bad military dude occurs. They are in a cellar with a secret door and they know they are about to fight one another so they begin to remove parts of there uniforms and that's when Zorro removes his mask and the bad guy is like "(whatever his name is)" They fight and fight and the bad guy finally dies. GREAT GREAT MOVIE!!!! I loved the musical score!!! Is this the right Zorro movie I am thinking of???

If not can somebody tell me which one so that I may watch it again. Thank-you