From 7d7fd5700bba3e5feabc27646268446b6832b077 Mon Sep 17 00:00:00 2001 From: Thomas Rupprecht Date: Sat, 27 Nov 2021 11:01:14 +0100 Subject: [PATCH] formating --- src/action.cpp | 84 ++++++++++++++++++++++++------------------------- src/actiondef.h | 82 +++++++++++++++++++++++------------------------ 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/action.cpp b/src/action.cpp index 272c1cf2ce0..838f7a33ef5 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -104,48 +104,48 @@ const char *getDroidActionName(DROID_ACTION action) { static const char *name[] = { - "DACTION_NONE", // (0) not doing anything - "DACTION_MOVE", // (1) moving to a location - "DACTION_BUILD", // (2) building a structure - "DACTION_BUILD_FOUNDATION", // (3) building a foundation for a structure - "DACTION_DEMOLISH", // (4)demolishing a structure - "DACTION_REPAIR", // (5) repairing a structure - "DACTION_ATTACK", // (6) attacking something - "DACTION_OBSERVE", // (7) observing something - "DACTION_FIRESUPPORT", // (8) attacking something visible by a sensor droid - "DACTION_SULK", // (9) refuse to do anything aggressive for a fixed time - "DACTION_DESTRUCT", // (10) self destruct - "DACTION_TRANSPORTOUT", // (11) move transporter offworld - "DACTION_TRANSPORTWAITTOFLYIN", // (12) wait for timer to move reinforcements in - "DACTION_TRANSPORTIN", // (13) move transporter onworld - "DACTION_DROIDREPAIR", // (14) repairing a droid - "DACTION_RESTORE", // (15) restore resistance points of a structure - "DACTION_UNUSED", - "DACTION_MOVEFIRE", // (17) - "DACTION_MOVETOBUILD", // (18) moving to a new building location - "DACTION_MOVETODEMOLISH", // (19) moving to a new demolition location - "DACTION_MOVETOREPAIR", // (20) moving to a new repair location - "DACTION_BUILDWANDER", // (21) moving around while building - "DACTION_FOUNDATION_WANDER", // (22) moving around while building the foundation - "DACTION_MOVETOATTACK", // (23) moving to a target to attack - "DACTION_ROTATETOATTACK", // (24) rotating to a target to attack - "DACTION_MOVETOOBSERVE", // (25) moving to be able to see a target - "DACTION_WAITFORREPAIR", // (26) waiting to be repaired by a facility - "DACTION_MOVETOREPAIRPOINT", // (27) move to repair facility repair point - "DACTION_WAITDURINGREPAIR", // (28) waiting to be repaired by a facility - "DACTION_MOVETODROIDREPAIR", // (29) moving to a new location next to droid to be repaired - "DACTION_MOVETORESTORE", // (30) moving to a low resistance structure - "DACTION_UNUSED2", - "DACTION_MOVETOREARM", // (32) moving to a rearming pad - VTOLS - "DACTION_WAITFORREARM", // (33) waiting for rearm - VTOLS - "DACTION_MOVETOREARMPOINT", // (34) move to rearm point - VTOLS - this actually moves them onto the pad - "DACTION_WAITDURINGREARM", // (35) waiting during rearm process- VTOLS - "DACTION_VTOLATTACK", // (36) a VTOL droid doing attack runs - "DACTION_CLEARREARMPAD", // (37) a VTOL droid being told to get off a rearm pad - "DACTION_RETURNTOPOS", // (38) used by scout/patrol order when returning to route - "DACTION_FIRESUPPORT_RETREAT", // (39) used by firesupport order when sensor retreats - "ACTION UNKNOWN", - "DACTION_CIRCLE" // (41) circling while engaging + "DACTION_NONE", // (0) not doing anything + "DACTION_MOVE", // (1) moving to a location + "DACTION_BUILD", // (2) building a structure + "DACTION_BUILD_FOUNDATION", // (3) building a foundation for a structure + "DACTION_DEMOLISH", // (4)demolishing a structure + "DACTION_REPAIR", // (5) repairing a structure + "DACTION_ATTACK", // (6) attacking something + "DACTION_OBSERVE", // (7) observing something + "DACTION_FIRESUPPORT", // (8) attacking something visible by a sensor droid + "DACTION_SULK", // (9) refuse to do anything aggressive for a fixed time + "DACTION_DESTRUCT", // (10) self destruct + "DACTION_TRANSPORTOUT", // (11) move transporter offworld + "DACTION_TRANSPORTWAITTOFLYIN", // (12) wait for timer to move reinforcements in + "DACTION_TRANSPORTIN", // (13) move transporter onworld + "DACTION_DROIDREPAIR", // (14) repairing a droid + "DACTION_RESTORE", // (15) restore resistance points of a structure + "DACTION_UNUSED", // (16) + "DACTION_MOVEFIRE", // (17) + "DACTION_MOVETOBUILD", // (18) moving to a new building location + "DACTION_MOVETODEMOLISH", // (19) moving to a new demolition location + "DACTION_MOVETOREPAIR", // (20) moving to a new repair location + "DACTION_BUILDWANDER", // (21) moving around while building + "DACTION_FOUNDATION_WANDER", // (22) moving around while building the foundation + "DACTION_MOVETOATTACK", // (23) moving to a target to attack + "DACTION_ROTATETOATTACK", // (24) rotating to a target to attack + "DACTION_MOVETOOBSERVE", // (25) moving to be able to see a target + "DACTION_WAITFORREPAIR", // (26) waiting to be repaired by a facility + "DACTION_MOVETOREPAIRPOINT", // (27) move to repair facility repair point + "DACTION_WAITDURINGREPAIR", // (28) waiting to be repaired by a facility + "DACTION_MOVETODROIDREPAIR", // (29) moving to a new location next to droid to be repaired + "DACTION_MOVETORESTORE", // (30) moving to a low resistance structure + "DACTION_UNUSED2", // (31) + "DACTION_MOVETOREARM", // (32) moving to a rearming pad - VTOLS + "DACTION_WAITFORREARM", // (33) waiting for rearm - VTOLS + "DACTION_MOVETOREARMPOINT", // (34) move to rearm point - VTOLS - this actually moves them onto the pad + "DACTION_WAITDURINGREARM", // (35) waiting during rearm process- VTOLS + "DACTION_VTOLATTACK", // (36) a VTOL droid doing attack runs + "DACTION_CLEARREARMPAD", // (37) a VTOL droid being told to get off a rearm pad + "DACTION_RETURNTOPOS", // (38) used by scout/patrol order when returning to route + "DACTION_FIRESUPPORT_RETREAT", // (39) used by firesupport order when sensor retreats + "ACTION UNKNOWN", // (40) + "DACTION_CIRCLE" // (41) circling while engaging }; ASSERT_OR_RETURN(nullptr, action < sizeof(name) / sizeof(name[0]), "DROID_ACTION out of range: %u", action); diff --git a/src/actiondef.h b/src/actiondef.h index f66b839399c..9ed211992c9 100644 --- a/src/actiondef.h +++ b/src/actiondef.h @@ -30,51 +30,51 @@ */ enum DROID_ACTION { - DACTION_NONE, ///< 0 not doing anything - DACTION_MOVE, ///< 1 moving to a location - DACTION_BUILD, ///< 2 building a structure - DACTION_BUILD_FOUNDATION, ///< 3 used to be building a foundation for a structure - DACTION_DEMOLISH, ///< 4 demolishing a structure - DACTION_REPAIR, ///< 5 repairing a structure - DACTION_ATTACK, ///< 6 attacking something - DACTION_OBSERVE, ///< 7 observing something - DACTION_FIRESUPPORT, ///< 8 attacking something visible by a sensor droid - DACTION_SULK, ///< 9 refuse to do anything aggressive for a fixed time - DACTION_DESTRUCT, ///< 10 self destruct - DACTION_TRANSPORTOUT, ///< 11 move transporter offworld - DACTION_TRANSPORTWAITTOFLYIN, ///< 12 wait for timer to move reinforcements in - DACTION_TRANSPORTIN, ///< 13 move transporter onworld - DACTION_DROIDREPAIR, ///< 14 repairing a droid - DACTION_RESTORE, ///< 15 restore resistance points of a structure - DACTION_UNUSED, + DACTION_NONE, ///< 0 not doing anything + DACTION_MOVE, ///< 1 moving to a location + DACTION_BUILD, ///< 2 building a structure + DACTION_BUILD_FOUNDATION, ///< 3 used to be building a foundation for a structure + DACTION_DEMOLISH, ///< 4 demolishing a structure + DACTION_REPAIR, ///< 5 repairing a structure + DACTION_ATTACK, ///< 6 attacking something + DACTION_OBSERVE, ///< 7 observing something + DACTION_FIRESUPPORT, ///< 8 attacking something visible by a sensor droid + DACTION_SULK, ///< 9 refuse to do anything aggressive for a fixed time + DACTION_DESTRUCT, ///< 10 self destruct + DACTION_TRANSPORTOUT, ///< 11 move transporter offworld + DACTION_TRANSPORTWAITTOFLYIN, ///< 12 wait for timer to move reinforcements in + DACTION_TRANSPORTIN, ///< 13 move transporter onworld + DACTION_DROIDREPAIR, ///< 14 repairing a droid + DACTION_RESTORE, ///< 15 restore resistance points of a structure + DACTION_UNUSED, ///< 16 // The states below are used by the action system // but should not be given as an action - DACTION_MOVEFIRE, ///< 17 - DACTION_MOVETOBUILD, ///< 18 moving to a new building location - DACTION_MOVETODEMOLISH, ///< 19 moving to a new demolition location - DACTION_MOVETOREPAIR, ///< 20 moving to a new repair location - DACTION_BUILDWANDER, ///< 21 moving around while building - DACTION_FOUNDATION_WANDER, ///< 22 used to be moving around while building the foundation - DACTION_MOVETOATTACK, ///< 23 moving to a target to attack - DACTION_ROTATETOATTACK, ///< 24 rotating to a target to attack - DACTION_MOVETOOBSERVE, ///< 25 moving to be able to see a target - DACTION_WAITFORREPAIR, ///< 26 waiting to be repaired by a facility - DACTION_MOVETOREPAIRPOINT, ///< 27 move to repair facility repair point - DACTION_WAITDURINGREPAIR, ///< 28 waiting to be repaired by a facility - DACTION_MOVETODROIDREPAIR, ///< 29 moving to a new location next to droid to be repaired - DACTION_MOVETORESTORE, ///< 30 moving to a low resistance structure - DACTION_UNUSED2, - DACTION_MOVETOREARM, ///< 32 moving to a rearming pad - VTOLS - DACTION_WAITFORREARM, ///< 33 waiting for rearm - VTOLS - DACTION_MOVETOREARMPOINT, ///< 34 move to rearm point - VTOLS - this actually moves them onto the pad - DACTION_WAITDURINGREARM, ///< 35 waiting during rearm process- VTOLS - DACTION_VTOLATTACK, ///< 36 a VTOL droid doing attack runs - DACTION_CLEARREARMPAD, ///< 37 a VTOL droid being told to get off a rearm pad - DACTION_RETURNTOPOS, ///< 38 used by scout/patrol order when returning to route - DACTION_FIRESUPPORT_RETREAT, ///< 39 used by firesupport order when sensor retreats + DACTION_MOVEFIRE, ///< 17 + DACTION_MOVETOBUILD, ///< 18 moving to a new building location + DACTION_MOVETODEMOLISH, ///< 19 moving to a new demolition location + DACTION_MOVETOREPAIR, ///< 20 moving to a new repair location + DACTION_BUILDWANDER, ///< 21 moving around while building + DACTION_FOUNDATION_WANDER, ///< 22 used to be moving around while building the foundation + DACTION_MOVETOATTACK, ///< 23 moving to a target to attack + DACTION_ROTATETOATTACK, ///< 24 rotating to a target to attack + DACTION_MOVETOOBSERVE, ///< 25 moving to be able to see a target + DACTION_WAITFORREPAIR, ///< 26 waiting to be repaired by a facility + DACTION_MOVETOREPAIRPOINT, ///< 27 move to repair facility repair point + DACTION_WAITDURINGREPAIR, ///< 28 waiting to be repaired by a facility + DACTION_MOVETODROIDREPAIR, ///< 29 moving to a new location next to droid to be repaired + DACTION_MOVETORESTORE, ///< 30 moving to a low resistance structure + DACTION_UNUSED2, ///< 31 + DACTION_MOVETOREARM, ///< 32 moving to a rearming pad - VTOLS + DACTION_WAITFORREARM, ///< 33 waiting for rearm - VTOLS + DACTION_MOVETOREARMPOINT, ///< 34 move to rearm point - VTOLS - this actually moves them onto the pad + DACTION_WAITDURINGREARM, ///< 35 waiting during rearm process- VTOLS + DACTION_VTOLATTACK, ///< 36 a VTOL droid doing attack runs + DACTION_CLEARREARMPAD, ///< 37 a VTOL droid being told to get off a rearm pad + DACTION_RETURNTOPOS, ///< 38 used by scout/patrol order when returning to route + DACTION_FIRESUPPORT_RETREAT, ///< 39 used by firesupport order when sensor retreats // ACTION UNKNOWN - DACTION_CIRCLE = 41, ///< 41 circling while engaging + DACTION_CIRCLE = 41, ///< 41 circling while engaging }; #endif // __INCLUDED_SRC_ACTIONDEF_H__