[Planeshift-cvs] CVS: planeshift/src/client/paws pawsobjectview.cpp,1.4,1.5

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/paws
In directory sc8-pr-cvs1:/tmp/cvs-serv25220/src/client/paws

Modified Files:
	pawsobjectview.cpp 
Log Message:
Added some fixes after talking with Jorrit.


Index: pawsobjectview.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsobjectview.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pawsobjectview.cpp	23 Jun 2003 00:08:23 -0000	1.4
--- pawsobjectview.cpp	14 Jul 2003 13:18:07 -0000	1.5
***************
*** 80,88 ****
      iRegion * region = engine->CreateRegion("Object View");
  
!     if ( !loader->LoadTexture("stone", "/lib/std/stone4.gif") )
      {
          Error1("Error loading the object view texture");
          return false;
      }
  
      iMaterialWrapper * matWrap;
--- 80,96 ----
      iRegion * region = engine->CreateRegion("Object View");
  
!     /*    if ( !loader->LoadTexture("stone", "/lib/std/stone4.gif") )
      {
          Error1("Error loading the object view texture");
          return false;
      }
+     */
+     iTextureWrapper* txt = loader->LoadTexture("stone", "/lib/std/stone4.gif");
+     if ( !txt )
+      {
+          Error1("Error loading the object view texture");
+         return false;
+      }
+     region->Add( txt->QueryObject () );
  
      iMaterialWrapper * matWrap;
***************
*** 97,101 ****
      region->Add( walls->QueryObject() );
  
!     csRef<iThingFactoryState> walls_state = SCF_QUERY_INTERFACE( walls->GetMeshObject(),  iThingFactoryState );
  
      csRef<iPolygon3DStatic> p;
--- 105,111 ----
      region->Add( walls->QueryObject() );
  
!     //    csRef<iThingFactoryState> walls_state = SCF_QUERY_INTERFACE( walls->GetMeshObject(),  iThingFactoryState );
!     csRef<iThingState> ws = SCF_QUERY_INTERFACE (walls->GetMeshObject (), iThingState);
!     iThingFactoryState* walls_state = ws->GetFactory ();
  
      csRef<iPolygon3DStatic> p;