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

Fix parts of UI that break if increasing MAX_FACTORY.

master
Cyp 2011-01-04 15:48:00 +01:00
parent c4d4dcd73a
commit 4a34b821ad
8 changed files with 113 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/widget/form.cpp
View File

@ -62,6 +62,7 @@ W_FORMINIT::W_FORMINIT()
, numMajor(0)
// aNumMinors
, TabMultiplier(0)
, maxTabsShown(MAX_TAB_SMALL_SHOWN - 1) // Equal to TAB_SEVEN, which is equal to 7.
, pTip(NULL)
// apMajorTips
// apMinorTips
@ -183,6 +184,7 @@ W_TABFORM::W_TABFORM(W_FORMINIT const *init)
, state(0) // This assignment was previously done by a memset.
, tabHiLite(~0)
, TabMultiplier(init->TabMultiplier)
, maxTabsShown(init->maxTabsShown)
, numStats(init->numStats)
, numButtons(init->numButtons)
, pTabDisplay(init->pTabDisplay)
@ -689,7 +691,7 @@ void formGetOrigin(W_FORM *psWidget, SDWORD *pXOrigin, SDWORD *pYOrigin)
static BOOL formPickHTab(TAB_POS *psTabPos,
SDWORD x0, SDWORD y0,
UDWORD width, UDWORD height, UDWORD gap,
UDWORD number, SDWORD fx, SDWORD fy)
UDWORD number, SDWORD fx, SDWORD fy, unsigned maxTabsShown)
{
SDWORD x, y1;
UDWORD i;
@ -711,21 +713,18 @@ static BOOL formPickHTab(TAB_POS *psTabPos,
// Also need to check if the TabMultiplier is set or not, if not then it means
// we have not yet added the code to display/handle the tab scroll buttons.
// At this time, I think only the design screen has this limitation of only 8 tabs.
if (number > (MAX_TAB_SMALL_SHOWN - 1) && psTabPos->TabMultiplier) // of course only do this if we actually need >8 tabs.
if (number > maxTabsShown && psTabPos->TabMultiplier) // of course only do this if we actually need >8 tabs.
{
number -= (psTabPos->TabMultiplier - 1) * TAB_SEVEN;
if (number > TAB_SEVEN) // is it still > than TAB_SEVEN?
{
number = TAB_SEVEN;
}
number -= (psTabPos->TabMultiplier - 1) * maxTabsShown;
number = std::min(number, maxTabsShown); // is it still > than maxTabsShown?
}
else if (number > MAX_TAB_SMALL_SHOWN)
else if (number > maxTabsShown + 1)
{
// we need to clip the tab count to max amount *without* the scrolltabs visible.
// The reason for this, is that in design screen & 'feature' debug & others(?),
// we can get over max # of tabs that the game originally supported.
// This made it look bad.
number = MAX_TAB_SMALL_SHOWN;
number = maxTabsShown + 1;
}
for (i=0; i < number; i++)
@ -737,7 +736,7 @@ static BOOL formPickHTab(TAB_POS *psTabPos,
// found a tab under the coordinate
if (psTabPos->TabMultiplier) //Checks to see we need the extra tab scroll buttons
{ // holds the VIRTUAL tab #, since obviously, we can't display more than 7
psTabPos->index = (i % TAB_SEVEN)+ ((psTabPos->TabMultiplier -1)*TAB_SEVEN);
psTabPos->index = (i % maxTabsShown)+ ((psTabPos->TabMultiplier -1)*maxTabsShown);
}
else
{ // This is a normal request.
@ -884,7 +883,7 @@ static BOOL formPickTab(W_TABFORM *psForm, UDWORD fx, UDWORD fy,
case WFORM_TABTOP:
if (formPickHTab(psTabPos, x0+psForm->majorOffset - xOffset, y0 - psForm->tabMajorThickness,
psForm->majorSize, psForm->tabMajorThickness, psForm->tabMajorGap,
psForm->numMajor, fx, fy))
psForm->numMajor, fx, fy, psForm->maxTabsShown))
{
return true;
}
@ -893,7 +892,7 @@ static BOOL formPickTab(W_TABFORM *psForm, UDWORD fx, UDWORD fy,
case WFORM_TABBOTTOM:
if (formPickHTab(psTabPos, x0+psForm->majorOffset - xOffset, y1,
psForm->majorSize, psForm->tabMajorThickness, psForm->tabMajorGap,
psForm->numMajor, fx, fy))
psForm->numMajor, fx, fy, psForm->maxTabsShown))
{
return true;
}
@ -927,7 +926,7 @@ static BOOL formPickTab(W_TABFORM *psForm, UDWORD fx, UDWORD fy,
case WFORM_TABTOP:
if (formPickHTab(psTabPos, x0+psForm->minorOffset - xOffset2, y0 - psForm->tabMinorThickness,
psForm->minorSize, psForm->tabMinorThickness, psForm->tabMinorGap,
psMajor->numMinor, fx, fy))
psMajor->numMinor, fx, fy, psForm->maxTabsShown))
{
psTabPos->index += psForm->numMajor;
return true;
@ -936,7 +935,7 @@ static BOOL formPickTab(W_TABFORM *psForm, UDWORD fx, UDWORD fy,
case WFORM_TABBOTTOM:
if (formPickHTab(psTabPos, x0+psForm->minorOffset - xOffset2, y1,
psForm->minorSize, psForm->tabMinorThickness, psForm->tabMinorGap,
psMajor->numMinor, fx, fy))
psMajor->numMinor, fx, fy, psForm->maxTabsShown))
{
psTabPos->index += psForm->numMajor;
return true;
@ -1260,18 +1259,18 @@ static void formDisplayTTabs(W_TABFORM *psForm,SDWORD x0, SDWORD y0,
x = x0 + 2;
x1 = x + width - 2;
y1 = y0 + height;
if (number > (MAX_TAB_SMALL_SHOWN - 1)) //we can display 8 tabs fine with no extra voodoo.
if (number > psForm->maxTabsShown) //we can display 8 tabs fine with no extra voodoo.
{ // We do NOT want to draw all the tabs once we have drawn 7 tabs
// Both selected & hilite are converted from virtual tab range, to a range
// that is seen on the form itself. This would be 0-6 (7 tabs)
// We also fix drawnumber, so we don't display too many tabs since the pages
// will be empty.
drawnumber = (number - (( psForm->TabMultiplier -1) * TAB_SEVEN));
if (drawnumber > TAB_SEVEN) drawnumber = TAB_SEVEN ;
selected = (selected % TAB_SEVEN); //Go from Virtual range, to our range
drawnumber = (number - (( psForm->TabMultiplier -1) * psForm->maxTabsShown));
if (drawnumber > psForm->maxTabsShown) drawnumber = psForm->maxTabsShown ;
selected = (selected % psForm->maxTabsShown); //Go from Virtual range, to our range
if(hilite != 65535) //sigh. Don't blame me for this!It is THEIR 'hack'.
hilite = hilite % TAB_SEVEN; //we want to hilite tab 0 - 6.
hilite = hilite % psForm->maxTabsShown; //we want to hilite tab 0 - 6.
}
else
{ // normal draw

1
lib/widget/form.h
View File

@ -88,6 +88,7 @@ struct W_TABFORM : public W_FORM
UWORD numMajor; // The number of major tabs
SWORD TabMultiplier; //used to tell system we got lots of tabs to display
unsigned maxTabsShown; ///< Maximum number of tabs shown at once.
UWORD numStats; //# of 'stats' (items) in list
UWORD numButtons; //# of buttons per form
W_MAJORTAB asMajor[WFORM_MAXMAJOR]; // The major tab information

1
lib/widget/widget.h
View File

@ -167,6 +167,7 @@ struct W_FORMINIT : public W_INIT
UWORD numMajor; ///< Number of major tabs
UWORD aNumMinors[WFORM_MAXMAJOR]; ///< Number of minor tabs for each major
SWORD TabMultiplier; ///< Used to tell system we got lots of (virtual) tabs to display
unsigned maxTabsShown; ///< Maximum number of tabs shown at once.
const char *pTip; ///< Tool tip for the form itself
char *apMajorTips[WFORM_MAXMAJOR]; ///< Tool tips for the major tabs
char *apMinorTips[WFORM_MAXMAJOR][WFORM_MAXMINOR]; ///< Tool tips for the minor tabs

5
src/display3d.cpp
View File

@ -1822,10 +1822,9 @@ void setViewPos( UDWORD x, UDWORD y, WZ_DECL_UNUSED BOOL Pan )
}
/// Get the player position
void getPlayerPos(SDWORD *px, SDWORD *py)
Vector2i getPlayerPos()
{
*px = player.p.x + (visibleTiles.x/2)*TILE_UNITS;
*py = player.p.z + (visibleTiles.y/2)*TILE_UNITS;
return removeZ(swapYZ(player.p)) + visibleTiles/2*TILE_UNITS;
}
/// Set the player position

2
src/display3d.h
View File

@ -60,7 +60,7 @@ extern BOOL radarOnScreen;
extern bool rangeOnScreen; // Added to get sensor/gun range on screen. -Q 5-10-05
extern void scaleMatrix( UDWORD percent );
extern void setViewPos( UDWORD x, UDWORD y, BOOL Pan);
extern void getPlayerPos(SDWORD *px, SDWORD *py);
Vector2i getPlayerPos();
extern void setPlayerPos(SDWORD x, SDWORD y);
extern void disp3d_setView(iView *newView);
extern void disp3d_resetView(void);

332
src/hci.cpp
View File

@ -28,6 +28,7 @@
*/
#include <string.h>
#include <algorithm>
#include "lib/framework/frame.h"
#include "lib/framework/strres.h"
@ -371,26 +372,13 @@ COMPONENT_STATS **apsComponentList;
UDWORD numExtraSys;
COMPONENT_STATS **apsExtraSysList;
//defined in HCI.h now
// store the objects that are being used for the object bar
//#define MAX_OBJECTS 15//10 we need at least 15 for the 3 different types of factory
BASE_OBJECT **apsObjectList;
SDWORD numObjects;
//this list is used for sorting the objects - at the mo' this is just factories
BASE_OBJECT **apsListToOrder;
/*max size required to store unordered factories */
#define ORDERED_LIST_SIZE (NUM_FACTORY_TYPES * MAX_FACTORY)
std::vector<BASE_OBJECT *> apsObjectList;
/* The current design being edited on the design screen */
extern DROID_TEMPLATE sCurrDesign;
/* The button id of the component that is in the design */
//UDWORD desCompID;
/* The button id of the droid template that has been locked down */
//UDWORD droidTemplID;
/* Flags to check whether the power bars are currently on the screen */
static BOOL powerBarUp = false;
static BOOL StatsUp = false;
@ -400,7 +388,7 @@ static BASE_OBJECT *psStatsScreenOwner = NULL;
static BASE_OBJECT *apsPreviousObj[IOBJ_MAX];
/* The jump position for each object on the base bar */
static Vector2i asJumpPos[IOBJ_MAX];
static std::vector<Vector2i> asJumpPos;
/***************************************************************************************/
/* Function Prototypes */
@ -575,22 +563,7 @@ BOOL intInitialise(void)
}
// allocate the object list
apsObjectList = (BASE_OBJECT **)malloc(sizeof(BASE_OBJECT *) * MAX_OBJECTS);
if (!apsObjectList)
{
debug( LOG_FATAL, "Out of memory" );
abort();
return false;
}
//allocate the order list - ONLY SIZED FOR FACTORIES AT PRESENT!!
apsListToOrder = (BASE_OBJECT **)malloc(sizeof(BASE_OBJECT *) * ORDERED_LIST_SIZE);
if (!apsListToOrder)
{
debug( LOG_FATAL, "Out of memory" );
abort();
return false;
}
apsObjectList.clear();
intInitialiseGraphics();
@ -637,7 +610,7 @@ BOOL intInitialise(void)
intResetPreviousObj();
// reset the jump positions
memset(asJumpPos, 0, sizeof(asJumpPos));
asJumpPos.clear();
/* make demolish stat always available */
if(!bInTutorial)
@ -684,8 +657,7 @@ void interfaceShutDown(void)
free(apsFeatureList);
free(apsComponentList);
free(apsExtraSysList);
free(apsObjectList);
free(apsListToOrder);
apsObjectList.clear();
apsStructStatsList = NULL;
ppResearchList = NULL;
@ -695,8 +667,6 @@ void interfaceShutDown(void)
apsFeatureList = NULL;
apsComponentList = NULL;
apsExtraSysList = NULL;
apsObjectList = NULL;
apsListToOrder = NULL;
interfaceDeleteGraphics();
@ -1529,7 +1499,7 @@ INT_RETVAL intRunWidgets(void)
if (intMode == INT_OBJECT || intMode == INT_STAT || intMode == INT_CMDORDER)
{
// see if there is a dead object in the list
for(i=0; i<numObjects; i++)
for(unsigned i = 0; i < apsObjectList.size(); ++i)
{
if (apsObjectList[i] && apsObjectList[i]->died)
{
@ -2457,13 +2427,14 @@ static void intProcessObject(UDWORD id)
{
// set the map position - either the object position, or the position jumped from
butIndex = id - IDOBJ_OBJSTART;
if (butIndex >= 0 && butIndex < IOBJ_MAX)
if (butIndex >= 0 && butIndex <= IDOBJ_OBJEND - IDOBJ_OBJSTART)
{
asJumpPos.resize(IDOBJ_OBJEND - IDOBJ_OBJSTART, Vector2i(0, 0));
if (((asJumpPos[butIndex].x == 0) && (asJumpPos[butIndex].y == 0)) ||
!DrawnInLastFrame((SDWORD)psObj->sDisplay.frameNumber) ||
((psObj->sDisplay.screenX > pie_GetVideoBufferWidth()) || (psObj->sDisplay.screenY > pie_GetVideoBufferHeight())))
{
getPlayerPos((SDWORD*)&asJumpPos[butIndex].x, (SDWORD*)&asJumpPos[butIndex].y);
asJumpPos[butIndex] = getPlayerPos();
setPlayerPos(psObj->pos.x, psObj->pos.y);
@ -3156,101 +3127,52 @@ void intDemolishCancel(void)
//reorder the research facilities so that first built is first in the list
static void orderResearch(void)
{
BASE_OBJECT *psTemp;
UDWORD i, maxLoop = (UDWORD)(numObjects / 2);
for (i = 0; i < maxLoop; i++)
{
psTemp = apsObjectList[i];
apsObjectList[i] = apsObjectList[(numObjects - 1) - i];
apsObjectList[(numObjects - 1) - i] = psTemp;
}
std::reverse(apsObjectList.begin(), apsObjectList.end()); // Why reverse this list, instead of sorting it?
}
static inline bool sortObjectByIdFunction(BASE_OBJECT *a, BASE_OBJECT *b)
{
return (a == NULL? 0 : a->id) < (b == NULL? 0 : b->id);
}
// reorder the commanders
static void orderDroids(void)
{
SDWORD i, j;
BASE_OBJECT *psTemp;
debug( LOG_NEVER, "orderUnit\n" );
// bubble sort on the ID - first built will always be first in the list
for (i = 0; i < MAX_OBJECTS; i++)
{
for(j = i + 1; j < MAX_OBJECTS; j++)
{
if (apsObjectList[i] != NULL && apsObjectList[j] != NULL &&
apsObjectList[i]->id > apsObjectList[j]->id)
{
psTemp = apsObjectList[i];
apsObjectList[i] = apsObjectList[j];
apsObjectList[j] = psTemp;
}
}
}
std::sort(apsObjectList.begin(), apsObjectList.end(), sortObjectByIdFunction); // Why sort this list, instead of reversing it?
}
static inline bool sortFactoryByTypeFunction(BASE_OBJECT *a, BASE_OBJECT *b)
{
if (a == NULL || b == NULL)
{
return (a == NULL) < (b == NULL);
}
STRUCTURE *s = castStructure(a), *t = castStructure(b);
ASSERT(s != NULL && StructIsFactory(s) && t != NULL && StructIsFactory(t), "object is not a factory");
FACTORY *x = (FACTORY *)s->pFunctionality, *y = (FACTORY *)t->pFunctionality;
if (x->psAssemblyPoint->factoryType != y->psAssemblyPoint->factoryType)
{
return x->psAssemblyPoint->factoryType < y->psAssemblyPoint->factoryType;
}
return x->psAssemblyPoint->factoryInc < y->psAssemblyPoint->factoryInc;
}
/*puts the selected players factories in order - Standard factories 1-5, then
cyborg factories 1-5 and then Vtol factories 1-5*/
static void orderFactories(void)
{
STRUCTURE *psStruct, *psNext;
SDWORD entry = 0;
UDWORD inc = 0, type = FACTORY_FLAG, objectInc = 0;
ASSERT(numObjects <= NUM_FACTORY_TYPES * MAX_FACTORY, "too many factories!");
//copy the object list into the list to order
memcpy(apsListToOrder, apsObjectList, sizeof(BASE_OBJECT*) * ORDERED_LIST_SIZE);
//go through the list of structures and extract them in order
while (entry < numObjects)
{
for (psStruct = (STRUCTURE*)apsListToOrder[objectInc]; psStruct != NULL; psStruct = psNext)
{
psNext = (STRUCTURE*)apsListToOrder[++objectInc];
if ((SDWORD)objectInc >= numObjects)
{
psNext = NULL;
}
ASSERT(StructIsFactory(psStruct), "structure is not a factory");
if (((FACTORY*)psStruct->pFunctionality)->psAssemblyPoint->factoryInc == inc
&& ((FACTORY*)psStruct->pFunctionality)->psAssemblyPoint->factoryType == type)
{
apsObjectList[entry++] = (BASE_OBJECT*)psStruct;
//quick check that don't end up with more!
if (entry > numObjects)
{
ASSERT(false, "too many objects!");
return;
}
break;
}
}
inc++;
if (inc > MAX_FACTORY)
{
inc = 0;
type++;
if (type > NUM_FACTORY_TYPES)
{
type = 0;
}
}
objectInc = 0;
}
std::sort(apsObjectList.begin(), apsObjectList.end(), sortFactoryByTypeFunction);
}
/** Order the objects in the bottom bar according to their type. */
static void orderObjectInterface(void)
{
if (!apsObjectList || !apsObjectList[0])
if (apsObjectList.empty())
{
//no objects so nothing to order!
return;
@ -3276,52 +3198,40 @@ static void orderObjectInterface(void)
}
}
// Rebuilds apsObjectList, and returns the index of psBuilding in apsObjectList, or returns apsObjectList.size() if not present (not sure whether that's supposed to be possible).
static unsigned rebuildFactoryListAndFindIndex(STRUCTURE *psBuilding)
{
apsObjectList.clear();
for (STRUCTURE *psCurr = interfaceStructList(); psCurr; psCurr = psCurr->psNext)
{
if (objSelectFunc(psCurr))
{
// The list is ordered now so we have to get all possible entries and sort it before checking if this is the one!
apsObjectList.push_back(psCurr);
}
}
// order the list
orderFactories();
// now look thru the list to see which one corresponds to the factory that has just finished
return std::find(apsObjectList.begin(), apsObjectList.end(), psBuilding) - apsObjectList.begin();
}
/* Tell the interface a factory has completed building ALL droids */
void intManufactureFinished(STRUCTURE *psBuilding)
{
SDWORD structureID;
STRUCTURE *psCurr;
ASSERT(psBuilding != NULL, "Invalid structure pointer");
if ((intMode == INT_OBJECT || intMode == INT_STAT) && objMode == IOBJ_MANUFACTURE)
{
/* Find which button the structure is on and clear it's stats */
structureID = 0;
numObjects = 0;
memset(apsObjectList, 0, sizeof(BASE_OBJECT *) * MAX_OBJECTS);
for (psCurr = interfaceStructList(); psCurr; psCurr = psCurr->psNext)
unsigned structureIndex = rebuildFactoryListAndFindIndex(psBuilding);
if (structureIndex != apsObjectList.size())
{
if (objSelectFunc((BASE_OBJECT *)psCurr))
intSetStats(structureIndex + IDOBJ_STATSTART, NULL);
// clear the loop button if interface is up
if (widgGetFromID(psWScreen, IDSTAT_LOOP_BUTTON))
{
// The list is ordered now so we have to get all possible entries and sort it before checking if this is the one!
apsObjectList[numObjects] = (BASE_OBJECT *)psCurr;
numObjects++;
}
// make sure the list doesn't overflow
if (numObjects >= MAX_OBJECTS)
{
break;
}
}
// order the list
orderFactories();
// now look thru the list to see which one corresponds to the factory that has just finished
for (structureID = 0; structureID < numObjects; structureID++)
{
BASE_OBJECT *psObj = apsObjectList[structureID];
if ((STRUCTURE *)psObj == psBuilding)
{
intSetStats(structureID + IDOBJ_STATSTART, NULL);
// clear the loop button if interface is up
if (widgGetFromID(psWScreen,IDSTAT_LOOP_BUTTON))
{
widgSetButtonState(psWScreen, IDSTAT_LOOP_BUTTON, 0);
}
break;
widgSetButtonState(psWScreen, IDSTAT_LOOP_BUTTON, 0);
}
}
}
@ -3329,46 +3239,15 @@ void intManufactureFinished(STRUCTURE *psBuilding)
void intUpdateManufacture(STRUCTURE *psBuilding)
{
SDWORD structureID;
STRUCTURE *psCurr;
FACTORY *psFact;
ASSERT(psBuilding != NULL, "Invalid structure pointer");
if ((intMode == INT_OBJECT || intMode == INT_STAT) && objMode == IOBJ_MANUFACTURE)
{
/* Find which button the structure is on and update its stats */
structureID = 0;
numObjects = 0;
memset(apsObjectList, 0, sizeof(BASE_OBJECT *) * MAX_OBJECTS);
for (psCurr = interfaceStructList(); psCurr; psCurr = psCurr->psNext)
unsigned structureIndex = rebuildFactoryListAndFindIndex(psBuilding);
if (structureIndex != apsObjectList.size())
{
if (objSelectFunc((BASE_OBJECT *)psCurr))
{
// The list is ordered now so we have to get all possible entries and sort it before checking if this is the one!
apsObjectList[numObjects] = (BASE_OBJECT *)psCurr;
numObjects++;
}
// make sure the list doesn't overflow
if (numObjects >= MAX_OBJECTS)
{
break;
}
}
// order the list
orderFactories();
// now look thru the list to see which one corresponds to the factory that has just finished
for (structureID = 0; structureID < numObjects; structureID++)
{
BASE_OBJECT *psObj = apsObjectList[structureID];
if ((STRUCTURE *)psObj == psBuilding)
{
psFact = &((STRUCTURE *)psObj)->pFunctionality->factory;
intSetStats(structureID + IDOBJ_STATSTART, psFact->psSubject);
break;
}
intSetStats(structureIndex + IDOBJ_STATSTART, psBuilding->pFunctionality->factory.psSubject);
}
}
}
@ -3389,14 +3268,7 @@ void intResearchFinished(STRUCTURE *psBuilding)
*/
UWORD numForms(UDWORD total, UDWORD perForm)
{
/* If the buttons fit exactly, don't have to add one */
if (total != 0 && (total % perForm) == 0)
{
return (UWORD)(total/perForm);
}
/* Otherwise add one to the div */
return (UWORD)(total/perForm + 1);
return std::max((total + perForm - 1)/perForm, 1u);
}
@ -3895,9 +3767,8 @@ BOOL intAddOptions(void)
static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,BOOL bForceStats)
{
UDWORD displayForm;
UDWORD i, statID=0;
SDWORD objLoop;
BASE_OBJECT *psObj, *psFirst;
UDWORD statID = 0;
BASE_OBJECT * psFirst;
BASE_STATS *psStats;
SDWORD BufferID;
DROID *Droid;
@ -3915,7 +3786,7 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B
else
{
// reset the object position array
memset(asJumpPos, 0, sizeof(asJumpPos));
asJumpPos.clear();
}
Animate = false;
@ -3924,29 +3795,17 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B
ClearTopicBuffers();
/* See how many objects the player has */
numObjects = 0;
psFirst = NULL;
memset(apsObjectList, 0, sizeof(BASE_OBJECT *) * MAX_OBJECTS);
for(psObj=psObjects; psObj; psObj = psObj->psNext)
apsObjectList.clear();
for (BASE_OBJECT *psObj = psObjects; psObj; psObj = psObj->psNext)
{
if (objSelectFunc(psObj))
{
apsObjectList[numObjects] = psObj;
numObjects++;
if (numObjects == 1)
{
psFirst = psObj;
}
// make sure the list doesn't overflow
if (numObjects >= MAX_OBJECTS)
{
break;
}
apsObjectList.push_back(psObj);
}
}
if(numObjects == 0) {
if (apsObjectList.empty())
{
// No objects so close the stats window if it's up...
if(widgGetFromID(psWScreen,IDSTAT_FORM) != NULL) {
intRemoveStatsNoAnim();
@ -3954,27 +3813,16 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B
// and return.
return false;
}
psFirst = apsObjectList.front();
/*if psSelected != NULL then check its in the list of suitable objects for
this instance of the interface - this could happen when a structure is upgraded*/
objLoop = 0;
if (psSelected != NULL)
{
for(objLoop = 0; objLoop < numObjects; objLoop++)
{
if (psSelected == apsObjectList[objLoop])
{
//found it so quit loop
break;
}
}
}
//if have reached the end of the loop and not quit out, then can't have found the selected object in the list
if (objLoop == numObjects)
{
//initialise psSelected so gets set up with an iten in the list
psSelected = NULL;
}
if (std::find(apsObjectList.begin(), apsObjectList.end(), psSelected) == apsObjectList.end())
{
//initialise psSelected so gets set up with an iten in the list
psSelected = NULL;
}
//order the objects according to what they are
orderObjectInterface();
@ -4092,8 +3940,7 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B
sFormInit.y = OBJ_TABY;
sFormInit.width = OBJ_WIDTH;
sFormInit.height = OBJ_HEIGHT;
sFormInit.numMajor = numForms((OBJ_BUTWIDTH + OBJ_GAP) * numObjects,
OBJ_WIDTH - OBJ_GAP);
sFormInit.numMajor = numForms(apsObjectList.size(), (OBJ_WIDTH - OBJ_GAP) / (OBJ_BUTWIDTH + OBJ_GAP));
sFormInit.majorPos = WFORM_TABTOP;
sFormInit.minorPos = WFORM_TABNONE;
sFormInit.majorSize = OBJ_TABWIDTH;
@ -4104,17 +3951,14 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B
sFormInit.pUserData = &StandardTab;
sFormInit.pTabDisplay = intDisplayTab;
if (sFormInit.numMajor > MAX_TAB_STD_SHOWN)
if (sFormInit.numMajor*(sFormInit.majorSize + sFormInit.tabMajorGap) > sFormInit.width)
{
// We do NOT want more than this amount of tabs, 40 items should be more than enough(?)
sFormInit.numMajor = MAX_TAB_STD_SHOWN;
// If we were to change this in future then :
//Just switching from normal sized tabs to smaller ones to fit more in form.
// sFormInit.pUserData = &SmallTab;
// sFormInit.majorSize /= 2;
// Change MAX_TAB_STD_SHOWN to ..SMALL_SHOWN, this will give us 80 items max.
sFormInit.pUserData = &SmallTab;
sFormInit.majorSize /= 2;
}
for (i=0; i< sFormInit.numMajor; i++)
sFormInit.maxTabsShown = WFORM_MAXMAJOR;
sFormInit.numMajor = std::min<unsigned>(sFormInit.numMajor, WFORM_MAXMAJOR);
for (unsigned i = 0; i < sFormInit.numMajor; ++i)
{
sFormInit.aNumMinors[i] = 1;
}
@ -4213,9 +4057,9 @@ static BOOL intAddObjectWindow(BASE_OBJECT *psObjects, BASE_OBJECT *psSelected,B
sLabInitCmdExp.pText = "@@@@@ - overrun";
displayForm = 0;
for(i=0; i<(UDWORD)numObjects; i++)
for (unsigned i = 0; i < apsObjectList.size(); ++i)
{
psObj = apsObjectList[i];
BASE_OBJECT *psObj = apsObjectList[i];
if(psObj->died == 0) { // Don't add the button if the objects dead.
IsFactory = false;
@ -4823,7 +4667,7 @@ static BASE_OBJECT *intGetObject(UDWORD id)
}
/* Find the object that the ID refers to */
ASSERT_OR_RETURN(NULL, (SDWORD)id - IDOBJ_OBJSTART >= 0 && (SDWORD)id - IDOBJ_OBJSTART < numObjects, "Invalid button ID %u", id);
ASSERT_OR_RETURN(NULL, id - IDOBJ_OBJSTART < apsObjectList.size(), "Invalid button ID %u", id);
psObj = apsObjectList[id - IDOBJ_OBJSTART];
return psObj;
@ -5887,8 +5731,7 @@ static void intObjectRMBPressed(UDWORD id)
BASE_OBJECT *psObj;
STRUCTURE *psStructure;
ASSERT( (SDWORD)id - IDOBJ_OBJSTART < numObjects,
"intObjectRMBPressed: Invalid object id" );
ASSERT(id - IDOBJ_OBJSTART < apsObjectList.size(), "intObjectRMBPressed: Invalid object id");
/* Find the object that the ID refers to */
psObj = intGetObject(id);
@ -5917,8 +5760,7 @@ static void intObjStatRMBPressed(UDWORD id)
BASE_OBJECT *psObj;
STRUCTURE *psStructure;
ASSERT( (SDWORD)id - IDOBJ_STATSTART < numObjects,
"intObjStatRMBPressed: Invalid stat id" );
ASSERT(id - IDOBJ_STATSTART < apsObjectList.size(), "intObjStatRMBPressed: Invalid stat id" );
/* Find the object that the ID refers to */
psObj = intGetObject(id);

4
src/hci.h
View File

@ -29,8 +29,6 @@
#include "message.h"
// store the objects that are being used for the object bar
#define MAX_OBJECTS 15 //10 we need at least 15 for the 3 different types of factory
#define BASE_COORDS_X (640)
#define BASE_COORDS_Y (480)
@ -61,7 +59,7 @@
#define IDOBJ_FORM 3000 // The object back form for build/manufacture/research
#define IDOBJ_CLOSE 3001 // The form for the close button
#define IDOBJ_OBJSTART 3002 // The first ID for droids/factories/research
#define IDOBJ_OBJEND 3021 // The last ID for droids/factories/research
#define IDOBJ_OBJEND 3099 // The last ID for droids/factories/research
#define IDOBJ_STATSTART 3100 // The first ID for stats
#define IDOBJ_STATEND 3199 // The last ID for stats
#define IDOBJ_PROGBARSTART 3200 // The first ID for stats progress bars.

4
src/multilimit.cpp
View File

@ -424,7 +424,7 @@ static void displayStructureBar(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset
STRUCTURE_STATS *stat = asStructureStats + psWidget->UserData;
Position position;
Vector3i rotation;
char str[3];
char str[20];
UDWORD scale,Radius;
@ -458,7 +458,7 @@ static void displayStructureBar(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset
iV_DrawText(_(getName(stat->pName)), x + 80, y + (psWidget->height / 2) + 3);
// draw limit
sprintf(str,"%d",((W_SLIDER*)(widgGetFromID(psWScreen,psWidget->id+1)))->pos);
ssprintf(str, "%d", ((W_SLIDER *)widgGetFromID(psWScreen, psWidget->id + 1))->pos);
iV_DrawText(str, x+270, y+(psWidget->height/2)+3);
return;