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.2 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.45 by root, Sun Jun 24 04:09:29 2007 UTC

1/* 1/*
2 * static char *rcsid_sock_info_c = 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * "$Id: info.C,v 1.2 2006/08/29 08:01:38 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
13 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
14 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
15 (at your option) any later version. 11 * any later version.
16 12 *
17 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, but
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
20 GNU General Public License for more details. 16 * for more details.
21 17 *
22 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
23 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25 21 *
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
27*/ 23 */
28 24
29/** 25/**
30 * \file 26 * \file
31 * Basic client output functions. 27 * Basic client output functions.
32 * 28 *
… …
40#include <sproto.h> 36#include <sproto.h>
41#include <stdarg.h> 37#include <stdarg.h>
42#include <spells.h> 38#include <spells.h>
43#include <skills.h> 39#include <skills.h>
44 40
41#include <cstring>
42
45/** 43/**
46 * Draws a normal message on the client. It is pretty 44 * Draws a normal message on the client. It is pretty
47 * much the same thing as the draw_info above, but takes a color 45 * much the same thing as the draw_info above, but takes a color
48 * parameter. the esrv_drawinfo functions should probably be 46 * parameter. the esrv_drawinfo functions should probably be
49 * replaced with this, just using black as the color. 47 * replaced with this, just using black as the color.
50 */ 48 */
49static void
51static void esrv_print_msg(NewSocket *ns,int color, const char *str) 50esrv_print_msg (client *ns, int color, const char *str)
52{ 51{
53 char buf[HUGE_BUF]; 52 ns->send_msg (color, "info", str);
54
55 if (ns->status == Ns_Old) {
56 snprintf(buf,HUGE_BUF,"%s\n", str);
57 } else {
58 snprintf(buf,HUGE_BUF, "drawinfo %d %s", color, str);
59 }
60/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
61 Write_String_To_Socket(ns, buf, strlen(buf));
62} 53}
63 54
64/** 55/**
65 * Draws an extended message on the client. 56 * Draws an extended message on the client.
66 * ns the socket to send message to 57 * ns the socket to send message to
… …
68 * type, 59 * type,
69 * subtype type and subtype of text message 60 * subtype type and subtype of text message
70 * intro Intro message to send with main message if client does not support the message type 61 * intro Intro message to send with main message if client does not support the message type
71 * message The main message 62 * message The main message
72 */ 63 */
64static void
73static void esrv_print_ext_msg(NewSocket *ns,int color,uint8 type, uint8 subtype, const char *message) 65esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
74{ 66{
75 char buf[HUGE_BUF];
76 snprintf(buf,HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 67 ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
77 Write_String_To_Socket(ns, buf, strlen(buf));
78/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
79
80} 68}
81 69
82/** 70/**
83 * Frontend for esrv_print_msg 71 * Frontend for esrv_print_msg
84 * \param colr message color 72 * \param colr message color
… …
87 * 75 *
88 * If pl is NULL or without contr set, writes message to log. 76 * If pl is NULL or without contr set, writes message to log.
89 * 77 *
90 * Else sends message to player via esrv_print_msg 78 * Else sends message to player via esrv_print_msg
91 */ 79 */
92 80static void
93static void print_message(int colr, const object *pl, const char *tmp) { 81print_message (int colr, const object *pl, const char *tmp)
94 82{
95 if(tmp == (char *) NULL) { 83 if (!tmp)
96 tmp="[NULL]"; 84 tmp = "[NULL]";
97 }
98 85
99 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 86 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
100 return; 87 return;
101 88
102 if (pl->type == PLAYER) { 89 if (pl->type == PLAYER)
103 esrv_print_msg(&pl->contr->socket,colr,(char*) tmp); 90 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
91}
92
93bool
94client::msg_suppressed (const char *msg)
95{
96 if (!pl)
104 return; 97 return false;
105 }
106}
107 98
99 if (pl->outputs_count <= 1 || !pl->outputs_sync)
100 return false;
108 101
109/** 102 int len = strlen (msg);
110 * Prints out the contents of specified buffer structures,
111 * and clears the string.
112 */
113 103
114void flush_output_element(const object *pl, Output_Buf *outputs) 104 if (len > MSG_BUF_SIZE)
115{ 105 return false;
116 char tbuf[MAX_BUF];
117 106
118 if (outputs->buf==NULL) return; 107 msg_buf *lru = msgbuf;
119 if (outputs->count > 1) { 108 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
120 snprintf(tbuf,MAX_BUF, "%d times %s", outputs->count, outputs->buf); 109 {
121 print_message(NDI_BLACK, pl, tbuf); 110 if (len == buf->len && !memcmp (msg, buf->msg, len))
122 } else 111 {
123 print_message(NDI_BLACK, pl, outputs->buf); 112 // found matching buf, see if expired
113 if (buf->expire <= pticks || !buf->count)
114 {
115 // yes, take over matching buffer, print
116 buf->expire = pticks + pl->outputs_sync;
117 buf->count = pl->outputs_count;
124 118
125 free_string(outputs->buf); 119 return false;
126 outputs->buf=NULL; 120 }
127 outputs->first_update=0; /* This way, it will be reused */
128}
129 121
130/** 122 // no, suppress
131 * Sends message to player through output buffers. 123 --buf->count;
132 * \param pl player to send message
133 * \param buf message to send
134 *
135 * If player's output_count is 1, sends message directly.
136 *
137 * Else checks output buffers for specified message.
138 *
139 * If found, checks if message should be sent now.
140 *
141 * If message not already in buffers, flushes olders buffer,
142 * and adds message to queue.
143 */
144
145static void check_output_buffers(const object *pl, const char *buf)
146{
147 int i, oldest=0;
148
149 if (pl->contr->outputs_count<2) {
150 print_message(NDI_BLACK, pl, buf);
151 return; 124 return true;
152 }
153 else {
154 for (i=0; i<NUM_OUTPUT_BUFS; i++) {
155 if (pl->contr->outputs[i].buf &&
156 !strcmp(buf, pl->contr->outputs[i].buf)) break;
157 else if (pl->contr->outputs[i].first_update <
158 pl->contr->outputs[oldest].first_update)
159 oldest=i;
160 } 125 }
161 /* We found a match */
162 if (i<NUM_OUTPUT_BUFS) {
163 pl->contr->outputs[i].count++;
164 if (pl->contr->outputs[i].count>=pl->contr->outputs_count) {
165 flush_output_element(pl, &pl->contr->outputs[i]);
166 }
167 }
168 /* No match - flush the oldest, and put the new one in */
169 else {
170 flush_output_element(pl, &pl->contr->outputs[oldest]);
171 126
172 pl->contr->outputs[oldest].first_update = pticks; 127 if (lru->expire > buf->expire)
173 pl->contr->outputs[oldest].count = 1; 128 lru = buf;
174 if (pl->contr->outputs[oldest].buf!=NULL)
175 free_string(pl->contr->outputs[oldest].buf);
176 pl->contr->outputs[oldest].buf = add_string(buf);
177 }
178 } 129 }
179}
180
181 130
131 // new message, evoke oldest buffer
132 lru->expire = pticks + pl->outputs_sync;
133 lru->count = pl->outputs_count;
134 lru->len = len;
135 memcpy (lru->msg, msg, len);
136
137 return false;
138}
182 139
183/** 140/**
184 * Sends message to player(s). 141 * Sends message to player(s).
185 * 142 *
186 * flags is various flags - mostly color, plus a few specials. 143 * flags is various flags - mostly color, plus a few specials.
… …
194 * in the flags. 151 * in the flags.
195 * 152 *
196 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 153 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
197 * 154 *
198 */ 155 */
199 156void
200void new_draw_info(int flags, int pri, const object *pl, const char *buf) 157new_draw_info (int flags, int pri, const object *op, const char *buf)
201{ 158{
202
203 if (flags & NDI_ALL) { 159 if (flags & NDI_ALL)
204 player *tmppl; 160 {
205 int i; 161 for_all_players (pl)
206
207 for (tmppl=first_player; tmppl!=NULL; tmppl=tmppl->next)
208 new_draw_info((flags & ~NDI_ALL), pri, tmppl->ob, buf); 162 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
209 163 }
210 for (i=1; i<socket_info.allocated_sockets; i++) { 164 else
211 if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri< 10) { 165 {
212 cs_write_string(&init_sockets[i], buf, strlen(buf)); 166 if (!op || !op->contr || !op->contr->ns)
213 /* Most messages don't have a newline, so add one */
214 cs_write_string(&init_sockets[i], "\n", 1);
215 }
216 }
217
218 return; 167 return;
219 } 168
220 if(!pl || (pl->type==PLAYER && pl->contr==NULL)) { 169 if (pri >= op->contr->listening)
221 /* Write to the socket? */
222 print_message(0, NULL, buf);
223 return; 170 return;
224 }
225 if (pl->type!=PLAYER) return;
226 if (pri>=pl->contr->listening) return;
227 171
228 if ((flags&NDI_COLOR_MASK)==NDI_BLACK && !(flags &NDI_UNIQUE)) { 172 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
229 /* following prints stuff out, as appropriate */ 173 || !op->contr->ns->msg_suppressed (buf))
230 check_output_buffers(pl, buf);
231 }
232 else {
233 print_message(flags&NDI_COLOR_MASK, pl, buf); 174 print_message (flags & NDI_COLOR_MASK, op, buf);
234 } 175 }
235} 176}
236 177
237/** 178/**
238 * Wrapper for new_draw_info printf-like. 179 * Wrapper for new_draw_info printf-like.
… …
240 * This is a pretty trivial function, but it allows us to use printf style 181 * This is a pretty trivial function, but it allows us to use printf style
241 * formatting, so instead of the calling function having to do it, we do 182 * formatting, so instead of the calling function having to do it, we do
242 * it here. It may also have advantages in the future for reduction of 183 * it here. It may also have advantages in the future for reduction of
243 * client/server bandwidth (client could keep track of various strings 184 * client/server bandwidth (client could keep track of various strings
244 */ 185 */
245 186void
246void new_draw_info_format(int flags, int pri, const object *pl, const char *format, ...) 187new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
247{ 188{
248 char buf[HUGE_BUF]; 189 char buf[HUGE_BUF];
249 190
250 va_list ap; 191 va_list ap;
251 va_start(ap, format); 192 va_start (ap, format);
252
253 vsnprintf(buf, HUGE_BUF, format, ap); 193 vsnprintf (buf, HUGE_BUF, format, ap);
254
255 va_end(ap); 194 va_end (ap);
256 195
257 new_draw_info(flags, pri, pl, buf); 196 new_draw_info (flags, pri, pl, buf);
258} 197}
259 198
199void
200draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
201{
260 202
261void draw_ext_info(
262 int flags, int pri, const object *pl, uint8 type,
263 uint8 subtype, const char* message, const char* oldmessage){
264
265 if(!pl || (pl->type!=PLAYER) || (pl->contr==NULL)) 203 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
266 return; 204 return;
267 205
268 if (pri>=pl->contr->listening) return; 206 if (pri >= pl->contr->listening)
207 return;
208
269 if (!CLIENT_SUPPORT_READABLES(&pl->contr->socket,type)){ 209 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
210 {
270 char *buf = (char*)malloc(strlen(oldmessage==NULL?message:oldmessage)+1); 211 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
212
271 if (buf==NULL) 213 if (buf == NULL)
272 LOG(llevError,"info::draw_ext_info -> Out of memory!"); 214 LOG (llevError, "info::draw_ext_info -> Out of memory!");
273 else{ 215 else
216 {
274 strcpy(buf,oldmessage==NULL?message:oldmessage); 217 strcpy (buf, oldmessage == NULL ? message : oldmessage);
275 strip_media_tag(buf); 218 strip_media_tag (buf);
276 new_draw_info(flags, pri, pl, buf); 219 new_draw_info (flags, pri, pl, buf);
277 free(buf); 220 free (buf);
278 } 221 }
222 }
279 }else{ 223 else
280 esrv_print_ext_msg(&pl->contr->socket,flags&NDI_COLOR_MASK,type,subtype,message); 224 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
281 }
282} 225}
283 226
284void draw_ext_info_format( 227void
285 int flags, int pri, const object *pl, uint8 type, 228draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
286 uint8 subtype, const char* old_format, 229{
287 char* new_format, ...){
288
289 char buf[HUGE_BUF]; 230 char buf[HUGE_BUF];
231
290 if(!pl || (pl->type!=PLAYER) || (pl->contr==NULL)) 232 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
291 return; 233 return;
292 234
293 if (pri>=pl->contr->listening) return; 235 if (pri >= pl->contr->listening)
236 return;
237
294 if (!CLIENT_SUPPORT_READABLES(&pl->contr->socket,type)){ 238 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
239 {
295 va_list ap; 240 va_list ap;
241
296 LOG(llevDebug,"Non supported extension text type for client.\n"); 242 LOG (llevDebug, "Non supported extension text type for client.\n");
297 va_start(ap, new_format); 243 va_start (ap, new_format);
298 vsnprintf(buf, HUGE_BUF, old_format, ap); 244 vsnprintf (buf, HUGE_BUF, old_format, ap);
299 va_end(ap); 245 va_end (ap);
300 new_draw_info(flags, pri, pl, buf); 246 new_draw_info (flags, pri, pl, buf);
301 return; 247 return;
302 }else{ 248 }
249 else
250 {
303 va_list ap; 251 va_list ap;
252
304 va_start(ap, new_format); 253 va_start (ap, new_format);
305 vsnprintf(buf, HUGE_BUF, new_format, ap); 254 vsnprintf (buf, HUGE_BUF, new_format, ap);
306 va_end(ap); 255 va_end (ap);
307 strip_media_tag(buf); 256 strip_media_tag (buf);
308 esrv_print_ext_msg(&pl->contr->socket,flags&NDI_COLOR_MASK,type,subtype,buf); 257 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
309 } 258 }
310} 259}
260
311/** 261/**
312 * Writes to everyone on the map *except* op. This is useful for emotions. 262 * Writes to everyone on the map *except* op. This is useful for emotions.
313 */ 263 */
314 264
265void
315void new_info_map_except(int color, mapstruct *map, object *op, const char *str) { 266new_info_map_except (int color, maptile * map, object *op, const char *str)
316 player *pl; 267{
317 268 for_all_players (pl)
318 for(pl = first_player; pl != NULL; pl = pl->next)
319 if(pl->ob != NULL && pl->ob->map == map && pl->ob != op) { 269 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
320 new_draw_info(color, 0, pl->ob, str); 270 new_draw_info (color, 0, pl->ob, str);
321 }
322} 271}
323 272
324/** 273/**
325 * Writes to everyone on the map except op1 and op2 274 * Writes to everyone on the map except op1 and op2
326 */ 275 */
327 276void
328void new_info_map_except2(int color, mapstruct *map, object *op1, object *op2, 277new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
329 const char *str) { 278{
330 player *pl; 279 for_all_players (pl)
331 280 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
332 for(pl = first_player; pl != NULL; pl = pl->next)
333 if(pl->ob != NULL && pl->ob->map == map
334 && pl->ob != op1 && pl->ob != op2) {
335 new_draw_info(color, 0, pl->ob, str); 281 new_draw_info (color, 0, pl->ob, str);
336 }
337} 282}
338 283
339/** 284/**
340 * Writes to everyone on the specified map 285 * Writes to everyone on the specified map
341 */ 286 */
342 287void
343void new_info_map(int color, mapstruct *map, const char *str) { 288new_info_map (int color, maptile * map, const char *str)
344 player *pl; 289{
345 290 for_all_players (pl)
346 for(pl = first_player; pl != NULL; pl = pl->next)
347 if(pl->ob != NULL && pl->ob->map == map) { 291 if (pl->ob != NULL && pl->ob->map == map)
348 new_draw_info(color, 0, pl->ob, str); 292 new_draw_info (color, 0, pl->ob, str);
349 }
350}
351
352
353/**
354 * This does nothing now. However, in theory, we should probably send
355 * something to the client and let the client figure out how it might want
356 * to handle this
357 */
358void clear_win_info(object *op)
359{
360}
361
362/**
363 * Get player's current range attack in obuf.
364 */
365void rangetostring(object *pl,char *obuf)
366{
367 switch(pl->contr->shoottype) {
368 case range_none:
369 strcpy(obuf,"Range: nothing");
370 break;
371
372 case range_bow:
373 {
374 object *op;
375
376 for (op = pl->inv; op; op=op->below)
377 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
378 break;
379 if(op==NULL) break;
380
381 sprintf (obuf, "Range: %s (%s)", query_base_name(op, 0),
382 op->race ? op->race : "nothing");
383 }
384 break;
385
386 case range_magic:
387 if (settings.casting_time == TRUE) {
388 if (pl->casting_time > -1) {
389 if (pl->casting_time == 0)
390 sprintf(obuf,"Range: Holding spell (%s)",
391 pl->spell->name);
392 else
393 sprintf(obuf,"Range: Casting spell (%s)",
394 pl->spell->name);
395 } else
396 sprintf(obuf,"Range: spell (%s)",
397 pl->contr->ranges[range_magic]->name);
398 } else
399 sprintf(obuf,"Range: spell (%s)",
400 pl->contr->ranges[range_magic]->name);
401 break;
402
403 case range_misc:
404 sprintf(obuf,"Range: %s",
405 pl->contr->ranges[range_misc]?
406 query_base_name(pl->contr->ranges[range_misc],0): "none");
407 break;
408
409 /* range_scroll is only used for controlling golems. If the
410 * the player does not have a golem, reset some things.
411 */
412 case range_golem:
413 if (pl->contr->ranges[range_golem]!=NULL)
414 sprintf(obuf,"Range: golem (%s)",pl->contr->ranges[range_golem]->name);
415 else {
416 pl->contr->shoottype = range_none;
417 strcpy(obuf,"Range: nothing");
418 }
419 break;
420
421 case range_skill:
422 sprintf(obuf,"Skill: %s", pl->chosen_skill!=NULL ?
423 pl->chosen_skill->name : "none");
424 break;
425
426 case range_builder:
427 sprintf( obuf, "Builder: %s", query_base_name( pl->contr->ranges[ range_builder ], 0 ) );
428 break;
429
430 default:
431 strcpy(obuf,"Range: illegal");
432 }
433} 293}
434 294
435/** 295/**
436 * Sets player title. 296 * Sets player title.
437 */ 297 */
298void
438void set_title(object *pl, char *buf) 299set_title (object *pl, char *buf)
439{ 300{
440 /* Eneq(@csd.uu.se): Let players define their own titles. */ 301 /* Eneq(@csd.uu.se): Let players define their own titles. */
441 if (pl->contr->own_title[0]=='\0') 302 if (pl->contr->own_title[0] == '\0')
442 sprintf(buf,"Player: %s the %s",pl->name,pl->contr->title); 303 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
443 else 304 else
444 sprintf(buf,"Player: %s %s",pl->name,pl->contr->own_title); 305 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
445} 306}
446 307
308// formerly a macro, used only by magic map, so optimised it out
309static inline faceidx
310GET_MAP_FACE (maptile *m, int x, int y, int layer)
311{
312 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
313 return op->face;
314 else
315 return 0;
316}
447 317
448/** 318/**
449 * Helper for magic map creation. 319 * Helper for magic map creation.
450 * 320 *
451 * Takes a player, the map_mark array and an x and y starting position. 321 * Takes a player, the map_mark array and an x and y starting position.
… …
454 * 324 *
455 * This function examines all the adjacant spaces next to px, py. 325 * This function examines all the adjacant spaces next to px, py.
456 * It updates the map_mark arrow with the color and high bits set 326 * It updates the map_mark arrow with the color and high bits set
457 * for various code values. 327 * for various code values.
458 */ 328 */
329static void
459static void magic_mapping_mark_recursive(object *pl, char *map_mark, int px, int py) 330magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
460{ 331{
461 int x, y, dx, dy,mflags; 332 int x, y, dx, dy, mflags;
462 sint16 nx, ny; 333 sint16 nx, ny;
463 mapstruct *mp; 334 maptile *mp;
464 New_Face *f;
465 335
466 for (dx = -1; dx <= 1; dx++) { 336 for (dx = -1; dx <= 1; dx++)
337 {
467 for (dy = -1; dy <= 1; dy++) { 338 for (dy = -1; dy <= 1; dy++)
339 {
468 x = px + dx; 340 x = px + dx;
469 y = py + dy; 341 y = py + dy;
470 342
471 if (FABS(x) >= MAGIC_MAP_HALF || FABS(y) >= MAGIC_MAP_HALF) continue; 343 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF)
344 continue;
472 345
473 mp = pl->map; 346 mp = pl->map;
474 nx = pl->x + x; 347 nx = pl->x + x;
475 ny = pl->y + y; 348 ny = pl->y + y;
476 349
477 mflags = get_map_flags(pl->map, &mp, nx, ny, &nx, &ny); 350 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
478 if (mflags & P_OUT_OF_MAP) continue; 351 if (mflags & P_OUT_OF_MAP)
352 continue;
479 353
480 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] == 0) { 354 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
355 {
481 f= GET_MAP_FACE(mp, nx, ny, 0); 356 int f = GET_MAP_FACE (mp, nx, ny, 0);
357 if (f == blank_face)
358 {
359 f = GET_MAP_FACE (mp, nx, ny, 1);
482 if (f == blank_face) 360 if (f == blank_face)
483 f= GET_MAP_FACE(mp, nx, ny, 1);
484 if (f == blank_face)
485 f= GET_MAP_FACE(mp, nx, ny, 2); 361 f = GET_MAP_FACE (mp, nx, ny, 2);
362 }
486 363
364 int magicmap = faces [f].magicmap;
365
487 /* Should probably have P_NO_MAGIC here also, but then shops don't 366 /* Should probably have P_NO_MAGIC here also, but then shops don't
488 * work. 367 * work.
489 */ 368 */
490 if (mflags & P_BLOCKSVIEW) 369 if (mflags & P_BLOCKSVIEW)
491 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_WALL | (f?f->magicmap:0); 370 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
492 else { 371 else
372 {
493 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f?f->magicmap:0); 373 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
494 magic_mapping_mark_recursive(pl, map_mark, x, y); 374 magic_mapping_mark_recursive (pl, map_mark, x, y);
495 } 375 }
496 } 376 }
497 } 377 }
498 } 378 }
499} 379}
500
501 380
502/** 381/**
503 * Creates magic map for player. 382 * Creates magic map for player.
504 * 383 *
505 * Note: For improved magic mapping display, the space that blocks 384 * Note: For improved magic mapping display, the space that blocks
… …
507 * being nonzero have been changed to check for 1. Also, since 386 * being nonzero have been changed to check for 1. Also, since
508 * map_mark is a char value, putting 2 in should cause no problems. 387 * map_mark is a char value, putting 2 in should cause no problems.
509 * 388 *
510 * This function examines the map the player is on, and determines what 389 * This function examines the map the player is on, and determines what
511 * is visible. 2 is set for walls or objects that blocks view. 1 390 * is visible. 2 is set for walls or objects that blocks view. 1
512 * is for open spaces. map_mark should already have been initialized 391 * is for open spaces. map_mark should already have been initialised
513 * to zero before this is called. 392 * to zero before this is called.
514 * strength is an initial strength*2 rectangular area that we automatically 393 * strength is an initial strength*2 rectangular area that we automatically
515 * see in/penetrate through. 394 * see in/penetrate through.
516 */ 395 */
517 396void
518void magic_mapping_mark(object *pl, char *map_mark, int strength) 397magic_mapping_mark (object *pl, char *map_mark, int strength)
519{ 398{
520 int x, y, mflags; 399 int x, y, mflags;
521 sint16 nx, ny; 400 sint16 nx, ny;
522 mapstruct *mp; 401 maptile *mp;
523 New_Face *f;
524 402
525 for (x = -strength; x <strength; x++) { 403 for (x = -strength; x < strength; x++)
404 {
526 for (y = -strength; y <strength; y++) { 405 for (y = -strength; y < strength; y++)
406 {
527 mp = pl->map; 407 mp = pl->map;
528 nx = pl->x + x; 408 nx = pl->x + x;
529 ny = pl->y + y; 409 ny = pl->y + y;
410
530 mflags = get_map_flags(pl->map, &mp, nx, ny, &nx, &ny); 411 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
531 if (mflags & P_OUT_OF_MAP) 412 if (mflags & P_OUT_OF_MAP)
532 continue; 413 continue;
414
415 int f = GET_MAP_FACE (mp, nx, ny, 0);
416 if (f == blank_face)
533 else { 417 {
534 f= GET_MAP_FACE(mp, nx, ny, 0); 418 f = GET_MAP_FACE (mp, nx, ny, 1);
535 if (f == blank_face) 419 if (f == blank_face)
536 f= GET_MAP_FACE(mp, nx, ny, 1);
537 if (f == blank_face)
538 f= GET_MAP_FACE(mp, nx, ny, 2); 420 f = GET_MAP_FACE (mp, nx, ny, 2);
539 } 421 }
540 422
423 int magicmap = faces [f].magicmap;
424
541 if (mflags & P_BLOCKSVIEW) 425 if (mflags & P_BLOCKSVIEW)
542 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_WALL | (f?f->magicmap:0); 426 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
543 else { 427 else
428 {
544 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f?f->magicmap:0); 429 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
545 magic_mapping_mark_recursive(pl, map_mark, x, y); 430 magic_mapping_mark_recursive (pl, map_mark, x, y);
546 } 431 }
547 } 432 }
548 } 433 }
549} 434}
550 435
551
552/** 436/**
553 * Creates and sends magic map to player. 437 * Creates and sends magic map to player.
554 * 438 *
555 * The following function is a lot messier than it really should be, 439 * The following function is a lot messier than it really should be,
556 * but there is no real easy solution. 440 * but there is no real easy solution.
557 * 441 *
558 * Mark Wedel 442 * Mark Wedel
559 */ 443 */
560 444void
561void draw_magic_map(object *pl) 445draw_magic_map (object *pl)
562{ 446{
563 int x,y;
564 char *map_mark = (char *) calloc(MAGIC_MAP_SIZE*MAGIC_MAP_SIZE, 1); 447 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
565 int xmin, xmax, ymin, ymax; 448 int xmin, xmax, ymin, ymax;
566 SockList sl;
567 449
568 if (pl->type!=PLAYER) { 450 if (pl->type != PLAYER)
451 {
569 LOG(llevError,"Non player object called draw_map.\n"); 452 LOG (llevError, "Non player object called draw_map.\n");
570 return; 453 return;
571 }
572 454 }
455
573 /* First, we figure out what spaces are 'reachable' by the player */ 456 /* First, we figure out what spaces are 'reachable' by the player */
574 magic_mapping_mark(pl, map_mark, 3); 457 magic_mapping_mark (pl, map_mark, 3);
575 458
576 /* We now go through and figure out what spaces have been 459 /* We now go through and figure out what spaces have been
577 * marked, and thus figure out rectangular region we send 460 * marked, and thus figure out rectangular region we send
578 * to the client (eg, if only a 10x10 area is visible, we only 461 * to the client (eg, if only a 10x10 area is visible, we only
579 * want to send those 100 spaces.) 462 * want to send those 100 spaces.)
580 */ 463 */
581 xmin = MAGIC_MAP_SIZE; 464 xmin = MAGIC_MAP_SIZE;
582 ymin = MAGIC_MAP_SIZE; 465 ymin = MAGIC_MAP_SIZE;
583 xmax = 0; 466 xmax = 0;
584 ymax = 0; 467 ymax = 0;
468
585 for(x = 0; x < MAGIC_MAP_SIZE ; x++) { 469 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
586 for(y = 0; y < MAGIC_MAP_SIZE; y++) { 470 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
587 if (map_mark[x + MAP_WIDTH(pl->map) * y] | FACE_FLOOR) { 471 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
472 {
588 xmin = x < xmin ? x : xmin; 473 xmin = x < xmin ? x : xmin;
589 xmax = x > xmax ? x : xmax; 474 xmax = x > xmax ? x : xmax;
590 ymin = y < ymin ? y : ymin; 475 ymin = y < ymin ? y : ymin;
591 ymax = y > ymax ? y : ymax; 476 ymax = y > ymax ? y : ymax;
592 }
593 } 477 }
594 }
595 478
596 sl.buf= (unsigned char*) malloc(MAXSOCKBUF); 479 packet sl;
597 snprintf((char*)sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax-xmin+1), (ymax-ymin+1), 480 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
598 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 481 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
599 sl.len=strlen((char*)sl.buf); 482
600
601 for (y = ymin; y <= ymax; y++) { 483 for (int y = ymin; y <= ymax; y++)
602 for (x = xmin; x <= xmax; x++) { 484 for (int x = xmin; x <= xmax; x++)
603 sl.buf[sl.len++]= map_mark[x+MAGIC_MAP_SIZE*y] & ~FACE_FLOOR; 485 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
604 } /* x loop */ 486
605 } /* y loop */ 487 pl->contr->ns->send_packet (sl);
606 488
607 Send_With_Handling(&pl->contr->socket, &sl);
608 free(sl.buf);
609 free(map_mark); 489 free (map_mark);
610} 490}
611
612 491
613/** 492/**
614 * Send a kill log record to sockets 493 * Send a kill log record to sockets
615 */ 494 */
616 495void
617void Log_Kill(const char *Who, 496Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
618 const char *What, int WhatType,
619 const char *With, int WithType)
620{ 497{
621 int i;
622 size_t len; 498 size_t len;
623 char buf[MAX_BUF]; 499 char buf[MAX_BUF];
624 500
625 if (With!=NULL) { 501 if (With != NULL)
626 snprintf(buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n",Who,What,WhatType,With,WithType); 502 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
627 }
628 else { 503 else
629 snprintf(buf,MAX_BUF, "%s\t%s\t%d\n",Who,What,WhatType); 504 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
630 } 505
631 len=strlen(buf); 506 len = strlen (buf);
632 for(i=1; i<socket_info.allocated_sockets; i++) {
633 if (init_sockets[i].old_mode == Old_Listen) {
634 cs_write_string(&init_sockets[i], buf, len);
635 }
636 }
637} 507}
508

Diff Legend

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