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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.48 by root, Tue May 6 16:44:54 2008 UTC vs.
Revision 1.57 by root, Fri Nov 6 13:11:28 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
139/** 140/**
140 * Sends message to player(s). 141 * Sends message to player(s).
141 * 142 *
142 * flags is various flags - mostly color, plus a few specials. 143 * flags is various flags - mostly color, plus a few specials.
143 * 144 *
144 * pri is priority. It is a little odd - the lower the value, the more 145 * pri is unused.
145 * important it is. Thus, 0 gets sent no matter what. Otherwise, the
146 * value must be less than the listening level that the player has set.
147 * Unfortunately, there is no clear guideline on what each level does what.
148 * 146 *
149 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set 147 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
150 * in the flags. 148 * in the flags.
151 * 149 *
152 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 150 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
… …
156new_draw_info (int flags, int pri, const object *op, const char *buf) 154new_draw_info (int flags, int pri, const object *op, const char *buf)
157{ 155{
158 if (flags & NDI_ALL) 156 if (flags & NDI_ALL)
159 { 157 {
160 for_all_players (pl) 158 for_all_players (pl)
161 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); 159 new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
162 } 160 }
163 else 161 else
164 { 162 {
165 if (!op || !op->contr || !op->contr->ns) 163 if (!op || !op->contr || !op->contr->ns)
166 return;
167
168 if (pri >= op->contr->listening)
169 return; 164 return;
170 165
171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK 166 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
172 || !op->contr->ns->msg_suppressed (buf)) 167 || !op->contr->ns->msg_suppressed (buf))
173 print_message (flags & NDI_COLOR_MASK, op, buf); 168 print_message (flags & NDI_COLOR_MASK, op, buf);
… …
183 * client/server bandwidth (client could keep track of various strings 178 * client/server bandwidth (client could keep track of various strings
184 */ 179 */
185void 180void
186new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 181new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
187{ 182{
188 char buf[HUGE_BUF];
189
190 va_list ap; 183 va_list ap;
191 va_start (ap, format); 184 va_start (ap, format);
192 vsnprintf (buf, HUGE_BUF, format, ap); 185 new_draw_info (flags, pri, pl, vformat (format, ap));
193 va_end (ap); 186 va_end (ap);
194
195 new_draw_info (flags, pri, pl, buf);
196}
197
198void
199draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
200{
201
202 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
203 return;
204
205 if (pri >= pl->contr->listening)
206 return;
207
208 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
209 {
210 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
211
212 if (buf == NULL)
213 LOG (llevError, "info::draw_ext_info -> Out of memory!");
214 else
215 {
216 strcpy (buf, oldmessage == NULL ? message : oldmessage);
217 strip_media_tag (buf);
218 new_draw_info (flags, pri, pl, buf);
219 free (buf);
220 }
221 }
222 else
223 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
224}
225
226void
227draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
228{
229 char buf[HUGE_BUF];
230
231 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
232 return;
233
234 if (pri >= pl->contr->listening)
235 return;
236
237 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
238 {
239 va_list ap;
240
241 LOG (llevDebug, "Non supported extension text type for client.\n");
242 va_start (ap, new_format);
243 vsnprintf (buf, HUGE_BUF, old_format, ap);
244 va_end (ap);
245 new_draw_info (flags, pri, pl, buf);
246 return;
247 }
248 else
249 {
250 va_list ap;
251
252 va_start (ap, new_format);
253 vsnprintf (buf, HUGE_BUF, new_format, ap);
254 va_end (ap);
255 strip_media_tag (buf);
256 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
257 }
258} 187}
259 188
260/** 189/**
261 * Writes to everyone on the map *except* op. This is useful for emotions. 190 * Writes to everyone on the map *except* op. This is useful for emotions.
262 */ 191 */
263
264void 192void
265new_info_map_except (int color, maptile * map, object *op, const char *str) 193new_info_map_except (int color, maptile * map, object *op, const char *str)
266{ 194{
267 for_all_players (pl) 195 for_all_players (pl)
268 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 196 if (pl->ob->map == map && pl->ob != op)
269 new_draw_info (color, 0, pl->ob, str); 197 new_draw_info (color, 0, pl->ob, str);
270} 198}
271 199
272/** 200/**
273 * Writes to everyone on the map except op1 and op2 201 * Writes to everyone on the map except op1 and op2
274 */ 202 */
275void 203static void
276new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 204new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
277{ 205{
278 for_all_players (pl) 206 for_all_players (pl)
279 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 207 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
280 new_draw_info (color, 0, pl->ob, str); 208 new_draw_info (color, 0, pl->ob, str);
281} 209}
282 210
283/** 211/**
284 * Writes to everyone on the specified map 212 * Writes to everyone on the specified map
285 */ 213 */
286void 214void
287new_info_map (int color, maptile * map, const char *str) 215new_info_map (int color, maptile * map, const char *str)
288{ 216{
289 for_all_players (pl) 217 for_all_players (pl)
290 if (pl->ob != NULL && pl->ob->map == map) 218 if (pl->ob->map == map)
291 new_draw_info (color, 0, pl->ob, str); 219 new_draw_info (color, 0, pl->ob, str);
292} 220}
293 221
294/** 222/**
295 * Sets player title. 223 * Sets player title.
… …
304 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 232 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
305} 233}
306 234
307// formerly a macro, used only by magic map, so optimised it out 235// formerly a macro, used only by magic map, so optimised it out
308static inline faceidx 236static inline faceidx
309GET_MAP_FACE (maptile *m, int x, int y, int layer) 237GET_MAP_FACE (mapspace &ms, int layer)
310{ 238{
311 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) 239 if (object *op = ms.faces_obj [layer])
312 return op->face; 240 return op->face;
313 else 241 else
314 return 0; 242 return 0;
315} 243}
316 244
… …
326 * for various code values. 254 * for various code values.
327 */ 255 */
328static void 256static void
329magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 257magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
330{ 258{
331 int x, y, dx, dy, mflags;
332 sint16 nx, ny;
333 maptile *mp;
334
335 for (dx = -1; dx <= 1; dx++) 259 for (int dx = -1; dx <= 1; dx++)
336 { 260 {
337 for (dy = -1; dy <= 1; dy++) 261 for (int dy = -1; dy <= 1; dy++)
338 { 262 {
339 x = px + dx; 263 int x = px + dx;
340 y = py + dy; 264 int y = py + dy;
341 265
342 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) 266 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
343 continue; 267 continue;
344 268
345 mp = pl->map; 269 mapxy pos (pl);
346 nx = pl->x + x; 270 pos.move (x, y);
347 ny = pl->y + y;
348 271
349 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 272 if (!pos.normalise ())
350 if (mflags & P_OUT_OF_MAP)
351 continue; 273 continue;
274
275 mapspace &ms = pos.ms ();
352 276
353 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 277 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
354 { 278 {
279 int mflags = ms.flags ();
280
355 int f = GET_MAP_FACE (mp, nx, ny, 0); 281 int f = GET_MAP_FACE (ms, 0);
356 if (f == blank_face) 282 if (f == blank_face)
357 { 283 {
358 f = GET_MAP_FACE (mp, nx, ny, 1); 284 f = GET_MAP_FACE (ms, 1);
359 if (f == blank_face) 285 if (f == blank_face)
360 f = GET_MAP_FACE (mp, nx, ny, 2); 286 f = GET_MAP_FACE (ms, 2);
361 } 287 }
362 288
363 int magicmap = faces [f].magicmap; 289 int magicmap = faces [f].magicmap;
364 290
365 /* Should probably have P_NO_MAGIC here also, but then shops don't 291 /* Should probably have P_NO_MAGIC here also, but then shops don't
… …
378} 304}
379 305
380/** 306/**
381 * Creates magic map for player. 307 * Creates magic map for player.
382 * 308 *
383 * Note: For improved magic mapping display, the space that blocks 309 * Note: For improved magic mapping display, the space that blocks
384 * the view is now marked with value 2. Any dependencies of map_mark 310 * the view is now marked with value 2. Any dependencies of map_mark
385 * being nonzero have been changed to check for 1. Also, since 311 * being nonzero have been changed to check for 1. Also, since
386 * map_mark is a char value, putting 2 in should cause no problems. 312 * map_mark is a char value, putting 2 in should cause no problems.
387 * 313 *
388 * This function examines the map the player is on, and determines what 314 * This function examines the map the player is on, and determines what
389 * is visible. 2 is set for walls or objects that blocks view. 1 315 * is visible. 2 is set for walls or objects that blocks view. 1
390 * is for open spaces. map_mark should already have been initialised 316 * is for open spaces. map_mark should already have been initialised
391 * to zero before this is called. 317 * to zero before this is called.
392 * strength is an initial strength*2 rectangular area that we automatically 318 * strength is an initial strength*2 rectangular area that we automatically
393 * see in/penetrate through. 319 * see in/penetrate through.
394 */ 320 */
395void 321static void
396magic_mapping_mark (object *pl, char *map_mark, int strength) 322magic_mapping_mark (object *pl, char *map_mark, int strength)
397{ 323{
398 int x, y, mflags;
399 sint16 nx, ny;
400 maptile *mp;
401
402 for (x = -strength; x < strength; x++) 324 for (int x = -strength; x < strength; x++)
403 { 325 {
404 for (y = -strength; y < strength; y++) 326 for (int y = -strength; y < strength; y++)
405 { 327 {
406 mp = pl->map; 328 mapxy pos (pl);
407 nx = pl->x + x; 329 pos.move (x, y);
408 ny = pl->y + y;
409 330
410 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 331 if (!pos.normalise ())
411 if (mflags & P_OUT_OF_MAP)
412 continue; 332 continue;
413 333
334 mapspace &ms = pos.ms ();
335
336 int mflags = ms.flags ();
337
414 int f = GET_MAP_FACE (mp, nx, ny, 0); 338 int f = GET_MAP_FACE (ms, 0);
415 if (f == blank_face) 339 if (f == blank_face)
416 { 340 {
417 f = GET_MAP_FACE (mp, nx, ny, 1); 341 f = GET_MAP_FACE (ms, 1);
418 if (f == blank_face) 342 if (f == blank_face)
419 f = GET_MAP_FACE (mp, nx, ny, 2); 343 f = GET_MAP_FACE (ms, 2);
420 } 344 }
421 345
422 int magicmap = faces [f].magicmap; 346 int magicmap = faces [f].magicmap;
423 347
424 if (mflags & P_BLOCKSVIEW) 348 if (mflags & P_BLOCKSVIEW)

Diff Legend

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