[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/ui mouse.c
|
From: |
Jimmy Salmon |
|
Subject: |
[Stratagus-CVS] stratagus/src/ui mouse.c |
|
Date: |
Tue, 30 Sep 2003 21:00:48 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/09/30 21:00:48
Modified files:
src/ui : mouse.c
Log message:
Cleanup
Patches:
Index: stratagus/src/ui/mouse.c
diff -u stratagus/src/ui/mouse.c:1.149 stratagus/src/ui/mouse.c:1.150
--- stratagus/src/ui/mouse.c:1.149 Mon Sep 29 22:53:03 2003
+++ stratagus/src/ui/mouse.c Tue Sep 30 21:00:48 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mouse.c,v 1.149 2003/09/30 02:53:03 jsalmon3 Exp $
+// $Id: mouse.c,v 1.150 2003/10/01 01:00:48 jsalmon3 Exp $
//@{
@@ -66,8 +66,8 @@
global enum _key_modifiers_ KeyModifiers;/// Current keyboard modifiers
global Unit* UnitUnderCursor; /// Unit under cursor
-global int ButtonAreaUnderCursor=-1; /// Button area under cursor
-global int ButtonUnderCursor=-1; /// Button under cursor
+global int ButtonAreaUnderCursor = -1; /// Button area under cursor
+global int ButtonUnderCursor = -1; /// Button under cursor
global char GameMenuButtonClicked; /// Menu button was clicked
global char GameDiplomacyButtonClicked; /// Diplomacy button was clicked
global char LeaveStops; /// Mouse leaves windows stops
scroll
@@ -99,14 +99,14 @@
** @param sx X map position in pixels.
** @param sy Y map position in pixels.
*/
-global void DoRightButton(int sx,int sy)
+global void DoRightButton(int sx, int sy)
{
int i;
int x;
int y;
Unit* dest;
Unit* unit;
- Unit* desttransporter=0;
+ Unit* desttransporter = 0;
UnitType* type;
int action;
int acknowledged;
@@ -116,7 +116,7 @@
//
// No unit selected
//
- if( !NumSelected ) {
+ if (!NumSelected) {
return;
}
@@ -124,7 +124,7 @@
// Unit selected isn't owned by the player.
// You can't select your own units + foreign unit(s).
//
- if( Selected[0]->Player!=ThisPlayer ) {
+ if (Selected[0]->Player != ThisPlayer) {
return;
}
@@ -134,11 +134,11 @@
//
// Right mouse with SHIFT appends command to old commands.
//
- flush=!(KeyModifiers&ModifierShift);
+ flush = !(KeyModifiers & ModifierShift);
- dest=UnitUnderCursor;
+ dest = UnitUnderCursor;
- if( dest && dest->Type->Transporter ) {
+ if (dest && dest->Type->Transporter) {
// n0b0dy: So we are clicking on a transporter. We have to:
// 1) Flush the transporters orders.
// 2) Tell the transporter to follow the units. We have to queue all
@@ -147,178 +147,177 @@
//
// Here we flush the order queue
SendCommandStopUnit(dest);
- desttransporter=dest;
+ desttransporter = dest;
}
// FIXME: the next should be rewritten, must select the units with
// FIXME: the box size and not with the tile position
// FIXME: and for a group of units this is slow!
- acknowledged=0;
- for( i=0; i<NumSelected; ++i ) {
- unit=Selected[i];
+ acknowledged = 0;
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
// If we are telling units to board a transporter,
// don't give the transport extra orders.
- if (unit==desttransporter) {
+ if (unit == desttransporter) {
continue;
}
- DebugCheck( !unit );
- if( !acknowledged ) {
- PlayUnitSound(unit,VoiceAcknowledging);
- acknowledged=1;
+ DebugCheck(!unit);
+ if (!acknowledged) {
+ PlayUnitSound(unit, VoiceAcknowledging);
+ acknowledged = 1;
}
- type=unit->Type;
- action=type->MouseAction;
+ type = unit->Type;
+ action = type->MouseAction;
DebugLevel3Fn("Mouse action %d\n" _C_ action);
//
// Control + right click on unit is follow anything.
//
- if( KeyModifiers&ModifierControl && dest && dest!=unit) {
- dest->Blink=4;
- SendCommandFollow(unit,dest,flush);
+ if (KeyModifiers & ModifierControl && dest && dest!=unit) {
+ dest->Blink = 4;
+ SendCommandFollow(unit, dest, flush);
continue;
}
//
// Enter transporters?
//
- if( dest && dest->Type->Transporter &&
- dest->Player==unit->Player
- && unit->Type->UnitType==UnitTypeLand ) {
- dest->Blink=4;
+ if (dest && dest->Type->Transporter && dest->Player == unit->Player &&
+ unit->Type->UnitType == UnitTypeLand) {
+ dest->Blink = 4;
DebugLevel0Fn("Board transporter\n");
// Let the transporter move to the unit. And QUEUE!!!
- SendCommandFollow(dest,unit,0);
- SendCommandBoard(unit,-1,-1,dest,flush);
+ SendCommandFollow(dest, unit, 0);
+ SendCommandBoard(unit, -1, -1, dest, flush);
continue;
}
//
// Handle resource workers.
//
- if( action==MouseActionHarvest ) {
+ if (action == MouseActionHarvest) {
if (unit->Type->Harvester) {
- if ( dest ) {
+ if (dest) {
// Return a loaded harvester to deposit
- if( (unit->Value>0) &&
- (dest->Type->CanStore[unit->CurrentResource])&&
- (dest->Player==unit->Player) ) {
- dest->Blink=4;
+ if ((unit->Value > 0) &&
+ (dest->Type->CanStore[unit->CurrentResource]) &&
+ (dest->Player == unit->Player)) {
+ dest->Blink = 4;
DebugLevel3Fn("Return to deposit.\n");
- SendCommandReturnGoods(unit,dest,flush);
+ SendCommandReturnGoods(unit, dest, flush);
continue;
}
// Go and harvest from an building
- if( (res=dest->Type->GivesResource) &&
+ if ((res=dest->Type->GivesResource) &&
(unit->Type->ResInfo[res]) &&
-
(unit->Value<unit->Type->ResInfo[res]->ResourceCapacity) &&
+ (unit->Value <
unit->Type->ResInfo[res]->ResourceCapacity) &&
(dest->Type->CanHarvest) &&
- (dest->Player==unit->Player ||
- (dest->Player->Player==PlayerMax-1)) ) {
- dest->Blink=4;
- SendCommandResource(unit,dest,flush);
+ (dest->Player == unit->Player ||
+ (dest->Player->Player == PlayerMax - 1))) {
+ dest->Blink = 4;
+ SendCommandResource(unit, dest, flush);
continue;
}
} else {
// FIXME: support harvesting more types of terrain.
- for (res=0;res<MaxCosts;res++) {
- if ( (unit->Type->ResInfo[res]) &&
+ for (res = 0; res < MaxCosts; ++res) {
+ if ((unit->Type->ResInfo[res]) &&
(unit->Type->ResInfo[res]->TerrainHarvester) &&
- (IsMapFieldExplored(unit->Player,x,y)) &&
- (ForestOnMap(x,y)) &&
- ((unit->CurrentResource!=res)||
-
(unit->Value<unit->Type->ResInfo[res]->ResourceCapacity))) {
+ (IsMapFieldExplored(unit->Player, x, y)) &&
+ (ForestOnMap(x, y)) &&
+ ((unit->CurrentResource != res) ||
+ (unit->Value <
unit->Type->ResInfo[res]->ResourceCapacity))) {
DebugLevel3("Sent worker to cut wood.\n");
- SendCommandResourceLoc(unit,x,y,flush);
+ SendCommandResourceLoc(unit, x, y,flush);
break;
}
}
- if (res!=MaxCosts) {
+ if (res != MaxCosts) {
continue;
}
}
}
// Go and repair
- if ( (unit->Type->RepairRange) && dest &&
+ if ((unit->Type->RepairRange) && dest &&
(dest->Type->RepairHP) &&
- dest->HP < dest->Stats->HitPoints &&
- (dest->Player==unit->Player || IsAllied(dest->Player,dest))
) {
- dest->Blink=4;
- SendCommandRepair(unit,x,y,dest,flush);
+ dest->HP < dest->Stats->HitPoints &&
+ (dest->Player == unit->Player || IsAllied(dest->Player,
dest))) {
+ dest->Blink = 4;
+ SendCommandRepair(unit, x, y, dest, flush);
continue;
}
// Follow another unit
- if( UnitUnderCursor && dest && dest!=unit &&
- (dest->Player==unit->Player || IsAllied(unit->Player,dest))
) {
- dest->Blink=4;
- SendCommandFollow(unit,dest,flush);
+ if (UnitUnderCursor && dest && dest != unit &&
+ (dest->Player == unit->Player || IsAllied(unit->Player,
dest))) {
+ dest->Blink = 4;
+ SendCommandFollow(unit, dest, flush);
continue;
}
// Move
- SendCommandMove(unit,x,y,flush);
+ SendCommandMove(unit, x, y, flush);
continue;
}
//
// Fighters
//
- if( action==MouseActionDemolish || action==MouseActionAttack ) {
- if( dest ) {
- if( IsEnemy(unit->Player,dest) ) {
- dest->Blink=4;
- if( action==MouseActionDemolish ) {
+ if (action == MouseActionDemolish || action == MouseActionAttack) {
+ if (dest) {
+ if (IsEnemy(unit->Player, dest)) {
+ dest->Blink = 4;
+ if (action == MouseActionDemolish) {
// This is for demolition squads and such
- SendCommandDemolish(unit,x,y,dest,flush);
+ SendCommandDemolish(unit, x, y, dest, flush);
} else {
- SendCommandAttack(unit,x,y,dest,flush);
+ SendCommandAttack(unit, x, y, dest, flush);
}
continue;
}
- if( WallOnMap(x,y) ) {
+ if (WallOnMap(x, y)) {
DebugLevel3("WALL ON TILE\n");
- if( unit->Player->Race==PlayerRaceHuman
- && OrcWallOnMap(x,y) ) {
+ if (unit->Player->Race == PlayerRaceHuman &&
+ OrcWallOnMap(x, y)) {
DebugLevel3("HUMAN ATTACKS ORC\n");
- SendCommandAttack(unit,x,y,NoUnitP,flush);
+ SendCommandAttack(unit, x, y, NoUnitP, flush);
continue;
}
- if( unit->Player->Race==PlayerRaceOrc
- && HumanWallOnMap(x,y) ) {
+ if (unit->Player->Race == PlayerRaceOrc &&
+ HumanWallOnMap(x, y)) {
DebugLevel3("ORC ATTACKS HUMAN\n");
- SendCommandAttack(unit,x,y,NoUnitP,flush);
+ SendCommandAttack(unit, x, y, NoUnitP, flush);
continue;
}
}
- if( (dest->Player==unit->Player||IsAllied(unit->Player,dest))
- && dest!=unit ) {
- dest->Blink=4;
- SendCommandFollow(unit,dest,flush);
+ if ((dest->Player == unit->Player || IsAllied(unit->Player,
dest)) &&
+ dest != unit) {
+ dest->Blink = 4;
+ SendCommandFollow(unit, dest, flush);
continue;
}
#ifdef NEW_SHIPS
- if( unit->Type->UnitType!=UnitTypeLand ) {
- x&=~1;
- y&=~1; // Ships could only even fields
+ if (unit->Type->UnitType != UnitTypeLand) {
+ x &= ~1;
+ y &= ~1; // Ships could only even fields
}
#endif
}
// empty space
- if( (KeyModifiers&ModifierControl) ) {
- if( RightButtonAttacks ) {
- SendCommandMove(unit,x,y,flush);
+ if ((KeyModifiers & ModifierControl)) {
+ if (RightButtonAttacks) {
+ SendCommandMove(unit, x, y, flush);
} else {
- SendCommandAttack(unit,x,y,NoUnitP,flush);
+ SendCommandAttack(unit, x, y, NoUnitP, flush);
}
} else {
- if( RightButtonAttacks ) {
- SendCommandAttack(unit,x,y,NoUnitP,flush);
+ if (RightButtonAttacks) {
+ SendCommandAttack(unit, x, y, NoUnitP, flush);
} else {
// Note: move is correct here, right default is move
- SendCommandMove(unit,x,y,flush);
+ SendCommandMove(unit, x, y, flush);
}
}
// FIXME: ALT-RIGHT-CLICK, move but fight back if attacked.
@@ -326,11 +325,11 @@
}
// FIXME: attack/follow/board ...
- if( (action==MouseActionMove || action==MouseActionSail) &&
- (dest && dest!=unit) &&
- (dest->Player==unit->Player|| IsAllied(unit->Player,dest))) {
- dest->Blink=4;
- SendCommandFollow(unit,dest,flush);
+ if ((action == MouseActionMove || action == MouseActionSail) &&
+ (dest && dest != unit) &&
+ (dest->Player == unit->Player|| IsAllied(unit->Player, dest))) {
+ dest->Blink = 4;
+ SendCommandFollow(unit, dest, flush);
continue;
}
@@ -338,35 +337,35 @@
// Ships
//
#ifdef NEW_SHIPS
- if( action==MouseActionSail ) {
- x&=~1;
- y&=~1; // Ships could only even fields
- }
- if( unit->Type->UnitType!=UnitTypeLand ) {
- x&=~1;
- y&=~1; // Ships could only even fields
+ if (action == MouseActionSail) {
+ x &= ~1;
+ y &= ~1; // Ships could only even fields
+ }
+ if (unit->Type->UnitType != UnitTypeLand) {
+ x &= ~1;
+ y &= ~1; // Ships could only even fields
}
#endif
if (type->Building) {
- if( dest && dest->Type->GivesResource ) {
- dest->Blink=4;
+ if (dest && dest->Type->GivesResource) {
+ dest->Blink = 4;
DebugLevel3("Set rally point to a resource.\n");
-
SendCommandResource(Selected[i],dest,!(KeyModifiers&ModifierShift));
+ SendCommandResource(Selected[i],dest, !(KeyModifiers &
ModifierShift));
continue;
}
- if( IsMapFieldExplored(unit->Player,x,y) && ForestOnMap(x,y) ) {
+ if (IsMapFieldExplored(unit->Player, x, y) && ForestOnMap(x, y)) {
DebugLevel3("Set rally point to a forest.\n");
-
SendCommandResourceLoc(Selected[i],x,y,!(KeyModifiers&ModifierShift));
+ SendCommandResourceLoc(Selected[i], x, y,!(KeyModifiers &
ModifierShift));
continue;
}
DebugLevel3("Set rally point to a location.\n");
- SendCommandMove(unit,x,y,flush);
+ SendCommandMove(unit, x, y, flush);
continue;
}
- SendCommandMove(unit,x,y,flush);
+ SendCommandMove(unit, x, y, flush);
}
- ShowOrdersCount=GameCycle+ShowOrders*CYCLES_PER_SECOND;
+ ShowOrdersCount = GameCycle + ShowOrders * CYCLES_PER_SECOND;
}
/**
@@ -375,7 +374,7 @@
** @param x X map tile position.
** @param y Y map tile position.
*/
-local void HandleMouseOn(int x,int y)
+local void HandleMouseOn(int x, int y)
{
int i;
@@ -386,105 +385,105 @@
//
// Handle buttons
//
- if( NetworkFildes==(Socket)-1 ) {
- if( TheUI.MenuButton.X!=-1 ) {
- if( x>=TheUI.MenuButton.X
- && x<=TheUI.MenuButton.X+TheUI.MenuButton.Width
- && y>TheUI.MenuButton.Y
- && y<=TheUI.MenuButton.Y+TheUI.MenuButton.Height ) {
- ButtonAreaUnderCursor=ButtonAreaMenu;
- ButtonUnderCursor=ButtonUnderMenu;
- CursorOn=CursorOnButton;
- MustRedraw|=RedrawMenuButton;
+ if (NetworkFildes == (Socket)-1) {
+ if (TheUI.MenuButton.X != -1) {
+ if (x >= TheUI.MenuButton.X &&
+ x <= TheUI.MenuButton.X + TheUI.MenuButton.Width &&
+ y > TheUI.MenuButton.Y &&
+ y <= TheUI.MenuButton.Y + TheUI.MenuButton.Height) {
+ ButtonAreaUnderCursor = ButtonAreaMenu;
+ ButtonUnderCursor = ButtonUnderMenu;
+ CursorOn = CursorOnButton;
+ MustRedraw |= RedrawMenuButton;
return;
}
}
} else {
- if( TheUI.NetworkMenuButton.X!=-1 ) {
- if( x>=TheUI.NetworkMenuButton.X
- &&
x<=TheUI.NetworkMenuButton.X+TheUI.NetworkMenuButton.Width
- && y>TheUI.NetworkMenuButton.Y
- &&
y<=TheUI.NetworkMenuButton.Y+TheUI.NetworkMenuButton.Height ) {
- ButtonAreaUnderCursor=ButtonAreaMenu;
- ButtonUnderCursor=ButtonUnderNetworkMenu;
- CursorOn=CursorOnButton;
- MustRedraw|=RedrawMenuButton;
+ if (TheUI.NetworkMenuButton.X != -1) {
+ if (x >= TheUI.NetworkMenuButton.X &&
+ x <= TheUI.NetworkMenuButton.X +
TheUI.NetworkMenuButton.Width &&
+ y > TheUI.NetworkMenuButton.Y &&
+ y <= TheUI.NetworkMenuButton.Y +
TheUI.NetworkMenuButton.Height) {
+ ButtonAreaUnderCursor = ButtonAreaMenu;
+ ButtonUnderCursor = ButtonUnderNetworkMenu;
+ CursorOn = CursorOnButton;
+ MustRedraw |= RedrawMenuButton;
return;
}
}
- if( TheUI.NetworkDiplomacyButton.X!=-1 ) {
- if( x>=TheUI.NetworkDiplomacyButton.X
- &&
x<=TheUI.NetworkDiplomacyButton.X+TheUI.NetworkDiplomacyButton.Width
- && y>TheUI.NetworkDiplomacyButton.Y
- &&
y<=TheUI.NetworkDiplomacyButton.Y+TheUI.NetworkDiplomacyButton.Height ) {
- ButtonAreaUnderCursor=ButtonAreaMenu;
- ButtonUnderCursor=ButtonUnderNetworkDiplomacy;
- CursorOn=CursorOnButton;
- MustRedraw|=RedrawMenuButton;
+ if (TheUI.NetworkDiplomacyButton.X != -1) {
+ if (x >= TheUI.NetworkDiplomacyButton.X &&
+ x <= TheUI.NetworkDiplomacyButton.X +
TheUI.NetworkDiplomacyButton.Width &&
+ y > TheUI.NetworkDiplomacyButton.Y &&
+ y <= TheUI.NetworkDiplomacyButton.Y +
TheUI.NetworkDiplomacyButton.Height) {
+ ButtonAreaUnderCursor = ButtonAreaMenu;
+ ButtonUnderCursor = ButtonUnderNetworkDiplomacy;
+ CursorOn = CursorOnButton;
+ MustRedraw |= RedrawMenuButton;
return;
}
}
}
- for( i=0; i<TheUI.NumButtonButtons; ++i ) {
- if( x>=TheUI.ButtonButtons[i].X
- && x<=TheUI.ButtonButtons[i].X+TheUI.ButtonButtons[i].Width+7
- && y>TheUI.ButtonButtons[i].Y
- && y<=TheUI.ButtonButtons[i].Y+TheUI.ButtonButtons[i].Height+7
) {
- ButtonAreaUnderCursor=ButtonAreaButton;
- ButtonUnderCursor=i;
- CursorOn=CursorOnButton;
- MustRedraw|=RedrawButtonPanel;
+ for (i = 0; i < TheUI.NumButtonButtons; ++i) {
+ if (x >= TheUI.ButtonButtons[i].X &&
+ x <= TheUI.ButtonButtons[i].X + TheUI.ButtonButtons[i].Width +
7 &&
+ y>TheUI.ButtonButtons[i].Y &&
+ y<=TheUI.ButtonButtons[i].Y + TheUI.ButtonButtons[i].Height +
7) {
+ ButtonAreaUnderCursor = ButtonAreaButton;
+ ButtonUnderCursor = i;
+ CursorOn = CursorOnButton;
+ MustRedraw |= RedrawButtonPanel;
return;
}
}
- if( NumSelected==1 && Selected[0]->Type->Building
- && Selected[0]->Orders[0].Action==UnitActionTrain
- && Selected[0]->Data.Train.Count>1 ) {
- for( i=0; i<TheUI.NumTrainingButtons; ++i ) {
- if( x>=TheUI.TrainingButtons[i].X
- &&
x<=TheUI.TrainingButtons[i].X+TheUI.TrainingButtons[i].Width+7
- && y>TheUI.TrainingButtons[i].Y
- &&
y<=TheUI.TrainingButtons[i].Y+TheUI.TrainingButtons[i].Height+7 ) {
- ButtonAreaUnderCursor=ButtonAreaTraining;
- ButtonUnderCursor=i;
- CursorOn=CursorOnButton;
- MustRedraw|=RedrawButtonPanel;
+ if (NumSelected == 1 && Selected[0]->Type->Building &&
+ Selected[0]->Orders[0].Action == UnitActionTrain &&
+ Selected[0]->Data.Train.Count > 1) {
+ for (i = 0; i < TheUI.NumTrainingButtons; ++i) {
+ if (x >= TheUI.TrainingButtons[i].X &&
+ x <= TheUI.TrainingButtons[i].X +
TheUI.TrainingButtons[i].Width + 7 &&
+ y > TheUI.TrainingButtons[i].Y &&
+ y <= TheUI.TrainingButtons[i].Y +
TheUI.TrainingButtons[i].Height + 7) {
+ ButtonAreaUnderCursor = ButtonAreaTraining;
+ ButtonUnderCursor = i;
+ CursorOn = CursorOnButton;
+ MustRedraw |= RedrawButtonPanel;
return;
}
}
} else {
- for( i=0; i<TheUI.NumInfoButtons; ++i ) {
- if( x>=TheUI.InfoButtons[i].X
- && x<=TheUI.InfoButtons[i].X+TheUI.InfoButtons[i].Width+7
- && y>TheUI.InfoButtons[i].Y
- && y<=TheUI.InfoButtons[i].Y+TheUI.InfoButtons[i].Height+7
) {
- ButtonAreaUnderCursor=ButtonAreaInfo;
- ButtonUnderCursor=i;
- CursorOn=CursorOnButton;
- MustRedraw|=RedrawButtonPanel;
+ for (i = 0; i < TheUI.NumInfoButtons; ++i) {
+ if (x >= TheUI.InfoButtons[i].X &&
+ x <= TheUI.InfoButtons[i].X + TheUI.InfoButtons[i].Width +
7 &&
+ y > TheUI.InfoButtons[i].Y &&
+ y <= TheUI.InfoButtons[i].Y + TheUI.InfoButtons[i].Height +
7) {
+ ButtonAreaUnderCursor = ButtonAreaInfo;
+ ButtonUnderCursor = i;
+ CursorOn = CursorOnButton;
+ MustRedraw |= RedrawButtonPanel;
return;
}
}
}
- if( ButtonUnderCursor!=-1 ) { // remove old display
- if( ButtonAreaUnderCursor==ButtonAreaMenu ) {
- MustRedraw|=RedrawMenuButton;
- } else if( ButtonAreaUnderCursor==ButtonAreaInfo ) {
- MustRedraw|=RedrawInfoPanel;
+ if (ButtonUnderCursor != -1) { // remove old display
+ if (ButtonAreaUnderCursor == ButtonAreaMenu) {
+ MustRedraw |= RedrawMenuButton;
+ } else if (ButtonAreaUnderCursor == ButtonAreaInfo) {
+ MustRedraw |= RedrawInfoPanel;
} else {
- MustRedraw|=RedrawButtonPanel;
+ MustRedraw |= RedrawButtonPanel;
}
- ButtonAreaUnderCursor=-1;
- ButtonUnderCursor=-1;
+ ButtonAreaUnderCursor = -1;
+ ButtonUnderCursor = -1;
}
//
// Minimap
//
- if( x>=TheUI.MinimapPosX && x<TheUI.MinimapPosX+MINIMAP_W
- && y>=TheUI.MinimapPosY && y<TheUI.MinimapPosY+MINIMAP_H ) {
- CursorOn=CursorOnMinimap;
+ if (x >= TheUI.MinimapPosX && x < TheUI.MinimapPosX + MINIMAP_W &&
+ y >= TheUI.MinimapPosY && y < TheUI.MinimapPosY + MINIMAP_H) {
+ CursorOn = CursorOnMinimap;
return;
}
@@ -492,17 +491,17 @@
// Map
// NOTE: Later this is not always true, with shaped maps view.
//
- if (x>=TheUI.MapArea.X && x<=TheUI.MapArea.EndX
- && y>=TheUI.MapArea.Y && y<=TheUI.MapArea.EndY) {
+ if (x >= TheUI.MapArea.X && x <= TheUI.MapArea.EndX &&
+ y >= TheUI.MapArea.Y && y <= TheUI.MapArea.EndY) {
Viewport* vp;
DebugLevel3Fn("viewport %d, %d\n" _C_ x _C_ y);
vp = GetViewport(x, y);
- DebugCheck( !vp );
- if (TheUI.MouseViewport != vp ) { // viewport changed
+ DebugCheck(!vp);
+ if (TheUI.MouseViewport != vp) { // viewport changed
TheUI.MouseViewport = vp;
- DebugLevel0Fn("current viewport changed to %d.\n"
- _C_ vp - TheUI.Viewports);
+ DebugLevel0Fn("current viewport changed to %d.\n" _C_
+ vp - TheUI.Viewports);
}
// Note cursor on map can be in scroll area
@@ -514,7 +513,7 @@
//
// Scrolling Region Handling.
//
- HandleMouseScrollArea(x,y);
+ HandleMouseScrollArea(x, y);
}
/**
@@ -525,13 +524,13 @@
*/
global void HandleMouseExit(void)
{
- if( !LeaveStops ) { // Disabled
+ if (!LeaveStops) { // Disabled
return;
}
//
// Denote cursor not on anything in window (used?)
//
- CursorOn=-1;
+ CursorOn = -1;
//
// Prevent scrolling while out of focus (on other applications) */
@@ -542,8 +541,8 @@
// Show hour-glass (to denote to the user, the game is waiting)
// FIXME: couldn't define a hour-glass that easily, so used pointer
//
- CursorX = VideoWidth/2;
- CursorY = VideoHeight/2;
+ CursorX = VideoWidth / 2;
+ CursorY = VideoHeight / 2;
GameCursor = TheUI.Point.Cursor;
}
@@ -605,38 +604,38 @@
** @param x Screen X position.
** @param y Screen Y position.
*/
-global void UIHandleMouseMove(int x,int y)
+global void UIHandleMouseMove(int x, int y)
{
int mx;
int my;
enum _cursor_on_ OldCursorOn;
- OldCursorOn=CursorOn;
+ OldCursorOn = CursorOn;
//
// Selecting units.
//
- if( CursorState==CursorStateRectangle ) {
+ if (CursorState == CursorStateRectangle) {
return;
}
//
// Move map.
//
- if( GameCursor==TheUI.Scroll.Cursor ) {
+ if (GameCursor == TheUI.Scroll.Cursor) {
int xo;
int yo;
int speed;
- if( KeyModifiers&ModifierControl ) {
- speed=TheUI.MouseScrollSpeedControl;
+ if (KeyModifiers & ModifierControl) {
+ speed = TheUI.MouseScrollSpeedControl;
} else {
- speed=TheUI.MouseScrollSpeedDefault;
+ speed = TheUI.MouseScrollSpeedDefault;
}
xo = TheUI.MouseViewport->MapX;
yo = TheUI.MouseViewport->MapY;
- SubScrollX += speed * (x-CursorStartX);
- SubScrollY += speed * (y-CursorStartY);
+ SubScrollX += speed * (x - CursorStartX);
+ SubScrollY += speed * (y - CursorStartY);
// only tile based scrolling is supported
xo += SubScrollX / TileSizeX;
@@ -644,81 +643,81 @@
yo += SubScrollY / TileSizeY;
SubScrollY = SubScrollY % TileSizeY;
- TheUI.MouseWarpX=CursorStartX;
- TheUI.MouseWarpY=CursorStartY;
+ TheUI.MouseWarpX = CursorStartX;
+ TheUI.MouseWarpY = CursorStartY;
ViewportSetViewpoint(TheUI.MouseViewport, xo, yo);
return;
}
- UnitUnderCursor=NULL;
- GameCursor=TheUI.Point.Cursor; // Reset
- HandleMouseOn(x,y);
+ UnitUnderCursor = NULL;
+ GameCursor = TheUI.Point.Cursor; // Reset
+ HandleMouseOn(x, y);
DebugLevel3("MouseOn %d\n" _C_ CursorOn);
// Restrict mouse to minimap when dragging
- if( OldCursorOn==CursorOnMinimap && CursorOn!=CursorOnMinimap &&
- (MouseButtons&LeftButton) ) {
+ if (OldCursorOn == CursorOnMinimap && CursorOn != CursorOnMinimap &&
+ (MouseButtons & LeftButton)) {
RestrictCursorToMinimap();
ViewportCenterViewpoint(TheUI.SelectedViewport,
- ScreenMinimap2MapX(CursorX), ScreenMinimap2MapY(CursorY));
+ ScreenMinimap2MapX(CursorX), ScreenMinimap2MapY(CursorY));
return;
}
//
// User may be draging with button pressed.
//
- if( GameMenuButtonClicked || GameDiplomacyButtonClicked ) {
+ if (GameMenuButtonClicked || GameDiplomacyButtonClicked) {
return;
}
// This is forbidden for unexplored and not visible space
// FIXME: This must done new, moving units, scrolling...
- if( CursorOn==CursorOnMap ) {
+ if (CursorOn == CursorOnMap) {
const Viewport* vp;
vp = TheUI.MouseViewport;
- if( IsMapFieldExplored(ThisPlayer,Viewport2MapX(vp,x),
- Viewport2MapY(vp,y)) || ReplayRevealMap ) {
- UnitUnderCursor=UnitOnScreen(NULL,x-vp->X+vp->MapX*TileSizeX
- ,y-vp->Y+vp->MapY*TileSizeY);
- }
- } else if( CursorOn==CursorOnMinimap ) {
- mx=ScreenMinimap2MapX(x);
- my=ScreenMinimap2MapY(y);
- if( IsMapFieldExplored(ThisPlayer,mx,my) || ReplayRevealMap ) {
- UnitUnderCursor=UnitOnMapTile(mx,my);
+ if (IsMapFieldExplored(ThisPlayer, Viewport2MapX(vp, x),
+ Viewport2MapY(vp, y)) || ReplayRevealMap) {
+ UnitUnderCursor = UnitOnScreen(NULL, x - vp->X + vp->MapX *
TileSizeX,
+ y - vp->Y + vp->MapY * TileSizeY);
+ }
+ } else if (CursorOn == CursorOnMinimap) {
+ mx = ScreenMinimap2MapX(x);
+ my = ScreenMinimap2MapY(y);
+ if (IsMapFieldExplored(ThisPlayer, mx, my) || ReplayRevealMap) {
+ UnitUnderCursor = UnitOnMapTile(mx, my);
}
}
//NOTE: vladi: if unit is invisible, no cursor hint should be allowed
// FIXME: johns: not corrrect? Should I get informations about
// buildings under fog of war?
- if ( UnitUnderCursor && !UnitKnownOnMap(UnitUnderCursor)
- && !ReplayRevealMap ) {
- UnitUnderCursor=NULL;
+ if (UnitUnderCursor && !UnitKnownOnMap(UnitUnderCursor) &&
+ !ReplayRevealMap) {
+ UnitUnderCursor = NULL;
}
//
// Selecting target.
//
- if( CursorState==CursorStateSelect ) {
- if( CursorOn==CursorOnMap || CursorOn==CursorOnMinimap ) {
- GameCursor=TheUI.YellowHair.Cursor;
- if( UnitUnderCursor ) {
+ if (CursorState == CursorStateSelect) {
+ if (CursorOn == CursorOnMap || CursorOn == CursorOnMinimap) {
+ GameCursor = TheUI.YellowHair.Cursor;
+ if (UnitUnderCursor) {
// FIXME: should use IsEnemy here? yes (:
- if( UnitUnderCursor->Player==ThisPlayer ) {
- GameCursor=TheUI.GreenHair.Cursor;
- } else if( UnitUnderCursor->Player->Player!=PlayerNumNeutral ) {
- GameCursor=TheUI.RedHair.Cursor;
+ if (UnitUnderCursor->Player == ThisPlayer) {
+ GameCursor = TheUI.GreenHair.Cursor;
+ } else if (UnitUnderCursor->Player->Player != PlayerNumNeutral)
{
+ GameCursor = TheUI.RedHair.Cursor;
}
}
- if( CursorOn==CursorOnMinimap && (MouseButtons&RightButton) ) {
+ if (CursorOn == CursorOnMinimap && (MouseButtons & RightButton)) {
//
// Minimap move viewpoint
//
ViewportCenterViewpoint(TheUI.SelectedViewport,
- ScreenMinimap2MapX(CursorX),
- ScreenMinimap2MapY(CursorY));
+ ScreenMinimap2MapX(CursorX),
+ ScreenMinimap2MapY(CursorY));
}
}
// FIXME: must move minimap if right button is down !
@@ -728,29 +727,29 @@
//
// Cursor pointing.
//
- if( CursorOn==CursorOnMap ) {
+ if (CursorOn == CursorOnMap) {
//
// Map
//
- if( UnitUnderCursor && (UnitVisibleOnMap(UnitUnderCursor)
- || ReplayRevealMap) ) {
- if( NumSelected==0 ) {
- MustRedraw|=RedrawInfoPanel;
+ if (UnitUnderCursor && (UnitVisibleOnMap(UnitUnderCursor) ||
+ ReplayRevealMap)) {
+ if (NumSelected == 0) {
+ MustRedraw |= RedrawInfoPanel;
}
- GameCursor=TheUI.Glass.Cursor;
+ GameCursor = TheUI.Glass.Cursor;
}
return;
}
- if( CursorOn==CursorOnMinimap && (MouseButtons&LeftButton) ) {
+ if (CursorOn == CursorOnMinimap && (MouseButtons & LeftButton)) {
//
// Minimap move viewpoint
//
ViewportCenterViewpoint(TheUI.SelectedViewport,
- ScreenMinimap2MapX(CursorX), ScreenMinimap2MapY(CursorY));
- CursorStartX=CursorX;
- CursorStartY=CursorY;
+ ScreenMinimap2MapX(CursorX), ScreenMinimap2MapY(CursorY));
+ CursorStartX = CursorX;
+ CursorStartY = CursorY;
return;
}
}
@@ -763,7 +762,7 @@
** @param sx X screen map position.
** @param sy Y screen map position.
*/
-local void SendRepair(int sx,int sy)
+local void SendRepair(int sx, int sy)
{
int i;
Unit* unit;
@@ -771,17 +770,17 @@
int x;
int y;
- x=sx/TileSizeX;
- y=sy/TileSizeY;
+ x = sx / TileSizeX;
+ y = sy / TileSizeY;
// Check if the dest is repairable!
- if( (dest=UnitUnderCursor) && (dest->HP<dest->Stats->HitPoints) &&
+ if ((dest = UnitUnderCursor) && (dest->HP < dest->Stats->HitPoints) &&
(dest->Type->RepairHP) &&
- (dest->Player==ThisPlayer||IsAllied(ThisPlayer,dest))) {
- for( i=0; i<NumSelected; ++i ) {
- unit=Selected[i];
- if( unit->Type->RepairRange ) {
- SendCommandRepair(unit,x,y,dest,!(KeyModifiers&ModifierShift));
+ (dest->Player == ThisPlayer || IsAllied(ThisPlayer, dest))) {
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
+ if (unit->Type->RepairRange) {
+ SendCommandRepair(unit, x, y, dest, !(KeyModifiers &
ModifierShift));
} else {
DebugLevel0Fn("Non-worker repairs\n");
}
@@ -798,7 +797,7 @@
** @todo To reduce the CPU load for pathfinder, we should check if
** the destination is reachable and handle nice group movements.
*/
-local void SendMove(int sx,int sy)
+local void SendMove(int sx, int sy)
{
int i;
int flush;
@@ -806,25 +805,25 @@
Unit* transporter;
// Move to a transporter.
- if( (transporter=UnitUnderCursor) &&
+ if ((transporter = UnitUnderCursor) &&
(transporter->Type->Transporter) &&
- (transporter->Player==ThisPlayer)){
+ (transporter->Player == ThisPlayer)){
SendCommandStopUnit(transporter);
} else {
- transporter=NULL;
+ transporter = NULL;
}
- flush=!(KeyModifiers&ModifierShift);
+ flush = !(KeyModifiers & ModifierShift);
- for( i=0; i<NumSelected; ++i ) {
- unit=Selected[i];
- if( transporter && unit->Type->UnitType==UnitTypeLand ) {
- transporter->Blink=4;
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
+ if (transporter && unit->Type->UnitType == UnitTypeLand) {
+ transporter->Blink = 4;
DebugLevel3Fn("Board transporter\n");
- SendCommandFollow(transporter,unit,0);
- SendCommandBoard(unit,-1,-1,transporter,flush);
+ SendCommandFollow(transporter, unit, 0);
+ SendCommandBoard(unit, -1, -1, transporter, flush);
} else {
- SendCommandMove(unit,sx/TileSizeX,sy/TileSizeY,flush);
+ SendCommandMove(unit, sx / TileSizeX, sy / TileSizeY, flush);
}
}
}
@@ -843,7 +842,7 @@
**
** @see Selected, @see NumSelected
*/
-local void SendAttack(int sx,int sy)
+local void SendAttack(int sx, int sy)
{
int i;
Unit* unit;
@@ -851,22 +850,22 @@
int x;
int y;
- x=sx/TileSizeX;
- y=sy/TileSizeY;
- for( i=0; i<NumSelected; i++ ) {
- unit=Selected[i];
- if( unit->Type->CanAttack || unit->Type->Building ) {
- if( (dest=UnitUnderCursor) && CanTarget(unit->Type,dest->Type)) {
+ x=sx / TileSizeX;
+ y=sy / TileSizeY;
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
+ if (unit->Type->CanAttack || unit->Type->Building) {
+ if ((dest = UnitUnderCursor) && CanTarget(unit->Type, dest->Type)) {
DebugLevel3Fn("Attacking %p\n" _C_ dest);
- dest->Blink=4;
+ dest->Blink = 4;
} else {
- dest=NoUnitP;
+ dest = NoUnitP;
}
- if( dest!=unit ) { // don't let an unit self destruct
- SendCommandAttack(unit,x,y,dest,!(KeyModifiers&ModifierShift));
+ if (dest != unit) { // don't let an unit self destruct
+ SendCommandAttack(unit, x, y, dest, !(KeyModifiers &
ModifierShift));
}
} else {
- SendCommandMove(unit,x,y,!(KeyModifiers&ModifierShift));
+ SendCommandMove(unit, x, y, !(KeyModifiers & ModifierShift));
}
}
}
@@ -877,17 +876,19 @@
** @param sx X screen map position.
** @param sy Y screen map position.
*/
-local void SendAttackGround(int sx,int sy)
+local void SendAttackGround(int sx, int sy)
{
int i;
Unit* unit;
- for( i=0; i<NumSelected; ++i ) {
- unit=Selected[i];
- if( unit->Type->CanAttack ) {
-
SendCommandAttackGround(unit,sx/TileSizeX,sy/TileSizeY,!(KeyModifiers&ModifierShift));
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
+ if (unit->Type->CanAttack) {
+ SendCommandAttackGround(unit, sx / TileSizeX, sy / TileSizeY,
+ !(KeyModifiers & ModifierShift));
} else {
-
SendCommandMove(unit,sx/TileSizeX,sy/TileSizeY,!(KeyModifiers&ModifierShift));
+ SendCommandMove(unit, sx / TileSizeX, sy / TileSizeY,
+ !(KeyModifiers & ModifierShift));
}
}
}
@@ -897,14 +898,15 @@
** @param sx X screen map position.
** @param sy Y screen map position.
*/
-local void SendPatrol(int sx,int sy)
+local void SendPatrol(int sx, int sy)
{
int i;
Unit* unit;
- for( i=0; i<NumSelected; i++ ) {
- unit=Selected[i];
-
SendCommandPatrol(unit,sx/TileSizeX,sy/TileSizeY,!(KeyModifiers&ModifierShift));
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
+ SendCommandPatrol(unit, sx / TileSizeX, sy / TileSizeY,
+ !(KeyModifiers & ModifierShift));
}
}
@@ -914,7 +916,7 @@
** @param sx X screen map position
** @param sy Y screen map position
*/
-local void SendDemolish(int sx,int sy)
+local void SendDemolish(int sx, int sy)
{
int i;
Unit* unit;
@@ -924,16 +926,17 @@
x = sx / TileSizeX;
y = sy / TileSizeY;
- for( i=0; i<NumSelected; ++i ) {
- unit=Selected[i];
- if( unit->Type->Volatile ) {
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
+ if (unit->Type->Volatile) {
// FIXME: choose correct unit no flying ...
- if( (dest=UnitUnderCursor) && CanTarget(unit->Type,dest->Type)) {
- dest->Blink=4;
+ if ((dest = UnitUnderCursor) && CanTarget(unit->Type, dest->Type)) {
+ dest->Blink = 4;
} else {
- dest=NoUnitP;
+ dest = NoUnitP;
}
-
SendCommandDemolish(unit,sx/TileSizeX,sy/TileSizeY,dest,!(KeyModifiers&ModifierShift));
+ SendCommandDemolish(unit, sx / TileSizeX, sy / TileSizeY, dest,
+ !(KeyModifiers & ModifierShift));
} else {
DebugLevel0Fn("can't demolish %p\n" _C_ unit);
}
@@ -948,32 +951,33 @@
**
** @see Selected
*/
-local void SendResource(int sx,int sy)
+local void SendResource(int sx, int sy)
{
int i;
int res;
Unit* dest;
- for( i=0; i<NumSelected; ++i ) {
- if ((dest=UnitUnderCursor) &&
+ for (i = 0; i < NumSelected; ++i) {
+ if ((dest = UnitUnderCursor) &&
(Selected[i]->Type->Harvester) &&
(res=dest->Type->GivesResource) &&
(Selected[i]->Type->ResInfo[res])) {
- dest->Blink=4;
+ dest->Blink = 4;
DebugLevel3("RESOURCE\n");
- SendCommandResource(Selected[i],dest,!(KeyModifiers&ModifierShift));
+ SendCommandResource(Selected[i],dest, !(KeyModifiers &
ModifierShift));
continue;
}
- for (res=0;res<MaxCosts;res++) {
- if( Selected[i]->Type->Harvester &&
+ for (res = 0; res < MaxCosts; ++res) {
+ if (Selected[i]->Type->Harvester &&
Selected[i]->Type->ResInfo[res] &&
Selected[i]->Type->ResInfo[res]->TerrainHarvester &&
// Full harvesters don't act.
-
Selected[i]->Value<Selected[i]->Type->ResInfo[res]->ResourceCapacity &&
-
IsMapFieldExplored(Selected[i]->Player,sx/TileSizeX,sy/TileSizeY) &&
- ForestOnMap(sx/TileSizeX,sy/TileSizeY) ) {
+ Selected[i]->Value <
Selected[i]->Type->ResInfo[res]->ResourceCapacity &&
+ IsMapFieldExplored(Selected[i]->Player, sx / TileSizeX, sy
/ TileSizeY) &&
+ ForestOnMap(sx / TileSizeX, sy / TileSizeY)) {
DebugLevel3("RESOURCE\n");
-
SendCommandResourceLoc(Selected[i],sx/TileSizeY,sy/TileSizeY,!(KeyModifiers&ModifierShift));
+ SendCommandResourceLoc(Selected[i], sx / TileSizeY, sy /
TileSizeY,
+ !(KeyModifiers & ModifierShift));
}
}
}
@@ -985,14 +989,14 @@
** @param sx X screen map position.
** @param sy Y screen map position.
*/
-local void SendUnload(int sx,int sy)
+local void SendUnload(int sx, int sy)
{
int i;
- for( i=0; i<NumSelected; i++ ) {
+ for (i = 0; i < NumSelected; ++i) {
// FIXME: not only transporter selected?
- SendCommandUnload(Selected[i],sx/TileSizeX,sy/TileSizeY,NoUnitP
- ,!(KeyModifiers&ModifierShift));
+ SendCommandUnload(Selected[i], sx / TileSizeX, sy / TileSizeY, NoUnitP,
+ !(KeyModifiers & ModifierShift));
}
}
@@ -1016,10 +1020,10 @@
int x;
int y;
- x=sx/TileSizeX;
- y=sy/TileSizeY;
+ x = sx / TileSizeX;
+ y = sy / TileSizeY;
- dest=UnitUnderCursor;
+ dest = UnitUnderCursor;
DebugLevel3Fn("SpellCast on: %p (%d,%d)\n" _C_ dest _C_ x _C_ y);
/* NOTE: Vladi:
@@ -1027,23 +1031,23 @@
(if exists). All checks are performed at spell cast handle
function which will cancel function if cannot be executed
*/
- for( i=0; i<NumSelected; i++ ) {
- unit=Selected[i];
+ for (i = 0; i < NumSelected; ++i) {
+ unit = Selected[i];
if (!unit->Type->CanCastSpell) {
continue; // this unit cannot cast spell
}
- if( dest && unit==dest ) {
+ if (dest && unit == dest) {
continue; // no unit can cast spell on himself
// n0b0dy: why not?
}
#ifndef NEW_UI
// CursorValue here holds the spell type id
- SendCommandSpellCast(unit,x,y,dest,CursorValue,
- !(KeyModifiers&ModifierShift));
+ SendCommandSpellCast(unit, x, y, dest, CursorValue,
+ !(KeyModifiers & ModifierShift));
#else
// CursorSpell here holds the spell type id
- SendCommandSpellCast(unit,x,y,dest,CursorSpell,
- !(KeyModifiers&ModifierShift));
+ SendCommandSpellCast(unit, x, y, dest, CursorSpell,
+ !(KeyModifiers & ModifierShift));
#endif
}
}
@@ -1060,39 +1064,39 @@
int x;
int y;
- x=sx/TileSizeX;
- y=sy/TileSizeY;
+ x = sx / TileSizeX;
+ y = sy / TileSizeY;
#ifndef NEW_UI
- CurrentButtonLevel=0; // reset unit buttons to normal
+ CurrentButtonLevel = 0; // reset unit buttons to normal
UpdateButtonPanel();
#endif
- switch( CursorAction ) {
+ switch (CursorAction) {
case ButtonMove:
- SendMove(sx,sy);
+ SendMove(sx, sy);
break;
case ButtonRepair:
- SendRepair(sx,sy);
+ SendRepair(sx, sy);
break;
case ButtonAttack:
- SendAttack(sx,sy);
+ SendAttack(sx, sy);
break;
case ButtonAttackGround:
- SendAttackGround(sx,sy);
+ SendAttackGround(sx, sy);
break;
case ButtonPatrol:
- SendPatrol(sx,sy);
+ SendPatrol(sx, sy);
break;
case ButtonHarvest:
- SendResource(sx,sy);
+ SendResource(sx, sy);
break;
case ButtonUnload:
- SendUnload(sx,sy);
+ SendUnload(sx, sy);
break;
case ButtonDemolish:
- SendDemolish(sx,sy);
+ SendDemolish(sx, sy);
break;
case ButtonSpellCast:
- SendSpellCast(sx,sy);
+ SendSpellCast(sx, sy);
break;
default:
DebugLevel1("Unsupported send action %d\n" _C_ CursorAction);
@@ -1102,8 +1106,8 @@
//
// Acknowledge the command with first selected unit.
//
- for( i=0; i<NumSelected; ++i ) {
- PlayUnitSound(Selected[i],VoiceAcknowledging);
+ for (i = 0; i < NumSelected; ++i) {
+ PlayUnitSound(Selected[i], VoiceAcknowledging);
break;
}
}
@@ -1120,25 +1124,25 @@
{
Unit* unit;
- if( num>=NumSelected || !(MouseButtons&LeftButton) ) {
+ if (num >= NumSelected || !(MouseButtons & LeftButton)) {
return;
}
- unit=Selected[num];
+ unit = Selected[num];
- if( (KeyModifiers&ModifierControl)
- || (MouseButtons&(LeftButton<<MouseDoubleShift)) ) {
- if( KeyModifiers&ModifierShift ) {
+ if ((KeyModifiers & ModifierControl) ||
+ (MouseButtons & (LeftButton << MouseDoubleShift))) {
+ if (KeyModifiers & ModifierShift) {
ToggleUnitsByType(unit);
} else {
SelectUnitsByType(unit);
}
- } else if( KeyModifiers&ModifierAlt ) {
- if( KeyModifiers&ModifierShift ) {
+ } else if (KeyModifiers & ModifierAlt) {
+ if (KeyModifiers & ModifierShift) {
AddGroupFromUnitToSelection(unit);
} else {
SelectGroupFromUnit(unit);
}
- } else if( KeyModifiers&ModifierShift ) {
+ } else if (KeyModifiers & ModifierShift) {
ToggleSelectUnit(unit);
} else {
SelectSingleUnit(unit);
@@ -1150,7 +1154,7 @@
CurrentButtonLevel = 0; // reset unit buttons to normal
#endif
SelectionChanged();
- MustRedraw|=RedrawInfoPanel;
+ MustRedraw |= RedrawInfoPanel;
}
//.............................................................................
@@ -1172,41 +1176,41 @@
#ifdef NEW_UI
// to redraw the cursor immediately (and avoid up to 1 sec delay
- if( CursorBuilding ) {
+ if (CursorBuilding) {
// Possible Selected[0] was removed from map
// need to make sure there is an unit to build
- if( Selected[0] && (MouseButtons&LeftButton) ) {// enter select mode
+ if (Selected[0] && (MouseButtons&LeftButton)) {// enter select mode
int x;
int y;
int i;
int j;
int explored;
- x=Viewport2MapX(TheUI.MouseViewport,CursorX);
- y=Viewport2MapY(TheUI.MouseViewport,CursorY);
+ x = Viewport2MapX(TheUI.MouseViewport, CursorX);
+ y = Viewport2MapY(TheUI.MouseViewport, CursorY);
// FIXME: error messages
- explored=1;
- for( j=0; explored && j<Selected[0]->Type->TileHeight; ++j ) {
- for( i=0; i<Selected[0]->Type->TileWidth; ++i ) {
- if( !IsMapFieldExplored(ThisPlayer,x+i,y+j) ) {
- explored=0;
+ explored = 1;
+ for (j = 0; explored && j < Selected[0]->Type->TileHeight; ++j) {
+ for (i = 0; i < Selected[0]->Type->TileWidth; ++i) {
+ if (!IsMapFieldExplored(ThisPlayer, x + i, y + j)) {
+ explored = 0;
break;
}
}
}
- if( CanBuildUnitType(Selected[0],CursorBuilding,x,y)
- && (explored || ReplayRevealMap) ) {
- PlayGameSound(GameSounds.PlacementSuccess.Sound
- ,MaxSampleVolume);
- SendCommandBuildBuilding(Selected[0],x,y,CursorBuilding
- ,!(KeyModifiers&ModifierShift));
- if( KeyModifiers&ModifierAlt ) {
+ if (CanBuildUnitType(Selected[0], CursorBuilding, x, y) &&
+ (explored || ReplayRevealMap)) {
+ PlayGameSound(GameSounds.PlacementSuccess.Sound,
+ MaxSampleVolume);
+ SendCommandBuildBuilding(Selected[0], x, y,CursorBuilding,
+ !(KeyModifiers & ModifierShift));
+ if (KeyModifiers & ModifierAlt) {
return;
}
} else {
- PlayGameSound(GameSounds.PlacementError.Sound
- ,MaxSampleVolume);
+ PlayGameSound(GameSounds.PlacementError.Sound,
+ MaxSampleVolume);
}
}
ChooseTargetFinish();
@@ -1219,26 +1223,26 @@
//
// Clicking on the map.
//
- if( CursorOn==CursorOnMap ) {
+ if (CursorOn == CursorOnMap) {
#ifndef NEW_UI
ClearStatusLine();
ClearCosts();
- CursorState=CursorStatePoint;
- GameCursor=TheUI.Point.Cursor;
+ CursorState = CursorStatePoint;
+ GameCursor = TheUI.Point.Cursor;
CurrentButtonLevel = 0;
UpdateButtonPanel();
- MustRedraw|=RedrawButtonPanel|RedrawCursor;
+ MustRedraw |= RedrawButtonPanel | RedrawCursor;
#endif
sx = CursorX - vp->X + TileSizeX * vp->MapX;
sy = CursorY - vp->Y + TileSizeY * vp->MapY;
- if( MouseButtons&LeftButton ) {
- if( ClickMissile ) {
- MakeLocalMissile(MissileTypeByIdent(ClickMissile)
- ,vp->MapX*TileSizeX+CursorX - vp->X
- ,vp->MapY*TileSizeY+CursorY - vp->Y
- ,vp->MapX*TileSizeX+CursorX - vp->X
- ,vp->MapY*TileSizeY+CursorY - vp->Y);
+ if (MouseButtons & LeftButton) {
+ if (ClickMissile) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile),
+ vp->MapX * TileSizeX+CursorX - vp->X,
+ vp->MapY * TileSizeY+CursorY - vp->Y,
+ vp->MapX * TileSizeX+CursorX - vp->X,
+ vp->MapY * TileSizeY+CursorY - vp->Y);
}
SendCommand(sx, sy);
}
@@ -1251,29 +1255,29 @@
//
// Clicking on the minimap.
//
- if( CursorOn==CursorOnMinimap ) {
+ if (CursorOn == CursorOnMinimap) {
int mx;
int my;
- mx=ScreenMinimap2MapX(CursorX);
- my=ScreenMinimap2MapY(CursorY);
- if( MouseButtons&LeftButton ) {
- sx=mx*TileSizeX;
- sy=my*TileSizeY;
+ mx = ScreenMinimap2MapX(CursorX);
+ my = ScreenMinimap2MapY(CursorY);
+ if (MouseButtons & LeftButton) {
+ sx = mx * TileSizeX;
+ sy = my * TileSizeY;
#ifndef NEW_UI
ClearStatusLine();
ClearCosts();
- CursorState=CursorStatePoint;
- GameCursor=TheUI.Point.Cursor;
+ CursorState = CursorStatePoint;
+ GameCursor = TheUI.Point.Cursor;
CurrentButtonLevel = 0; // reset unit buttons to normal
UpdateButtonPanel();
- MustRedraw|=RedrawButtonPanel|RedrawCursor;
+ MustRedraw |= RedrawButtonPanel | RedrawCursor;
#endif
- if( ClickMissile ) {
- MakeLocalMissile(MissileTypeByIdent(ClickMissile)
- ,sx+TileSizeX/2,sy+TileSizeY/2,0,0);
+ if (ClickMissile) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile),
+ sx + TileSizeX / 2, sy + TileSizeY / 2, 0, 0);
}
- SendCommand(sx,sy);
+ SendCommand(sx, sy);
#ifdef NEW_UI
ChooseTargetFinish();
#endif
@@ -1283,9 +1287,9 @@
return;
}
- if( CursorOn==CursorOnButton ) {
+ if (CursorOn==CursorOnButton) {
// FIXME: other buttons?
- if( ButtonAreaUnderCursor==ButtonAreaButton ) {
+ if (ButtonAreaUnderCursor == ButtonAreaButton) {
#ifdef NEW_UI
ChooseTargetFinish();
#endif
@@ -1297,11 +1301,11 @@
#ifndef NEW_UI
ClearStatusLine();
ClearCosts();
- CursorState=CursorStatePoint;
- GameCursor=TheUI.Point.Cursor;
+ CursorState = CursorStatePoint;
+ GameCursor = TheUI.Point.Cursor;
CurrentButtonLevel = 0; // reset unit buttons to normal
UpdateButtonPanel();
- MustRedraw|=RedrawButtonPanel|RedrawCursor;
+ MustRedraw |= RedrawButtonPanel | RedrawCursor;
#else
ChooseTargetFinish();
#endif
@@ -1325,38 +1329,38 @@
/**
** Detect long selection click, FIXME: tempory hack to test the feature.
*/
-#define LongSelected (MouseButtons&((LeftButton<<MouseHoldShift)))
+#define LongSelected (MouseButtons & ((LeftButton << MouseHoldShift)))
- if( LongSelected ) {
- if( !OldValid ) {
- OldShowOrders=ShowOrders;
- OldShowSightRange=ShowSightRange;
- OldShowAttackRange=ShowAttackRange;
- OldShowReactionRange=ShowReactionRange;
- OldValid=1;
-
- ShowOrders=1;
- ShowSightRange=1;
- ShowAttackRange=1;
- ShowReactionRange=1;
- }
- } else if( OldValid ) {
- ShowOrders=OldShowOrders;
- ShowSightRange=OldShowSightRange;
- ShowAttackRange=OldShowAttackRange;
- ShowReactionRange=OldShowReactionRange;
- OldValid=0;
+ if (LongSelected) {
+ if (!OldValid) {
+ OldShowOrders = ShowOrders;
+ OldShowSightRange = ShowSightRange;
+ OldShowAttackRange = ShowAttackRange;
+ OldShowReactionRange = ShowReactionRange;
+ OldValid = 1;
+
+ ShowOrders = 1;
+ ShowSightRange = 1;
+ ShowAttackRange = 1;
+ ShowReactionRange = 1;
+ }
+ } else if (OldValid) {
+ ShowOrders = OldShowOrders;
+ ShowSightRange = OldShowSightRange;
+ ShowAttackRange = OldShowAttackRange;
+ ShowReactionRange = OldShowReactionRange;
+ OldValid = 0;
}
- if( CursorState==CursorStateRectangle ) { // select mode
+ if (CursorState == CursorStateRectangle) { // select mode
return;
}
//
// Selecting target. (Move,Attack,Patrol,... commands);
//
- if( CursorState==CursorStateSelect ) {
- if( !GameObserve && !GamePaused ) {
+ if (CursorState == CursorStateSelect) {
+ if (!GameObserve && !GamePaused) {
UISelectStateButtonDown(button);
}
return;
@@ -1365,54 +1369,54 @@
//
// Cursor is on the map area
//
- if( CursorOn==CursorOnMap ) {
- DebugCheck( !TheUI.MouseViewport );
+ if (CursorOn == CursorOnMap) {
+ DebugCheck(!TheUI.MouseViewport);
- if ( (MouseButtons&LeftButton) &&
- TheUI.SelectedViewport != TheUI.MouseViewport ) {
+ if ((MouseButtons&LeftButton) &&
+ TheUI.SelectedViewport != TheUI.MouseViewport) {
TheUI.SelectedViewport = TheUI.MouseViewport;
MustRedraw = RedrawMinimapCursor | RedrawMap;
DebugLevel0Fn("selected viewport changed to %d.\n" _C_
- TheUI.SelectedViewport - TheUI.Viewports);
+ TheUI.SelectedViewport - TheUI.Viewports);
}
#ifndef NEW_UI
// to redraw the cursor immediately (and avoid up to 1 sec delay
- if( CursorBuilding ) {
+ if (CursorBuilding) {
// Possible Selected[0] was removed from map
// need to make sure there is an unit to build
- if( Selected[0] && (MouseButtons&LeftButton) ) {// enter select mode
+ if (Selected[0] && (MouseButtons&LeftButton)) {// enter select mode
int x;
int y;
int i;
int j;
int explored;
- x=Viewport2MapX(TheUI.MouseViewport,CursorX);
- y=Viewport2MapY(TheUI.MouseViewport,CursorY);
+ x = Viewport2MapX(TheUI.MouseViewport, CursorX);
+ y = Viewport2MapY(TheUI.MouseViewport, CursorY);
// FIXME: error messages
- explored=1;
- for( j=0; explored && j<Selected[0]->Type->TileHeight; ++j ) {
- for( i=0; i<Selected[0]->Type->TileWidth; ++i ) {
- if( !IsMapFieldExplored(ThisPlayer,x+i,y+j) ) {
- explored=0;
+ explored = 1;
+ for (j = 0; explored && j < Selected[0]->Type->TileHeight; ++j)
{
+ for (i = 0; i < Selected[0]->Type->TileWidth; ++i) {
+ if (!IsMapFieldExplored(ThisPlayer, x + i, y + j)) {
+ explored = 0;
break;
}
}
}
- if( CanBuildUnitType(Selected[0],CursorBuilding,x,y)
- && (explored || ReplayRevealMap) ) {
- PlayGameSound(GameSounds.PlacementSuccess.Sound
- ,MaxSampleVolume);
- SendCommandBuildBuilding(Selected[0],x,y,CursorBuilding
- ,!(KeyModifiers&ModifierShift));
- if(
!((KeyModifiers&ModifierAlt)||(KeyModifiers&ModifierShift)) ) {
+ if (CanBuildUnitType(Selected[0],CursorBuilding, x, y) &&
+ (explored || ReplayRevealMap)) {
+ PlayGameSound(GameSounds.PlacementSuccess.Sound,
+ MaxSampleVolume);
+ SendCommandBuildBuilding(Selected[0], x, y, CursorBuilding,
+ !(KeyModifiers & ModifierShift));
+ if (!((KeyModifiers & ModifierAlt) || (KeyModifiers &
ModifierShift))) {
CancelBuildingMode();
}
} else {
- PlayGameSound(GameSounds.PlacementError.Sound
- ,MaxSampleVolume);
+ PlayGameSound(GameSounds.PlacementError.Sound,
+ MaxSampleVolume);
}
} else {
CancelBuildingMode();
@@ -1421,132 +1425,132 @@
}
#endif
- if( MouseButtons&LeftButton ) { // enter select mode
- CursorStartX=CursorX;
- CursorStartY=CursorY;
- CursorStartScrMapX = CursorStartX - TheUI.MouseViewport->X
- + TileSizeX * TheUI.MouseViewport->MapX;
- CursorStartScrMapY = CursorStartY - TheUI.MouseViewport->Y
- + TileSizeY * TheUI.MouseViewport->MapY;
- GameCursor=TheUI.Cross.Cursor;
- CursorState=CursorStateRectangle;
- MustRedraw|=RedrawCursor;
- } else if( MouseButtons&MiddleButton ) {// enter move map mode
- CursorStartX=CursorX;
- CursorStartY=CursorY;
- SubScrollX=0;
- SubScrollY=0;
- GameCursor=TheUI.Scroll.Cursor;
+ if (MouseButtons & LeftButton) { // enter select mode
+ CursorStartX = CursorX;
+ CursorStartY = CursorY;
+ CursorStartScrMapX = CursorStartX - TheUI.MouseViewport->X +
+ TileSizeX * TheUI.MouseViewport->MapX;
+ CursorStartScrMapY = CursorStartY - TheUI.MouseViewport->Y +
+ TileSizeY * TheUI.MouseViewport->MapY;
+ GameCursor = TheUI.Cross.Cursor;
+ CursorState = CursorStateRectangle;
+ MustRedraw |= RedrawCursor;
+ } else if (MouseButtons & MiddleButton) {// enter move map mode
+ CursorStartX = CursorX;
+ CursorStartY = CursorY;
+ SubScrollX = 0;
+ SubScrollY = 0;
+ GameCursor = TheUI.Scroll.Cursor;
DebugLevel3("Cursor middle down %d,%d\n" _C_ CursorX _C_ CursorY);
- MustRedraw|=RedrawCursor;
- } else if( MouseButtons&RightButton ) {
- if( !GameObserve && !GamePaused ) {
+ MustRedraw |= RedrawCursor;
+ } else if (MouseButtons & RightButton) {
+ if (!GameObserve && !GamePaused) {
Unit* unit;
// FIXME: Rethink the complete chaos of coordinates here
// FIXME: Johns: Perhaps we should use a pixel map coordinates
int x;
int y;
- x = CursorX - TheUI.MouseViewport->X
- + TheUI.MouseViewport->MapX * TileSizeX;
- y = CursorY - TheUI.MouseViewport->Y
- + TheUI.MouseViewport->MapY * TileSizeY;
- if( x>=TheMap.Width*TileSizeX ) { // Reduce to map limits
- x=(TheMap.Width-1)*TileSizeX;
+ x = CursorX - TheUI.MouseViewport->X +
+ TheUI.MouseViewport->MapX * TileSizeX;
+ y = CursorY - TheUI.MouseViewport->Y +
+ TheUI.MouseViewport->MapY * TileSizeY;
+ if (x >= TheMap.Width * TileSizeX) { // Reduce to map limits
+ x = (TheMap.Width - 1) * TileSizeX;
}
- if( y>=TheMap.Height*TileSizeY ) { // Reduce to map limits
- y=(TheMap.Height-1)*TileSizeY;
+ if (y >= TheMap.Height * TileSizeY) { // Reduce to map limits
+ y = (TheMap.Height - 1) * TileSizeY;
}
- if( UnitUnderCursor &&
(unit=UnitOnMapTile(x/TileSizeX,y/TileSizeY)) ) {
- unit->Blink=4; // if right click on building -- blink
+ if (UnitUnderCursor && (unit = UnitOnMapTile(x / TileSizeX, y /
TileSizeY))) {
+ unit->Blink = 4; // if right click on building -- blink
} else { // if not not click on building -- green cross
- if( ClickMissile ) {
- MakeLocalMissile(MissileTypeByIdent(ClickMissile)
- ,TheUI.MouseViewport->MapX*TileSizeX
- +CursorX-TheUI.MouseViewport->X
- ,TheUI.MouseViewport->MapY*TileSizeY
- +CursorY-TheUI.MouseViewport->Y,0,0);
+ if (ClickMissile) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile),
+ TheUI.MouseViewport->MapX * TileSizeX +
+ CursorX - TheUI.MouseViewport->X,
+ TheUI.MouseViewport->MapY * TileSizeY +
+ CursorY - TheUI.MouseViewport->Y, 0, 0);
}
}
- DoRightButton(x,y);
+ DoRightButton(x, y);
}
}
//
// Cursor is on the minimap area
//
- } else if( CursorOn==CursorOnMinimap ) {
- if( MouseButtons&LeftButton ) { // enter move mini-mode
+ } else if (CursorOn == CursorOnMinimap) {
+ if (MouseButtons & LeftButton) { // enter move mini-mode
ViewportCenterViewpoint(TheUI.SelectedViewport,
ScreenMinimap2MapX(CursorX), ScreenMinimap2MapY(CursorY));
- } else if( MouseButtons&RightButton ) {
- if( !GameObserve && !GamePaused ) {
- if( ClickMissile ) {
- MakeLocalMissile(MissileTypeByIdent(ClickMissile)
- ,ScreenMinimap2MapX(CursorX)*TileSizeX+TileSizeX/2
- ,ScreenMinimap2MapY(CursorY)*TileSizeY+TileSizeY/2,0,0);
+ } else if (MouseButtons & RightButton) {
+ if (!GameObserve && !GamePaused) {
+ if (ClickMissile) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile),
+ ScreenMinimap2MapX(CursorX) * TileSizeX + TileSizeX / 2,
+ ScreenMinimap2MapY(CursorY) * TileSizeY + TileSizeY /
2, 0, 0);
}
// DoRightButton() takes screen map coordinates
DoRightButton(ScreenMinimap2MapX(CursorX) * TileSizeX,
- ScreenMinimap2MapY(CursorY) * TileSizeY);
+ ScreenMinimap2MapY(CursorY) * TileSizeY);
}
}
//
// Cursor is on the buttons: group or command
//
- } else if( CursorOn==CursorOnButton ) {
+ } else if (CursorOn == CursorOnButton) {
//
// clicked on info panel - selection shown
//
- if( NumSelected>1 && ButtonAreaUnderCursor==ButtonAreaInfo ) {
- if( !GameObserve && !GamePaused ) {
- DoSelectionButtons(ButtonUnderCursor,button);
+ if (NumSelected > 1 && ButtonAreaUnderCursor == ButtonAreaInfo) {
+ if (!GameObserve && !GamePaused) {
+ DoSelectionButtons(ButtonUnderCursor, button);
}
- } else if( (MouseButtons&LeftButton) ) {
+ } else if ((MouseButtons & LeftButton)) {
//
// clicked on menu button
//
- if( ButtonAreaUnderCursor==ButtonAreaMenu ) {
- if( (ButtonUnderCursor==ButtonUnderMenu
- || ButtonUnderCursor==ButtonUnderNetworkMenu)
- && !GameMenuButtonClicked ) {
- PlayGameSound(GameSounds.Click.Sound,MaxSampleVolume);
- GameMenuButtonClicked=1;
- MustRedraw|=RedrawMenuButton;
- } else if( ButtonUnderCursor==ButtonUnderNetworkDiplomacy
- && !GameDiplomacyButtonClicked ) {
- PlayGameSound(GameSounds.Click.Sound,MaxSampleVolume);
- GameDiplomacyButtonClicked=1;
- MustRedraw|=RedrawMenuButton;
+ if (ButtonAreaUnderCursor == ButtonAreaMenu) {
+ if ((ButtonUnderCursor == ButtonUnderMenu ||
+ ButtonUnderCursor == ButtonUnderNetworkMenu) &&
+ !GameMenuButtonClicked) {
+ PlayGameSound(GameSounds.Click.Sound, MaxSampleVolume);
+ GameMenuButtonClicked = 1;
+ MustRedraw |= RedrawMenuButton;
+ } else if (ButtonUnderCursor == ButtonUnderNetworkDiplomacy &&
+ !GameDiplomacyButtonClicked) {
+ PlayGameSound(GameSounds.Click.Sound, MaxSampleVolume);
+ GameDiplomacyButtonClicked = 1;
+ MustRedraw |= RedrawMenuButton;
}
//
// clicked on info panel
//
- } else if( ButtonAreaUnderCursor==ButtonAreaInfo ) {
+ } else if (ButtonAreaUnderCursor == ButtonAreaInfo) {
//
// clicked on single unit shown
//
- if( ButtonUnderCursor==0 && NumSelected==1 ) {
- PlayGameSound(GameSounds.Click.Sound,MaxSampleVolume);
+ if (ButtonUnderCursor == 0 && NumSelected == 1) {
+ PlayGameSound(GameSounds.Click.Sound, MaxSampleVolume);
ViewportCenterViewpoint(TheUI.SelectedViewport,
Selected[0]->X,
- Selected[0]->Y);
+ Selected[0]->Y);
//
// for transporter
//
- } else if( ButtonUnderCursor>2 && ButtonUnderCursor<9 ) {
- if( NumSelected==1 && Selected[0]->Type->Transporter ) {
- if( !GameObserve && !GamePaused ) {
- if (Selected[0]->InsideCount>=ButtonUnderCursor-3) {
+ } else if (ButtonUnderCursor > 2 && ButtonUnderCursor < 9) {
+ if (NumSelected == 1 && Selected[0]->Type->Transporter) {
+ if (!GameObserve && !GamePaused) {
+ if (Selected[0]->InsideCount >= ButtonUnderCursor -
3) {
// FIXME: should check if valid here.
// n0b0dy: check WHAT?
uins=Selected[0]->UnitInside;
- for (i=0;i<ButtonUnderCursor-3;i++)
- uins=uins->NextContained;
+ for (i = 0; i < ButtonUnderCursor - 3; ++i) {
+ uins = uins->NextContained;
+ }
SendCommandUnload(Selected[0],
- Selected[0]->X,Selected[0]->Y,
- uins,
- !(KeyModifiers&ModifierShift));
+ Selected[0]->X, Selected[0]->Y, uins,
+ !(KeyModifiers & ModifierShift));
}
}
}
@@ -1554,9 +1558,9 @@
//
// clicked on training button
//
- } else if( ButtonAreaUnderCursor==ButtonAreaTraining ) {
- if( !GameObserve && !GamePaused ) {
- if( ButtonUnderCursor<Selected[0]->Data.Train.Count ) {
+ } else if (ButtonAreaUnderCursor == ButtonAreaTraining) {
+ if (!GameObserve && !GamePaused) {
+ if (ButtonUnderCursor < Selected[0]->Data.Train.Count) {
DebugLevel0Fn("Cancel slot %d %s\n" _C_
ButtonUnderCursor _C_
Selected[0]->Data.Train.What[ButtonUnderCursor]->Ident);
@@ -1568,31 +1572,31 @@
//
// clicked on button panel
//
- } else if( ButtonAreaUnderCursor==ButtonAreaButton ) {
- if( !GameObserve && !GamePaused ) {
+ } else if (ButtonAreaUnderCursor == ButtonAreaButton) {
+ if (!GameObserve && !GamePaused) {
#ifndef NEW_UI
DoButtonButtonClicked(ButtonUnderCursor);
#else
- if( ButtonUnderCursor >= 0 && ButtonUnderCursor < 9 ) {
+ if (ButtonUnderCursor >= 0 && ButtonUnderCursor < 9) {
DoButtonButtonClicked(ButtonUnderCursor);
}
#endif
}
}
- } else if( (MouseButtons&MiddleButton) ) {
+ } else if ((MouseButtons&MiddleButton)) {
//
// clicked on info panel - single unit shown
//
- if( ButtonAreaUnderCursor==ButtonAreaInfo
- && ButtonUnderCursor==0 && NumSelected==1 ) {
- PlayGameSound(GameSounds.Click.Sound,MaxSampleVolume);
- if( TheUI.SelectedViewport->Unit == Selected[0] ) {
+ if (ButtonAreaUnderCursor == ButtonAreaInfo &&
+ ButtonUnderCursor == 0 && NumSelected == 1) {
+ PlayGameSound(GameSounds.Click.Sound, MaxSampleVolume);
+ if (TheUI.SelectedViewport->Unit == Selected[0]) {
TheUI.SelectedViewport->Unit = NULL;
} else {
TheUI.SelectedViewport->Unit = Selected[0];
}
}
- } else if( (MouseButtons&RightButton) ) {
+ } else if ((MouseButtons&RightButton)) {
}
}
}
@@ -1607,26 +1611,26 @@
//
// Move map.
//
- if( GameCursor==TheUI.Scroll.Cursor ) {
- GameCursor=TheUI.Point.Cursor; // Reset
+ if (GameCursor == TheUI.Scroll.Cursor) {
+ GameCursor = TheUI.Point.Cursor; // Reset
return;
}
//
// Menu (F10) button
//
- if( (1<<button)==LeftButton && GameMenuButtonClicked ) {
- GameMenuButtonClicked=0;
- MustRedraw|=RedrawMenuButton;
- if( ButtonAreaUnderCursor==ButtonAreaMenu
- && (ButtonUnderCursor==ButtonUnderMenu
- || ButtonUnderCursor==ButtonUnderNetworkMenu) ) {
+ if ((1 << button) == LeftButton && GameMenuButtonClicked) {
+ GameMenuButtonClicked = 0;
+ MustRedraw |= RedrawMenuButton;
+ if (ButtonAreaUnderCursor == ButtonAreaMenu &&
+ (ButtonUnderCursor == ButtonUnderMenu ||
+ ButtonUnderCursor == ButtonUnderNetworkMenu)) {
// FIXME: Not if, in input mode.
- if( NetworkFildes==(Socket)-1 ) {
- GamePaused=1;
+ if (NetworkFildes == (Socket)-1) {
+ GamePaused = 1;
SetStatusLine("Game Paused");
}
- ProcessMenu("menu-game",0);
+ ProcessMenu("menu-game", 0);
return;
}
}
@@ -1634,13 +1638,13 @@
//
// Diplomacy button
//
- if( (1<<button)==LeftButton && GameDiplomacyButtonClicked ) {
- GameDiplomacyButtonClicked=0;
- MustRedraw|=RedrawMenuButton;
- if( ButtonAreaUnderCursor==ButtonAreaMenu
- && ButtonUnderCursor==ButtonUnderNetworkDiplomacy) {
+ if ((1 << button) == LeftButton && GameDiplomacyButtonClicked) {
+ GameDiplomacyButtonClicked = 0;
+ MustRedraw |= RedrawMenuButton;
+ if (ButtonAreaUnderCursor == ButtonAreaMenu &&
+ ButtonUnderCursor == ButtonUnderNetworkDiplomacy) {
// FIXME: Not if, in input mode.
- ProcessMenu("menu-diplomacy",0);
+ ProcessMenu("menu-diplomacy", 0);
return;
}
}
@@ -1652,16 +1656,16 @@
// add the content of the rectangle to the selectection
// ALT takes group of unit
// CTRL takes all units of same type (st*rcr*ft)
- if( CursorState==CursorStateRectangle
- && !(MouseButtons&LeftButton) ) { // leave select mode
+ if (CursorState == CursorStateRectangle &&
+ !(MouseButtons & LeftButton)) { // leave select mode
int num;
Unit* unit;
//
// Little threshold
//
- if( CursorStartX<CursorX-1 || CursorStartX>CursorX+1
- || CursorStartY<CursorY-1 || CursorStartY>CursorY+1 ) {
+ if (CursorStartX < CursorX - 1 || CursorStartX > CursorX + 1 ||
+ CursorStartY < CursorY - 1 || CursorStartY > CursorY + 1) {
int x0;
int y0;
int x1;
@@ -1669,96 +1673,92 @@
x0 = CursorStartScrMapX;
y0 = CursorStartScrMapY;
- x1 = CursorX - TheUI.MouseViewport->X
- + TheUI.MouseViewport->MapX * TileSizeX;
- y1 = CursorY - TheUI.MouseViewport->Y
- + TheUI.MouseViewport->MapY * TileSizeY;
+ x1 = CursorX - TheUI.MouseViewport->X +
+ TheUI.MouseViewport->MapX * TileSizeX;
+ y1 = CursorY - TheUI.MouseViewport->Y +
+ TheUI.MouseViewport->MapY * TileSizeY;
- if (x0>x1) {
+ if (x0 > x1) {
int swap;
swap = x0;
x0 = x1;
x1 = swap;
}
- if (y0>y1) {
+ if (y0 > y1) {
int swap;
swap = y0;
y0 = y1;
y1 = swap;
}
- if ( KeyModifiers & ModifierShift ) {
- if( KeyModifiers & ModifierAlt ) {
- num=AddSelectedGroundUnitsInRectangle(x0, y0, x1, y1);
- } else if( KeyModifiers & ModifierControl ) {
- num=AddSelectedAirUnitsInRectangle(x0, y0, x1, y1);
+ if (KeyModifiers & ModifierShift) {
+ if (KeyModifiers & ModifierAlt) {
+ num = AddSelectedGroundUnitsInRectangle(x0, y0, x1, y1);
+ } else if (KeyModifiers & ModifierControl) {
+ num = AddSelectedAirUnitsInRectangle(x0, y0, x1, y1);
} else {
- num=AddSelectedUnitsInRectangle(x0 ,y0, x1, y1);
+ num = AddSelectedUnitsInRectangle(x0, y0, x1, y1);
}
} else {
- if( KeyModifiers & ModifierAlt ) {
- num=SelectGroundUnitsInRectangle(x0, y0, x1, y1);
- } else if( KeyModifiers & ModifierControl ) {
- num=SelectAirUnitsInRectangle(x0, y0, x1, y1);
+ if (KeyModifiers & ModifierAlt) {
+ num = SelectGroundUnitsInRectangle(x0, y0, x1, y1);
+ } else if (KeyModifiers & ModifierControl) {
+ num = SelectAirUnitsInRectangle(x0, y0, x1, y1);
} else {
- num=SelectUnitsInRectangle(x0, y0, x1, y1);
+ num = SelectUnitsInRectangle(x0, y0, x1, y1);
}
}
} else {
//
// Select single unit
//
- unit=NULL;
- if( NumSelected==1 ) {
- unit=Selected[0];
+ unit = NULL;
+ if (NumSelected == 1) {
+ unit = Selected[0];
}
// cade: cannot select unit on invisible space
// FIXME: johns: only complete invisibile units
- if( IsMapFieldVisible(ThisPlayer,
- Viewport2MapX(TheUI.MouseViewport,CursorX),
- Viewport2MapY(TheUI.MouseViewport,CursorY)) ||
ReplayRevealMap ) {
- unit=UnitOnScreen(unit
- ,CursorX-TheUI.MouseViewport->X+
- TheUI.MouseViewport->MapX*TileSizeX
- ,CursorY-TheUI.MouseViewport->Y+
- TheUI.MouseViewport->MapY*TileSizeY);
+ if (IsMapFieldVisible(ThisPlayer,
+ Viewport2MapX(TheUI.MouseViewport,CursorX),
+ Viewport2MapY(TheUI.MouseViewport,CursorY)) ||
ReplayRevealMap) {
+ unit = UnitOnScreen(unit,
+ CursorX - TheUI.MouseViewport->X +
TheUI.MouseViewport->MapX * TileSizeX,
+ CursorY - TheUI.MouseViewport->Y +
TheUI.MouseViewport->MapY * TileSizeY);
}
- if( unit ) {
+ if (unit) {
// FIXME: Not nice coded, button number hardcoded!
- if( (KeyModifiers&ModifierControl)
- || (button&(1<<MouseDoubleShift))) {
- if( KeyModifiers&ModifierShift ) {
- num=ToggleUnitsByType(unit);
+ if ((KeyModifiers & ModifierControl)
+ || (button & (1 << MouseDoubleShift))) {
+ if (KeyModifiers & ModifierShift) {
+ num = ToggleUnitsByType(unit);
} else {
- num=SelectUnitsByType(unit);
+ num = SelectUnitsByType(unit);
}
- } else if( (KeyModifiers&ModifierAlt) && unit->LastGroup ) {
- if( KeyModifiers&ModifierShift ) {
- num=AddGroupFromUnitToSelection(unit);
+ } else if ((KeyModifiers & ModifierAlt) && unit->LastGroup) {
+ if (KeyModifiers & ModifierShift) {
+ num = AddGroupFromUnitToSelection(unit);
} else {
- num=SelectGroupFromUnit(unit);
+ num = SelectGroupFromUnit(unit);
}
// Don't allow to select own and enemy units.
// Don't allow mixing buildings
- } else if( KeyModifiers&ModifierShift
- && unit->Player==ThisPlayer
- && !unit->Type->Building
- && (NumSelected!=1 || !Selected[0]->Type->Building)
- && (NumSelected!=1
- || Selected[0]->Player==ThisPlayer)) {
- num=ToggleSelectUnit(unit);
+ } else if (KeyModifiers & ModifierShift &&
+ unit->Player == ThisPlayer && !unit->Type->Building &&
+ (NumSelected != 1 || !Selected[0]->Type->Building) &&
+ (NumSelected != 1 || Selected[0]->Player ==
ThisPlayer)) {
+ num = ToggleSelectUnit(unit);
} else {
SelectSingleUnit(unit);
- num=1;
+ num = 1;
}
} else {
- num=0;
+ num = 0;
}
}
- if( num ) {
+ if (num) {
ClearStatusLine();
#ifndef NEW_UI
ClearCosts();
@@ -1772,33 +1772,33 @@
// This player, or neutral unit (goldmine,critter)
// Other clicks.
//
- if( NumSelected==1 ) {
- if( Selected[0]->Orders[0].Action==UnitActionBuilded ) {
- PlayUnitSound(Selected[0],VoiceBuilding);
- } else if( Selected[0]->Burning ) {
+ if (NumSelected == 1) {
+ if (Selected[0]->Orders[0].Action == UnitActionBuilded) {
+ PlayUnitSound(Selected[0], VoiceBuilding);
+ } else if (Selected[0]->Burning) {
// FIXME: use GameSounds.Burning
- PlayGameSound(SoundIdForName("burning"),MaxSampleVolume);
- } else if( Selected[0]->Player==ThisPlayer
- || Selected[0]->Player->Race==PlayerRaceNeutral ) {
- PlayUnitSound(Selected[0],VoiceSelected);
+ PlayGameSound(SoundIdForName("burning"), MaxSampleVolume);
+ } else if (Selected[0]->Player == ThisPlayer ||
+ Selected[0]->Player->Race == PlayerRaceNeutral) {
+ PlayUnitSound(Selected[0], VoiceSelected);
} else {
- PlayGameSound(GameSounds.Click.Sound,MaxSampleVolume);
+ PlayGameSound(GameSounds.Click.Sound, MaxSampleVolume);
}
- if ( Selected[0]->Player == ThisPlayer ) {
- char buf[64];
- sprintf( buf, "You have ~<%d~> %s(s)",
-
Selected[0]->Player->UnitTypesCount[Selected[0]->Type->Type],
- Selected[0]->Type->Name);
- SetStatusLine( buf );
+ if (Selected[0]->Player == ThisPlayer) {
+ char buf[64];
+ sprintf(buf, "You have ~<%d~> %s(s)",
+
Selected[0]->Player->UnitTypesCount[Selected[0]->Type->Type],
+ Selected[0]->Type->Name);
+ SetStatusLine(buf);
}
}
}
- CursorStartX=0;
- CursorStartY=0;
- GameCursor=TheUI.Point.Cursor;
- CursorState=CursorStatePoint;
- MustRedraw|=RedrawCursor|RedrawMap|RedrawPanels;
+ CursorStartX = 0;
+ CursorStartY = 0;
+ GameCursor = TheUI.Point.Cursor;
+ CursorState = CursorStatePoint;
+ MustRedraw |= RedrawCursor | RedrawMap | RedrawPanels;
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src/ui mouse.c,
Jimmy Salmon <=