[Opentnl-cvs] tnl/zap ship.cpp,1.20,1.21

[Robert B. Jr. <rbl...@us...>]

Update of /cvsroot/opentnl/tnl/zap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15509/zap

Modified Files:
	ship.cpp 
Log Message:
Crash fix in ship rendering. Also changed processArguments to be consistent with the way all other objects are loaded from the game level, ie: multiplying the position by the grid size.

Index: ship.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/ship.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ship.cpp	30 Apr 2004 21:58:10 -0000	1.20
--- ship.cpp	1 May 2004 19:47:26 -0000	1.21
***************
*** 81,89 ****
        return;
  
!    mMoveState[0].pos.read(argv);
! 
!    for(U32 i = 1; i < MoveStateCount; i++)
     {
!       mMoveState[i].pos = mMoveState[0].pos;
        mMoveState[i].angle = 0;
     }
--- 81,90 ----
        return;
  
!    Point pos;
!    pos.read(argv);
!    pos *= getGame()->getGridSize();
!    for(U32 i = 0; i < MoveStateCount; i++)
     {
!       mMoveState[i].pos = pos;
        mMoveState[i].angle = 0;
     }
***************
*** 752,756 ****
  
     // Render name...
!    if(gClientGame->getConnectionToServer()->getControlObject() != this)
     {
        static char buff[255];
--- 753,758 ----
  
     // Render name...
!    GameConnection *conn = gClientGame->getConnectionToServer();
!    if(conn && conn->getControlObject() != this)
     {
        static char buff[255];