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

Allow queuing of DORDER_SCOUT (shift+click) 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7009 4a71c877-e1ca-e34f-864e-861f7616d084
master
Guangcong Luo 2009-04-11 00:38:28 +00:00 committed by Git SVN Gateway
parent b56294cb1c
commit dda2e8539a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/display.c
View File

@ -407,7 +407,7 @@ void ProcessRadarInput(void)
CalcRadarPosition(x, y, &PosX, &PosY);
setViewPos(PosX,PosY,true);
bRadarDragging = true;
if(keyDown(KEY_LCTRL) || keyDown(KEY_RCTRL))
if (ctrlShiftDown())
{
player.r.y = 0;
}
@ -574,8 +574,7 @@ static void CheckFinishedDrag(void)
}
/* Only clear if shift isn't down - this is for the drag selection box for units*/
if(!keyDown(KEY_LCTRL) && !keyDown(KEY_RCTRL)
&& !keyDown(KEY_LSHIFT) && !keyDown(KEY_RSHIFT) && wallDrag.status==DRAG_INACTIVE)
if(!ctrlShiftDown() && wallDrag.status==DRAG_INACTIVE)
{
clearSelection();
}
@ -1615,7 +1614,7 @@ void dealWithDroidSelect(DROID *psDroid, BOOL bDragBox)
/* Fix this ALEX M!!! */
}
}
else if (keyDown(KEY_LCTRL) || keyDown(KEY_RCTRL) || keyDown(KEY_LSHIFT) || keyDown(KEY_RSHIFT)
else if (ctrlShiftDown()
|| !droidHasLeader(psDroid))
{
@ -1770,8 +1769,7 @@ static inline void dealWithLMBDroid(DROID* psDroid, SELECTION_TYPE selection)
else if (psDroid->droidType == DROID_COMMAND && selection != SC_INVALID &&
selection != SC_DROID_COMMAND &&
selection != SC_DROID_CONSTRUCT &&
!(keyDown(KEY_LCTRL) || keyDown(KEY_RCTRL)) &&
!(keyDown(KEY_LSHIFT) || keyDown(KEY_RSHIFT)))
!ctrlShiftDown())
{
turnOffMultiMsg(true);
orderSelectedObj(selectedPlayer, (BASE_OBJECT*)psDroid);
@ -2190,7 +2188,7 @@ void dealWithLMB( void )
if (psLocation == NULL || driveModeActive() || selNumSelected(selectedPlayer))
{
// now changed to use the multiple order stuff
if(keyDown(KEY_LCTRL) || keyDown(KEY_RCTRL)) // ctrl clicked a destination, add an order
if (ctrlShiftDown()) // ctrl clicked a destination, add an order
{
orderSelectedLocAdd(selectedPlayer,
mouseTileX*TILE_UNITS+TILE_UNITS/2,

5
src/order.c
View File

@ -2457,6 +2457,7 @@ BOOL orderDroidList(DROID *psDroid)
switch (psDroid->asOrderList[0].order)
{
case DORDER_MOVE:
case DORDER_SCOUT:
sOrder.psObj = NULL;
break;
case DORDER_ATTACK:
@ -2561,8 +2562,8 @@ static BOOL orderDroidLocAdd(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWORD
{
DROID_ORDER_DATA sOrder;
// can only queue move orders
if (order != DORDER_MOVE)
// can only queue move and scout orders
if (order != DORDER_MOVE && order != DORDER_SCOUT)
{
return false;
}