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.4 by root, Sun Sep 3 00:18:43 2006 UTC vs.
Revision 1.56 by root, Fri Nov 6 13:07:28 2009 UTC

1/* 1/*
2 * static char *rcsid_sock_info_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: info.C,v 1.4 2006/09/03 00:18:43 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify it under
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
15 (at your option) any later version. 11 * option) 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License 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 Affero GNU General Public License
23 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
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 <support@deliantra.net>
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 outputs->buf=NULL; 119 return false;
126 outputs->first_update=0; /* This way, it will be reused */ 120 }
127}
128 121
129/** 122 // no, suppress
130 * Sends message to player through output buffers. 123 --buf->count;
131 * \param pl player to send message
132 * \param buf message to send
133 *
134 * If player's output_count is 1, sends message directly.
135 *
136 * Else checks output buffers for specified message.
137 *
138 * If found, checks if message should be sent now.
139 *
140 * If message not already in buffers, flushes olders buffer,
141 * and adds message to queue.
142 */
143
144static void check_output_buffers(const object *pl, const char *buf)
145{
146 int i, oldest=0;
147
148 if (pl->contr->outputs_count<2) {
149 print_message(NDI_BLACK, pl, buf);
150 return; 124 return true;
151 }
152 else {
153 for (i=0; i<NUM_OUTPUT_BUFS; i++) {
154 if (pl->contr->outputs[i].buf &&
155 !strcmp(buf, pl->contr->outputs[i].buf)) break;
156 else if (pl->contr->outputs[i].first_update <
157 pl->contr->outputs[oldest].first_update)
158 oldest=i;
159 } 125 }
160 /* We found a match */
161 if (i<NUM_OUTPUT_BUFS) {
162 pl->contr->outputs[i].count++;
163 if (pl->contr->outputs[i].count>=pl->contr->outputs_count) {
164 flush_output_element(pl, &pl->contr->outputs[i]);
165 }
166 }
167 /* No match - flush the oldest, and put the new one in */
168 else {
169 flush_output_element(pl, &pl->contr->outputs[oldest]);
170 126
171 pl->contr->outputs[oldest].first_update = pticks; 127 if (lru->expire > buf->expire)
172 pl->contr->outputs[oldest].count = 1; 128 lru = buf;
173 pl->contr->outputs[oldest].buf = buf;
174 }
175 } 129 }
176}
177
178 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}
179 139
180/** 140/**
181 * Sends message to player(s). 141 * Sends message to player(s).
182 * 142 *
183 * flags is various flags - mostly color, plus a few specials. 143 * flags is various flags - mostly color, plus a few specials.
184 * 144 *
185 * pri is priority. It is a little odd - the lower the value, the more 145 * pri is unused.
186 * important it is. Thus, 0 gets sent no matter what. Otherwise, the
187 * value must be less than the listening level that the player has set.
188 * Unfortunately, there is no clear guideline on what each level does what.
189 * 146 *
190 * 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
191 * in the flags. 148 * in the flags.
192 * 149 *
193 * 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.
194 * 151 *
195 */ 152 */
196 153void
197void new_draw_info(int flags, int pri, const object *pl, const char *buf) 154new_draw_info (int flags, int pri, const object *op, const char *buf)
198{ 155{
199
200 if (flags & NDI_ALL) { 156 if (flags & NDI_ALL)
201 player *tmppl; 157 {
202 int i; 158 for_all_players (pl)
203
204 for (tmppl=first_player; tmppl!=NULL; tmppl=tmppl->next)
205 new_draw_info((flags & ~NDI_ALL), pri, tmppl->ob, buf); 159 new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
206 160 }
207 for (i=1; i<socket_info.allocated_sockets; i++) { 161 else
208 if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri< 10) { 162 {
209 cs_write_string(&init_sockets[i], buf, strlen(buf)); 163 if (!op || !op->contr || !op->contr->ns)
210 /* Most messages don't have a newline, so add one */
211 cs_write_string(&init_sockets[i], "\n", 1);
212 }
213 }
214
215 return; 164 return;
216 }
217 if(!pl || (pl->type==PLAYER && pl->contr==NULL)) {
218 /* Write to the socket? */
219 print_message(0, NULL, buf);
220 return;
221 }
222 if (pl->type!=PLAYER) return;
223 if (pri>=pl->contr->listening) return;
224 165
225 if ((flags&NDI_COLOR_MASK)==NDI_BLACK && !(flags &NDI_UNIQUE)) { 166 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
226 /* following prints stuff out, as appropriate */ 167 || !op->contr->ns->msg_suppressed (buf))
227 check_output_buffers(pl, buf);
228 }
229 else {
230 print_message(flags&NDI_COLOR_MASK, pl, buf); 168 print_message (flags & NDI_COLOR_MASK, op, buf);
231 } 169 }
232} 170}
233 171
234/** 172/**
235 * Wrapper for new_draw_info printf-like. 173 * Wrapper for new_draw_info printf-like.
… …
237 * This is a pretty trivial function, but it allows us to use printf style 175 * This is a pretty trivial function, but it allows us to use printf style
238 * formatting, so instead of the calling function having to do it, we do 176 * formatting, so instead of the calling function having to do it, we do
239 * it here. It may also have advantages in the future for reduction of 177 * it here. It may also have advantages in the future for reduction of
240 * client/server bandwidth (client could keep track of various strings 178 * client/server bandwidth (client could keep track of various strings
241 */ 179 */
242 180void
243void new_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, ...)
244{ 182{
245 char buf[HUGE_BUF];
246
247 va_list ap; 183 va_list ap;
248 va_start(ap, format); 184 va_start (ap, format);
249 185 new_draw_info (flags, pri, pl, vformat (format, ap));
250 vsnprintf(buf, HUGE_BUF, format, ap);
251
252 va_end(ap); 186 va_end (ap);
253
254 new_draw_info(flags, pri, pl, buf);
255} 187}
256 188
257 189void
258void draw_ext_info( 190draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
259 int flags, int pri, const object *pl, uint8 type, 191{
260 uint8 subtype, const char* message, const char* oldmessage){
261
262 if(!pl || (pl->type!=PLAYER) || (pl->contr==NULL)) 192 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
263 return; 193 return;
264 194
265 if (pri>=pl->contr->listening) return;
266 if (!CLIENT_SUPPORT_READABLES(&pl->contr->socket,type)){ 195 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
196 {
267 char *buf = (char*)malloc(strlen(oldmessage==NULL?message:oldmessage)+1); 197 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
198
268 if (buf==NULL) 199 if (buf == NULL)
269 LOG(llevError,"info::draw_ext_info -> Out of memory!"); 200 LOG (llevError, "info::draw_ext_info -> Out of memory!");
270 else{ 201 else
202 {
271 strcpy(buf,oldmessage==NULL?message:oldmessage); 203 strcpy (buf, oldmessage == NULL ? message : oldmessage);
272 strip_media_tag(buf); 204 strip_media_tag (buf);
273 new_draw_info(flags, pri, pl, buf); 205 new_draw_info (flags, pri, pl, buf);
274 free(buf); 206 free (buf);
275 } 207 }
208 }
276 }else{ 209 else
277 esrv_print_ext_msg(&pl->contr->socket,flags&NDI_COLOR_MASK,type,subtype,message); 210 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
278 }
279} 211}
280 212
281void draw_ext_info_format( 213void
282 int flags, int pri, const object *pl, uint8 type, 214draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
283 uint8 subtype, const char* old_format, 215{
284 char* new_format, ...){ 216 va_list ap;
285 217 va_start (ap, new_format);
286 char buf[HUGE_BUF]; 218
287 if(!pl || (pl->type!=PLAYER) || (pl->contr==NULL)) 219 if (!pl || !pl->is_player ())
288 return; 220 return;
289 221
290 if (pri>=pl->contr->listening) return; 222 // TODO: just assume, and rip out?
291 if (!CLIENT_SUPPORT_READABLES(&pl->contr->socket,type)){ 223 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
292 va_list ap; 224 {
293 LOG(llevDebug,"Non supported extension text type for client.\n"); 225 LOG (llevDebug, "Non supported extension text type for client.\n");
294 va_start(ap, new_format); 226 new_draw_info (flags, pri, pl, vformat (old_format, ap));
295 vsnprintf(buf, HUGE_BUF, old_format, ap); 227 }
296 va_end(ap); 228 else
297 new_draw_info(flags, pri, pl, buf); 229 {
298 return; 230 char *buf = vformat (new_format, ap);
299 }else{
300 va_list ap;
301 va_start(ap, new_format);
302 vsnprintf(buf, HUGE_BUF, new_format, ap);
303 va_end(ap);
304 strip_media_tag(buf); 231 strip_media_tag (buf);
305 esrv_print_ext_msg(&pl->contr->socket,flags&NDI_COLOR_MASK,type,subtype,buf); 232 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
306 } 233 }
234
235 va_end (ap);
307} 236}
237
308/** 238/**
309 * Writes to everyone on the map *except* op. This is useful for emotions. 239 * Writes to everyone on the map *except* op. This is useful for emotions.
310 */ 240 */
311 241void
312void new_info_map_except(int color, mapstruct *map, object *op, const char *str) { 242new_info_map_except (int color, maptile * map, object *op, const char *str)
313 player *pl; 243{
314 244 for_all_players (pl)
315 for(pl = first_player; pl != NULL; pl = pl->next)
316 if(pl->ob != NULL && pl->ob->map == map && pl->ob != op) { 245 if (pl->ob->map == map && pl->ob != op)
317 new_draw_info(color, 0, pl->ob, str); 246 new_draw_info (color, 0, pl->ob, str);
318 }
319} 247}
320 248
321/** 249/**
322 * Writes to everyone on the map except op1 and op2 250 * Writes to everyone on the map except op1 and op2
323 */ 251 */
324 252static void
325void new_info_map_except2(int color, mapstruct *map, object *op1, object *op2, 253new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
326 const char *str) { 254{
327 player *pl; 255 for_all_players (pl)
328 256 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
329 for(pl = first_player; pl != NULL; pl = pl->next)
330 if(pl->ob != NULL && pl->ob->map == map
331 && pl->ob != op1 && pl->ob != op2) {
332 new_draw_info(color, 0, pl->ob, str); 257 new_draw_info (color, 0, pl->ob, str);
333 }
334} 258}
335 259
336/** 260/**
337 * Writes to everyone on the specified map 261 * Writes to everyone on the specified map
338 */ 262 */
339 263void
340void new_info_map(int color, mapstruct *map, const char *str) { 264new_info_map (int color, maptile * map, const char *str)
341 player *pl; 265{
342 266 for_all_players (pl)
343 for(pl = first_player; pl != NULL; pl = pl->next) 267 if (pl->ob->map == map)
344 if(pl->ob != NULL && pl->ob->map == map) {
345 new_draw_info(color, 0, pl->ob, str); 268 new_draw_info (color, 0, pl->ob, str);
346 }
347}
348
349
350/**
351 * This does nothing now. However, in theory, we should probably send
352 * something to the client and let the client figure out how it might want
353 * to handle this
354 */
355void clear_win_info(object *op)
356{
357}
358
359/**
360 * Get player's current range attack in obuf.
361 */
362void rangetostring(object *pl,char *obuf)
363{
364 switch(pl->contr->shoottype) {
365 case range_none:
366 strcpy(obuf,"Range: nothing");
367 break;
368
369 case range_bow:
370 {
371 object *op;
372
373 for (op = pl->inv; op; op=op->below)
374 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
375 break;
376 if(op==NULL) break;
377
378 sprintf (obuf, "Range: %s (%s)", query_base_name(op, 0),
379 op->race ? (const char *)op->race : "nothing");
380 }
381 break;
382
383 case range_magic:
384 if (settings.casting_time == TRUE) {
385 if (pl->casting_time > -1) {
386 if (pl->casting_time == 0)
387 sprintf(obuf,"Range: Holding spell (%s)",
388 (const char *)pl->spell->name);
389 else
390 sprintf(obuf,"Range: Casting spell (%s)",
391 (const char *)pl->spell->name);
392 } else
393 sprintf(obuf,"Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
394 } else
395 sprintf(obuf,"Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
396 break;
397
398 case range_misc:
399 sprintf(obuf,"Range: %s", pl->contr->ranges[range_misc] ?
400 query_base_name(pl->contr->ranges[range_misc],0) : "none");
401 break;
402
403 /* range_scroll is only used for controlling golems. If the
404 * the player does not have a golem, reset some things.
405 */
406 case range_golem:
407 if (pl->contr->ranges[range_golem]!=NULL)
408 sprintf(obuf,"Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
409 else {
410 pl->contr->shoottype = range_none;
411 strcpy(obuf,"Range: nothing");
412 }
413 break;
414
415 case range_skill:
416 sprintf(obuf,"Skill: %s", pl->chosen_skill!=NULL ?
417 (const char *)pl->chosen_skill->name : "none");
418 break;
419
420 case range_builder:
421 sprintf( obuf, "Builder: %s", query_base_name( pl->contr->ranges[ range_builder ], 0 ) );
422 break;
423
424 default:
425 strcpy(obuf,"Range: illegal");
426 }
427} 269}
428 270
429/** 271/**
430 * Sets player title. 272 * Sets player title.
431 */ 273 */
274void
432void set_title(object *pl, char *buf) 275set_title (object *pl, char *buf)
433{ 276{
434 /* Eneq(@csd.uu.se): Let players define their own titles. */ 277 /* Eneq(@csd.uu.se): Let players define their own titles. */
435 if (pl->contr->own_title[0]=='\0') 278 if (pl->contr->own_title[0] == '\0')
436 sprintf(buf,"Player: %s the %s",(const char *)pl->name,(const char *)pl->contr->title); 279 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
437 else 280 else
438 sprintf(buf,"Player: %s %s",(const char *)pl->name,(const char *)pl->contr->own_title); 281 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
439} 282}
440 283
284// formerly a macro, used only by magic map, so optimised it out
285static inline faceidx
286GET_MAP_FACE (mapspace &ms, int layer)
287{
288 if (object *op = ms.faces_obj [layer])
289 return op->face;
290 else
291 return 0;
292}
441 293
442/** 294/**
443 * Helper for magic map creation. 295 * Helper for magic map creation.
444 * 296 *
445 * Takes a player, the map_mark array and an x and y starting position. 297 * Takes a player, the map_mark array and an x and y starting position.
… …
448 * 300 *
449 * This function examines all the adjacant spaces next to px, py. 301 * This function examines all the adjacant spaces next to px, py.
450 * It updates the map_mark arrow with the color and high bits set 302 * It updates the map_mark arrow with the color and high bits set
451 * for various code values. 303 * for various code values.
452 */ 304 */
305static void
453static void magic_mapping_mark_recursive(object *pl, char *map_mark, int px, int py) 306magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
454{ 307{
455 int x, y, dx, dy,mflags;
456 sint16 nx, ny;
457 mapstruct *mp;
458 New_Face *f;
459
460 for (dx = -1; dx <= 1; dx++) { 308 for (int dx = -1; dx <= 1; dx++)
309 {
461 for (dy = -1; dy <= 1; dy++) { 310 for (int dy = -1; dy <= 1; dy++)
311 {
462 x = px + dx; 312 int x = px + dx;
463 y = py + dy; 313 int y = py + dy;
464 314
465 if (FABS(x) >= MAGIC_MAP_HALF || FABS(y) >= MAGIC_MAP_HALF) continue; 315 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
316 continue;
466 317
467 mp = pl->map; 318 mapxy pos (pl);
468 nx = pl->x + x; 319 pos.move (x, y);
469 ny = pl->y + y;
470 320
471 mflags = get_map_flags(pl->map, &mp, nx, ny, &nx, &ny); 321 if (!pos.normalise ())
472 if (mflags & P_OUT_OF_MAP) continue; 322 continue;
473 323
324 mapspace &ms = pos.ms ();
325
474 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] == 0) { 326 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
327 {
328 int mflags = ms.flags ();
329
475 f= GET_MAP_FACE(mp, nx, ny, 0); 330 int f = GET_MAP_FACE (ms, 0);
331 if (f == blank_face)
332 {
333 f = GET_MAP_FACE (ms, 1);
476 if (f == blank_face) 334 if (f == blank_face)
477 f= GET_MAP_FACE(mp, nx, ny, 1);
478 if (f == blank_face)
479 f= GET_MAP_FACE(mp, nx, ny, 2); 335 f = GET_MAP_FACE (ms, 2);
336 }
480 337
338 int magicmap = faces [f].magicmap;
339
481 /* Should probably have P_NO_MAGIC here also, but then shops don't 340 /* Should probably have P_NO_MAGIC here also, but then shops don't
482 * work. 341 * work.
483 */ 342 */
484 if (mflags & P_BLOCKSVIEW) 343 if (mflags & P_BLOCKSVIEW)
485 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_WALL | (f?f->magicmap:0); 344 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
486 else { 345 else
346 {
487 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f?f->magicmap:0); 347 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
488 magic_mapping_mark_recursive(pl, map_mark, x, y); 348 magic_mapping_mark_recursive (pl, map_mark, x, y);
489 } 349 }
490 } 350 }
491 } 351 }
492 } 352 }
493} 353}
494 354
495
496/** 355/**
497 * Creates magic map for player. 356 * Creates magic map for player.
498 * 357 *
499 * Note: For improved magic mapping display, the space that blocks 358 * Note: For improved magic mapping display, the space that blocks
500 * the view is now marked with value 2. Any dependencies of map_mark 359 * the view is now marked with value 2. Any dependencies of map_mark
501 * being nonzero have been changed to check for 1. Also, since 360 * being nonzero have been changed to check for 1. Also, since
502 * map_mark is a char value, putting 2 in should cause no problems. 361 * map_mark is a char value, putting 2 in should cause no problems.
503 * 362 *
504 * This function examines the map the player is on, and determines what 363 * This function examines the map the player is on, and determines what
505 * is visible. 2 is set for walls or objects that blocks view. 1 364 * is visible. 2 is set for walls or objects that blocks view. 1
506 * is for open spaces. map_mark should already have been initialized 365 * is for open spaces. map_mark should already have been initialised
507 * to zero before this is called. 366 * to zero before this is called.
508 * strength is an initial strength*2 rectangular area that we automatically 367 * strength is an initial strength*2 rectangular area that we automatically
509 * see in/penetrate through. 368 * see in/penetrate through.
510 */ 369 */
511 370static void
512void magic_mapping_mark(object *pl, char *map_mark, int strength) 371magic_mapping_mark (object *pl, char *map_mark, int strength)
513{ 372{
514 int x, y, mflags;
515 sint16 nx, ny;
516 mapstruct *mp;
517 New_Face *f;
518
519 for (x = -strength; x <strength; x++) { 373 for (int x = -strength; x < strength; x++)
374 {
520 for (y = -strength; y <strength; y++) { 375 for (int y = -strength; y < strength; y++)
521 mp = pl->map; 376 {
522 nx = pl->x + x; 377 mapxy pos (pl);
523 ny = pl->y + y; 378 pos.move (x, y);
524 mflags = get_map_flags(pl->map, &mp, nx, ny, &nx, &ny); 379
525 if (mflags & P_OUT_OF_MAP) 380 if (!pos.normalise ())
526 continue; 381 continue;
382
383 mapspace &ms = pos.ms ();
384
385 int mflags = ms.flags ();
386
387 int f = GET_MAP_FACE (ms, 0);
388 if (f == blank_face)
527 else { 389 {
528 f= GET_MAP_FACE(mp, nx, ny, 0); 390 f = GET_MAP_FACE (ms, 1);
529 if (f == blank_face) 391 if (f == blank_face)
530 f= GET_MAP_FACE(mp, nx, ny, 1);
531 if (f == blank_face)
532 f= GET_MAP_FACE(mp, nx, ny, 2); 392 f = GET_MAP_FACE (ms, 2);
533 } 393 }
534 394
395 int magicmap = faces [f].magicmap;
396
535 if (mflags & P_BLOCKSVIEW) 397 if (mflags & P_BLOCKSVIEW)
536 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_WALL | (f?f->magicmap:0); 398 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
537 else { 399 else
400 {
538 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE* (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f?f->magicmap:0); 401 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
539 magic_mapping_mark_recursive(pl, map_mark, x, y); 402 magic_mapping_mark_recursive (pl, map_mark, x, y);
540 } 403 }
541 } 404 }
542 } 405 }
543} 406}
544 407
545
546/** 408/**
547 * Creates and sends magic map to player. 409 * Creates and sends magic map to player.
548 * 410 *
549 * The following function is a lot messier than it really should be, 411 * The following function is a lot messier than it really should be,
550 * but there is no real easy solution. 412 * but there is no real easy solution.
551 * 413 *
552 * Mark Wedel 414 * Mark Wedel
553 */ 415 */
554 416void
555void draw_magic_map(object *pl) 417draw_magic_map (object *pl)
556{ 418{
557 int x,y;
558 char *map_mark = (char *) calloc(MAGIC_MAP_SIZE*MAGIC_MAP_SIZE, 1); 419 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
559 int xmin, xmax, ymin, ymax; 420 int xmin, xmax, ymin, ymax;
560 SockList sl;
561 421
562 if (pl->type!=PLAYER) { 422 if (pl->type != PLAYER)
423 {
563 LOG(llevError,"Non player object called draw_map.\n"); 424 LOG (llevError, "Non player object called draw_map.\n");
564 return; 425 return;
565 }
566 426 }
427
567 /* First, we figure out what spaces are 'reachable' by the player */ 428 /* First, we figure out what spaces are 'reachable' by the player */
568 magic_mapping_mark(pl, map_mark, 3); 429 magic_mapping_mark (pl, map_mark, 3);
569 430
570 /* We now go through and figure out what spaces have been 431 /* We now go through and figure out what spaces have been
571 * marked, and thus figure out rectangular region we send 432 * marked, and thus figure out rectangular region we send
572 * to the client (eg, if only a 10x10 area is visible, we only 433 * to the client (eg, if only a 10x10 area is visible, we only
573 * want to send those 100 spaces.) 434 * want to send those 100 spaces.)
574 */ 435 */
575 xmin = MAGIC_MAP_SIZE; 436 xmin = MAGIC_MAP_SIZE;
576 ymin = MAGIC_MAP_SIZE; 437 ymin = MAGIC_MAP_SIZE;
577 xmax = 0; 438 xmax = 0;
578 ymax = 0; 439 ymax = 0;
440
579 for(x = 0; x < MAGIC_MAP_SIZE ; x++) { 441 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
580 for(y = 0; y < MAGIC_MAP_SIZE; y++) { 442 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
581 if (map_mark[x + MAP_WIDTH(pl->map) * y] | FACE_FLOOR) { 443 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
444 {
582 xmin = x < xmin ? x : xmin; 445 xmin = x < xmin ? x : xmin;
583 xmax = x > xmax ? x : xmax; 446 xmax = x > xmax ? x : xmax;
584 ymin = y < ymin ? y : ymin; 447 ymin = y < ymin ? y : ymin;
585 ymax = y > ymax ? y : ymax; 448 ymax = y > ymax ? y : ymax;
586 }
587 } 449 }
588 }
589 450
590 sl.buf= (unsigned char*) malloc(MAXSOCKBUF); 451 packet sl;
591 snprintf((char*)sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax-xmin+1), (ymax-ymin+1), 452 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
592 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 453 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
593 sl.len=strlen((char*)sl.buf); 454
594
595 for (y = ymin; y <= ymax; y++) { 455 for (int y = ymin; y <= ymax; y++)
596 for (x = xmin; x <= xmax; x++) { 456 for (int x = xmin; x <= xmax; x++)
597 sl.buf[sl.len++]= map_mark[x+MAGIC_MAP_SIZE*y] & ~FACE_FLOOR; 457 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
598 } /* x loop */ 458
599 } /* y loop */ 459 pl->contr->ns->send_packet (sl);
600 460
601 Send_With_Handling(&pl->contr->socket, &sl);
602 free(sl.buf);
603 free(map_mark); 461 free (map_mark);
604} 462}
605 463
606
607/**
608 * Send a kill log record to sockets
609 */
610
611void Log_Kill(const char *Who,
612 const char *What, int WhatType,
613 const char *With, int WithType)
614{
615 int i;
616 size_t len;
617 char buf[MAX_BUF];
618
619 if (With!=NULL) {
620 snprintf(buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n",Who,What,WhatType,With,WithType);
621 }
622 else {
623 snprintf(buf,MAX_BUF, "%s\t%s\t%d\n",Who,What,WhatType);
624 }
625 len=strlen(buf);
626 for(i=1; i<socket_info.allocated_sockets; i++) {
627 if (init_sockets[i].old_mode == Old_Listen) {
628 cs_write_string(&init_sockets[i], buf, len);
629 }
630 }
631}

Diff Legend

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