[Planeshift-cvs] CVS: planeshift/src/client psengine.cpp,1.192,1.193 psengine.h,1.69,1.70

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

Update of /cvsroot/planeshift/planeshift/src/client
In directory usw-pr-cvs1:/tmp/cvs-serv11538/src/client

Modified Files:
	psengine.cpp psengine.h 
Log Message:
Small reorganization of aws and added in inventory window

Index: psengine.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -d -r1.192 -r1.193
*** psengine.cpp	14 Jun 2002 05:09:25 -0000	1.192
--- psengine.cpp	21 Jun 2002 01:19:58 -0000	1.193
***************
*** 146,153 ****
  	scfiEventHandler->DecRef();
      }
      if (dialogmanager)
  	dialogmanager->Clear();
  
!     if ( psaws ) delete psaws;
  
      SCF_DEC_REF(soundmanager);
--- 146,155 ----
  	scfiEventHandler->DecRef();
      }
+ 
      if (dialogmanager)
  	dialogmanager->Clear();
  
!     if ( psaws ) 
! 	delete psaws;
  
      SCF_DEC_REF(soundmanager);
***************
*** 534,538 ****
  	//Show the window
  	psaws->Create("Communication Window");
! 	psaws->GetWindow("Communication Window")->Show();
  
  	if (!gameLoaded)
--- 536,541 ----
  	//Show the window
  	psaws->Create("Communication Window");
! 	psaws->GetPSWindow("Communication Window")->GetAWSWindow()->Show();
! 	psaws->Create("Inventory Window");
  
  	if (!gameLoaded)
***************
*** 654,659 ****
  
  	    psaws->Create("Player Window");
! 	    psaws->playerWindow->Setup();
! 	    psaws->GetWindow("Player Window")->Show();
  	
  	    //Let the gui know about the actor.
--- 657,661 ----
  
  	    psaws->Create("Player Window");
! 	    psaws->GetPSWindow("Player Window")->GetAWSWindow()->Show();
  	
  	    //Let the gui know about the actor.

Index: psengine.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** psengine.h	29 May 2002 22:25:29 -0000	1.69
--- psengine.h	21 Jun 2002 01:19:58 -0000	1.70
***************
*** 26,33 ****
--- 26,35 ----
  #include "iclient/psengine.h"
  #include "iclient/loadstate.h"
+ #include "iclient/iwinmgr.h"
  
  #include "engine/pscel.h"
  #include "aws/psaws.h"
  
+ 
  class csApp;
  class csObject;
***************
*** 126,130 ****
  
      /// Get the AWS window manager.
!     psAwsManager* GetWindowManager() { return psaws; }
      /// return pointer to CEL client
      psCelClient *GetCelClient()         { return celclient; };
--- 128,132 ----
  
      /// Get the AWS window manager.
!     iPSWindowMgr* GetWindowManager() { return psaws; }
      /// return pointer to CEL client
      psCelClient *GetCelClient()         { return celclient; };
***************
*** 232,236 ****
  
      /// Hold the ps AWS manager
!     psAwsManager* psaws;
  };
  
--- 234,241 ----
  
      /// Hold the ps AWS manager
!     //iPSWindowMgr* psaws;
!     
!      psAwsManager* psaws;
! 
  };