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

Fix bug #11911: two patrol buttons. Patrol now has a new icon, drawn by 

elio. Circle now has correct tooltip and uses old patrol icon. Some
spelling issues also fixed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5565 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-07-16 12:06:26 +00:00
parent d98f300696
commit eb3ac2e356
8 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/base/images/intfac.img
View File

@ -371,10 +371,10 @@
2,9,99,4,5,0,0,"IMAGE GN 2"
2,5,99,2,5,0,0,"IMAGE GN 1"
2,0,99,4,5,0,0,"IMAGE GN 0"
4,74,126,36,24,0,0,"IMAGE ORD PATROLUP"
4,111,126,36,24,0,0,"IMAGE ORD PATROLDOWN"
4,0,126,36,24,0,0,"IMAGE ORD PERSUEUP"
4,37,126,36,24,0,0,"IMAGE ORD PERSUEDOWN"
4,74,126,36,24,0,0,"IMAGE ORD CIRCLEUP"
4,111,126,36,24,0,0,"IMAGE ORD CIRCLEDOWN"
4,0,126,36,24,0,0,"IMAGE ORD PURSUEUP"
4,37,126,36,24,0,0,"IMAGE ORD PURSUEDOWN"
4,148,125,36,24,0,0,"IMAGE ORD GUARDUP"
4,185,125,36,24,0,0,"IMAGE ORD GUARDDOWN"
4,217,155,36,24,0,0,"IMAGE ORD RTRUP"
@ -489,6 +489,8 @@
0,137,165,7,10,0,0,"IMAGE RGTTABD"
0,134,179,9,14,0,0,"IMAGE RGTTABH"
0,134,179,9,14,0,0,"IMAGE NADDA"
5,0,59,36,24,0,0,"IMAGE ORD PATROLUP"
5,37,59,36,24,0,0,"IMAGE ORD PATROLDOWN"
5,0,0,37,29,-5,1,"IMAGE EDIT OPTIONS UP"
5,0,29,37,29,-5,1,"IMAGE EDIT OPTIONS DOWN"
5,185,0,37,29,-5,1,"IMAGE EDIT TILES UP"

BIN
data/base/images/intfac5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

10
src/intfac.h
View File

@ -398,10 +398,10 @@ enum {
IMAGE_GN_2,
IMAGE_GN_1,
IMAGE_GN_0,
IMAGE_ORD_PATROLUP,
IMAGE_ORD_PATROLDOWN,
IMAGE_ORD_PERSUEUP,
IMAGE_ORD_PERSUEDOWN,
IMAGE_ORD_CIRCLEUP,
IMAGE_ORD_CIRCLEDOWN,
IMAGE_ORD_PURSUEUP,
IMAGE_ORD_PURSUEDOWN,
IMAGE_ORD_GUARDUP,
IMAGE_ORD_GUARDDOWN,
IMAGE_ORD_RTRUP,
@ -516,6 +516,8 @@ enum {
IMAGE_RGTTABD,
IMAGE_RGTTABH,
IMAGE_NADDA,
IMAGE_ORD_PATROLUP,
IMAGE_ORD_PATROLDOWN,
};
#endif // __INCLUDED_SRC_INTFAC_H__

22
src/intorder.c
View File

@ -156,7 +156,7 @@ enum
STR_DORD_FIRE2,
STR_DORD_FIRE3,
STR_DORD_PATROL,
STR_DORD_PERSUE,
STR_DORD_PURSUE,
STR_DORD_GUARD,
STR_DORD_HOLDPOS,
STR_DORD_RETREPAIR,
@ -167,7 +167,8 @@ enum
STR_DORD_FACTORY,
STR_DORD_CYBORG_FACTORY,
STR_DORD_FIREDES,
STR_DORD_VTOL_FACTORY
STR_DORD_VTOL_FACTORY,
STR_DORD_CIRCLE,
};
// return translated text
@ -185,7 +186,7 @@ static const char *getDORDDescription(int id)
case STR_DORD_FIRE2 : return _("Return Fire");
case STR_DORD_FIRE3 : return _("Hold Fire");
case STR_DORD_PATROL : return _("Patrol");
case STR_DORD_PERSUE : return _("Pursue");
case STR_DORD_PURSUE : return _("Pursue");
case STR_DORD_GUARD : return _("Guard Position");
case STR_DORD_HOLDPOS : return _("Hold Position");
case STR_DORD_RETREPAIR : return _("Return For Repair");
@ -197,6 +198,7 @@ static const char *getDORDDescription(int id)
case STR_DORD_CYBORG_FACTORY : return _("Assign Cyborg Factory Production");
case STR_DORD_FIREDES : return _("Assign Fire Support");
case STR_DORD_VTOL_FACTORY : return _("Assign VTOL Factory Production");
case STR_DORD_CIRCLE : return _("Circle");
default : return ""; // make compiler shut up
}
@ -285,10 +287,10 @@ ORDERBUTTONS OrderButtons[NUM_ORDERS]=
ORD_JUSTIFY_COMBINE,
IDORDER_CIRCLE,
1,0,
{IMAGE_ORD_PATROLUP, 0, 0},
{IMAGE_ORD_PATROLUP, 0, 0},
{IMAGE_ORD_CIRCLEUP, 0, 0},
{IMAGE_ORD_CIRCLEUP, 0, 0},
{IMAGE_DES_HILIGHT, 0, 0},
{STR_DORD_PATROL, 0, 0},
{STR_DORD_CIRCLE, 0, 0},
{DSS_CIRCLE_SET, 0, 0}
},
@ -300,11 +302,11 @@ ORDERBUTTONS OrderButtons[NUM_ORDERS]=
ORD_JUSTIFY_CENTER | ORD_JUSTIFY_NEWLINE,
IDORDER_HALT_TYPE,
3,0,
{IMAGE_ORD_PERSUEUP, IMAGE_ORD_GUARDUP, IMAGE_ORD_HALTUP},
{IMAGE_ORD_PERSUEUP, IMAGE_ORD_GUARDUP, IMAGE_ORD_HALTUP},
{IMAGE_ORD_PURSUEUP, IMAGE_ORD_GUARDUP, IMAGE_ORD_HALTUP},
{IMAGE_ORD_PURSUEUP, IMAGE_ORD_GUARDUP, IMAGE_ORD_HALTUP},
{IMAGE_DES_HILIGHT, IMAGE_DES_HILIGHT, IMAGE_DES_HILIGHT},
{STR_DORD_PERSUE, STR_DORD_GUARD, STR_DORD_HOLDPOS},
{DSS_HALT_PERSUE, DSS_HALT_GUARD, DSS_HALT_HOLD}
{STR_DORD_PURSUE, STR_DORD_GUARD, STR_DORD_HOLDPOS},
{DSS_HALT_PURSUE, DSS_HALT_GUARD, DSS_HALT_HOLD}
},
{
ORDBUTCLASS_NORMAL,

2
src/keybind.c
View File

@ -2039,7 +2039,7 @@ void kf_SetDroidMoveHold( void )
// --------------------------------------------------------------------------
void kf_SetDroidMovePursue( void )
{
kfsf_SetSelectedDroidsState(DSO_HALTTYPE,DSS_HALT_PERSUE); // ASK?
kfsf_SetSelectedDroidsState(DSO_HALTTYPE,DSS_HALT_PURSUE); // ASK?
}
// --------------------------------------------------------------------------

8
src/order.c
View File

@ -3629,9 +3629,9 @@ BOOL secondarySetState(DROID *psDroid, SECONDARY_ORDER sec, SECONDARY_STATE Stat
case DSO_HALTTYPE:
switch (State & DSS_HALT_MASK)
{
case DSS_HALT_PERSUE:
case DSS_HALT_PURSUE:
CurrState &= ~ DSS_HALT_MASK;
CurrState |= DSS_HALT_PERSUE;
CurrState |= DSS_HALT_PURSUE;
if (orderState(psDroid, DORDER_GUARD))
{
orderDroid(psDroid, DORDER_STOP);
@ -4118,9 +4118,9 @@ BOOL setFactoryState(STRUCTURE *psStruct, SECONDARY_ORDER sec, SECONDARY_STATE S
case DSO_HALTTYPE:
switch (State & DSS_HALT_MASK)
{
case DSS_HALT_PERSUE:
case DSS_HALT_PURSUE:
CurrState &= ~ DSS_HALT_MASK;
CurrState |= DSS_HALT_PERSUE;
CurrState |= DSS_HALT_PURSUE;
break;
case DSS_HALT_GUARD:
CurrState &= ~ DSS_HALT_MASK;

2
src/order.h
View File

@ -109,7 +109,7 @@ typedef enum _secondary_state
DSS_ALEV_NEVER = 0x000030,
DSS_HALT_HOLD = 0x000040,
DSS_HALT_GUARD = 0x000080,
DSS_HALT_PERSUE = 0x0000c0,
DSS_HALT_PURSUE = 0x0000c0,
DSS_RECYCLE_SET = 0x000100,
DSS_ASSPROD_START = 0x000200,
DSS_ASSPROD_MID = 0x002000,

2
src/scripttabs.c
View File

@ -1876,7 +1876,7 @@ CONST_SYMBOL asConstantTable[] =
{ "DSS_ALEV_NEVER", VAL_INT, false, DSS_ALEV_NEVER, NULL, NULL, 0.0f },
{ "DSS_HALT_HOLD", VAL_INT, false, DSS_HALT_HOLD, NULL, NULL, 0.0f },
{ "DSS_HALT_GUARD", VAL_INT, false, DSS_HALT_GUARD, NULL, NULL, 0.0f },
{ "DSS_HALT_PERSUE", VAL_INT, false, DSS_HALT_PERSUE, NULL, NULL, 0.0f },
{ "DSS_HALT_PERSUE", VAL_INT, false, DSS_HALT_PURSUE, NULL, NULL, 0.0f },
{ "DSS_RECYCLE_SET", VAL_INT, false, DSS_RECYCLE_SET, NULL, NULL, 0.0f },
{ "DSS_ASSPROD_START", VAL_INT, false, DSS_ASSPROD_START, NULL, NULL, 0.0f },
{ "DSS_ASSPROD_END ", VAL_INT, false, DSS_ASSPROD_END , NULL, NULL, 0.0f },