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

Remove useless parameter from PIE button display functions.

master
per 2013-10-20 00:24:15 +02:00
parent 38731a9030
commit d9353c1701
7 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/component.cpp
View File

@ -65,25 +65,15 @@ UBYTE getPlayerColour(UDWORD pl)
}
static void setMatrix(Vector3i *Position, Vector3i *Rotation, bool RotXYZ, int scale)
static void setMatrix(Vector3i *Position, Vector3i *Rotation, int scale)
{
pie_PerspectiveBegin();
pie_MatBegin();
pie_TRANSLATE(Position->x, Position->y, Position->z);
if (RotXYZ)
{
pie_MatRotX(DEG(Rotation->x));
pie_MatRotY(DEG(Rotation->y));
pie_MatRotZ(DEG(Rotation->z));
}
else
{
pie_MatRotY(DEG(Rotation->y));
pie_MatRotX(DEG(Rotation->x));
pie_MatRotZ(DEG(Rotation->z));
}
pie_MatRotX(DEG(Rotation->x));
pie_MatRotY(DEG(Rotation->y));
pie_MatRotZ(DEG(Rotation->z));
pie_MatScale(scale / 100.f);
}
@ -178,16 +168,16 @@ UDWORD getStructureStatHeight(STRUCTURE_STATS *psStat)
}
void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale)
void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, SDWORD scale)
{
setMatrix(Position, Rotation, RotXYZ, scale);
setMatrix(Position, Rotation, scale);
pie_Draw3DShape(IMDShape, 0, getPlayerColour(selectedPlayer), WZCOL_WHITE, pie_BUTTON, 0);
unsetMatrix();
}
//changed it to loop thru and draw all weapons
void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i *Position, bool RotXYZ, SDWORD scale)
void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i *Position, SDWORD scale)
{
iIMDShape *baseImd, *strImd;
iIMDShape *mountImd[STRUCT_MAXWEAPS];
@ -204,7 +194,7 @@ void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i
Position->y -= 20;
}
setMatrix(Position, rotation, RotXYZ, scale);
setMatrix(Position, rotation, scale);
/* Draw the building's base first */
baseImd = psStructure->pStructureType->pBaseIMD;
@ -284,7 +274,7 @@ void displayStructureButton(STRUCTURE *psStructure, Vector3i *rotation, Vector3i
unsetMatrix();
}
void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale)
void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, SDWORD scale)
{
iIMDShape *baseImd, *strImd;
iIMDShape *mountImd[STRUCT_MAXWEAPS];
@ -299,7 +289,7 @@ void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vect
Position->y -= 20;
}
setMatrix(Position, Rotation, RotXYZ, scale);
setMatrix(Position, Rotation, scale);
/* Draw the building's base first */
baseImd = Stats->pBaseIMD;
@ -388,7 +378,7 @@ void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vect
// Render a component given a BASE_STATS structure.
//
void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale)
void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, SDWORD scale)
{
iIMDShape *ComponentIMD = NULL;
iIMDShape *MountIMD = NULL;
@ -402,7 +392,7 @@ void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Posi
{
return;
}
setMatrix(Position, Rotation, RotXYZ, scale);
setMatrix(Position, Rotation, scale);
/* VTOL bombs are only stats allowed to have NULL ComponentIMD */
if (StatIsComponent(Stat) != COMP_WEAPON
@ -433,7 +423,7 @@ void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Posi
// Render a research item given a BASE_STATS structure.
//
void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale)
void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, SDWORD scale)
{
iIMDShape *ResearchIMD = ((RESEARCH *)Stat)->pIMD;
iIMDShape *MountIMD = ((RESEARCH *)Stat)->pIMD2;
@ -441,7 +431,7 @@ void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Posit
ASSERT(ResearchIMD, "ResearchIMD is NULL");
if (ResearchIMD)
{
setMatrix(Position, Rotation, RotXYZ, scale);
setMatrix(Position, Rotation, scale);
if (MountIMD)
{
@ -903,9 +893,9 @@ static void displayCompObj(DROID *psDroid, bool bButton)
// Render a composite droid given a DROID_TEMPLATE structure.
//
void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale)
void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, SDWORD scale)
{
setMatrix(Position, Rotation, RotXYZ, scale);
setMatrix(Position, Rotation, scale);
// Decide how to sort it.
leftFirst = angleDelta(DEG(Rotation->y)) < 0;
@ -926,11 +916,11 @@ void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotati
// Render a composite droid given a DROID structure.
//
void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale)
void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, SDWORD scale)
{
SDWORD difference;
setMatrix(Position, Rotation, RotXYZ, scale);
setMatrix(Position, Rotation, scale);
// Decide how to sort it.
difference = Rotation->y % 360;

14
src/component.h
View File

@ -54,13 +54,13 @@ UDWORD getStructureStatSizeMax(STRUCTURE_STATS *Stats);
#define TOWER_HEIGHT 100
UDWORD getStructureStatHeight(STRUCTURE_STATS *psStat);
void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale);
void displayStructureButton(STRUCTURE *psStructure, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale);
void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale);
void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale);
void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale);
void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale);
void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, bool RotXYZ, SDWORD scale);
void displayIMDButton(iIMDShape *IMDShape, Vector3i *Rotation, Vector3i *Position, SDWORD scale);
void displayStructureButton(STRUCTURE *psStructure, Vector3i *Rotation, Vector3i *Position, SDWORD scale);
void displayStructureStatButton(STRUCTURE_STATS *Stats, Vector3i *Rotation, Vector3i *Position, SDWORD scale);
void displayComponentButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, SDWORD scale);
void displayResearchButton(BASE_STATS *Stat, Vector3i *Rotation, Vector3i *Position, SDWORD scale);
void displayComponentButtonTemplate(DROID_TEMPLATE *psTemplate, Vector3i *Rotation, Vector3i *Position, SDWORD scale);
void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *Position, SDWORD scale);
void displayComponentObject(DROID *psDroid);
void compPersonToBits(DROID *psDroid);

4
src/design.cpp
View File

@ -3924,7 +3924,7 @@ static void intDisplayStatForm(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset)
}
//display component in bottom design screen window
displayComponentButton(psStats, &Rotation, &Position, true, falseScale);
displayComponentButton(psStats, &Rotation, &Position, falseScale);
}
/* Displays the 3D view of the droid in a window on the design form */
@ -3967,7 +3967,7 @@ static void intDisplayViewForm(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset)
falseScale = (DESIGN_DROID_SCALE * OBJECT_RADIUS) / templateRadius;
//display large droid view in the design screen
displayComponentButtonTemplate(&sCurrDesign, &Rotation, &Position, true, falseScale);
displayComponentButtonTemplate(&sCurrDesign, &Rotation, &Position, falseScale);
}
}

14
src/intdisplay.cpp
View File

@ -1428,11 +1428,11 @@ void IntFancyButton::displayIMD(Image image, ImdObject imdObject, int xOffset, i
//lefthand display droid buttons
if (IMDType == IMDTYPE_DROID)
{
displayComponentButtonObject((DROID *)Object, &Rotation, &Position, true, scale);
displayComponentButtonObject((DROID *)Object, &Rotation, &Position, scale);
}
else
{
displayComponentButtonTemplate((DROID_TEMPLATE *)Object, &Rotation, &Position, true, scale);
displayComponentButtonTemplate((DROID_TEMPLATE *)Object, &Rotation, &Position, scale);
}
}
else
@ -1576,23 +1576,23 @@ void IntFancyButton::displayIMD(Image image, ImdObject imdObject, int xOffset, i
/* all non droid buttons */
if (IMDType == IMDTYPE_COMPONENT)
{
displayComponentButton((BASE_STATS *)Object, &Rotation, &Position, true, scale);
displayComponentButton((BASE_STATS *)Object, &Rotation, &Position, scale);
}
else if (IMDType == IMDTYPE_RESEARCH)
{
displayResearchButton((BASE_STATS *)Object, &Rotation, &Position, true, scale);
displayResearchButton((BASE_STATS *)Object, &Rotation, &Position, scale);
}
else if (IMDType == IMDTYPE_STRUCTURE)
{
displayStructureButton((STRUCTURE *)Object, &Rotation, &Position, true, scale);
displayStructureButton((STRUCTURE *)Object, &Rotation, &Position, scale);
}
else if (IMDType == IMDTYPE_STRUCTURESTAT)
{
displayStructureStatButton((STRUCTURE_STATS *)Object, &Rotation, &Position, true, scale);
displayStructureStatButton((STRUCTURE_STATS *)Object, &Rotation, &Position, scale);
}
else
{
displayIMDButton((iIMDShape *)Object, &Rotation, &Position, true, scale);
displayIMDButton((iIMDShape *)Object, &Rotation, &Position, scale);
}
pie_SetDepthBufferStatus(DEPTH_CMP_ALWAYS_WRT_ON);

9
src/mapdisplay.cpp
View File

@ -53,9 +53,6 @@ void renderResearchToBuffer(RESEARCH *psResearch, UDWORD OriginX, UDWORD OriginY
pie_SetGeometricOffset(OriginX+10, OriginY+10);
// Pitch down a bit
//pie_MatRotX(-65536/12);
// Rotate round
// full rotation once every 2 seconds..
angle = (realTime % ROTATE_TIME) * 360 / ROTATE_TIME;
@ -163,15 +160,15 @@ void renderResearchToBuffer(RESEARCH *psResearch, UDWORD OriginX, UDWORD OriginY
/* display the IMDs */
if(IMDType == IMDTYPE_COMPONENT)
{
displayComponentButton(psResGraphic, &Rotation, &Position, true, scale);
displayComponentButton(psResGraphic, &Rotation, &Position, scale);
}
else if(IMDType == IMDTYPE_RESEARCH)
{
displayResearchButton(psResGraphic, &Rotation, &Position, true, scale);
displayResearchButton(psResGraphic, &Rotation, &Position, scale);
}
else if(IMDType == IMDTYPE_STRUCTURESTAT)
{
displayStructureStatButton((STRUCTURE_STATS *)psResGraphic, &Rotation, &Position, true, scale);
displayStructureStatButton((STRUCTURE_STATS *)psResGraphic, &Rotation, &Position, scale);
}
else
{

2
src/multilimit.cpp
View File

@ -363,7 +363,7 @@ static void displayStructureBar(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset
}
pie_SetDepthBufferStatus(DEPTH_CMP_LEQ_WRT_ON);
displayStructureStatButton(stat, &rotation, &position, true, scale);
displayStructureStatButton(stat, &rotation, &position, scale);
pie_SetDepthBufferStatus(DEPTH_CMP_ALWAYS_WRT_ON);
// draw name

2
src/multimenu.cpp
View File

@ -867,7 +867,7 @@ static void displayMultiPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset)
position.z = 4100;
}
displayComponentButtonObject(displayDroid, &rotation, &position, false, 100);
displayComponentButtonObject(displayDroid, &rotation, &position, 100);
}
else if (apsDroidLists[player])
{