Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/client/gui pawscharcreatemain.cpp,1.2,1.3 pawscharparents.cpp,1.2,1.3 pawscharparents.h,1.2,1.3 pawschild.cpp,1.3,1.4 pawschild.h,1.2,1.3 pawsconfigkeys.cpp,1.1,1.2 pawsexchangewindow.cpp,1.4,1.5 pawslife.cpp,1.3,1.4 pawslife.h,1.2,1.3 pawsstackcountwindow.cpp,1.1,1.2
|
From: Andrew C. <ac...@us...> - 2003-11-28 01:18:38
|
Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv29863/src/client/gui
Modified Files:
pawscharcreatemain.cpp pawscharparents.cpp pawscharparents.h
pawschild.cpp pawschild.h pawsconfigkeys.cpp
pawsexchangewindow.cpp pawslife.cpp pawslife.h
pawsstackcountwindow.cpp
Log Message:
Fixes from Brendon Costa.
Added in CP tracking for char creation.
Index: pawscharcreatemain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharcreatemain.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawscharcreatemain.cpp 14 Nov 2003 00:35:44 -0000 1.2
--- pawscharcreatemain.cpp 28 Nov 2003 01:18:34 -0000 1.3
***************
*** 108,111 ****
--- 108,112 ----
if ( widget->GetID() >= 0 && widget->GetID() <= 11 )
{
+ //printf("Setting Description: %s\n", (const char*)createManager->GetRaceDescription( widget->GetID() ) );
raceDescription->SetText( createManager->GetRaceDescription( widget->GetID() ) );
int raceCP = createManager->GetRaceCP( widget->GetID() );
Index: pawscharparents.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharparents.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawscharparents.cpp 21 Nov 2003 00:33:33 -0000 1.2
--- pawscharparents.cpp 28 Nov 2003 01:18:34 -0000 1.3
***************
*** 83,92 ****
{
pawsListBoxRow* row = widget->GetSelectedRow();
- fatherJobDesc->SetText( createManager->GetDescription(row->GetID()) );
createManager->RemoveChoice( lastFatherChoice );
createManager->AddChoice( row->GetID() );
lastFatherChoice = row->GetID();
!
return;
}
--- 83,93 ----
{
pawsListBoxRow* row = widget->GetSelectedRow();
+ fatherJobDesc->SetText( createManager->GetDescription(row->GetID()) );
+
createManager->RemoveChoice( lastFatherChoice );
createManager->AddChoice( row->GetID() );
lastFatherChoice = row->GetID();
! UpdateCP();
return;
}
***************
*** 100,104 ****
createManager->AddChoice( row->GetID() );
lastReligionChoice = row->GetID();
!
return;
}
--- 101,105 ----
createManager->AddChoice( row->GetID() );
lastReligionChoice = row->GetID();
! UpdateCP();
return;
}
***************
*** 152,158 ****
}
! void pawsCharParents::Show()
{
- pawsWidget::Show();
int cp = createManager->GetCurrentCP();
--- 153,158 ----
}
! void pawsCharParents::UpdateCP()
{
int cp = createManager->GetCurrentCP();
***************
*** 160,164 ****
sprintf( buff, "%d", cp );
cpBox->SetText( buff );
!
}
--- 160,169 ----
sprintf( buff, "%d", cp );
cpBox->SetText( buff );
! }
!
! void pawsCharParents::Show()
! {
! pawsWidget::Show();
! UpdateCP();
}
Index: pawscharparents.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharparents.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawscharparents.h 21 Nov 2003 00:33:33 -0000 1.2
--- pawscharparents.h 28 Nov 2003 01:18:34 -0000 1.3
***************
*** 67,70 ****
--- 67,72 ----
void PopulateFields();
+ void UpdateCP();
+
int lastFatherChoice;
int lastReligionChoice;
Index: pawschild.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawschild.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawschild.cpp 21 Nov 2003 00:33:33 -0000 1.3
--- pawschild.cpp 28 Nov 2003 01:18:34 -0000 1.4
***************
*** 110,113 ****
--- 110,114 ----
void pawsChildhoodWindow::PopulateFields()
{
+ UpdateCP();
for ( int x=0; x < createManager->childhoodData.Length(); x++ )
{
***************
*** 191,195 ****
eventDesc->SetText( createManager->GetDescription(row->GetID()) );
! return;
}
case ACTIVITY_LISTBOX:
--- 192,196 ----
eventDesc->SetText( createManager->GetDescription(row->GetID()) );
! break;
}
case ACTIVITY_LISTBOX:
***************
*** 201,205 ****
activityDesc->SetText( createManager->GetDescription(row->GetID()) );
! return;
}
--- 202,206 ----
activityDesc->SetText( createManager->GetDescription(row->GetID()) );
! break;
}
***************
*** 212,216 ****
houseDesc->SetText( createManager->GetDescription(row->GetID()) );
! return;
}
--- 213,217 ----
houseDesc->SetText( createManager->GetDescription(row->GetID()) );
! break;
}
***************
*** 223,230 ****
siblingsDesc->SetText( createManager->GetDescription(row->GetID()) );
! return;
}
! }
}
--- 224,243 ----
siblingsDesc->SetText( createManager->GetDescription(row->GetID()) );
! break;
}
! }
! UpdateCP();
}
+
+
+
+ void pawsChildhoodWindow::UpdateCP()
+ {
+ int cp = createManager->GetCurrentCP();
+
+ char buff[10];
+ sprintf( buff, "CP: %d", cp );
+ cpBox->SetText( buff );
+ }
Index: pawschild.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawschild.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawschild.h 21 Nov 2003 00:33:33 -0000 1.2
--- pawschild.h 28 Nov 2003 01:18:34 -0000 1.3
***************
*** 47,50 ****
--- 47,51 ----
private:
void PopulateFields();
+ void UpdateCP();
psCreationManager* createManager;
Index: pawsconfigkeys.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigkeys.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawsconfigkeys.cpp 7 Nov 2003 06:44:40 -0000 1.1
--- pawsconfigkeys.cpp 28 Nov 2003 01:18:35 -0000 1.2
***************
*** 61,65 ****
{
Error1("No root in XML");
! return false;
}
topNode = root->GetNode("widget_description");
--- 61,65 ----
{
Error1("No root in XML");
! return NULL;
}
topNode = root->GetNode("widget_description");
***************
*** 67,71 ****
{
Error1("No <widget_description> in XML");
! return false;
}
widgetNode = topNode->GetNode("widget");
--- 67,71 ----
{
Error1("No <widget_description> in XML");
! return NULL;
}
widgetNode = topNode->GetNode("widget");
***************
*** 73,77 ****
{
Error1("No <widget> in <widget_description>");
! return false;
}
return widgetNode;
--- 73,77 ----
{
Error1("No <widget> in <widget_description>");
! return NULL;
}
return widgetNode;
Index: pawsexchangewindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsexchangewindow.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pawsexchangewindow.cpp 18 Nov 2003 10:48:52 -0000 1.4
--- pawsexchangewindow.cpp 28 Nov 2003 01:18:35 -0000 1.5
***************
*** 118,122 ****
if (!bulkList)
return false;
! for (int i = 0; i < EXCHANGE_SLOT_COUNT/2; i++)
{
pawsListBoxRow * listRow = bulkList->NewRow(i);
--- 118,123 ----
if (!bulkList)
return false;
! int i;
! for (i = 0; i < EXCHANGE_SLOT_COUNT/2; i++)
{
pawsListBoxRow * listRow = bulkList->NewRow(i);
***************
*** 136,140 ****
return false;
bulkList->Show();
! for (int i = 0; i < EXCHANGE_SLOT_COUNT/2; i++)
{
pawsListBoxRow * listRow = bulkList->NewRow(i);
--- 137,141 ----
return false;
bulkList->Show();
! for (i = 0; i < EXCHANGE_SLOT_COUNT/2; i++)
{
pawsListBoxRow * listRow = bulkList->NewRow(i);
Index: pawslife.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawslife.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawslife.cpp 21 Nov 2003 00:33:33 -0000 1.3
--- pawslife.cpp 28 Nov 2003 01:18:35 -0000 1.4
***************
*** 23,26 ****
--- 23,27 ----
#include "paws/pawsselector.h"
#include "paws/pawslistbox.h"
+ #include "paws/pawstextbox.h"
#include "pawslife.h"
#include "pawssummary.h"
***************
*** 52,55 ****
--- 53,60 ----
return false;
+ cpBox = (pawsTextBox*)FindWidget("CP");
+ if ( !cpBox )
+ return false;
+
return true;
}
***************
*** 64,67 ****
--- 69,73 ----
pawsListBoxRow* moved = choiceSelection->GetMoved();
int id = moved->GetID();
+ createManager->AddLifeEvent( id );
int index = createManager->FindLifeEvent( id );
***************
*** 82,91 ****
int addindex = createManager->FindLifeEvent( createManager->lifeEventData[index].adds[aidx] );
text->SetText( createManager->lifeEventData[addindex].name );
! row->SetID( createManager->lifeEventData[addindex].id );
! createManager->AddLifeEvent( row->GetID() );
}
}
return true;
}
--- 88,97 ----
int addindex = createManager->FindLifeEvent( createManager->lifeEventData[index].adds[aidx] );
text->SetText( createManager->lifeEventData[addindex].name );
! row->SetID( createManager->lifeEventData[addindex].id );
}
}
+ UpdateCP();
return true;
}
***************
*** 118,122 ****
}
}
!
return true;
}
--- 124,128 ----
}
}
! UpdateCP();
return true;
}
***************
*** 173,180 ****
}
}
}
!
--- 179,194 ----
}
}
+ UpdateCP();
}
! void pawsLifeEventWindow::UpdateCP()
! {
! int cp = createManager->GetCurrentCP();
!
! char buff[10];
! sprintf( buff, "CP: %d", cp );
! cpBox->SetText( buff );
! }
Index: pawslife.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawslife.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawslife.h 11 Nov 2003 21:55:27 -0000 1.2
--- pawslife.h 28 Nov 2003 01:18:35 -0000 1.3
***************
*** 24,27 ****
--- 24,28 ----
class pawsSelectorBox;
class psCreationManager;
+ class pawsTextBox;
***************
*** 39,43 ****
private:
psCreationManager* createManager;
!
bool dataLoaded;
--- 40,44 ----
private:
psCreationManager* createManager;
! pawsTextBox* cpBox;
bool dataLoaded;
***************
*** 45,48 ****
--- 46,51 ----
void PopulateFields();
+ void UpdateCP();
+
};
Index: pawsstackcountwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsstackcountwindow.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pawsstackcountwindow.cpp 17 Nov 2003 19:33:23 -0000 1.1
--- pawsstackcountwindow.cpp 28 Nov 2003 01:18:35 -0000 1.2
***************
*** 144,148 ****
{
csString text;
! bool valid;
if (widget == editBox)
--- 144,148 ----
{
csString text;
! bool valid = false;
if (widget == editBox)
***************
*** 158,161 ****
--- 158,162 ----
editBox->SetText(lastValidText);
}
+ return valid;
}
***************
*** 183,185 ****
--- 184,187 ----
windowManager->SetModalWidget(scw);
windowManager->SetCurrentFocusedWidget(scw);
+ return scw;
}
|