Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/client/gui psdcadvant.cpp,1.9,1.10 psdcadvant.h,1.3,1.4 psdcskil.cpp,1.34,1.35 psgwskill.cpp,1.13,1.14
|
From: Luca P. <lpa...@us...> - 2002-04-30 11:46:45
|
Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21725/src/client/gui
Modified Files:
psdcadvant.cpp psdcadvant.h psdcskil.cpp psgwskill.cpp
Log Message:
fixed advantage screen, added GetText() to psText
Index: psdcadvant.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcadvant.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** psdcadvant.cpp 21 Apr 2002 19:59:55 -0000 1.9
--- psdcadvant.cpp 30 Apr 2002 11:46:42 -0000 1.10
***************
*** 100,103 ****
--- 100,121 ----
+ // All players start with 2 adv points
+ advPoints = 2;
+
+ // Add Text that displays the current Advantage Points left
+ psText* text = new psText(this, 600);
+ text->Initialize(RX(300), RY(70), RX(40), RY(20));
+ char txt[4];
+ cs_snprintf(txt,4,"%d", advPoints);
+ text->SetText(txt);
+ AddComp(text);
+
+ // Add Text that displays info on the chosen Vantage
+ text = new psText(this, 700);
+ text->Initialize(RX(50), RY(415), RX(500), RY(50));
+ text->SetText("Click on an advantage or disadvantage to choose it and to have more info.");
+ AddComp(text);
+
+
// Set up the physical advantages
psAdvantageSet* set = dmanager->GetRPGInfo()->GetAdvantageSet();
***************
*** 167,170 ****
--- 185,190 ----
void psdcAdvantage::Select(psDialog* dialog, int iID,void *)
{
+ psdcAdvantage* mdialog = (psdcAdvantage*)dialog;
+
int colourOn = dialog->GetDialogManager()->GetTextureManager()
->FindRGB(255,0,0);
***************
*** 173,185 ****
->FindRGB(255,255,255);
psText* text = (psText*)dialog->GetComp(iID);
!
int color = text->GetFGColor();
! if ( color == colourOn )
! text->SetFGColor( colourOff ) ;
! else
! text->SetFGColor( colourOn );
}
--- 193,246 ----
->FindRGB(255,255,255);
+ psAdvantageSet* set = dialog->GetDialogManager()->GetRPGInfo()->GetAdvantageSet();
psText* text = (psText*)dialog->GetComp(iID);
! csString vantageStr = text->GetText();
! psAdvantage* vantage = NULL;
! if (iID>=1000)
! vantage = set->GetDisadvantage(vantageStr);
! else
! vantage = set->GetAdvantage(vantageStr);
!
! // return if no vantage found
! if (vantage==NULL)
! return;
!
! int cost = 0;
int color = text->GetFGColor();
! if ( color == colourOn ) {
!
! // turn color off
! text->SetFGColor( colourOff );
!
! // disadvantage
! if (iID>=1000)
! cost = -vantage->cost;
! // advantage
! else
! cost = vantage->cost;
! }
! else {
!
! // turn color on
! text->SetFGColor( colourOn );
+ // disadvantage
+ if (iID>=1000)
+ cost = vantage->cost;
+ // advantage
+ else
+ cost = -vantage->cost;
+ }
+
+ // displays new value of remaining Advantage Points
+ mdialog->advPoints+=cost;
+ char txt[4];
+ cs_snprintf(txt,4,"%d", mdialog->advPoints);
+ ((psText*)mdialog->GetComp(600))->SetText(txt);
+
+ // Update info text
+ text = (psText*)dialog->GetComp(700);
+ text->SetText(vantage->info);
}
Index: psdcadvant.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcadvant.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** psdcadvant.h 23 Mar 2002 23:37:12 -0000 1.3
--- psdcadvant.h 30 Apr 2002 11:46:42 -0000 1.4
***************
*** 47,50 ****
--- 47,53 ----
static void Select(psDialog* , int , void *);
+ // Advantages Points Left
+ int advPoints;
+
private:
///Helper function to create the window
Index: psdcskil.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcskil.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** psdcskil.cpp 28 Apr 2002 01:10:29 -0000 1.34
--- psdcskil.cpp 30 Apr 2002 11:46:42 -0000 1.35
***************
*** 616,620 ****
case 74:
! skillName = "Lah'ar";
break;
}
--- 616,620 ----
case 74:
! skillName = "Lahar";
break;
}
***************
*** 807,811 ****
caster->SetText(txt);
! cs_snprintf(txt,4,"%d", (int)pccdata->GetSkill("Lah'ar") );
caster = (psText*)GetComp(113);
caster->SetText(txt);
--- 807,811 ----
caster->SetText(txt);
! cs_snprintf(txt,4,"%d", (int)pccdata->GetSkill("Lahar") );
caster = (psText*)GetComp(113);
caster->SetText(txt);
***************
*** 981,985 ****
case 10037:
! skillName = "Lah'ar";
break;
}
--- 981,985 ----
case 10037:
! skillName = "Lahar";
break;
}
Index: psgwskill.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psgwskill.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** psgwskill.cpp 27 Apr 2002 21:28:01 -0000 1.13
--- psgwskill.cpp 30 Apr 2002 11:46:42 -0000 1.14
***************
*** 434,438 ****
caster->SetText(txt);
! cs_snprintf(txt,4,"%d", (int)pccdata->GetSkill("Lah'ar") );
caster = (psText*)GetComp(38);
caster->SetText(txt);
--- 434,438 ----
caster->SetText(txt);
! cs_snprintf(txt,4,"%d", (int)pccdata->GetSkill("Lahar") );
caster = (psText*)GetComp(38);
caster->SetText(txt);
***************
*** 592,596 ****
case 10037:
! skillName = "Lah'ar";
break;
}
--- 592,596 ----
case 10037:
! skillName = "Lahar";
break;
}
|