[Planeshift-cvs] CVS: planeshift/src/client cmdusers.cpp,1.46,1.47 modehandler.cpp,1.54,1.55 pscelclient.cpp,1.118,1.119 psclientchar.cpp,1.78,1.79 zonehandler.cpp,1.9,1.10

[Andrew C. <ac...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13339/src/client

Modified Files:
	cmdusers.cpp modehandler.cpp pscelclient.cpp psclientchar.cpp 
	zonehandler.cpp 
Log Message:
Fixes for latest Crystal Space changes

Index: cmdusers.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/cmdusers.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** cmdusers.cpp	10 Jan 2004 19:33:44 -0000	1.46
--- cmdusers.cpp	27 Jan 2004 00:55:41 -0000	1.47
***************
*** 20,24 ****
  #include <config.h>
  
! #include <csengine/meshobj.h>
  #include <imesh/sprite3d.h>
  
--- 20,25 ----
  #include <config.h>
  
! #include <iengine/movable.h>
! #include <iengine/mesh.h>
  #include <imesh/sprite3d.h>
  

Index: modehandler.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/modehandler.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** modehandler.cpp	17 Jan 2004 02:10:39 -0000	1.54
--- modehandler.cpp	27 Jan 2004 00:55:41 -0000	1.55
***************
*** 24,33 ****
  #include <iengine/light.h>
  #include <iengine/material.h>
! #include <csengine/meshobj.h>
! #include <csengine/movable.h>
! #include <csengine/sector.h>
  #include <imesh/partsys.h>
  #include <imesh/rain.h>
  #include <csutil/cscolor.h>
  #include <iutil/vfs.h>
  #include <cssys/sysfunc.h>
--- 24,36 ----
  #include <iengine/light.h>
  #include <iengine/material.h>
! #include <iengine/mesh.h>
! #include <iengine/movable.h>
! #include <iengine/sector.h>
! #include <iengine/sharevar.h>
! #include <imesh/object.h>
  #include <imesh/partsys.h>
  #include <imesh/rain.h>
  #include <csutil/cscolor.h>
+ #include <csutil/flags.h>
  #include <iutil/vfs.h>
  #include <cssys/sysfunc.h>
***************
*** 36,39 ****
--- 39,43 ----
  #include <isound/source.h>
  #include <imesh/sprite3d.h>
+ #include <csutil/scf.h>
  
  #include <physicallayer/pl.h>

Index: pscelclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** pscelclient.cpp	21 Jan 2004 04:49:50 -0000	1.118
--- pscelclient.cpp	27 Jan 2004 00:55:41 -0000	1.119
***************
*** 31,35 ****
  #include <imesh/spritecal3d.h>
  #include <iengine/region.h>
! #include <csengine/movable.h>
  
  #include <physicallayer/pl.h>
--- 31,35 ----
  #include <imesh/spritecal3d.h>
  #include <iengine/region.h>
! #include <iengine/movable.h>
  
  #include <physicallayer/pl.h>

Index: psclientchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psclientchar.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** psclientchar.cpp	21 Jan 2004 04:49:50 -0000	1.78
--- psclientchar.cpp	27 Jan 2004 00:55:41 -0000	1.79
***************
*** 26,30 ****
  #include <iutil/databuff.h>
  #include <iengine/mesh.h>
! #include <csengine/movable.h>
  #include <cssys/sysfunc.h>
  #include <iutil/objreg.h>
--- 26,30 ----
  #include <iutil/databuff.h>
  #include <iengine/mesh.h>
! #include <iengine/movable.h>
  #include <cssys/sysfunc.h>
  #include <iutil/objreg.h>
***************
*** 930,932 ****
          }            
      }        
! }
\ No newline at end of file
--- 930,932 ----
          }            
      }        
! }

Index: zonehandler.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/zonehandler.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** zonehandler.cpp	16 Jan 2004 11:20:42 -0000	1.9
--- zonehandler.cpp	27 Jan 2004 00:55:41 -0000	1.10
***************
*** 20,30 ****
  
  #include <csutil/objreg.h>
  #include <iengine/engine.h>
  #include <iengine/sector.h>
  #include <iengine/light.h>
  #include <iengine/material.h>
! #include <csengine/meshobj.h>
! #include <csengine/movable.h>
! #include <csengine/sector.h>
  #include <imesh/partsys.h>
  #include <imesh/rain.h>
--- 20,31 ----
  
  #include <csutil/objreg.h>
+ #include <iutil/object.h>
  #include <iengine/engine.h>
  #include <iengine/sector.h>
  #include <iengine/light.h>
  #include <iengine/material.h>
! #include <iengine/mesh.h>
! #include <iengine/movable.h>
! #include <iengine/sector.h>
  #include <imesh/partsys.h>
  #include <imesh/rain.h>
***************
*** 118,125 ****
      {
          printf("Crossed from sector %s to sector %s.\n",
!            msg.s1->GetPrivateObject()->GetName(),
!            msg.s2->GetPrivateObject()->GetName() );
  
!         LoadZones(msg.s2->GetPrivateObject()->GetName());
      }
  }
--- 119,126 ----
      {
          printf("Crossed from sector %s to sector %s.\n",
!            msg.s1->QueryObject()->GetName(),
!            msg.s2->QueryObject()->GetName() );
  
!         LoadZones(msg.s2->QueryObject()->GetName());
      }
  }