Changeset 312

Timestamp:

01/01/09 14:33:42 (19 months ago)

Author:

ryan

Message:

#99: Allow Eon craft

Location:

trunk/engine/ObjFac1

Files:

• HoverRender.cpp (modified) (4 diffs)
• HoverRender.h (modified) (1 diff)
• ObjFac1Res.h (modified) (1 diff)

trunk/engine/ObjFac1/HoverRender.cpp

@@ -58 +58 @@
         mCockpitBitmap[lCounter] = resourceLib->GetBitmap(MR_CAR_COCKPIT1 + lCounter);
         mCockpitBitmap2[lCounter] = resourceLib->GetBitmap(MR_CAR_COCKPIT21 + lCounter);
+        mEonCockpitBitmap[lCounter] = resourceLib->GetBitmap(MR_CAR_COCKPIT31 + lCounter);
     }
 }
@@ -86 +87 @@
         MR_ResActorFriend::Draw(mActor2, pDest, lMatrix, lSeq, mFrame, mCockpitBitmap[pHoverId % 10]);
     } else if(pModel == 3) {
-        MR_ResActorFriend::Draw(mActor3, pDest, lMatrix, lSeq, mFrame, mCockpitBitmap[pHoverId % 10]);
+        MR_ResActorFriend::Draw(mActor3, pDest, lMatrix, lSeq, mFrame, mEonCockpitBitmap[pHoverId % 10]);
     } else {
         MR_ResActorFriend::Draw(mActor0, pDest, lMatrix, lSeq, mFrame, mCockpitBitmap[pHoverId % 10]);
@@ -149 +150 @@
 }
 
-void MR_ResActorFriend::Draw(const MR_ResActor * pActor, MR_3DViewPort * pDest, const MR_PositionMatrix & pMatrix, int pSequence, int pFrame, const MR_Bitmap * pCockpitBitmap)
+void MR_ResActorFriend::Draw(const MR_ResActor *pActor, MR_3DViewPort *pDest, const MR_PositionMatrix &pMatrix, int pSequence, int pFrame, const MR_Bitmap *pCockpitBitmap)
 {
     MR_ResActor::Frame * lFrame = &(pActor->mSequenceList[pSequence].mFrameList[pFrame]);
@@ -156 +157 @@
 
     for(int lCounter = 0; lCounter < lFrame->mNbComponent; lCounter++) {
-        MR_ResActor::Patch * lPatch = (MR_ResActor::Patch *) lFrame->mComponentList[lCounter];
+        MR_ResActor::Patch *lPatch = (MR_ResActor::Patch *) lFrame->mComponentList[lCounter];
 
         int lBitmapResId = lPatch->mBitmap->GetResourceId();
 
-        if((lBitmapResId == MR_CAR_COCKPIT) || (lBitmapResId == MR_CAR2_COCKPIT) /*||(lBitmapResId == MR_ECAR_COCKPIT) */ ) {
-        pDest->RenderPatch(*lPatch, pMatrix, pCockpitBitmap);
-    }
-    else {
-        pDest->RenderPatch(*lPatch, pMatrix, lPatch->mBitmap);
+        if((lBitmapResId == MR_CAR_COCKPIT) || (lBitmapResId == MR_CAR2_COCKPIT) ||(lBitmapResId == MR_EON_COCKPIT)) {
+            pDest->RenderPatch(*lPatch, pMatrix, pCockpitBitmap);
+        }
+        else {
+            pDest->RenderPatch(*lPatch, pMatrix, lPatch->mBitmap);
+        }
     }
 }
-
-}

trunk/engine/ObjFac1/HoverRender.h

@@ -52 +52 @@
         const MR_ResBitmap *mCockpitBitmap[10];
         const MR_ResBitmap *mCockpitBitmap2[10];
+        const MR_ResBitmap *mEonCockpitBitmap[10];
 
     public:

trunk/engine/ObjFac1/ObjFac1Res.h

@@ -64 +64 @@
 #define MR_CAR_MOTOR2      28
 #define MR_CAR_MOTOR3      29
+#define MR_EON_COCKPIT     30
 
 #define MR_CAR_COCKPIT1    40