From: hellcatv <hel...@us...> - 2005-03-24 04:49:12
|
Update of /cvsroot/vegastrike/vegastrike/src/cmd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5470/cmd Modified Files: bolt.cpp unit_csv.cpp Log Message: fixed boltage Index: bolt.cpp =================================================================== RCS file: /cvsroot/vegastrike/vegastrike/src/cmd/bolt.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -r1.42 -r1.43 *** bolt.cpp 14 Sep 2004 21:35:30 -0000 1.42 --- bolt.cpp 24 Mar 2005 04:49:03 -0000 1.43 *************** *** 150,154 **** --- 150,158 ---- //FIXME::MuST USE DRAWNOTRANSFORMNOW cur->CalculateOrientation (result); for (j=i->begin();j!=i->end();j++) {//don't update time more than once + Vector p,q,r; + _Universe->AccessCamera()->GetOrientation(p,q,r); BlendTrans ((*j)->drawmat,(*j)->cur_position,(*j)->prev_position); + Matrix tmp; + VectorAndPositionToMatrix(tmp,p,q,r,(*j)->drawmat.p); //result[12]=(*j)->drawmat[12]; //result[13]=(*j)->drawmat[13]; *************** *** 157,161 **** cur->SetDimensions ((*j)->radius,(*j)->radius); // cur->DrawNow(result); ! GFXLoadMatrixModel ((*j)->drawmat); #ifdef PERBOLTSOUND #ifdef PERFRAMESOUND --- 161,165 ---- cur->SetDimensions ((*j)->radius,(*j)->radius); // cur->DrawNow(result); ! GFXLoadMatrixModel (tmp ); #ifdef PERBOLTSOUND #ifdef PERFRAMESOUND *************** *** 165,172 **** #endif GFXColorf ((*j)->col); ! cur->DrawNoTransform(); } // cur->UpdateTime (GetElapsedTime());//update the time of the animation; } if (q->boltmesh) { q->boltmesh->LoadDrawState(); --- 169,177 ---- #endif GFXColorf ((*j)->col); ! cur->DrawNoTransform(false,true); } // cur->UpdateTime (GetElapsedTime());//update the time of the animation; } + GFXDisable(DEPTHWRITE); if (q->boltmesh) { q->boltmesh->LoadDrawState(); Index: unit_csv.cpp =================================================================== RCS file: /cvsroot/vegastrike/vegastrike/src/cmd/unit_csv.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** unit_csv.cpp 22 Mar 2005 23:12:32 -0000 1.57 --- unit_csv.cpp 24 Mar 2005 04:49:03 -0000 1.58 *************** *** 1187,1191 **** } if (!ret->GetCargo("Hitchhiker",i)) { ! ret->AddCargo(Cargo("Hitchhiker","Passengers",6,1,.01,5.0,1.0,1.0),true); } if (!ret->GetCargo("Slaves",i)) { --- 1187,1191 ---- } if (!ret->GetCargo("Hitchhiker",i)) { ! ret->AddCargo(Cargo("Hitchhiker","Passengers",42,1,.01,5.0,1.0,1.0),true); } if (!ret->GetCargo("Slaves",i)) { |