ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_chat.C
(Generate patch)

Comparing deliantra/server/server/c_chat.C (file contents):
Revision 1.4 by root, Sun Sep 3 00:18:42 2006 UTC vs.
Revision 1.10 by pippijn, Mon Jan 15 21:06:19 2007 UTC

1/* 1/*
2 * static char *rcsid_c_chat_c = 2 * CrossFire, A Multiplayer game for X-windows
3 * "$Id: c_chat.C,v 1.4 2006/09/03 00:18:42 root Exp $"; 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
4 */ 23 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen
11
12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version.
16
17 This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details.
21
22 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25
26 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/
28 24
29#include <global.h> 25#include <global.h>
30#include <loader.h> 26#include <loader.h>
31#include <sproto.h> 27#include <sproto.h>
32 28
29int
33int command_me (object *op, char *params) 30command_me (object *op, char *params)
34{ 31{
35 char buf[MAX_BUF]; 32 char buf[MAX_BUF];
36 33
37 if (!params) return 0; 34 if (!params)
38 snprintf(buf, MAX_BUF-1, "%s %s",&op->name, params);
39 new_info_map(NDI_UNIQUE|NDI_BLUE,op->map, buf);
40
41 return 0; 35 return 0;
42} 36 snprintf (buf, MAX_BUF - 1, "%s %s", &op->name, params);
37 new_info_map (NDI_UNIQUE | NDI_BLUE, op->map, buf);
43 38
39 return 0;
40}
44 41
42
43int
45int command_cointoss(object *op, char *params) 44command_cointoss (object *op, char *params)
46{ 45{
47 char buf[MAX_BUF]; 46 char buf[MAX_BUF];
48 char buf2[MAX_BUF]; 47 char buf2[MAX_BUF];
49 int i; 48 int i;
50 49
51 i = rndm(1, 2); 50 i = rndm (1, 2);
52 if (i == 1) { 51 if (i == 1)
52 {
53 snprintf(buf, MAX_BUF-1, "%s flips a coin.... Heads!", &op->name); 53 snprintf (buf, MAX_BUF - 1, "%s flips a coin.... Heads!", &op->name);
54 snprintf(buf2, MAX_BUF-1, "You flip a coin.... Heads!"); 54 snprintf (buf2, MAX_BUF - 1, "You flip a coin.... Heads!");
55 } else {
56 snprintf(buf, MAX_BUF-1, "%s flips a coin.... Tails!", &op->name);
57 snprintf(buf2, MAX_BUF-1, "You flip a coin.... Tails!");
58 } 55 }
56 else
57 {
58 snprintf (buf, MAX_BUF - 1, "%s flips a coin.... Tails!", &op->name);
59 snprintf (buf2, MAX_BUF - 1, "You flip a coin.... Tails!");
60 }
59 new_draw_info(NDI_UNIQUE, 0, op, buf2); 61 new_draw_info (NDI_UNIQUE, 0, op, buf2);
60 new_info_map_except(NDI_WHITE, op->map, op, buf); 62 new_info_map_except (NDI_WHITE, op->map, op, buf);
61 return 0; 63 return 0;
62} 64}
63 65
64static const char* const orcknuckle[7] = {"none", "beholder", "ghost", "knight", 66static const char *const orcknuckle[7] = { "none", "beholder", "ghost", "knight",
65 "princess", "dragon", "orc"}; 67 "princess", "dragon", "orc"
68};
66 69
70int
67int command_orcknuckle(object *op, char *params) 71command_orcknuckle (object *op, char *params)
68{ 72{
69 char buf[MAX_BUF]; 73 char buf[MAX_BUF];
70 char buf2[MAX_BUF]; 74 char buf2[MAX_BUF];
71 int i, j, k, l; 75 int i, j, k, l;
72 76
73 i = rndm(1, 5); 77 i = rndm (1, 5);
74 j = rndm(1, 5); 78 j = rndm (1, 5);
75 k = rndm(1, 5); 79 k = rndm (1, 5);
76 l = rndm(1, 6); 80 l = rndm (1, 6);
77 81
78 snprintf(buf2, MAX_BUF-1, "%s rolls %s, %s, %s, %s!", &op->name, 82 snprintf (buf2, MAX_BUF - 1, "%s rolls %s, %s, %s, %s!", &op->name, orcknuckle[i], orcknuckle[j], orcknuckle[k], orcknuckle[l]);
79 orcknuckle[i], orcknuckle[j], orcknuckle[k], orcknuckle[l]); 83 snprintf (buf, MAX_BUF - 1, "You roll %s, %s, %s, %s!", orcknuckle[i], orcknuckle[j], orcknuckle[k], orcknuckle[l]);
80 snprintf(buf, MAX_BUF-1, "You roll %s, %s, %s, %s!",
81 orcknuckle[i], orcknuckle[j], orcknuckle[k], orcknuckle[l]);
82 new_draw_info(NDI_UNIQUE, 0, op, buf); 84 new_draw_info (NDI_UNIQUE, 0, op, buf);
83 new_info_map_except(NDI_UNIQUE, op->map, op, buf2); 85 new_info_map_except (NDI_UNIQUE, op->map, op, buf2);
84 return 0; 86 return 0;
85} 87}
86 88
87/* 89/*
88 * This function covers basic emotions a player can have. An emotion can be 90 * This function covers basic emotions a player can have. An emotion can be
89 * one of three things currently. Directed at oneself, directed at someone, 91 * one of three things currently. Directed at oneself, directed at someone,
… …
93 * that are not. Helper functions will call basic_emote with the proper 95 * that are not. Helper functions will call basic_emote with the proper
94 * arguments, translating them into commands. Adding a new emotion can be 96 * arguments, translating them into commands. Adding a new emotion can be
95 * done by editing command.c and command.h. 97 * done by editing command.c and command.h.
96 * [garbled 09-25-2001] 98 * [garbled 09-25-2001]
97 */ 99 */
98 100static int
99static int basic_emote(object *op, char *params, int emotion) 101basic_emote (object *op, char *params, int emotion)
100{ 102{
101 char buf[MAX_BUF], buf2[MAX_BUF], buf3[MAX_BUF]; 103 char buf[MAX_BUF], buf2[MAX_BUF], buf3[MAX_BUF];
102 player *pl; 104 player *pl;
103 105
104 if (!params) { 106 if (!params)
107 {
105 switch(emotion) { 108 switch (emotion)
109 {
106 case EMOTE_NOD: 110 case EMOTE_NOD:
107 sprintf(buf, "%s nods solemnly.", &op->name); 111 sprintf (buf, "%s nods solemnly.", &op->name);
108 sprintf(buf2, "You nod solemnly."); 112 sprintf (buf2, "You nod solemnly.");
109 break; 113 break;
110 case EMOTE_DANCE: 114 case EMOTE_DANCE:
111 sprintf(buf, "%s expresses himself through interpretive dance.", 115 sprintf (buf, "%s expresses himself through interpretive dance.", &op->name);
112 &op->name);
113 sprintf(buf2, "You dance with glee."); 116 sprintf (buf2, "You dance with glee.");
114 break; 117 break;
115 case EMOTE_KISS: 118 case EMOTE_KISS:
116 sprintf(buf, "%s makes a weird facial contortion", &op->name); 119 sprintf (buf, "%s makes a weird facial contortion", &op->name);
117 sprintf(buf2, "All the lonely people.."); 120 sprintf (buf2, "All the lonely people..");
118 break; 121 break;
119 case EMOTE_BOUNCE: 122 case EMOTE_BOUNCE:
120 sprintf(buf, "%s bounces around.", &op->name); 123 sprintf (buf, "%s bounces around.", &op->name);
121 sprintf(buf2, "BOIINNNNNNGG!"); 124 sprintf (buf2, "BOIINNNNNNGG!");
122 break; 125 break;
123 case EMOTE_SMILE: 126 case EMOTE_SMILE:
124 sprintf(buf, "%s smiles happily.", &op->name); 127 sprintf (buf, "%s smiles happily.", &op->name);
125 sprintf(buf2, "You smile happily."); 128 sprintf (buf2, "You smile happily.");
126 break; 129 break;
127 case EMOTE_CACKLE: 130 case EMOTE_CACKLE:
128 sprintf(buf, "%s throws back his head and cackles with insane " 131 sprintf (buf, "%s throws back his head and cackles with insane " "glee!", &op->name);
129 "glee!", &op->name);
130 sprintf(buf2, "You cackle gleefully."); 132 sprintf (buf2, "You cackle gleefully.");
131 break; 133 break;
132 case EMOTE_LAUGH: 134 case EMOTE_LAUGH:
133 sprintf(buf, "%s falls down laughing.", &op->name); 135 sprintf (buf, "%s falls down laughing.", &op->name);
134 sprintf(buf2, "You fall down laughing."); 136 sprintf (buf2, "You fall down laughing.");
135 break; 137 break;
136 case EMOTE_GIGGLE: 138 case EMOTE_GIGGLE:
137 sprintf(buf, "%s giggles.", &op->name); 139 sprintf (buf, "%s giggles.", &op->name);
138 sprintf(buf2, "You giggle."); 140 sprintf (buf2, "You giggle.");
139 break; 141 break;
140 case EMOTE_SHAKE: 142 case EMOTE_SHAKE:
141 sprintf(buf, "%s shakes his head.", &op->name); 143 sprintf (buf, "%s shakes his head.", &op->name);
142 sprintf(buf2, "You shake your head."); 144 sprintf (buf2, "You shake your head.");
143 break; 145 break;
144 case EMOTE_PUKE: 146 case EMOTE_PUKE:
145 sprintf(buf, "%s pukes.", &op->name); 147 sprintf (buf, "%s pukes.", &op->name);
146 sprintf(buf2, "Bleaaaaaghhhhhhh!"); 148 sprintf (buf2, "Bleaaaaaghhhhhhh!");
147 break; 149 break;
148 case EMOTE_GROWL: 150 case EMOTE_GROWL:
149 sprintf(buf, "%s growls.", &op->name); 151 sprintf (buf, "%s growls.", &op->name);
150 sprintf(buf2, "Grrrrrrrrr...."); 152 sprintf (buf2, "Grrrrrrrrr....");
151 break; 153 break;
152 case EMOTE_SCREAM: 154 case EMOTE_SCREAM:
153 sprintf(buf, "%s screams at the top of his lungs!", &op->name); 155 sprintf (buf, "%s screams at the top of his lungs!", &op->name);
154 sprintf(buf2, "ARRRRRRRRRRGH!!!!!"); 156 sprintf (buf2, "ARRRRRRRRRRGH!!!!!");
155 break; 157 break;
156 case EMOTE_SIGH: 158 case EMOTE_SIGH:
157 sprintf(buf, "%s sighs loudly.", &op->name); 159 sprintf (buf, "%s sighs loudly.", &op->name);
158 sprintf(buf2, "You sigh."); 160 sprintf (buf2, "You sigh.");
159 break; 161 break;
160 case EMOTE_SULK: 162 case EMOTE_SULK:
161 sprintf(buf, "%s sulks in the corner.", &op->name); 163 sprintf (buf, "%s sulks in the corner.", &op->name);
162 sprintf(buf2, "You sulk."); 164 sprintf (buf2, "You sulk.");
163 break; 165 break;
164 case EMOTE_CRY: 166 case EMOTE_CRY:
165 sprintf(buf, "%s bursts into tears.", &op->name); 167 sprintf (buf, "%s bursts into tears.", &op->name);
166 sprintf(buf2, "Waaaaaaahhh.."); 168 sprintf (buf2, "Waaaaaaahhh..");
167 break; 169 break;
168 case EMOTE_GRIN: 170 case EMOTE_GRIN:
169 sprintf(buf, "%s grins evilly.", &op->name); 171 sprintf (buf, "%s grins evilly.", &op->name);
170 sprintf(buf2, "You grin evilly."); 172 sprintf (buf2, "You grin evilly.");
171 break; 173 break;
172 case EMOTE_BOW: 174 case EMOTE_BOW:
173 sprintf(buf, "%s bows deeply.", &op->name); 175 sprintf (buf, "%s bows deeply.", &op->name);
174 sprintf(buf2, "You bow deeply."); 176 sprintf (buf2, "You bow deeply.");
175 break; 177 break;
176 case EMOTE_CLAP: 178 case EMOTE_CLAP:
177 sprintf(buf, "%s gives a round of applause.", &op->name); 179 sprintf (buf, "%s gives a round of applause.", &op->name);
178 sprintf(buf2, "Clap, clap, clap."); 180 sprintf (buf2, "Clap, clap, clap.");
179 break; 181 break;
180 case EMOTE_BLUSH: 182 case EMOTE_BLUSH:
181 sprintf(buf, "%s blushes.", &op->name); 183 sprintf (buf, "%s blushes.", &op->name);
182 sprintf(buf2, "Your cheeks are burning."); 184 sprintf (buf2, "Your cheeks are burning.");
183 break; 185 break;
184 case EMOTE_BURP: 186 case EMOTE_BURP:
185 sprintf(buf, "%s burps loudly.", &op->name); 187 sprintf (buf, "%s burps loudly.", &op->name);
186 sprintf(buf2, "You burp loudly."); 188 sprintf (buf2, "You burp loudly.");
187 break; 189 break;
188 case EMOTE_CHUCKLE: 190 case EMOTE_CHUCKLE:
189 sprintf(buf, "%s chuckles politely.", &op->name); 191 sprintf (buf, "%s chuckles politely.", &op->name);
190 sprintf(buf2, "You chuckle politely"); 192 sprintf (buf2, "You chuckle politely");
191 break; 193 break;
192 case EMOTE_COUGH: 194 case EMOTE_COUGH:
193 sprintf(buf, "%s coughs loudly.", &op->name); 195 sprintf (buf, "%s coughs loudly.", &op->name);
194 sprintf(buf2, "Yuck, try to cover your mouth next time!"); 196 sprintf (buf2, "Yuck, try to cover your mouth next time!");
195 break; 197 break;
196 case EMOTE_FLIP: 198 case EMOTE_FLIP:
197 sprintf(buf, "%s flips head over heels.", &op->name); 199 sprintf (buf, "%s flips head over heels.", &op->name);
198 sprintf(buf2, "You flip head over heels."); 200 sprintf (buf2, "You flip head over heels.");
199 break; 201 break;
200 case EMOTE_FROWN: 202 case EMOTE_FROWN:
201 sprintf(buf, "%s frowns.", &op->name); 203 sprintf (buf, "%s frowns.", &op->name);
202 sprintf(buf2, "What's bothering you?"); 204 sprintf (buf2, "What's bothering you?");
203 break; 205 break;
204 case EMOTE_GASP: 206 case EMOTE_GASP:
205 sprintf(buf, "%s gasps in astonishment.", &op->name); 207 sprintf (buf, "%s gasps in astonishment.", &op->name);
206 sprintf(buf2, "You gasp in astonishment."); 208 sprintf (buf2, "You gasp in astonishment.");
207 break; 209 break;
208 case EMOTE_GLARE: 210 case EMOTE_GLARE:
209 sprintf(buf, "%s glares around him.", &op->name); 211 sprintf (buf, "%s glares around him.", &op->name);
210 sprintf(buf2, "You glare at nothing in particular."); 212 sprintf (buf2, "You glare at nothing in particular.");
211 break; 213 break;
212 case EMOTE_GROAN: 214 case EMOTE_GROAN:
213 sprintf(buf, "%s groans loudly.", &op->name); 215 sprintf (buf, "%s groans loudly.", &op->name);
214 sprintf(buf2, "You groan loudly."); 216 sprintf (buf2, "You groan loudly.");
215 break; 217 break;
216 case EMOTE_HICCUP: 218 case EMOTE_HICCUP:
217 sprintf(buf, "%s hiccups.", &op->name); 219 sprintf (buf, "%s hiccups.", &op->name);
218 sprintf(buf2, "*HIC*"); 220 sprintf (buf2, "*HIC*");
219 break; 221 break;
220 case EMOTE_LICK: 222 case EMOTE_LICK:
221 sprintf(buf, "%s licks his mouth and smiles.", &op->name); 223 sprintf (buf, "%s licks his mouth and smiles.", &op->name);
222 sprintf(buf2, "You lick your mouth and smile."); 224 sprintf (buf2, "You lick your mouth and smile.");
223 break; 225 break;
224 case EMOTE_POUT: 226 case EMOTE_POUT:
225 sprintf(buf, "%s pouts.", &op->name); 227 sprintf (buf, "%s pouts.", &op->name);
226 sprintf(buf2, "Aww, don't take it so hard."); 228 sprintf (buf2, "Aww, don't take it so hard.");
227 break; 229 break;
228 case EMOTE_SHIVER: 230 case EMOTE_SHIVER:
229 sprintf(buf, "%s shivers uncomfortably.", &op->name); 231 sprintf (buf, "%s shivers uncomfortably.", &op->name);
230 sprintf(buf2, "Brrrrrrrrr."); 232 sprintf (buf2, "Brrrrrrrrr.");
231 break; 233 break;
232 case EMOTE_SHRUG: 234 case EMOTE_SHRUG:
233 sprintf(buf, "%s shrugs helplessly.", &op->name); 235 sprintf (buf, "%s shrugs helplessly.", &op->name);
234 sprintf(buf2, "You shrug."); 236 sprintf (buf2, "You shrug.");
235 break; 237 break;
236 case EMOTE_SMIRK: 238 case EMOTE_SMIRK:
237 sprintf(buf, "%s smirks.", &op->name); 239 sprintf (buf, "%s smirks.", &op->name);
238 sprintf(buf2, "You smirk."); 240 sprintf (buf2, "You smirk.");
239 break; 241 break;
240 case EMOTE_SNAP: 242 case EMOTE_SNAP:
241 sprintf(buf, "%s snaps his fingers.", &op->name); 243 sprintf (buf, "%s snaps his fingers.", &op->name);
242 sprintf(buf2, "PRONTO! You snap your fingers."); 244 sprintf (buf2, "PRONTO! You snap your fingers.");
243 break; 245 break;
244 case EMOTE_SNEEZE: 246 case EMOTE_SNEEZE:
245 sprintf(buf, "%s sneezes.", &op->name); 247 sprintf (buf, "%s sneezes.", &op->name);
246 sprintf(buf2, "Gesundheit!"); 248 sprintf (buf2, "Gesundheit!");
247 break; 249 break;
248 case EMOTE_SNICKER: 250 case EMOTE_SNICKER:
249 sprintf(buf, "%s snickers softly.", &op->name); 251 sprintf (buf, "%s snickers softly.", &op->name);
250 sprintf(buf2, "You snicker softly."); 252 sprintf (buf2, "You snicker softly.");
251 break; 253 break;
252 case EMOTE_SNIFF: 254 case EMOTE_SNIFF:
253 sprintf(buf, "%s sniffs sadly.", &op->name); 255 sprintf (buf, "%s sniffs sadly.", &op->name);
254 sprintf(buf2, "You sniff sadly. *SNIFF*"); 256 sprintf (buf2, "You sniff sadly. *SNIFF*");
255 break; 257 break;
256 case EMOTE_SNORE: 258 case EMOTE_SNORE:
257 sprintf(buf, "%s snores loudly.", &op->name); 259 sprintf (buf, "%s snores loudly.", &op->name);
258 sprintf(buf2, "Zzzzzzzzzzzzzzz."); 260 sprintf (buf2, "Zzzzzzzzzzzzzzz.");
259 break; 261 break;
260 case EMOTE_SPIT: 262 case EMOTE_SPIT:
261 sprintf(buf, "%s spits over his left shoulder.", &op->name); 263 sprintf (buf, "%s spits over his left shoulder.", &op->name);
262 sprintf(buf2, "You spit over your left shoulder."); 264 sprintf (buf2, "You spit over your left shoulder.");
263 break; 265 break;
264 case EMOTE_STRUT: 266 case EMOTE_STRUT:
265 sprintf(buf, "%s struts proudly.", &op->name); 267 sprintf (buf, "%s struts proudly.", &op->name);
266 sprintf(buf2, "Strut your stuff."); 268 sprintf (buf2, "Strut your stuff.");
267 break; 269 break;
268 case EMOTE_TWIDDLE: 270 case EMOTE_TWIDDLE:
269 sprintf(buf, "%s patiently twiddles his thumbs.", &op->name); 271 sprintf (buf, "%s patiently twiddles his thumbs.", &op->name);
270 sprintf(buf2, "You patiently twiddle your thumbs."); 272 sprintf (buf2, "You patiently twiddle your thumbs.");
271 break; 273 break;
272 case EMOTE_WAVE: 274 case EMOTE_WAVE:
273 sprintf(buf, "%s waves happily.", &op->name); 275 sprintf (buf, "%s waves happily.", &op->name);
274 sprintf(buf2, "You wave."); 276 sprintf (buf2, "You wave.");
275 break; 277 break;
276 case EMOTE_WHISTLE: 278 case EMOTE_WHISTLE:
277 sprintf(buf, "%s whistles appreciatively.", &op->name); 279 sprintf (buf, "%s whistles appreciatively.", &op->name);
278 sprintf(buf2, "You whistle appreciatively."); 280 sprintf (buf2, "You whistle appreciatively.");
279 break; 281 break;
280 case EMOTE_WINK: 282 case EMOTE_WINK:
281 sprintf(buf, "%s winks suggestively.", &op->name); 283 sprintf (buf, "%s winks suggestively.", &op->name);
282 sprintf(buf2, "Have you got something in your eye?"); 284 sprintf (buf2, "Have you got something in your eye?");
283 break; 285 break;
284 case EMOTE_YAWN: 286 case EMOTE_YAWN:
285 sprintf(buf, "%s yawns sleepily.", &op->name); 287 sprintf (buf, "%s yawns sleepily.", &op->name);
286 sprintf(buf2, "You open up your yap and let out a big breeze " 288 sprintf (buf2, "You open up your yap and let out a big breeze " "of stale air.");
287 "of stale air.");
288 break; 289 break;
289 case EMOTE_CRINGE: 290 case EMOTE_CRINGE:
290 sprintf(buf, "%s cringes in terror!", &op->name); 291 sprintf (buf, "%s cringes in terror!", &op->name);
291 sprintf(buf2, "You cringe in terror."); 292 sprintf (buf2, "You cringe in terror.");
292 break; 293 break;
293 case EMOTE_BLEED: 294 case EMOTE_BLEED:
294 sprintf(buf, "%s is bleeding all over the carpet" 295 sprintf (buf, "%s is bleeding all over the carpet" " - got a spare tourniquet?", &op->name);
295 " - got a spare tourniquet?", &op->name);
296 sprintf(buf2, "You bleed all over your nice new armour."); 296 sprintf (buf2, "You bleed all over your nice new armour.");
297 break; 297 break;
298 case EMOTE_THINK: 298 case EMOTE_THINK:
299 sprintf(buf, "%s closes his eyes and thinks really hard.", 299 sprintf (buf, "%s closes his eyes and thinks really hard.", &op->name);
300 &op->name);
301 sprintf(buf2, "Anything in particular that you'd care to think " 300 sprintf (buf2, "Anything in particular that you'd care to think " "about?");
302 "about?");
303 break; 301 break;
304 default: 302 default:
305 sprintf(buf, "%s dances with glee.", &op->name); 303 sprintf (buf, "%s dances with glee.", &op->name);
306 sprintf(buf2, "You are a nut."); 304 sprintf (buf2, "You are a nut.");
307 break; 305 break;
308 } /*case*/ 306 } /*case */
307
309 new_info_map_except(NDI_WHITE, op->map, op, buf); 308 new_info_map_except (NDI_WHITE, op->map, op, buf);
310 new_draw_info(NDI_UNIQUE|NDI_WHITE, 0, op, buf2); 309 new_draw_info (NDI_UNIQUE | NDI_WHITE, 0, op, buf2);
311 return(0); 310 return (0);
312 } else { 311 }
313 for(pl=first_player;pl!=NULL;pl=pl->next) { 312 else
313 {
314 for_all_players (pl)
315 {
314 if(strncasecmp(pl->ob->name, params, MAX_NAME)==0 && 316 if (strncasecmp (pl->ob->name, params, MAX_NAME) == 0 &&
315 pl->ob->map == op->map && pl->ob != op && 317 pl->ob->map == op->map && pl->ob != op && !(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden))
316 !(QUERY_FLAG(pl->ob,FLAG_WIZ) && pl->ob->contr->hidden)) { 318 {
317 /* Hidden dms are not affected by emotions*/ 319 /* Hidden dms are not affected by emotions */
318 switch(emotion) { 320 switch (emotion)
321 {
319 case EMOTE_NOD: 322 case EMOTE_NOD:
320 sprintf(buf, "You nod solemnly to %s.", &pl->ob->name); 323 sprintf (buf, "You nod solemnly to %s.", &pl->ob->name);
321 sprintf(buf2, "%s nods solemnly to you.", &op->name); 324 sprintf (buf2, "%s nods solemnly to you.", &op->name);
322 sprintf(buf3, "%s nods solemnly to %s.", &op->name, 325 sprintf (buf3, "%s nods solemnly to %s.", &op->name, &pl->ob->name);
323 &pl->ob->name);
324 break; 326 break;
325 case EMOTE_DANCE: 327 case EMOTE_DANCE:
326 sprintf(buf, "You grab %s and begin doing the Cha-Cha!", 328 sprintf (buf, "You grab %s and begin doing the Cha-Cha!", &pl->ob->name);
327 &pl->ob->name);
328 sprintf(buf2, "%s grabs you, and begins dancing!", 329 sprintf (buf2, "%s grabs you, and begins dancing!", &op->name);
329 &op->name);
330 sprintf(buf3, "Yipe! %s and %s are doing the Macarena!", 330 sprintf (buf3, "Yipe! %s and %s are doing the Macarena!", &op->name, &pl->ob->name);
331 &op->name, &pl->ob->name);
332 break; 331 break;
333 case EMOTE_KISS: 332 case EMOTE_KISS:
334 sprintf(buf, "You kiss %s.", &pl->ob->name); 333 sprintf (buf, "You kiss %s.", &pl->ob->name);
335 sprintf(buf2, "%s kisses you.", &op->name); 334 sprintf (buf2, "%s kisses you.", &op->name);
336 sprintf(buf3, "%s kisses %s.", &op->name, &pl->ob->name); 335 sprintf (buf3, "%s kisses %s.", &op->name, &pl->ob->name);
337 break; 336 break;
338 case EMOTE_BOUNCE: 337 case EMOTE_BOUNCE:
339 sprintf(buf, "You bounce around the room with %s.", 338 sprintf (buf, "You bounce around the room with %s.", &pl->ob->name);
340 &pl->ob->name);
341 sprintf(buf2, "%s bounces around the room with you.", 339 sprintf (buf2, "%s bounces around the room with you.", &op->name);
342 &op->name);
343 sprintf(buf3, "%s bounces around the room with %s.", 340 sprintf (buf3, "%s bounces around the room with %s.", &op->name, &pl->ob->name);
344 &op->name, &pl->ob->name);
345 break; 341 break;
346 case EMOTE_SMILE: 342 case EMOTE_SMILE:
347 sprintf(buf, "You smile at %s.", &pl->ob->name); 343 sprintf (buf, "You smile at %s.", &pl->ob->name);
348 sprintf(buf2, "%s smiles at you.", &op->name); 344 sprintf (buf2, "%s smiles at you.", &op->name);
349 sprintf(buf3, "%s beams a smile at %s.", &op->name, 345 sprintf (buf3, "%s beams a smile at %s.", &op->name, &pl->ob->name);
350 &pl->ob->name);
351 break; 346 break;
352 case EMOTE_LAUGH: 347 case EMOTE_LAUGH:
353 sprintf(buf, "You take one look at %s and fall down " 348 sprintf (buf, "You take one look at %s and fall down " "laughing.", &pl->ob->name);
354 "laughing.", &pl->ob->name);
355 sprintf(buf2, "%s looks at you and falls down on the " 349 sprintf (buf2, "%s looks at you and falls down on the " "ground laughing.", &op->name);
356 "ground laughing.", &op->name);
357 sprintf(buf3, "%s looks at %s and falls down on the " 350 sprintf (buf3, "%s looks at %s and falls down on the " "ground laughing.", &op->name, &pl->ob->name);
358 "ground laughing.", &op->name, &pl->ob->name);
359 break; 351 break;
360 case EMOTE_SHAKE: 352 case EMOTE_SHAKE:
361 sprintf(buf, "You shake %s's hand.", &pl->ob->name); 353 sprintf (buf, "You shake %s's hand.", &pl->ob->name);
362 sprintf(buf2, "%s shakes your hand.", &op->name); 354 sprintf (buf2, "%s shakes your hand.", &op->name);
363 sprintf(buf3, "%s shakes %s's hand.", &op->name, 355 sprintf (buf3, "%s shakes %s's hand.", &op->name, &pl->ob->name);
364 &pl->ob->name);
365 break; 356 break;
366 case EMOTE_PUKE: 357 case EMOTE_PUKE:
367 sprintf(buf, "You puke on %s.", &pl->ob->name); 358 sprintf (buf, "You puke on %s.", &pl->ob->name);
368 sprintf(buf2, "%s pukes on your clothes!", &op->name); 359 sprintf (buf2, "%s pukes on your clothes!", &op->name);
369 sprintf(buf3, "%s pukes on %s.", &op->name, &pl->ob->name); 360 sprintf (buf3, "%s pukes on %s.", &op->name, &pl->ob->name);
370 break; 361 break;
371 case EMOTE_HUG: 362 case EMOTE_HUG:
372 sprintf(buf, "You hug %s.", &pl->ob->name); 363 sprintf (buf, "You hug %s.", &pl->ob->name);
373 sprintf(buf2, "%s hugs you.", &op->name); 364 sprintf (buf2, "%s hugs you.", &op->name);
374 sprintf(buf3, "%s hugs %s.", &op->name, &pl->ob->name); 365 sprintf (buf3, "%s hugs %s.", &op->name, &pl->ob->name);
375 break; 366 break;
376 case EMOTE_CRY: 367 case EMOTE_CRY:
377 sprintf(buf, "You cry on %s's shoulder.", &pl->ob->name); 368 sprintf (buf, "You cry on %s's shoulder.", &pl->ob->name);
378 sprintf(buf2, "%s cries on your shoulder.", &op->name); 369 sprintf (buf2, "%s cries on your shoulder.", &op->name);
379 sprintf(buf3, "%s cries on %s's shoulder.", &op->name, 370 sprintf (buf3, "%s cries on %s's shoulder.", &op->name, &pl->ob->name);
380 &pl->ob->name);
381 break; 371 break;
382 case EMOTE_POKE: 372 case EMOTE_POKE:
383 sprintf(buf, "You poke %s in the ribs.", &pl->ob->name); 373 sprintf (buf, "You poke %s in the ribs.", &pl->ob->name);
384 sprintf(buf2, "%s pokes you in the ribs.", &op->name); 374 sprintf (buf2, "%s pokes you in the ribs.", &op->name);
385 sprintf(buf3, "%s pokes %s in the ribs.", &op->name, 375 sprintf (buf3, "%s pokes %s in the ribs.", &op->name, &pl->ob->name);
386 &pl->ob->name);
387 break; 376 break;
388 case EMOTE_ACCUSE: 377 case EMOTE_ACCUSE:
389 sprintf(buf, "You look accusingly at %s.", &pl->ob->name); 378 sprintf (buf, "You look accusingly at %s.", &pl->ob->name);
390 sprintf(buf2, "%s looks accusingly at you.", &op->name); 379 sprintf (buf2, "%s looks accusingly at you.", &op->name);
391 sprintf(buf3, "%s looks accusingly at %s.", &op->name, 380 sprintf (buf3, "%s looks accusingly at %s.", &op->name, &pl->ob->name);
392 &pl->ob->name);
393 break; 381 break;
394 case EMOTE_GRIN: 382 case EMOTE_GRIN:
395 sprintf(buf, "You grin at %s.", &pl->ob->name); 383 sprintf (buf, "You grin at %s.", &pl->ob->name);
396 sprintf(buf2, "%s grins evilly at you.", &op->name); 384 sprintf (buf2, "%s grins evilly at you.", &op->name);
397 sprintf(buf3, "%s grins evilly at %s.", &op->name, 385 sprintf (buf3, "%s grins evilly at %s.", &op->name, &pl->ob->name);
398 &pl->ob->name);
399 break; 386 break;
400 case EMOTE_BOW: 387 case EMOTE_BOW:
401 sprintf(buf, "You bow before %s.", &pl->ob->name); 388 sprintf (buf, "You bow before %s.", &pl->ob->name);
402 sprintf(buf2, "%s bows before you.", &op->name); 389 sprintf (buf2, "%s bows before you.", &op->name);
403 sprintf(buf3, "%s bows before %s.", &op->name, 390 sprintf (buf3, "%s bows before %s.", &op->name, &pl->ob->name);
404 &pl->ob->name);
405 break; 391 break;
406 case EMOTE_FROWN: 392 case EMOTE_FROWN:
407 sprintf(buf, "You frown darkly at %s.", &pl->ob->name); 393 sprintf (buf, "You frown darkly at %s.", &pl->ob->name);
408 sprintf(buf2, "%s frowns darkly at you.", &op->name); 394 sprintf (buf2, "%s frowns darkly at you.", &op->name);
409 sprintf(buf3, "%s frowns darkly at %s.", &op->name, 395 sprintf (buf3, "%s frowns darkly at %s.", &op->name, &pl->ob->name);
410 &pl->ob->name);
411 break; 396 break;
412 case EMOTE_GLARE: 397 case EMOTE_GLARE:
413 sprintf(buf, "You glare icily at %s.", &pl->ob->name); 398 sprintf (buf, "You glare icily at %s.", &pl->ob->name);
414 sprintf(buf2, "%s glares icily at you, you feel cold to" 399 sprintf (buf2, "%s glares icily at you, you feel cold to" " your bones.", &op->name);
415 " your bones.", &op->name);
416 sprintf(buf3, "%s glares at %s.", &op->name, &pl->ob->name); 400 sprintf (buf3, "%s glares at %s.", &op->name, &pl->ob->name);
417 break; 401 break;
418 case EMOTE_LICK: 402 case EMOTE_LICK:
419 sprintf(buf, "You lick %s.", &pl->ob->name); 403 sprintf (buf, "You lick %s.", &pl->ob->name);
420 sprintf(buf2, "%s licks you.", &op->name); 404 sprintf (buf2, "%s licks you.", &op->name);
421 sprintf(buf3, "%s licks %s.", &op->name, &pl->ob->name); 405 sprintf (buf3, "%s licks %s.", &op->name, &pl->ob->name);
422 break; 406 break;
423 case EMOTE_SHRUG: 407 case EMOTE_SHRUG:
424 sprintf(buf, "You shrug at %s.", &pl->ob->name); 408 sprintf (buf, "You shrug at %s.", &pl->ob->name);
425 sprintf(buf2, "%s shrugs at you.", &op->name); 409 sprintf (buf2, "%s shrugs at you.", &op->name);
426 sprintf(buf3, "%s shrugs at %s.", &op->name, &pl->ob->name); 410 sprintf (buf3, "%s shrugs at %s.", &op->name, &pl->ob->name);
427 break; 411 break;
428 case EMOTE_SLAP: 412 case EMOTE_SLAP:
429 sprintf(buf, "You slap %s.", &pl->ob->name); 413 sprintf (buf, "You slap %s.", &pl->ob->name);
430 sprintf(buf2, "You are slapped by %s.", &op->name); 414 sprintf (buf2, "You are slapped by %s.", &op->name);
431 sprintf(buf3, "%s slaps %s.", &op->name, &pl->ob->name); 415 sprintf (buf3, "%s slaps %s.", &op->name, &pl->ob->name);
432 break; 416 break;
433 case EMOTE_SNEEZE: 417 case EMOTE_SNEEZE:
434 sprintf(buf, "You sneeze at %s and a film of snot shoots" 418 sprintf (buf, "You sneeze at %s and a film of snot shoots" " onto him.", &pl->ob->name);
435 " onto him.", &pl->ob->name);
436 sprintf(buf2, "%s sneezes on you, you feel the snot cover" 419 sprintf (buf2, "%s sneezes on you, you feel the snot cover" " you. EEEEEEW.", &op->name);
437 " you. EEEEEEW.", &op->name);
438 sprintf(buf3, "%s sneezes on %s and a film of snot covers" 420 sprintf (buf3, "%s sneezes on %s and a film of snot covers" " him.", &op->name, &pl->ob->name);
439 " him.", &op->name, &pl->ob->name);
440 break; 421 break;
441 case EMOTE_SNIFF: 422 case EMOTE_SNIFF:
442 sprintf(buf, "You sniff %s.", &pl->ob->name); 423 sprintf (buf, "You sniff %s.", &pl->ob->name);
443 sprintf(buf2, "%s sniffs you.", &op->name); 424 sprintf (buf2, "%s sniffs you.", &op->name);
444 sprintf(buf3, "%s sniffs %s", &op->name, &pl->ob->name); 425 sprintf (buf3, "%s sniffs %s", &op->name, &pl->ob->name);
445 break; 426 break;
446 case EMOTE_SPIT: 427 case EMOTE_SPIT:
447 sprintf(buf, "You spit on %s.", &pl->ob->name); 428 sprintf (buf, "You spit on %s.", &pl->ob->name);
448 sprintf(buf2, "%s spits in your face!", &op->name); 429 sprintf (buf2, "%s spits in your face!", &op->name);
449 sprintf(buf3, "%s spits in %s's face.", &op->name, 430 sprintf (buf3, "%s spits in %s's face.", &op->name, &pl->ob->name);
450 &pl->ob->name);
451 break; 431 break;
452 case EMOTE_THANK: 432 case EMOTE_THANK:
453 sprintf(buf, "You thank %s heartily.", &pl->ob->name); 433 sprintf (buf, "You thank %s heartily.", &pl->ob->name);
454 sprintf(buf2, "%s thanks you heartily.", &op->name); 434 sprintf (buf2, "%s thanks you heartily.", &op->name);
455 sprintf(buf3, "%s thanks %s heartily.", &op->name, 435 sprintf (buf3, "%s thanks %s heartily.", &op->name, &pl->ob->name);
456 &pl->ob->name);
457 break; 436 break;
458 case EMOTE_WAVE: 437 case EMOTE_WAVE:
459 sprintf(buf, "You wave goodbye to %s.", &pl->ob->name); 438 sprintf (buf, "You wave goodbye to %s.", &pl->ob->name);
460 sprintf(buf2, "%s waves goodbye to you. Have a good" 439 sprintf (buf2, "%s waves goodbye to you. Have a good" " journey.", &op->name);
461 " journey.", &op->name);
462 sprintf(buf3, "%s waves goodbye to %s.", &op->name, 440 sprintf (buf3, "%s waves goodbye to %s.", &op->name, &pl->ob->name);
463 &pl->ob->name);
464 break; 441 break;
465 case EMOTE_WHISTLE: 442 case EMOTE_WHISTLE:
466 sprintf(buf, "You whistle at %s.", &pl->ob->name); 443 sprintf (buf, "You whistle at %s.", &pl->ob->name);
467 sprintf(buf2, "%s whistles at you.", &op->name); 444 sprintf (buf2, "%s whistles at you.", &op->name);
468 sprintf(buf2, "%s whistles at %s.", &op->name, &pl->ob->name); 445 sprintf (buf2, "%s whistles at %s.", &op->name, &pl->ob->name);
469 break; 446 break;
470 case EMOTE_WINK: 447 case EMOTE_WINK:
471 sprintf(buf, "You wink suggestively at %s.", &pl->ob->name); 448 sprintf (buf, "You wink suggestively at %s.", &pl->ob->name);
472 sprintf(buf2, "%s winks suggestively at you.", &op->name); 449 sprintf (buf2, "%s winks suggestively at you.", &op->name);
473 sprintf(buf2, "%s winks at %s.", &op->name, &pl->ob->name); 450 sprintf (buf2, "%s winks at %s.", &op->name, &pl->ob->name);
474 break; 451 break;
475 case EMOTE_BEG: 452 case EMOTE_BEG:
476 sprintf(buf, "You beg %s for mercy.", &pl->ob->name); 453 sprintf (buf, "You beg %s for mercy.", &pl->ob->name);
477 sprintf(buf2, "%s begs you for mercy! Show no quarter!", 454 sprintf (buf2, "%s begs you for mercy! Show no quarter!", &op->name);
478 &op->name);
479 sprintf(buf2, "%s begs %s for mercy!", &op->name, 455 sprintf (buf2, "%s begs %s for mercy!", &op->name, &pl->ob->name);
480 &pl->ob->name);
481 break; 456 break;
482 case EMOTE_BLEED: 457 case EMOTE_BLEED:
483 sprintf(buf, "You slash your wrist and bleed all over %s", 458 sprintf (buf, "You slash your wrist and bleed all over %s", &pl->ob->name);
484 &pl->ob->name);
485 sprintf(buf2, "%s slashes his wrist and bleeds all over" 459 sprintf (buf2, "%s slashes his wrist and bleeds all over" " you.", &op->name);
486 " you.", &op->name);
487 sprintf(buf2, "%s slashes his wrist and bleeds all " 460 sprintf (buf2, "%s slashes his wrist and bleeds all " "over %s.", &op->name, &pl->ob->name);
488 "over %s.", &op->name, &pl->ob->name);
489 break; 461 break;
490 case EMOTE_CRINGE: 462 case EMOTE_CRINGE:
491 sprintf(buf, "You cringe away from %s.", &pl->ob->name); 463 sprintf (buf, "You cringe away from %s.", &pl->ob->name);
492 sprintf(buf2, "%s cringes away from you.", &op->name); 464 sprintf (buf2, "%s cringes away from you.", &op->name);
493 sprintf(buf2, "%s cringes away from %s in mortal terror.", 465 sprintf (buf2, "%s cringes away from %s in mortal terror.", &op->name, &pl->ob->name);
494 &op->name, &pl->ob->name);
495 break; 466 break;
496 default: 467 default:
497 sprintf(buf, "You are still nuts."); 468 sprintf (buf, "You are still nuts.");
498 sprintf(buf2, "You get the distinct feeling that %s is nuts.", 469 sprintf (buf2, "You get the distinct feeling that %s is nuts.", &op->name);
499 &op->name);
500 sprintf(buf3, "%s is eyeing %s quizzically.", &pl->ob->name, 470 sprintf (buf3, "%s is eyeing %s quizzically.", &pl->ob->name, &op->name);
501 &op->name);
502 break; 471 break;
503 } /*case*/ 472 } /*case */
473
504 new_draw_info(NDI_UNIQUE|NDI_WHITE, 0, op, buf); 474 new_draw_info (NDI_UNIQUE | NDI_WHITE, 0, op, buf);
505 new_draw_info(NDI_UNIQUE|NDI_WHITE, 0, pl->ob, buf2); 475 new_draw_info (NDI_UNIQUE | NDI_WHITE, 0, pl->ob, buf2);
506 new_info_map_except2(NDI_WHITE, op->map, op, pl->ob, buf3); 476 new_info_map_except2 (NDI_WHITE, op->map, op, pl->ob, buf3);
507 return(0); 477 return (0);
508 } 478 }
509 if(strncasecmp(pl->ob->name, params, MAX_NAME)==0 && 479 if (strncasecmp (pl->ob->name, params, MAX_NAME) == 0 && pl->ob->map == op->map && pl->ob == op)
510 pl->ob->map == op->map && pl->ob == op) { 480 {
511 switch(emotion) { 481 switch (emotion)
482 {
512 case EMOTE_DANCE: 483 case EMOTE_DANCE:
513 sprintf(buf, "You skip and dance around by yourself."); 484 sprintf (buf, "You skip and dance around by yourself.");
514 sprintf(buf2, "%s embraces himself and begins to dance!", 485 sprintf (buf2, "%s embraces himself and begins to dance!", &op->name);
515 &op->name);
516 break; 486 break;
517 case EMOTE_LAUGH: 487 case EMOTE_LAUGH:
518 sprintf(buf, "Laugh at yourself all you want, the others " 488 sprintf (buf, "Laugh at yourself all you want, the others " "won't understand.");
519 "won't understand.");
520 sprintf(buf2, "%s is laughing at something.", &op->name); 489 sprintf (buf2, "%s is laughing at something.", &op->name);
521 break; 490 break;
522 case EMOTE_SHAKE: 491 case EMOTE_SHAKE:
523 sprintf(buf, "You are shaken by yourself."); 492 sprintf (buf, "You are shaken by yourself.");
524 sprintf(buf2, "%s shakes and quivers like a bowlful of " 493 sprintf (buf2, "%s shakes and quivers like a bowlful of " "jelly.", &op->name);
525 "jelly.", &op->name);
526 break; 494 break;
527 case EMOTE_PUKE: 495 case EMOTE_PUKE:
528 sprintf(buf, "You puke on yourself."); 496 sprintf (buf, "You puke on yourself.");
529 sprintf(buf2, "%s pukes on his clothes.", &op->name); 497 sprintf (buf2, "%s pukes on his clothes.", &op->name);
530 break; 498 break;
531 case EMOTE_HUG: 499 case EMOTE_HUG:
532 sprintf(buf, "You hug yourself."); 500 sprintf (buf, "You hug yourself.");
533 sprintf(buf2, "%s hugs himself.", &op->name); 501 sprintf (buf2, "%s hugs himself.", &op->name);
534 break; 502 break;
535 case EMOTE_CRY: 503 case EMOTE_CRY:
536 sprintf(buf, "You cry to yourself."); 504 sprintf (buf, "You cry to yourself.");
537 sprintf(buf2, "%s sobs quietly to himself.", &op->name); 505 sprintf (buf2, "%s sobs quietly to himself.", &op->name);
538 break; 506 break;
539 case EMOTE_POKE: 507 case EMOTE_POKE:
540 sprintf(buf, "You poke yourself in the ribs, feeling very" 508 sprintf (buf, "You poke yourself in the ribs, feeling very" " silly.");
541 " silly.");
542 sprintf(buf2, "%s pokes himself in the ribs, looking very" 509 sprintf (buf2, "%s pokes himself in the ribs, looking very" " sheepish.", &op->name);
543 " sheepish.", &op->name);
544 break; 510 break;
545 case EMOTE_ACCUSE: 511 case EMOTE_ACCUSE:
546 sprintf(buf, "You accuse yourself."); 512 sprintf (buf, "You accuse yourself.");
547 sprintf(buf2, "%s seems to have a bad conscience.", 513 sprintf (buf2, "%s seems to have a bad conscience.", &op->name);
548 &op->name);
549 break; 514 break;
550 case EMOTE_BOW: 515 case EMOTE_BOW:
551 sprintf(buf, "You kiss your toes."); 516 sprintf (buf, "You kiss your toes.");
552 sprintf(buf2, "%s folds up like a jackknife and kisses his" 517 sprintf (buf2, "%s folds up like a jackknife and kisses his" " own toes.", &op->name);
553 " own toes.", &op->name);
554 break; 518 break;
555 case EMOTE_FROWN: 519 case EMOTE_FROWN:
556 sprintf(buf, "You frown at yourself."); 520 sprintf (buf, "You frown at yourself.");
557 sprintf(buf2, "%s frowns at himself.", &op->name); 521 sprintf (buf2, "%s frowns at himself.", &op->name);
558 break; 522 break;
559 case EMOTE_GLARE: 523 case EMOTE_GLARE:
560 sprintf(buf, "You glare icily at your feet, they are " 524 sprintf (buf, "You glare icily at your feet, they are " "suddenly very cold.");
561 "suddenly very cold.");
562 sprintf(buf2, "%s glares at his feet, what is bothering " 525 sprintf (buf2, "%s glares at his feet, what is bothering " "him?", &op->name);
563 "him?", &op->name);
564 break; 526 break;
565 case EMOTE_LICK: 527 case EMOTE_LICK:
566 sprintf(buf, "You lick yourself."); 528 sprintf (buf, "You lick yourself.");
567 sprintf(buf2, "%s licks himself - YUCK.", &op->name); 529 sprintf (buf2, "%s licks himself - YUCK.", &op->name);
568 break; 530 break;
569 case EMOTE_SLAP: 531 case EMOTE_SLAP:
570 sprintf(buf, "You slap yourself, silly you."); 532 sprintf (buf, "You slap yourself, silly you.");
571 sprintf(buf2, "%s slaps himself, really strange...", 533 sprintf (buf2, "%s slaps himself, really strange...", &op->name);
572 &op->name);
573 break; 534 break;
574 case EMOTE_SNEEZE: 535 case EMOTE_SNEEZE:
575 sprintf(buf, "You sneeze on yourself, what a mess!"); 536 sprintf (buf, "You sneeze on yourself, what a mess!");
576 sprintf(buf2, "%s sneezes, and covers himself in a slimy" 537 sprintf (buf2, "%s sneezes, and covers himself in a slimy" " substance.", &op->name);
577 " substance.", &op->name);
578 break; 538 break;
579 case EMOTE_SNIFF: 539 case EMOTE_SNIFF:
580 sprintf(buf, "You sniff yourself."); 540 sprintf (buf, "You sniff yourself.");
581 sprintf(buf2, "%s sniffs himself.", &op->name); 541 sprintf (buf2, "%s sniffs himself.", &op->name);
582 break; 542 break;
583 case EMOTE_SPIT: 543 case EMOTE_SPIT:
584 sprintf(buf, "You drool all over yourself."); 544 sprintf (buf, "You drool all over yourself.");
585 sprintf(buf2, "%s drools all over himself.", &op->name); 545 sprintf (buf2, "%s drools all over himself.", &op->name);
586 break; 546 break;
587 case EMOTE_THANK: 547 case EMOTE_THANK:
588 sprintf(buf, "You thank yourself since nobody else " 548 sprintf (buf, "You thank yourself since nobody else " "wants to!");
589 "wants to!");
590 sprintf(buf2, "%s thanks himself since you won't.", 549 sprintf (buf2, "%s thanks himself since you won't.", &op->name);
591 &op->name);
592 break; 550 break;
593 case EMOTE_WAVE: 551 case EMOTE_WAVE:
594 sprintf(buf, "Are you going on adventures as well??"); 552 sprintf (buf, "Are you going on adventures as well??");
595 sprintf(buf2, "%s waves goodbye to himself.", &op->name); 553 sprintf (buf2, "%s waves goodbye to himself.", &op->name);
596 break; 554 break;
597 case EMOTE_WHISTLE: 555 case EMOTE_WHISTLE:
598 sprintf(buf, "You whistle while you work."); 556 sprintf (buf, "You whistle while you work.");
599 sprintf(buf2, "%s whistles to himself in boredom.", 557 sprintf (buf2, "%s whistles to himself in boredom.", &op->name);
600 &op->name);
601 break; 558 break;
602 case EMOTE_WINK: 559 case EMOTE_WINK:
603 sprintf(buf, "You wink at yourself?? What are you up to?"); 560 sprintf (buf, "You wink at yourself?? What are you up to?");
604 sprintf(buf2, "%s winks at himself - something strange " 561 sprintf (buf2, "%s winks at himself - something strange " "is going on...", &op->name);
605 "is going on...", &op->name);
606 break; 562 break;
607 case EMOTE_BLEED: 563 case EMOTE_BLEED:
608 sprintf(buf, "Very impressive! You wipe your blood all " 564 sprintf (buf, "Very impressive! You wipe your blood all " "over yourself.");
609 "over yourself.");
610 sprintf(buf2, "%s performs some satanic ritual while " 565 sprintf (buf2, "%s performs some satanic ritual while " "wiping his blood on himself.", &op->name);
611 "wiping his blood on himself.", &op->name);
612 break; 566 break;
613 default: 567 default:
614 sprintf(buf, "My god! is that LEGAL?"); 568 sprintf (buf, "My god! is that LEGAL?");
615 sprintf(buf2, "You look away from %s.", &op->name); 569 sprintf (buf2, "You look away from %s.", &op->name);
616 break; 570 break;
617 }/*case*/ 571 } /*case */
618 new_draw_info(NDI_UNIQUE|NDI_WHITE, 0, op, buf); 572 new_draw_info (NDI_UNIQUE | NDI_WHITE, 0, op, buf);
619 new_info_map_except(NDI_WHITE, op->map, op, buf2); 573 new_info_map_except (NDI_WHITE, op->map, op, buf2);
620 return(0); 574 return (0);
621 }/*if self*/ 575 } /*if self */
622 }/*for*/ 576 } /*for */
577
623 new_draw_info_format(NDI_UNIQUE, 0, op, "%s is not around.", params); 578 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is not around.", params);
624 return(1); 579 return (1);
625 } /*else*/ 580 } /*else */
626 581
627 return(0); 582 return (0);
628} 583}
629 584
630/* 585/*
631 * everything from here on out are just wrapper calls to basic_emote 586 * everything from here on out are just wrapper calls to basic_emote
632 */ 587 */
633 588
589int
634int command_nod(object *op, char *params) 590command_nod (object *op, char *params)
635{ 591{
636 return(basic_emote(op, params, EMOTE_NOD)); 592 return (basic_emote (op, params, EMOTE_NOD));
637} 593}
638 594
595int
639int command_dance(object *op, char *params) 596command_dance (object *op, char *params)
640{ 597{
641 return(basic_emote(op, params, EMOTE_DANCE)); 598 return (basic_emote (op, params, EMOTE_DANCE));
642} 599}
643 600
601int
644int command_kiss(object *op, char *params) 602command_kiss (object *op, char *params)
645{ 603{
646 return(basic_emote(op, params, EMOTE_KISS)); 604 return (basic_emote (op, params, EMOTE_KISS));
647} 605}
648 606
607int
649int command_bounce(object *op, char *params) 608command_bounce (object *op, char *params)
650{ 609{
651 return(basic_emote(op, params, EMOTE_BOUNCE)); 610 return (basic_emote (op, params, EMOTE_BOUNCE));
652} 611}
653 612
613int
654int command_smile(object *op, char *params) 614command_smile (object *op, char *params)
655{ 615{
656 return(basic_emote(op, params, EMOTE_SMILE)); 616 return (basic_emote (op, params, EMOTE_SMILE));
657} 617}
658 618
619int
659int command_cackle(object *op, char *params) 620command_cackle (object *op, char *params)
660{ 621{
661 return(basic_emote(op, params, EMOTE_CACKLE)); 622 return (basic_emote (op, params, EMOTE_CACKLE));
662} 623}
663 624
625int
664int command_laugh(object *op, char *params) 626command_laugh (object *op, char *params)
665{ 627{
666 return(basic_emote(op, params, EMOTE_LAUGH)); 628 return (basic_emote (op, params, EMOTE_LAUGH));
667} 629}
668 630
631int
669int command_giggle(object *op, char *params) 632command_giggle (object *op, char *params)
670{ 633{
671 return(basic_emote(op, params, EMOTE_GIGGLE)); 634 return (basic_emote (op, params, EMOTE_GIGGLE));
672} 635}
673 636
637int
674int command_shake(object *op, char *params) 638command_shake (object *op, char *params)
675{ 639{
676 return(basic_emote(op, params, EMOTE_SHAKE)); 640 return (basic_emote (op, params, EMOTE_SHAKE));
677} 641}
678 642
643int
679int command_puke(object *op, char *params) 644command_puke (object *op, char *params)
680{ 645{
681 return(basic_emote(op, params, EMOTE_PUKE)); 646 return (basic_emote (op, params, EMOTE_PUKE));
682} 647}
683 648
649int
684int command_growl(object *op, char *params) 650command_growl (object *op, char *params)
685{ 651{
686 return(basic_emote(op, params, EMOTE_GROWL)); 652 return (basic_emote (op, params, EMOTE_GROWL));
687} 653}
688 654
655int
689int command_scream(object *op, char *params) 656command_scream (object *op, char *params)
690{ 657{
691 return(basic_emote(op, params, EMOTE_SCREAM)); 658 return (basic_emote (op, params, EMOTE_SCREAM));
692} 659}
693 660
661int
694int command_sigh(object *op, char *params) 662command_sigh (object *op, char *params)
695{ 663{
696 return(basic_emote(op, params, EMOTE_SIGH)); 664 return (basic_emote (op, params, EMOTE_SIGH));
697} 665}
698 666
667int
699int command_sulk(object *op, char *params) 668command_sulk (object *op, char *params)
700{ 669{
701 return(basic_emote(op, params, EMOTE_SULK)); 670 return (basic_emote (op, params, EMOTE_SULK));
702} 671}
703 672
673int
704int command_hug(object *op, char *params) 674command_hug (object *op, char *params)
705{ 675{
706 return(basic_emote(op, params, EMOTE_HUG)); 676 return (basic_emote (op, params, EMOTE_HUG));
707} 677}
708 678
679int
709int command_cry(object *op, char *params) 680command_cry (object *op, char *params)
710{ 681{
711 return(basic_emote(op, params, EMOTE_CRY)); 682 return (basic_emote (op, params, EMOTE_CRY));
712} 683}
713 684
685int
714int command_poke(object *op, char *params) 686command_poke (object *op, char *params)
715{ 687{
716 return(basic_emote(op, params, EMOTE_POKE)); 688 return (basic_emote (op, params, EMOTE_POKE));
717} 689}
718 690
691int
719int command_accuse(object *op, char *params) 692command_accuse (object *op, char *params)
720{ 693{
721 return(basic_emote(op, params, EMOTE_ACCUSE)); 694 return (basic_emote (op, params, EMOTE_ACCUSE));
722} 695}
723 696
697int
724int command_grin(object *op, char *params) 698command_grin (object *op, char *params)
725{ 699{
726 return(basic_emote(op, params, EMOTE_GRIN)); 700 return (basic_emote (op, params, EMOTE_GRIN));
727} 701}
728 702
703int
729int command_bow(object *op, char *params) 704command_bow (object *op, char *params)
730{ 705{
731 return(basic_emote(op, params, EMOTE_BOW)); 706 return (basic_emote (op, params, EMOTE_BOW));
732} 707}
733 708
709int
734int command_clap(object *op, char *params) 710command_clap (object *op, char *params)
735{ 711{
736 return(basic_emote(op, params, EMOTE_CLAP)); 712 return (basic_emote (op, params, EMOTE_CLAP));
737} 713}
738 714
715int
739int command_blush(object *op, char *params) 716command_blush (object *op, char *params)
740{ 717{
741 return(basic_emote(op, params, EMOTE_BLUSH)); 718 return (basic_emote (op, params, EMOTE_BLUSH));
742} 719}
743 720
721int
744int command_burp(object *op, char *params) 722command_burp (object *op, char *params)
745{ 723{
746 return(basic_emote(op, params, EMOTE_BURP)); 724 return (basic_emote (op, params, EMOTE_BURP));
747} 725}
748 726
727int
749int command_chuckle(object *op, char *params) 728command_chuckle (object *op, char *params)
750{ 729{
751 return(basic_emote(op, params, EMOTE_CHUCKLE)); 730 return (basic_emote (op, params, EMOTE_CHUCKLE));
752} 731}
753 732
733int
754int command_cough(object *op, char *params) 734command_cough (object *op, char *params)
755{ 735{
756 return(basic_emote(op, params, EMOTE_COUGH)); 736 return (basic_emote (op, params, EMOTE_COUGH));
757} 737}
758 738
739int
759int command_flip(object *op, char *params) 740command_flip (object *op, char *params)
760{ 741{
761 return(basic_emote(op, params, EMOTE_FLIP)); 742 return (basic_emote (op, params, EMOTE_FLIP));
762} 743}
763 744
745int
764int command_frown(object *op, char *params) 746command_frown (object *op, char *params)
765{ 747{
766 return(basic_emote(op, params, EMOTE_FROWN)); 748 return (basic_emote (op, params, EMOTE_FROWN));
767} 749}
768 750
751int
769int command_gasp(object *op, char *params) 752command_gasp (object *op, char *params)
770{ 753{
771 return(basic_emote(op, params, EMOTE_GASP)); 754 return (basic_emote (op, params, EMOTE_GASP));
772} 755}
773 756
757int
774int command_glare(object *op, char *params) 758command_glare (object *op, char *params)
775{ 759{
776 return(basic_emote(op, params, EMOTE_GLARE)); 760 return (basic_emote (op, params, EMOTE_GLARE));
777} 761}
778 762
763int
779int command_groan(object *op, char *params) 764command_groan (object *op, char *params)
780{ 765{
781 return(basic_emote(op, params, EMOTE_GROAN)); 766 return (basic_emote (op, params, EMOTE_GROAN));
782} 767}
783 768
769int
784int command_hiccup(object *op, char *params) 770command_hiccup (object *op, char *params)
785{ 771{
786 return(basic_emote(op, params, EMOTE_HICCUP)); 772 return (basic_emote (op, params, EMOTE_HICCUP));
787} 773}
788 774
775int
789int command_lick(object *op, char *params) 776command_lick (object *op, char *params)
790{ 777{
791 return(basic_emote(op, params, EMOTE_LICK)); 778 return (basic_emote (op, params, EMOTE_LICK));
792} 779}
793 780
781int
794int command_pout(object *op, char *params) 782command_pout (object *op, char *params)
795{ 783{
796 return(basic_emote(op, params, EMOTE_POUT)); 784 return (basic_emote (op, params, EMOTE_POUT));
797} 785}
798 786
787int
799int command_shiver(object *op, char *params) 788command_shiver (object *op, char *params)
800{ 789{
801 return(basic_emote(op, params, EMOTE_SHIVER)); 790 return (basic_emote (op, params, EMOTE_SHIVER));
802} 791}
803 792
793int
804int command_shrug(object *op, char *params) 794command_shrug (object *op, char *params)
805{ 795{
806 return(basic_emote(op, params, EMOTE_SHRUG)); 796 return (basic_emote (op, params, EMOTE_SHRUG));
807} 797}
808 798
799int
809int command_slap(object *op, char *params) 800command_slap (object *op, char *params)
810{ 801{
811 return(basic_emote(op, params, EMOTE_SLAP)); 802 return (basic_emote (op, params, EMOTE_SLAP));
812} 803}
813 804
805int
814int command_smirk(object *op, char *params) 806command_smirk (object *op, char *params)
815{ 807{
816 return(basic_emote(op, params, EMOTE_SMIRK)); 808 return (basic_emote (op, params, EMOTE_SMIRK));
817} 809}
818 810
811int
819int command_snap(object *op, char *params) 812command_snap (object *op, char *params)
820{ 813{
821 return(basic_emote(op, params, EMOTE_SNAP)); 814 return (basic_emote (op, params, EMOTE_SNAP));
822} 815}
823 816
817int
824int command_sneeze(object *op, char *params) 818command_sneeze (object *op, char *params)
825{ 819{
826 return(basic_emote(op, params, EMOTE_SNEEZE)); 820 return (basic_emote (op, params, EMOTE_SNEEZE));
827} 821}
828 822
823int
829int command_snicker(object *op, char *params) 824command_snicker (object *op, char *params)
830{ 825{
831 return(basic_emote(op, params, EMOTE_SNICKER)); 826 return (basic_emote (op, params, EMOTE_SNICKER));
832} 827}
833 828
829int
834int command_sniff(object *op, char *params) 830command_sniff (object *op, char *params)
835{ 831{
836 return(basic_emote(op, params, EMOTE_SNIFF)); 832 return (basic_emote (op, params, EMOTE_SNIFF));
837} 833}
838 834
835int
839int command_snore(object *op, char *params) 836command_snore (object *op, char *params)
840{ 837{
841 return(basic_emote(op, params, EMOTE_SNORE)); 838 return (basic_emote (op, params, EMOTE_SNORE));
842} 839}
843 840
841int
844int command_spit(object *op, char *params) 842command_spit (object *op, char *params)
845{ 843{
846 return(basic_emote(op, params, EMOTE_SPIT)); 844 return (basic_emote (op, params, EMOTE_SPIT));
847} 845}
848 846
847int
849int command_strut(object *op, char *params) 848command_strut (object *op, char *params)
850{ 849{
851 return(basic_emote(op, params, EMOTE_STRUT)); 850 return (basic_emote (op, params, EMOTE_STRUT));
852} 851}
853 852
853int
854int command_thank(object *op, char *params) 854command_thank (object *op, char *params)
855{ 855{
856 return(basic_emote(op, params, EMOTE_THANK)); 856 return (basic_emote (op, params, EMOTE_THANK));
857} 857}
858 858
859int
859int command_twiddle(object *op, char *params) 860command_twiddle (object *op, char *params)
860{ 861{
861 return(basic_emote(op, params, EMOTE_TWIDDLE)); 862 return (basic_emote (op, params, EMOTE_TWIDDLE));
862} 863}
863 864
865int
864int command_wave(object *op, char *params) 866command_wave (object *op, char *params)
865{ 867{
866 return(basic_emote(op, params, EMOTE_WAVE)); 868 return (basic_emote (op, params, EMOTE_WAVE));
867} 869}
868 870
871int
869int command_whistle(object *op, char *params) 872command_whistle (object *op, char *params)
870{ 873{
871 return(basic_emote(op, params, EMOTE_WHISTLE)); 874 return (basic_emote (op, params, EMOTE_WHISTLE));
872} 875}
873 876
877int
874int command_wink(object *op, char *params) 878command_wink (object *op, char *params)
875{ 879{
876 return(basic_emote(op, params, EMOTE_WINK)); 880 return (basic_emote (op, params, EMOTE_WINK));
877} 881}
878 882
883int
879int command_yawn(object *op, char *params) 884command_yawn (object *op, char *params)
880{ 885{
881 return(basic_emote(op, params, EMOTE_YAWN)); 886 return (basic_emote (op, params, EMOTE_YAWN));
882} 887}
883 888
889int
884int command_beg(object *op, char *params) 890command_beg (object *op, char *params)
885{ 891{
886 return(basic_emote(op, params, EMOTE_BEG)); 892 return (basic_emote (op, params, EMOTE_BEG));
887} 893}
888 894
895int
889int command_bleed(object *op, char *params) 896command_bleed (object *op, char *params)
890{ 897{
891 return(basic_emote(op, params, EMOTE_BLEED)); 898 return (basic_emote (op, params, EMOTE_BLEED));
892} 899}
893 900
901int
894int command_cringe(object *op, char *params) 902command_cringe (object *op, char *params)
895{ 903{
896 return(basic_emote(op, params, EMOTE_CRINGE)); 904 return (basic_emote (op, params, EMOTE_CRINGE));
897} 905}
898 906
907int
899int command_think(object *op, char *params) 908command_think (object *op, char *params)
900{ 909{
901 return(basic_emote(op, params, EMOTE_THINK)); 910 return (basic_emote (op, params, EMOTE_THINK));
902} 911}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines