[Planeshift-cvs] CVS: planeshift/src/client/gui psddsktop.cpp,1.14,1.15 psdcskil.cpp,1.16,1.17 psdcmain.h,1.3,1.4 psdcmain.cpp,1.26,1.27

[Keith F. <ven...@us...>]

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

Modified Files:
	psddsktop.cpp psdcskil.cpp psdcmain.h psdcmain.cpp 
Log Message:
Fixed client crashing problems on quit.

Index: psddsktop.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psddsktop.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** psddsktop.cpp	24 Feb 2002 19:59:22 -0000	1.14
--- psddsktop.cpp	28 Feb 2002 05:29:07 -0000	1.15
***************
*** 49,85 ****
      alpha = 100;
  
-     csSimplePixmap *up;
  //unreferenced    csSimplePixmap *down;  
      psButton* btn;
      isMoveable = true; 
  
-     up = dmanager->CreatePixmap("inv.gif");
      btn = new psButton(this, 0);
      btn->Initialize(5, 5+30,
                      40, 40,
!                     up, up,  NULL);
      AddComp(btn);
      
  
-     up = dmanager->CreatePixmap("skill.gif");
      btn = new psButton(this, 0);
      btn->Initialize(3*5+2*40, 5+30,
                      40, 40,
!                     up, up,  psdDesktop::OpenSkillWindow);
      AddComp(btn);
       
-     up = dmanager->CreatePixmap("magic.gif");
      btn = new psButton(this, 0);
      btn->Initialize(2*5+40, 5+30,
                      40, 40,
!                     up, up,  psdDesktop::OpenSpellWindow);
      AddComp(btn);
       
  
-     up = dmanager->CreatePixmap("ps_small.gif");
      btn = new psButton(this, 1);
      btn->Initialize(2, 0,
                      4*256/5, 4*64/5,
!                     up, up,  NULL);
      AddComp(btn);
  
--- 49,88 ----
      alpha = 100;
  
  //unreferenced    csSimplePixmap *down;  
      psButton* btn;
      isMoveable = true; 
  
      btn = new psButton(this, 0);
      btn->Initialize(5, 5+30,
                      40, 40,
!                     dmanager->CreatePixmap("inv.gif"),
!                     dmanager->CreatePixmap("inv.gif"),  
!                     NULL);
      AddComp(btn);
      
  
      btn = new psButton(this, 0);
      btn->Initialize(3*5+2*40, 5+30,
                      40, 40,
!                     dmanager->CreatePixmap("skill.gif"),
!                     dmanager->CreatePixmap("skill.gif"),
!                     psdDesktop::OpenSkillWindow);
      AddComp(btn);
       
      btn = new psButton(this, 0);
      btn->Initialize(2*5+40, 5+30,
                      40, 40,
!                     dmanager->CreatePixmap("magic.gif"),
!                     dmanager->CreatePixmap("magic.gif"),
!                     psdDesktop::OpenSpellWindow);
      AddComp(btn);
       
  
      btn = new psButton(this, 1);
      btn->Initialize(2, 0,
                      4*256/5, 4*64/5,
!                     dmanager->CreatePixmap("ps_small.gif"),
!                     dmanager->CreatePixmap("ps_small.gif"),
!                     NULL);
      AddComp(btn);
  

Index: psdcskil.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcskil.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** psdcskil.cpp	27 Feb 2002 08:13:27 -0000	1.16
--- psdcskil.cpp	28 Feb 2002 05:29:07 -0000	1.17
***************
*** 71,81 ****
      psText*   txt;
  
-     csSimplePixmap *upleft = NULL, *downleft = NULL;
-     csSimplePixmap *upright = NULL, *downright = NULL;
- 
-     upleft    = dmanager->CreatePixmap("left.gif");
-     downleft  = dmanager->CreatePixmap("leftemb.gif");
-     upright   = dmanager->CreatePixmap("right.gif");
-     downright = dmanager->CreatePixmap("rightemb.gif");
  
      // Control buttons
--- 71,74 ----
***************
*** 103,107 ****
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         upleft, downleft, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 96,102 ----
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("left.gif"), 
!                         dmanager->CreatePixmap("leftemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 110,114 ****
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         upright,downright, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 105,111 ----
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("right.gif"),
!                         dmanager->CreatePixmap("rightemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 123,127 ****
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         upleft, downleft, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 120,126 ----
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("left.gif"),
!                         dmanager->CreatePixmap("leftemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 130,134 ****
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         upright,downright, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 129,135 ----
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("right.gif"),
!                         dmanager->CreatePixmap("rightemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 144,148 ****
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         upleft, downleft, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 145,151 ----
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("left.gif"),
!                         dmanager->CreatePixmap("leftemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 151,155 ****
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         upright,downright, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 154,160 ----
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("right.gif"),
!                         dmanager->CreatePixmap("rightemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 166,170 ****
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         upleft, downleft, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 171,177 ----
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("left.gif"),
!                         dmanager->CreatePixmap("leftemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 173,177 ****
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         upright,downright, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 180,186 ----
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("right.gif"),
!                         dmanager->CreatePixmap("rightemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 187,191 ****
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         upleft, downleft, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 196,202 ----
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("left.gif"), 
!                         dmanager->CreatePixmap("leftemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 194,198 ****
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         upright,downright, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 205,211 ----
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("right.gif"),
!                         dmanager->CreatePixmap("rightemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 207,211 ****
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         upleft, downleft, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 220,226 ----
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("left.gif"),
!                         dmanager->CreatePixmap("leftemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 214,218 ****
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         upright,downright, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 229,235 ----
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("right.gif"),
!                         dmanager->CreatePixmap("rightemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 228,232 ****
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         upleft, downleft, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 245,251 ----
          btn->Initialize(RX(tempx), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("left.gif"),
!                         dmanager->CreatePixmap("leftemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);
***************
*** 235,239 ****
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         upright,downright, psdcSkill::ChangeSkill);
  
          AddComp(btn);
--- 254,260 ----
          btn->Initialize(RX(tempx+25), RY(tempy),
                          RX(15), RY(15),
!                         dmanager->CreatePixmap("right.gif"),
!                         dmanager->CreatePixmap("rightemb.gif"),
!                         psdcSkill::ChangeSkill);
  
          AddComp(btn);

Index: psdcmain.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcmain.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** psdcmain.h	6 Jan 2002 04:18:35 -0000	1.3
--- psdcmain.h	28 Feb 2002 05:29:07 -0000	1.4
***************
*** 33,37 ****
  	psDialog(idmanager) { };
  
- 
      /// here's where we load the textures
      bool Initialize();
--- 33,36 ----

Index: psdcmain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcmain.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** psdcmain.cpp	27 Feb 2002 08:13:27 -0000	1.26
--- psdcmain.cpp	28 Feb 2002 05:29:07 -0000	1.27
***************
*** 43,46 ****
--- 43,47 ----
  #define RY(y)	((int) ((y) * ratioy))
  
+ 
  //---------------------------------------------------------------------------
  
***************
*** 83,88 ****
      psTextInput* txtIn;
  
-     csSimplePixmap *upleft = NULL, *downleft = NULL;
-     csSimplePixmap *upright = NULL, *downright = NULL;
      int i;
      int tempy = 150;
--- 84,87 ----
***************
*** 141,148 ****
      //Stats buttons
      tempy = 150;
-     upleft = dmanager->CreatePixmap("left.gif");
-     downleft = dmanager->CreatePixmap("leftemb.gif");
-     upright = dmanager->CreatePixmap("right.gif");
-     downright = dmanager->CreatePixmap("rightemb.gif");
  
      int ID = -1;
--- 140,143 ----
***************
*** 153,157 ****
  	btn->Initialize(RX(200), RY(tempy),
  			RX(15), RY(15),
!     		        upleft, downleft, psdcMain::IncrementStatus);
  
  	AddComp(btn);
--- 148,153 ----
  	btn->Initialize(RX(200), RY(tempy),
  			RX(15), RY(15),
!     		        dmanager->CreatePixmap("left.gif"), 
!                     dmanager->CreatePixmap("leftemb.gif"), psdcMain::IncrementStatus);
  
  	AddComp(btn);
***************
*** 160,164 ****
  	btn->Initialize(RX(225), RY(tempy),
  			RX(15), RY(15),
!     		        upright,downright, psdcMain::IncrementStatus);
  
  	AddComp(btn);
--- 156,161 ----
  	btn->Initialize(RX(225), RY(tempy),
  			RX(15), RY(15),
!     		        dmanager->CreatePixmap("right.gif"),
!                     dmanager->CreatePixmap("rightemb.gif"), psdcMain::IncrementStatus);
  
  	AddComp(btn);
***************
*** 171,175 ****
      btn->Initialize(RX(480), RY(63),
      		    RX(15), RY(15),
!     	            upright, downright, psdcMain::ChangeGender);
  
      AddComp(btn);
--- 168,173 ----
      btn->Initialize(RX(480), RY(63),
      		    RX(15), RY(15),
!     	            dmanager->CreatePixmap("right.gif"),
!                     dmanager->CreatePixmap("rightemb.gif"), psdcMain::ChangeGender);
  
      AddComp(btn);
***************
*** 178,182 ****
      btn->Initialize(RX(410), RY(63),
  		    RX(15), RY(15),
!     	            upleft,downleft, psdcMain::ChangeGender);
  
      AddComp(btn);
--- 176,181 ----
      btn->Initialize(RX(410), RY(63),
  		    RX(15), RY(15),
!     	            dmanager->CreatePixmap("left.gif"),
!                     dmanager->CreatePixmap("leftemb.gif"), psdcMain::ChangeGender);
  
      AddComp(btn);