Skip to content

Commit f39ada0

Browse files
BenLubarBenLubar
committed
explicitly number chatter enum
1 parent 59aced3 commit f39ada0

File tree

1 file changed

+134
-133
lines changed

1 file changed

+134
-133
lines changed

‎src/game/shared/swarm/asw_marine_profile.h‎

Lines changed: 134 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#define CHATTER_STRING_SIZE 64
1313

14-
#define NUM_CHATTER_LINES 124
1514
#define NUM_SUB_CHATTERS 18 // max variations allowed for a chatter line
1615

1716
extern const char *const g_szMarineClassLabel[NUM_MARINE_CLASSES];
@@ -36,137 +35,139 @@ const char* GetVoiceShortName( ASW_Voice_Type voice );
3635

3736
// different chatter lines
3837
enum {
39-
CHATTER_SELECTION,
40-
CHATTER_SELECTION_INJURED,
41-
CHATTER_USE,
42-
CHATTER_IDLE,
43-
CHATTER_FRIENDLY_FIRE,
44-
CHATTER_FIRING_AT_ALIEN,
45-
CHATTER_FOLLOW_ME,
46-
CHATTER_HOLD_POSITION,
47-
CHATTER_NEED_AMMO,
48-
CHATTER_NO_AMMO,
49-
CHATTER_MEDIC,
50-
CHATTER_RELOADING,
51-
CHATTER_SENTRY,
52-
CHATTER_AMMO,
53-
CHATTER_MEDKIT,
54-
CHATTER_THANKS,
55-
CHATTER_QUESTION,
56-
CHATTER_SARGE,
57-
CHATTER_JAEGER,
58-
CHATTER_WILDCAT,
59-
CHATTER_WOLFE,
60-
CHATTER_FAITH,
61-
CHATTER_BASTILLE,
62-
CHATTER_CRASH,
63-
CHATTER_FLYNN,
64-
CHATTER_VEGAS,
65-
CHATTER_SUPPLIES,
66-
CHATTER_SUPPLIES_AMMO,
67-
CHATTER_LOCKED_TERMINAL,
68-
CHATTER_LOCKED_TERMINAL_CRASH,
69-
CHATTER_LOCKED_TERMINAL_FLYNN,
70-
CHATTER_LOCKED_TERMINAL_VEGAS,
71-
CHATTER_HOLDING_POSITION,
72-
CHATTER_HOLDING_NORTH,
73-
CHATTER_HOLDING_SOUTH,
74-
CHATTER_HOLDING_EAST,
75-
CHATTER_HOLDING_WEST,
76-
CHATTER_GOT_POINT,
77-
CHATTER_GOT_REAR,
78-
CHATTER_REQUEST_SEAL_DOOR,
79-
CHATTER_REQUEST_CUT_DOOR,
80-
CHATTER_REQUEST_SHOOT_DOOR,
81-
CHATTER_CUTTING_DOOR,
82-
CHATTER_SEALING_DOOR,
83-
CHATTER_BIOMASS,
84-
CHATTER_TIME_TO_LEAVE,
85-
CHATTER_WATCH_OUT,
86-
CHATTER_SHIELDBUG,
87-
CHATTER_SHIELDBUG_HINT,
88-
CHATTER_PARASITE,
89-
CHATTER_INFESTED,
90-
CHATTER_EGGS,
91-
CHATTER_GRENADE,
92-
CHATTER_ALIEN_TOO_CLOSE,
93-
CHATTER_MAD_FIRING,
94-
CHATTER_BREACHED_DOOR,
95-
CHATTER_MARINE_DOWN,
96-
CHATTER_PAIN_SMALL,
97-
CHATTER_PAIN_LARGE,
98-
CHATTER_DIE,
99-
CHATTER_ON_FIRE,
100-
CHATTER_COMPLIMENTS,
101-
CHATTER_STIM_NOW,
102-
CHATTER_IMPATIENCE,
103-
104-
CHATTER_COMPLIMENTS_JAEGER, // sarge only
105-
CHATTER_COMPLIMENTS_SARGE, // jaeger only
106-
CHATTER_COMPLIMENTS_WILDCAT, // wolfe only
107-
CHATTER_COMPLIMENTS_WOLFE, // wildcat only
108-
CHATTER_COMPLIMENTS_CRASH, // wildcat only
109-
110-
CHATTER_HEALING, // class specific..
111-
CHATTER_MEDS_LOW,
112-
CHATTER_MEDS_NONE,
113-
114-
CHATTER_HACK_STARTED,
115-
CHATTER_HACK_LONG_STARTED,
116-
CHATTER_HACK_HALFWAY,
117-
CHATTER_HACK_FINISHED,
118-
CHATTER_HACK_BUTTON_FINISHED,
119-
120-
CHATTER_SCANNER,
121-
CHATTER_SCANNER_MULTIPLE,
122-
123-
CHATTER_MINE_DEPLOYED,
124-
125-
CHATTER_SYNUP_SPOTTED, // crash/vegas only // conversations...
126-
CHATTER_SYNUP_REPLY, // faith/bastille only
127-
CHATTER_CRASH_COMPLAIN,
128-
CHATTER_CRASH_COMPLAIN_REPLY,
129-
CHATTER_MEDIC_COMPLAIN,
130-
CHATTER_MEDIC_COMPLAIN_REPLY,
131-
CHATTER_HEALING_CRASH, // bastille only
132-
CHATTER_HEALING_CRASH_REPLY,
133-
CHATTER_TEQUILA_START, // Vegas only
134-
CHATTER_TEQUILA_REPLY,
135-
CHATTER_TEQUILA_REPLY_SARGE, // Vegas only
136-
CHATTER_TEQUILA_REPLY_JAEGER, // Vegas only
137-
CHATTER_TEQUILA_REPLY_WILDCAT, // Vegas only
138-
CHATTER_TEQUILA_REPLY_WOLFE, // Vegas only
139-
CHATTER_TEQUILA_REPLY_FAITH, // Vegas only
140-
CHATTER_TEQUILA_REPLY_BASTILLE, // Vegas only
141-
CHATTER_CRASH_IDLE, // crash only
142-
CHATTER_CRASH_IDLE_REPLY, // sarge/crash only
143-
CHATTER_SERIOUS_INJURY, // faith/bastille only
144-
CHATTER_SERIOUS_INJURY_REPLY, // all marines
145-
CHATTER_SERIOUS_INJURY_FOLLOW_UP, // faith/bastille only
146-
CHATTER_STILL_BREATHING, // jaeger only
147-
CHATTER_STILL_BREATHING_REPLY,
148-
CHATTER_SARGE_IDLE, // sarge only
149-
CHATTER_SARGE_IDLE_REPLY,
150-
CHATTER_BIG_ALIEN_DEAD, // crash only
151-
CHATTER_BIG_ALIEN_REPLY,
152-
CHATTER_AUTOGUN, // wildcat/wolfe only
153-
CHATTER_AUTOGUN_REPLY,
154-
CHATTER_WOLFE_BEST, // wolfe only
155-
CHATTER_WOLFE_BEST_REPLY, // wolfe only
156-
CHATTER_FIRST_BLOOD_START, // vegas only
157-
CHATTER_FIRST_BLOOD_WIN, // vegas only
158-
CHATTER_SARGE_JAEGER_CONV_1,
159-
CHATTER_SARGE_JAEGER_CONV_1_REPLY,
160-
CHATTER_SARGE_JAEGER_CONV_2,
161-
CHATTER_SARGE_JAEGER_CONV_2_REPLY,
162-
CHATTER_WILDCAT_KILL,
163-
CHATTER_WILDCAT_KILL_REPLY_AHEAD,
164-
CHATTER_WILDCAT_KILL_REPLY_BEHIND,
165-
CHATTER_WOLFE_KILL,
166-
CHATTER_WOLFE_KILL_REPLY_AHEAD,
167-
CHATTER_WOLFE_KILL_REPLY_BEHIND, // 123rd chatter line
168-
169-
CHATTER_MISC, // 124th chatter line
38+
CHATTER_SELECTION = 0,
39+
CHATTER_SELECTION_INJURED = 1,
40+
CHATTER_USE = 2,
41+
CHATTER_IDLE = 3,
42+
CHATTER_FRIENDLY_FIRE = 4,
43+
CHATTER_FIRING_AT_ALIEN = 5,
44+
CHATTER_FOLLOW_ME = 6,
45+
CHATTER_HOLD_POSITION = 7,
46+
CHATTER_NEED_AMMO = 8,
47+
CHATTER_NO_AMMO = 9,
48+
CHATTER_MEDIC = 10,
49+
CHATTER_RELOADING = 11,
50+
CHATTER_SENTRY = 12,
51+
CHATTER_AMMO = 13,
52+
CHATTER_MEDKIT = 14,
53+
CHATTER_THANKS = 15,
54+
CHATTER_QUESTION = 16,
55+
CHATTER_SARGE = 17,
56+
CHATTER_JAEGER = 18,
57+
CHATTER_WILDCAT = 19,
58+
CHATTER_WOLFE = 20,
59+
CHATTER_FAITH = 21,
60+
CHATTER_BASTILLE = 22,
61+
CHATTER_CRASH = 23,
62+
CHATTER_FLYNN = 24,
63+
CHATTER_VEGAS = 25,
64+
CHATTER_SUPPLIES = 26,
65+
CHATTER_SUPPLIES_AMMO = 27,
66+
CHATTER_LOCKED_TERMINAL = 28,
67+
CHATTER_LOCKED_TERMINAL_CRASH = 29,
68+
CHATTER_LOCKED_TERMINAL_FLYNN = 30,
69+
CHATTER_LOCKED_TERMINAL_VEGAS = 31,
70+
CHATTER_HOLDING_POSITION = 32,
71+
CHATTER_HOLDING_NORTH = 33,
72+
CHATTER_HOLDING_SOUTH = 34,
73+
CHATTER_HOLDING_EAST = 35,
74+
CHATTER_HOLDING_WEST = 36,
75+
CHATTER_GOT_POINT = 37,
76+
CHATTER_GOT_REAR = 38,
77+
CHATTER_REQUEST_SEAL_DOOR = 39,
78+
CHATTER_REQUEST_CUT_DOOR = 40,
79+
CHATTER_REQUEST_SHOOT_DOOR = 41,
80+
CHATTER_CUTTING_DOOR = 42,
81+
CHATTER_SEALING_DOOR = 43,
82+
CHATTER_BIOMASS = 44,
83+
CHATTER_TIME_TO_LEAVE = 45,
84+
CHATTER_WATCH_OUT = 46,
85+
CHATTER_SHIELDBUG = 47,
86+
CHATTER_SHIELDBUG_HINT = 48,
87+
CHATTER_PARASITE = 49,
88+
CHATTER_INFESTED = 50,
89+
CHATTER_EGGS = 51,
90+
CHATTER_GRENADE = 52,
91+
CHATTER_ALIEN_TOO_CLOSE = 53,
92+
CHATTER_MAD_FIRING = 54,
93+
CHATTER_BREACHED_DOOR = 55,
94+
CHATTER_MARINE_DOWN = 56,
95+
CHATTER_PAIN_SMALL = 57,
96+
CHATTER_PAIN_LARGE = 58,
97+
CHATTER_DIE = 59,
98+
CHATTER_ON_FIRE = 60,
99+
CHATTER_COMPLIMENTS = 61,
100+
CHATTER_STIM_NOW = 62,
101+
CHATTER_IMPATIENCE = 63,
102+
103+
CHATTER_COMPLIMENTS_JAEGER = 64, // sarge only
104+
CHATTER_COMPLIMENTS_SARGE = 65, // jaeger only
105+
CHATTER_COMPLIMENTS_WILDCAT = 66, // wolfe only
106+
CHATTER_COMPLIMENTS_WOLFE = 67, // wildcat only
107+
CHATTER_COMPLIMENTS_CRASH = 68, // wildcat only
108+
109+
CHATTER_HEALING = 69, // class specific..
110+
CHATTER_MEDS_LOW = 70,
111+
CHATTER_MEDS_NONE = 71,
112+
113+
CHATTER_HACK_STARTED = 72,
114+
CHATTER_HACK_LONG_STARTED = 73,
115+
CHATTER_HACK_HALFWAY = 74,
116+
CHATTER_HACK_FINISHED = 75,
117+
CHATTER_HACK_BUTTON_FINISHED = 76,
118+
119+
CHATTER_SCANNER = 77,
120+
CHATTER_SCANNER_MULTIPLE = 78,
121+
122+
CHATTER_MINE_DEPLOYED = 79,
123+
124+
CHATTER_SYNUP_SPOTTED = 80, // crash/vegas only // conversations...
125+
CHATTER_SYNUP_REPLY = 81, // faith/bastille only
126+
CHATTER_CRASH_COMPLAIN = 82,
127+
CHATTER_CRASH_COMPLAIN_REPLY = 83,
128+
CHATTER_MEDIC_COMPLAIN = 84,
129+
CHATTER_MEDIC_COMPLAIN_REPLY = 85,
130+
CHATTER_HEALING_CRASH = 86, // bastille only
131+
CHATTER_HEALING_CRASH_REPLY = 87,
132+
CHATTER_TEQUILA_START = 88, // Vegas only
133+
CHATTER_TEQUILA_REPLY = 89,
134+
CHATTER_TEQUILA_REPLY_SARGE = 90, // Vegas only
135+
CHATTER_TEQUILA_REPLY_JAEGER = 91, // Vegas only
136+
CHATTER_TEQUILA_REPLY_WILDCAT = 92, // Vegas only
137+
CHATTER_TEQUILA_REPLY_WOLFE = 93, // Vegas only
138+
CHATTER_TEQUILA_REPLY_FAITH = 94, // Vegas only
139+
CHATTER_TEQUILA_REPLY_BASTILLE = 95, // Vegas only
140+
CHATTER_CRASH_IDLE = 96, // crash only
141+
CHATTER_CRASH_IDLE_REPLY = 97, // sarge/crash only
142+
CHATTER_SERIOUS_INJURY = 98, // faith/bastille only
143+
CHATTER_SERIOUS_INJURY_REPLY = 99, // all marines
144+
CHATTER_SERIOUS_INJURY_FOLLOW_UP = 100, // faith/bastille only
145+
CHATTER_STILL_BREATHING = 101, // jaeger only
146+
CHATTER_STILL_BREATHING_REPLY = 102,
147+
CHATTER_SARGE_IDLE = 103, // sarge only
148+
CHATTER_SARGE_IDLE_REPLY = 104,
149+
CHATTER_BIG_ALIEN_DEAD = 105, // crash only
150+
CHATTER_BIG_ALIEN_REPLY = 106,
151+
CHATTER_AUTOGUN = 107, // wildcat/wolfe only
152+
CHATTER_AUTOGUN_REPLY = 108,
153+
CHATTER_WOLFE_BEST = 109, // wolfe only
154+
CHATTER_WOLFE_BEST_REPLY = 110, // wolfe only
155+
CHATTER_FIRST_BLOOD_START = 111, // vegas only
156+
CHATTER_FIRST_BLOOD_WIN = 112, // vegas only
157+
CHATTER_SARGE_JAEGER_CONV_1 = 113,
158+
CHATTER_SARGE_JAEGER_CONV_1_REPLY = 114,
159+
CHATTER_SARGE_JAEGER_CONV_2 = 115,
160+
CHATTER_SARGE_JAEGER_CONV_2_REPLY = 116,
161+
CHATTER_WILDCAT_KILL = 117,
162+
CHATTER_WILDCAT_KILL_REPLY_AHEAD = 118,
163+
CHATTER_WILDCAT_KILL_REPLY_BEHIND = 119,
164+
CHATTER_WOLFE_KILL = 120,
165+
CHATTER_WOLFE_KILL_REPLY_AHEAD = 121,
166+
CHATTER_WOLFE_KILL_REPLY_BEHIND = 122, // 123rd chatter line
167+
168+
CHATTER_MISC = 123, // 124th chatter line
169+
170+
NUM_CHATTER_LINES = 124,
170171
};
171172

172173
enum ASW_Pronouns
@@ -303,4 +304,4 @@ inline bool CASW_Marine_Profile::CanUseAutogun( void )
303304
{
304305
return GetMarineClass() == MARINE_CLASS_SPECIAL_WEAPONS;
305306
}
306-
#endif /* ASW_MARINEPROFILE_H */
307+
#endif /* ASW_MARINEPROFILE_H */

0 commit comments

Comments
 (0)