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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.219 by root, Sat Jan 30 23:30:26 2010 UTC vs.
Revision 1.224 by root, Wed Mar 24 16:44:38 2010 UTC

172 */ 172 */
173int 173int
174apply_potion (object *op, object *tmp) 174apply_potion (object *op, object *tmp)
175{ 175{
176 int got_one = 0, i; 176 int got_one = 0, i;
177 object *force = 0, *floor = 0; 177 object *force = 0;
178 178
179 floor = GET_MAP_OB (op->map, op->x, op->y); 179 object *floor = GET_MAP_OB (op->map, op->x, op->y);
180 180
181 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 181 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
182 { 182 {
183 op->failmsg ("Gods prevent you from using this here, it's sacred ground!"); 183 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
184 184
1576 : lev_diff < 15 ? "This book is way beyond your comprehension." 1576 : lev_diff < 15 ? "This book is way beyond your comprehension."
1577 : "This book is totally beyond your comprehension."); 1577 : "This book is totally beyond your comprehension.");
1578 return; 1578 return;
1579 } 1579 }
1580 1580
1581 // we currently don't use the message types for anything.
1581 readable_message_type *msgType = get_readable_message_type (tmp); 1582 // readable_message_type *msgType = get_readable_message_type (tmp);
1583
1584 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("apply_book"));
1582 1585
1583 if (player *pl = op->contr) 1586 if (player *pl = op->contr)
1584 if (client *ns = pl->ns) 1587 if (client *ns = pl->ns)
1585 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1588 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1586 1589
2673 while (*find == ' ') 2676 while (*find == ' ')
2674 find++; 2677 find++;
2675 2678
2676 memset (got, 0, MAX_BUF); 2679 memset (got, 0, MAX_BUF);
2677 2680
2678 if ((separator = strchr (find, ';'))) 2681 if ((separator = (char *) strchr (find, ';')))
2679 len = separator - find; 2682 len = separator - find;
2680 else 2683 else
2681 len = strlen (find); 2684 len = strlen (find);
2682 2685
2683 min_it (len, MAX_BUF - 1); 2686 min_it (len, MAX_BUF - 1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines