Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* added an additional function to lib/widget's interface: `widgSetTipText(WIDGET* psWidget, const char* pTip)` 

* intdisplay.c now uses the widget interface to set tooltips on its widgets (which is the const-correct way, and better localizes memory management code; i.e. strdup() would be the dirty-hack style alternative)
 * Change mixed space/tab indentation into tab indentation (only for one function though)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1812 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-06-04 18:33:36 +00:00
parent 6e3ff3d1ee
commit 376323c9dc
3 changed files with 96 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
lib/widget/widget.c
View File

@ -945,49 +945,56 @@ void widgSetTip( W_SCREEN *psScreen, UDWORD id, const char *pTip )
{
WIDGET *psWidget = widgGetFromID(psScreen, id);
if ( psWidget )
if (!psWidget)
return;
widgSetTipText(psWidget, pTip);
}
void widgSetTipText(WIDGET* psWidget, const char* pTip)
{
ASSERT(psWidget != NULL, "invalid widget pointer");
switch (psWidget->type)
{
switch (psWidget->type)
{
case WIDG_FORM:
if (psWidget->style & WFORM_CLICKABLE)
{
((W_CLICKFORM *) psWidget)->pTip = strdup(pTip);
}
else if (psWidget->style & WFORM_TABBED)
{
ASSERT(!"tabbed forms don't have a tip", "widgSetTip: tabbed forms do not have a tip");
}
else
{
ASSERT(!"plain forms don't have a tip", "widgSetTip: plain forms do not have a tip");
}
break;
case WIDG_FORM:
if (psWidget->style & WFORM_CLICKABLE)
{
((W_CLICKFORM *) psWidget)->pTip = strdup(pTip);
}
else if (psWidget->style & WFORM_TABBED)
{
ASSERT(!"tabbed forms don't have a tip", "widgSetTip: tabbed forms do not have a tip");
}
else
{
ASSERT(!"plain forms don't have a tip", "widgSetTip: plain forms do not have a tip");
}
break;
case WIDG_LABEL:
((W_LABEL *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_LABEL:
((W_LABEL *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_BUTTON:
((W_BUTTON *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_BUTTON:
((W_BUTTON *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_BARGRAPH:
((W_BARGRAPH *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_BARGRAPH:
((W_BARGRAPH *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_SLIDER:
((W_SLIDER *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_SLIDER:
((W_SLIDER *) psWidget)->pTip = strdup(pTip);
break;
case WIDG_EDITBOX:
ASSERT(!"wrong widget type", "widgSetTip: edit boxes do not have a tip");
break;
case WIDG_EDITBOX:
ASSERT(!"wrong widget type", "widgSetTip: edit boxes do not have a tip");
break;
default:
ASSERT(!"unknown widget type", "widgSetTip: Unknown widget type");
break;
}
default:
ASSERT(!"unknown widget type", "widgSetTip: Unknown widget type");
break;
}
}

1
lib/widget/widget.h
View File

@ -373,6 +373,7 @@ extern WIDGET *widgGetFromID(W_SCREEN *psScreen, UDWORD id);
/* Set tip string for a widget */
extern void widgSetTip( W_SCREEN *psScreen, UDWORD id, const char *pTip );
extern void widgSetTipText(WIDGET* psWidget, const char* pTip);
/* Colour numbers */
enum _w_colour

107
src/intdisplay.c
View File

@ -243,45 +243,46 @@ void intUpdateProgressBar(WIDGET *psWidget, W_CONTEXT *psContext)
Droid = (DROID*)psObj;
if(DroidIsBuilding(Droid)) { // Is it building.
ASSERT( Droid->asBits[COMP_CONSTRUCT].nStat,"intUpdateProgressBar: invalid droid type" );
Structure = DroidGetBuildStructure(Droid); // Get the structure it's building.
// ASSERT( Structure != NULL,"intUpdateProgressBar : NULL Structure pointer." );
if(Structure)
{
//check if have all the power to build yet
BuildPower = structPowerToBuild(Structure);
//if (Structure->currentPowerAccrued < (SWORD)Structure->pStructureType->powerToBuild)
if (Structure->currentPowerAccrued < (SWORD)BuildPower)
{
//if not started building show how much power accrued
//Range = Structure->pStructureType->powerToBuild;
Range = BuildPower;
BuildPoints = Structure->currentPowerAccrued;
//set the colour of the bar to green
BarGraph->majorCol = COL_LIGHTGREEN;
//and change the tool tip
BarGraph->pTip = _("Power Accrued");
}
else
{
//show progress of build
Range = Structure->pStructureType->buildPoints; // And how long it takes to build.
BuildPoints = Structure->currentBuildPts; // How near to completion.
//set the colour of the bar to yellow
BarGraph->majorCol = COL_YELLOW;
//and change the tool tip
BarGraph->pTip = _("Progress Bar");
}
if(DroidIsBuilding(Droid)) // Is it a building.
{
ASSERT(Droid->asBits[COMP_CONSTRUCT].nStat, "intUpdateProgressBar: invalid droid type" );
Structure = DroidGetBuildStructure(Droid); // Get the structure's building.
if (Structure)
{
//check if have all the power to build yet
BuildPower = structPowerToBuild(Structure);
if (Structure->currentPowerAccrued < (SWORD)BuildPower)
{
//if not started building show how much power accrued
//Range = Structure->pStructureType->powerToBuild;
Range = BuildPower;
BuildPoints = Structure->currentPowerAccrued;
//set the colour of the bar to green
BarGraph->majorCol = COL_LIGHTGREEN;
//and change the tool tip
widgSetTipText((WIDGET*)BarGraph, _("Power Accrued"));
}
else
{
//show progress of build
Range = Structure->pStructureType->buildPoints; // And how long it takes to build.
BuildPoints = Structure->currentBuildPts; // How near to completion.
//set the colour of the bar to yellow
BarGraph->majorCol = COL_YELLOW;
//and change the tool tip
widgSetTipText((WIDGET*)BarGraph, _("Progress Bar"));
}
if (BuildPoints > Range)
{
BuildPoints = Range;
}
BarGraph->majorSize = (UWORD)PERNUM(WBAR_SCALE,BuildPoints,Range);
BarGraph->majorSize = (UWORD)PERNUM(WBAR_SCALE,BuildPoints,Range);
BarGraph->style &= ~WIDG_HIDDEN;
}
else
{
else
{
BarGraph->majorSize = 0;
BarGraph->style |= WIDG_HIDDEN;
}
@ -306,15 +307,15 @@ void intUpdateProgressBar(WIDGET *psWidget, W_CONTEXT *psContext)
//set the colour of the bar to green
BarGraph->majorCol = COL_LIGHTGREEN;
//and change the tool tip
BarGraph->pTip = _("Power Accrued");
widgSetTipText((WIDGET*)BarGraph, _("Power Accrued"));
}
else
{
Range = Manufacture->timeToBuild;
Range = Manufacture->timeToBuild;
//set the colour of the bar to yellow
BarGraph->majorCol = COL_YELLOW;
//and change the tool tip
BarGraph->pTip = _("Progress Bar");
widgSetTipText((WIDGET*)BarGraph, _("Progress Bar"));
//if on hold need to take it into account
if (Manufacture->timeStartHold)
{
@ -334,14 +335,16 @@ void intUpdateProgressBar(WIDGET *psWidget, W_CONTEXT *psContext)
}
BarGraph->majorSize = (UWORD)PERNUM(WBAR_SCALE,BuildPoints,Range);
BarGraph->style &= ~WIDG_HIDDEN;
} else if(StructureIsResearching(Structure)) { // Is it researching.
}
else if(StructureIsResearching(Structure)) // Is it researching.
{
Research = StructureGetResearch(Structure);
pPlayerRes = asPlayerResList[selectedPlayer] + ((RESEARCH *)Research->
psSubject - asResearch);
//this is no good if you change which lab is researching the topic and one lab is faster
pPlayerRes = asPlayerResList[selectedPlayer] +
((RESEARCH *)Research->psSubject - asResearch);
//this is no good if you change which lab is researching the topic and one lab is faster
//Range = Research->timeToResearch;
Range = ((RESEARCH *)((RESEARCH_FACILITY*)Structure->
pFunctionality)->psSubject)->researchPoints;
Range = ((RESEARCH *)((RESEARCH_FACILITY*)Structure->
pFunctionality)->psSubject)->researchPoints;
//check started to research
if (Research->timeStarted == ACTION_START_TIME)
{
@ -352,37 +355,31 @@ void intUpdateProgressBar(WIDGET *psWidget, W_CONTEXT *psContext)
//set the colour of the bar to green
BarGraph->majorCol = COL_LIGHTGREEN;
//and change the tool tip
BarGraph->pTip = _("Power Accrued");
widgSetTipText((WIDGET*)BarGraph, _("Power Accrued"));
}
else
{
//set the colour of the bar to yellow
BarGraph->majorCol = COL_YELLOW;
//and change the tool tip
BarGraph->pTip = _("Progress Bar");
widgSetTipText((WIDGET*)BarGraph, _("Progress Bar"));
//if on hold need to take it into account
if (Research->timeStartHold)
{
BuildPoints = ((RESEARCH_FACILITY*)Structure->pFunctionality)->
researchPoints * (gameTime - (Research->timeStarted + (
gameTime - Research->timeStartHold))) / GAME_TICKS_PER_SEC;
researchPoints * (gameTime - (Research->timeStarted + (
gameTime - Research->timeStartHold))) / GAME_TICKS_PER_SEC;
BuildPoints+= pPlayerRes->currentPoints;
}
else
{
BuildPoints = ((RESEARCH_FACILITY*)Structure->pFunctionality)->
researchPoints * (gameTime - Research->timeStarted) /
GAME_TICKS_PER_SEC;
BuildPoints+= pPlayerRes->currentPoints;
BuildPoints = ((RESEARCH_FACILITY*)Structure->pFunctionality)->
researchPoints * (gameTime - Research->timeStarted) / GAME_TICKS_PER_SEC;
BuildPoints+= pPlayerRes->currentPoints;
}
}
if (BuildPoints > Range)