[Planeshift-cvs] CVS: planeshift/src/client/gui psdcadvant.cpp,1.4,1.5 psdcmain.cpp,1.44,1.45 psdconn.cpp,1.25,1.26 psdmmenu.cpp,1.13,1.14 psdmngr.cpp,1.48,1.49 psdmngr.h,1.24,1.25

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

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

Modified Files:
	psdcadvant.cpp psdcmain.cpp psdconn.cpp psdmmenu.cpp 
	psdmngr.cpp psdmngr.h 
Log Message:
BIG commit. Added upload character. See history

Index: psdcadvant.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcadvant.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** psdcadvant.cpp	23 Mar 2002 23:37:12 -0000	1.4
--- psdcadvant.cpp	29 Mar 2002 05:58:25 -0000	1.5
***************
*** 198,201 ****
--- 198,202 ----
  void psdcAdvantage::Next(psDialog* dialog, int,void *)
  {
+ #if 0
      psdWarning *warn = new psdWarning(dialog->GetDialogManager());
      warn->Initialize("Not Implemented", "Upload not implemented yet!", 
***************
*** 204,207 ****
--- 205,212 ----
      dialog->GetDialogManager()->Create(warn);
      dialog->GetDialogManager()->SetModal(true);
+ #endif
+     dialog->GetDialogManager()->SetActive("connect");
+     dialog->GetDialogManager()->SetVisible("cc_advantages",false);
+     dialog->GetDialogManager()->SetVisible("menu",true);
  }
  

Index: psdcmain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcmain.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** psdcmain.cpp	27 Mar 2002 05:54:32 -0000	1.44
--- psdcmain.cpp	29 Mar 2002 05:58:25 -0000	1.45
***************
*** 28,31 ****
--- 28,32 ----
  #include "ivideo/material.h"
  #include "ivideo/fontserv.h"
+ #include <iutil/objreg.h>
  
  // PS include
***************
*** 39,42 ****
--- 40,44 ----
  #include "psdcmain.h"
  #include "psgwwarning.h"
+ #include "iclient/psengine.h"
  
  // helping macros
***************
*** 250,253 ****
--- 252,261 ----
      dialog->GetDialogManager()->SetVisible("cc_main", false);
      dialog->GetDialogManager()->SetActive("menu");
+ 
+     iObjectRegistry* object_reg =
+ 	            dialog->GetDialogManager()->GetObjectRegistry();
+     iPSEngine* psengine = CS_QUERY_REGISTRY(object_reg, iPSEngine);
+     psengine->DoUpload(false);
+     psengine->DecRef();
  }
  

Index: psdconn.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdconn.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** psdconn.cpp	27 Mar 2002 08:16:05 -0000	1.25
--- psdconn.cpp	29 Mar 2002 05:58:25 -0000	1.26
***************
*** 204,207 ****
--- 204,208 ----
      iPSEngine *psengine = CS_QUERY_REGISTRY (object_reg, iPSEngine);
      iNetManager* netmanager = psengine->GetNetManager();
+     bool upload = psengine->Upload();
      psengine->DecRef();
  
***************
*** 214,218 ****
      me->SaveDefaults();
  
!     netmanager->Authenticate(me->login->GetText(),me->passwd->GetText());
      me->error->SetText("Please wait while Planeshift connects to server.");
  }
--- 215,220 ----
      me->SaveDefaults();
  
!     // !upload means player should exist so we need to check player.
!     netmanager->Authenticate(me->login->GetText(),me->passwd->GetText(), !upload);
      me->error->SetText("Please wait while Planeshift connects to server.");
  }

Index: psdmmenu.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdmmenu.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** psdmmenu.cpp	23 Mar 2002 23:37:12 -0000	1.13
--- psdmmenu.cpp	29 Mar 2002 05:58:25 -0000	1.14
***************
*** 35,38 ****
--- 35,39 ----
  #include "psdmmenu.h"
  #include "iclient/isoundmngr.h"
+ #include "iclient/psengine.h"
  
  //-------------------------------------------------------------------
***************
*** 149,152 ****
--- 150,159 ----
      if (dialog->GetDialogManager()->SetActive("cc_main"))
  	dialog->GetDialogManager()->SetVisible("menu", false);
+ 
+     iObjectRegistry* object_reg =
+ 	            dialog->GetDialogManager()->GetObjectRegistry();
+     iPSEngine* psengine = CS_QUERY_REGISTRY(object_reg, iPSEngine);
+     psengine->DoUpload(true);
+     psengine->DecRef();
  }
  

Index: psdmngr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdmngr.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** psdmngr.cpp	26 Mar 2002 21:52:32 -0000	1.48
--- psdmngr.cpp	29 Mar 2002 05:58:25 -0000	1.49
***************
*** 410,414 ****
      isModal = modal;
  }
!     
  //-----------------------------------------------------------------------------
  
--- 410,420 ----
      isModal = modal;
  }
!    
! void psDialogManager::HideAll()
! {
!         for ( int i = 0; i < dialogs.Length(); i++ )
! 	            dialogs[i]->SetVisible(false);
! }
! 
  //-----------------------------------------------------------------------------
  

Index: psdmngr.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdmngr.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** psdmngr.h	23 Mar 2002 23:37:12 -0000	1.24
--- psdmngr.h	29 Mar 2002 05:58:25 -0000	1.25
***************
*** 67,71 ****
      virtual void Show() { display = true; };
      virtual void Hide() { display = false; };
! 
      virtual bool Create( const char* name );
      virtual bool Create (psDialog* d);
--- 67,71 ----
      virtual void Show() { display = true; };
      virtual void Hide() { display = false; };
!     virtual void HideAll();
      virtual bool Create( const char* name );
      virtual bool Create (psDialog* d);