Adding a Alternate fire/Second trigger to weapons

To add a alternate fire there are 2 main changes, one adds a new state to the shape and the other is adding a new button to the player. This will cover adding the adding of a new weapon state, I'll come back and cover the button changes if nessecary.

Basically everything in shape*.h or shape*.cc that refer to to trigger should copied and changed to secondtrigger. Precise examples below, though its looks like alot in most cases its simple a case of duplicating the existing trigger code and change all references to trigger with secondTrigger.

Add the following line to enable a new state
In shapeBase.h,
after const char* stateTransitionTriggerDown add [MaxStates];

const char* stateTransitionSecondTriggerUp   [MaxStates];
const char* stateTransitionSecondTriggerDown [MaxStates];

also after bool mTrigger[MaxTriggerKeys] add

bool mSecondTrigger[MaxTriggerKeys];

also after bool triggerDown add

bool secondTriggerDown;

change an additional parameter to virtual void setImage( ... ), so it looks like

virtual void setImage(U32 imageSlot, ShapeBaseImageData* imageData, StringHandle &skinNameHandle, bool loaded = true, bool ammo = false, bool triggerDown = false, bool secondTriggerDown = false, bool target = false);

after bool getImageTriggerState(U32 imageSlot) add

void setImageSecondTriggerState(U32 imageSlot,bool trigger);
bool getImageSecondTriggerState(U32 imageSlot);

In shapeImage.cc
After transition.trigger[0] = transition.trigger[1] = -1; add

transition.secondtrigger[0] = transition.secondtrigger[1] = -1;

after stateTransitionTriggerDown[i] = 0; add

stateTransitionSecondTriggerUp[i] = 0;      stateTransitionSecondTriggerDown[i] = 0;

after s.transition.trigger[1] = lookupState stateTransitionTriggerDown[i]); add

s.transition.secondtrigger[0] = lookupState(stateTransitionSecondTriggerUp[i]);
s.transition.secondtrigger[1] = lookupState(stateTransitionSecondTriggerDown[i]);

after addField("stateTransitionOnTriggerDown", TypeString, Offset(stateTransitionTriggerDown, ShapeBaseImageData), MaxStates); add

addField("stateTransitionOnSecondTriggerUp", TypeString, Offset(stateTransitionSecondTriggerUp, ShapeBaseImageData), MaxStates);
addField("stateTransitionOnSecondTriggerDown", TypeString, Offset(stateTransitionSecondTriggerDown, ShapeBaseImageData), MaxStates);

after stream->writeInt(s.transition.trigger[1]+1,NumStateBits); add

stream->writeInt(s.transition.secondtrigger[0]+1,NumStateBits);
stream->writeInt(s.transition.secondtrigger[1]+1,NumStateBits);

after s.transition.trigger[1] = stream->readInt(NumStateBits) - 1; add

s.transition.secondtrigger[0] = stream->readInt(NumStateBits) - 1;
s.transition.secondtrigger[1] = stream->readInt(NumStateBits) - 1;

after triggerDown = false; add

secondTriggerDown = false;

after if ((ns = stateData.transition.trigger[1]) != -1)
if (isImageReady(imageSlot,ns,depth))
return true;
add

if ((ns = stateData.transition.secondtrigger[1]) != -1)
    if (isImageReady(imageSlot,ns,depth))
        return true;

change ShapeBase::setImage( ... ) to

void ShapeBase::setImage(U32 imageSlot, ShapeBaseImageData* imageData, StringHandle& skinNameHandle, bool loaded, bool ammo, bool triggerDown, bool secondTriggerDown, bool target)

after image.triggerDown = triggerDown; add

image.secondTriggerDown = secondTriggerDown;

after image.triggerDown = false; add

image.secondTriggerDown = false;

add 2 functions

bool ShapeBase::getImageSecondTriggerState(U32 imageSlot)
{
   if (isGhost() || !mMountedImageList[imageSlot].dataBlock)
      return false;
   return mMountedImageList[imageSlot].secondTriggerDown;
}

void ShapeBase::setImageSecondTriggerState(U32 imageSlot,bool trigger)
{
   if (isGhost() || !mMountedImageList[imageSlot].dataBlock)
      return;
   MountedImage& image = mMountedImageList[imageSlot];

   if (trigger) {
      if (!image.secondTriggerDown && image.dataBlock) {
         image.secondTriggerDown = true;
         if (!isGhost()) {
            setMaskBits(ImageMaskN << imageSlot);
            updateImageState(imageSlot,0);
         }
      }
   }
   else
      if (image.secondTriggerDown) {
         image.secondTriggerDown = false;
         if (!isGhost()) {
            setMaskBits(ImageMaskN << imageSlot);
            updateImageState(imageSlot,0);
         }
      }
}

after if ((ns = stateData.transition.trigger[image.triggerDown]) != -1) {
setImageState(imageSlot,ns);
return;
}
add

if ((ns = stateData.transition.secondtrigger[image.secondTriggerDown]) != -1) {
      setImageState(imageSlot,ns);
      return;
   }

after if ((ns = stateData.transition.trigger[image.triggerDown]) != -1) {
setImageState(imageSlot,ns);
return;
}

if ((ns = stateData.transition.secondtrigger[image.secondTriggerDown]) != -1) {
         setImageState(imageSlot,ns);
         return;
      }