1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
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 |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your 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 GNU General Public License |
19 | * along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
21 | * |
20 | * |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | * |
|
|
24 | */ |
22 | */ |
25 | |
23 | |
26 | /* |
24 | /* |
27 | * Object (handling) commands |
25 | * Object (handling) commands |
28 | */ |
26 | */ |
… | |
… | |
58 | * only unapply applied, or apply unapplied objects |
56 | * only unapply applied, or apply unapplied objects |
59 | **/ |
57 | **/ |
60 | static object * |
58 | static object * |
61 | find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag) |
59 | find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag) |
62 | { |
60 | { |
63 | object *tmp, *best = NULL; |
61 | object *best = 0; |
64 | int match_val = 0, tmpmatch; |
62 | int match_val = 0; |
65 | |
63 | |
66 | for (tmp = pl->inv; tmp; tmp = tmp->below) |
64 | for (object *tmp = pl->inv; tmp; tmp = tmp->below) |
67 | { |
65 | { |
68 | if (tmp->invisible) |
66 | if (tmp->invisible) |
69 | continue; |
67 | continue; |
|
|
68 | |
70 | if ((tmpmatch = item_matched_string (pl, tmp, params)) > match_val) |
69 | int tmpmatch = item_matched_string (pl, tmp, params); |
|
|
70 | |
|
|
71 | if (tmpmatch > match_val) |
71 | { |
72 | { |
72 | if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) |
73 | if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) |
73 | continue; |
74 | continue; |
|
|
75 | |
74 | if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) |
76 | if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) |
75 | continue; |
77 | continue; |
|
|
78 | |
76 | match_val = tmpmatch; |
79 | match_val = tmpmatch; |
77 | best = tmp; |
80 | best = tmp; |
78 | } |
81 | } |
79 | } |
82 | } |
|
|
83 | |
80 | return best; |
84 | return best; |
81 | } |
85 | } |
82 | |
86 | |
83 | /** |
87 | /** |
84 | * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); |
88 | * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); |
85 | **/ |
89 | **/ |
86 | object * |
90 | object * |
87 | find_best_object_match (object *pl, const char *params) |
91 | find_best_object_match (object *pl, const char *params) |
88 | { |
92 | { |
89 | return find_best_apply_object_match (pl, params, AP_NULL); |
93 | return find_best_apply_object_match (pl, params, AP_TOGGLE); |
|
|
94 | } |
|
|
95 | |
|
|
96 | static bool |
|
|
97 | can_split (object *pl, object *&op, sint32 nrof) |
|
|
98 | { |
|
|
99 | if (object *tmp = op->split (nrof ? nrof : op->number_of ())) |
|
|
100 | { |
|
|
101 | op = tmp; |
|
|
102 | return true; |
|
|
103 | } |
|
|
104 | else |
|
|
105 | { |
|
|
106 | if (op->nrof > 1) |
|
|
107 | new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl); |
|
|
108 | else |
|
|
109 | new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name); |
|
|
110 | |
|
|
111 | return false; |
|
|
112 | } |
90 | } |
113 | } |
91 | |
114 | |
92 | int |
115 | int |
93 | command_uskill (object *pl, char *params) |
116 | command_uskill (object *pl, char *params) |
94 | { |
117 | { |
95 | if (!params) |
118 | if (!params) |
96 | { |
119 | { |
97 | new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>"); |
120 | new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>"); |
98 | return 0; |
121 | return 0; |
99 | } |
122 | } |
|
|
123 | |
100 | return use_skill (pl, params); |
124 | return use_skill (pl, params); |
101 | } |
125 | } |
102 | |
126 | |
103 | int |
127 | int |
104 | command_rskill (object *pl, char *params) |
128 | command_rskill (object *pl, char *params) |
… | |
… | |
108 | if (!params) |
132 | if (!params) |
109 | { |
133 | { |
110 | new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); |
134 | new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); |
111 | return 0; |
135 | return 0; |
112 | } |
136 | } |
|
|
137 | |
113 | skill = find_skill_by_name (pl, params); |
138 | skill = find_skill_by_name (pl, params); |
114 | |
139 | |
115 | if (!skill) |
140 | if (!skill) |
116 | { |
141 | { |
117 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); |
142 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); |
118 | return 0; |
143 | return 0; |
119 | } |
144 | } |
120 | return change_skill (pl, skill, 0); |
|
|
121 | } |
|
|
122 | |
145 | |
|
|
146 | pl->change_skill (0); |
|
|
147 | apply_special (pl, skill, AP_APPLY); |
|
|
148 | return 1; |
|
|
149 | } |
123 | |
150 | |
124 | /* These functions (command_search, command_disarm) are really just wrappers for |
151 | /* These functions (command_search, command_disarm) are really just wrappers for |
125 | * things like 'use_skill ...'). In fact, they should really be obsoleted |
152 | * things like 'use_skill ...'). In fact, they should really be obsoleted |
126 | * and replaced with those. |
153 | * and replaced with those. |
127 | */ |
154 | */ |
… | |
… | |
135 | command_disarm (object *op, char *params) |
162 | command_disarm (object *op, char *params) |
136 | { |
163 | { |
137 | return use_skill (op, skill_names[SK_DISARM_TRAPS]); |
164 | return use_skill (op, skill_names[SK_DISARM_TRAPS]); |
138 | } |
165 | } |
139 | |
166 | |
140 | |
|
|
141 | /* A little special because we do want to pass the full params along |
167 | /* A little special because we do want to pass the full params along |
142 | * as it includes the object to throw. |
168 | * as it includes the object to throw. |
143 | */ |
169 | */ |
144 | int |
170 | int |
145 | command_throw (object *op, char *params) |
171 | command_throw (object *op, char *params) |
146 | { |
172 | { |
147 | object *skop; |
|
|
148 | |
|
|
149 | skop = find_skill_by_name (op, skill_names[SK_THROWING]); |
173 | if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING])) |
150 | if (skop) |
|
|
151 | return do_skill (op, op, skop, op->facing, params); |
174 | return do_skill (op, op, skop, op->facing, params); |
152 | else |
175 | else |
153 | { |
|
|
154 | new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); |
176 | new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); |
155 | } |
177 | |
156 | return 0; |
178 | return 0; |
157 | } |
179 | } |
158 | |
|
|
159 | |
180 | |
160 | int |
181 | int |
161 | command_apply (object *op, char *params) |
182 | command_apply (object *op, char *params) |
162 | { |
183 | { |
163 | if (!params) |
184 | if (!params) |
… | |
… | |
165 | player_apply_below (op); |
186 | player_apply_below (op); |
166 | return 0; |
187 | return 0; |
167 | } |
188 | } |
168 | else |
189 | else |
169 | { |
190 | { |
170 | apply_flag aflag = (apply_flag) 0; |
191 | apply_flag aflag = (apply_flag)0; |
171 | object *inv; |
|
|
172 | |
192 | |
173 | while (*params == ' ') |
193 | while (*params == ' ') |
174 | params++; |
194 | params++; |
|
|
195 | |
175 | if (!strncmp (params, "-a ", 3)) |
196 | if (!strncmp (params, "-a ", 3)) |
176 | { |
197 | { |
177 | aflag = AP_APPLY; |
198 | aflag = AP_APPLY; |
178 | params += 3; |
199 | params += 3; |
179 | } |
200 | } |
|
|
201 | |
180 | if (!strncmp (params, "-u ", 3)) |
202 | if (!strncmp (params, "-u ", 3)) |
181 | { |
203 | { |
182 | aflag = AP_UNAPPLY; |
204 | aflag = AP_UNAPPLY; |
183 | params += 3; |
205 | params += 3; |
184 | } |
206 | } |
|
|
207 | |
185 | while (*params == ' ') |
208 | while (*params == ' ') |
186 | params++; |
209 | params++; |
187 | |
210 | |
188 | inv = find_best_apply_object_match (op, params, aflag); |
211 | if (object *inv = find_best_apply_object_match (op, params, aflag)) |
189 | if (inv) |
|
|
190 | { |
|
|
191 | player_apply (op, inv, aflag, 0); |
212 | player_apply (op, inv, aflag, 0); |
192 | } |
|
|
193 | else |
213 | else |
194 | new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); |
214 | new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params); |
195 | } |
215 | } |
|
|
216 | |
196 | return 0; |
217 | return 0; |
197 | } |
218 | } |
198 | |
219 | |
199 | /* |
220 | /* |
200 | * Check if an item op can be put into a sack. If pl exists then tell |
221 | * Check if an item op can be put into a sack. If pl exists then tell |
… | |
… | |
206 | * not need to use split_ob and stuff. |
227 | * not need to use split_ob and stuff. |
207 | */ |
228 | */ |
208 | int |
229 | int |
209 | sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) |
230 | sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) |
210 | { |
231 | { |
211 | |
|
|
212 | if (!QUERY_FLAG (sack, FLAG_APPLIED)) |
232 | if (!QUERY_FLAG (sack, FLAG_APPLIED)) |
213 | { |
233 | { |
214 | new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); |
234 | new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); |
215 | return 0; |
235 | return 0; |
216 | } |
236 | } |
|
|
237 | |
217 | if (sack == op) |
238 | if (sack == op) |
218 | { |
239 | { |
219 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); |
240 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); |
220 | return 0; |
241 | return 0; |
221 | } |
242 | } |
|
|
243 | |
222 | if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) |
244 | if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) |
223 | { |
245 | { |
224 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); |
246 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); |
225 | return 0; |
247 | return 0; |
226 | } |
248 | } |
|
|
249 | |
227 | if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) |
250 | if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) |
228 | { |
251 | { |
229 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); |
252 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); |
230 | return 0; |
253 | return 0; |
231 | } |
254 | } |
|
|
255 | |
232 | if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * |
256 | if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * |
233 | (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) |
257 | (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) |
234 | * (100 - sack->stats.Str) / 100) > sack->weight_limit) |
258 | * (100 - sack->stats.Str) / 100) > sack->weight_limit) |
235 | { |
259 | { |
236 | new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); |
260 | new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); |
237 | return 0; |
261 | return 0; |
238 | } |
262 | } |
|
|
263 | |
239 | /* All other checks pass, must be OK */ |
264 | /* All other checks pass, must be OK */ |
240 | return 1; |
265 | return 1; |
241 | } |
266 | } |
242 | |
267 | |
243 | /* Pick up commands follow */ |
268 | /* Pick up commands follow */ |
… | |
… | |
248 | * pick up (0 means all of them) |
273 | * pick up (0 means all of them) |
249 | */ |
274 | */ |
250 | static void |
275 | static void |
251 | pick_up_object (object *pl, object *op, object *tmp, int nrof) |
276 | pick_up_object (object *pl, object *op, object *tmp, int nrof) |
252 | { |
277 | { |
253 | /* buf needs to be big (more than 256 chars) because you can get |
|
|
254 | * very long item names. |
|
|
255 | */ |
|
|
256 | char buf[HUGE_BUF]; |
|
|
257 | object *env = tmp->env; |
278 | object *env = tmp->env; |
258 | uint32 weight, effective_weight_limit; |
279 | uint32 weight, effective_weight_limit; |
259 | int tmp_nrof = tmp->nrof ? tmp->nrof : 1; |
280 | int tmp_nrof = tmp->number_of (); |
260 | |
281 | |
261 | /* IF the player is flying & trying to take the item out of a container |
282 | /* IF the player is flying & trying to take the item out of a container |
262 | * that is in his inventory, let him. tmp->env points to the container |
283 | * that is in his inventory, let him. tmp->env points to the container |
263 | * (sack, luggage, etc), tmp->env->env then points to the player (nested |
284 | * (sack, luggage, etc), tmp->env->env then points to the player (nested |
264 | * containers not allowed as of now) |
285 | * containers not allowed as of now) |
265 | */ |
286 | */ |
266 | if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) |
287 | if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) |
267 | { |
288 | { |
268 | new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); |
289 | pl->failmsg ("You are levitating, you can't reach the ground! " |
|
|
290 | "H<You have to stop levitating first, if you can, either by using your levitation skill, " |
|
|
291 | "or waiting till the levitation effect wears off.>"); |
269 | return; |
292 | return; |
270 | } |
293 | } |
271 | |
294 | |
272 | if (QUERY_FLAG (tmp, FLAG_NO_DROP)) |
295 | if (QUERY_FLAG (tmp, FLAG_NO_DROP)) |
273 | return; |
296 | return; |
274 | |
297 | |
275 | if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ)) |
|
|
276 | { |
|
|
277 | new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!"); |
|
|
278 | new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion."); |
|
|
279 | |
|
|
280 | if (pl->contr) |
|
|
281 | esrv_del_item (pl->contr, tmp->count); |
|
|
282 | |
|
|
283 | tmp->destroy (); |
|
|
284 | return; |
|
|
285 | } |
|
|
286 | |
|
|
287 | if (nrof > tmp_nrof || nrof == 0) |
298 | if (nrof > tmp_nrof || nrof <= 0) |
288 | nrof = tmp_nrof; |
299 | nrof = tmp_nrof; |
289 | |
300 | |
290 | /* Figure out how much weight this object will add to the player */ |
301 | /* Figure out how much weight this object will add to the player */ |
291 | weight = tmp->weight * nrof; |
302 | weight = tmp->weight * nrof; |
292 | if (tmp->inv) |
303 | if (tmp->inv) |
293 | weight += tmp->carrying * (100 - tmp->stats.Str) / 100; |
304 | weight += tmp->carrying * (100 - tmp->stats.Str) / 100; |
294 | |
305 | |
295 | if (pl->stats.Str <= MAX_STAT) |
|
|
296 | effective_weight_limit = weight_limit[pl->stats.Str]; |
306 | effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)]; |
297 | else |
|
|
298 | effective_weight_limit = weight_limit[MAX_STAT]; |
|
|
299 | |
307 | |
300 | if ((pl->weight + pl->carrying + weight) > effective_weight_limit) |
308 | if ((pl->weight + pl->carrying + weight) > effective_weight_limit) |
301 | { |
309 | { |
302 | new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); |
310 | new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); |
303 | return; |
311 | return; |
304 | } |
312 | } |
305 | |
313 | |
306 | if (nrof != tmp_nrof) |
314 | if (!can_split (pl, tmp, nrof)) |
307 | { |
|
|
308 | object *tmp2 = tmp; |
|
|
309 | |
|
|
310 | tmp = get_split_ob (tmp, nrof); |
|
|
311 | if (!tmp) |
|
|
312 | { |
|
|
313 | new_draw_info (NDI_UNIQUE, 0, pl, errmsg); |
|
|
314 | return; |
315 | return; |
315 | } |
|
|
316 | |
316 | |
317 | /* Tell the client what happened to the rest of objects */ |
317 | if (QUERY_FLAG (tmp, FLAG_UNPAID)) |
318 | if (pl->contr) |
318 | { |
319 | if (tmp2->destroyed ()) |
319 | tmp->flag.reset (FLAG_UNPAID); |
320 | esrv_del_item (pl->contr, tmp2->count); |
320 | new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); |
321 | else |
321 | tmp->flag.set (FLAG_UNPAID); |
322 | esrv_update_item (UPD_NROF, pl, tmp2); |
|
|
323 | } |
322 | } |
324 | else |
323 | else |
325 | { |
324 | new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp)); |
326 | /* If the object is in a container, send a delete to the client. |
|
|
327 | * - we are moving all the items from the container to elsewhere, |
|
|
328 | * so it needs to be deleted. |
|
|
329 | */ |
|
|
330 | if (!QUERY_FLAG (tmp, FLAG_REMOVED)) |
|
|
331 | { |
|
|
332 | if (tmp->env && pl->type == PLAYER) |
|
|
333 | esrv_del_item (pl->contr, tmp->count); |
|
|
334 | |
325 | |
335 | tmp->remove (); /* Unlink it */ |
326 | op->insert (tmp); |
336 | } |
|
|
337 | } |
|
|
338 | |
|
|
339 | if (QUERY_FLAG (tmp, FLAG_UNPAID)) |
|
|
340 | sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); |
|
|
341 | else |
|
|
342 | sprintf (buf, "You pick up the %s.", query_name (tmp)); |
|
|
343 | |
|
|
344 | new_draw_info (NDI_UNIQUE, 0, pl, buf); |
|
|
345 | |
|
|
346 | tmp = insert_ob_in_ob (tmp, op); |
|
|
347 | |
|
|
348 | /* All the stuff below deals with client/server code, and is only |
|
|
349 | * usable by players |
|
|
350 | */ |
|
|
351 | if (pl->contr) |
|
|
352 | { |
|
|
353 | esrv_send_item (pl, tmp); |
|
|
354 | |
|
|
355 | /* These are needed to update the weight for the container we |
|
|
356 | * are putting the object in. |
|
|
357 | */ |
|
|
358 | if (op != pl) |
|
|
359 | { |
|
|
360 | esrv_update_item (UPD_WEIGHT, pl, op); |
|
|
361 | esrv_send_item (pl, pl); |
|
|
362 | } |
|
|
363 | |
|
|
364 | /* Update the container the object was in */ |
|
|
365 | if (env && env != pl && env != op) |
|
|
366 | esrv_update_item (UPD_WEIGHT, pl, env); |
|
|
367 | } |
|
|
368 | } |
327 | } |
369 | |
328 | |
370 | /* modified slightly to allow monsters use this -b.t. 5-31-95 */ |
329 | /* modified slightly to allow monsters use this -b.t. 5-31-95 */ |
371 | void |
330 | void |
372 | pick_up (object *op, object *alt) |
331 | pick_up (object *op, object *alt) |
… | |
… | |
382 | if (!can_pick (op, alt)) |
341 | if (!can_pick (op, alt)) |
383 | { |
342 | { |
384 | new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); |
343 | new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); |
385 | goto leave; |
344 | goto leave; |
386 | } |
345 | } |
|
|
346 | |
387 | tmp = alt; |
347 | tmp = alt; |
388 | } |
348 | } |
389 | else |
349 | else |
390 | { |
350 | { |
391 | if (op->below == NULL || !can_pick (op, op->below)) |
351 | if (op->below == NULL || !can_pick (op, op->below)) |
… | |
… | |
400 | /* Try to catch it. */ |
360 | /* Try to catch it. */ |
401 | tmp_map = tmp->map; |
361 | tmp_map = tmp->map; |
402 | tmp = stop_item (tmp); |
362 | tmp = stop_item (tmp); |
403 | if (tmp == NULL) |
363 | if (tmp == NULL) |
404 | goto leave; |
364 | goto leave; |
|
|
365 | |
405 | need_fix_tmp = 1; |
366 | need_fix_tmp = 1; |
406 | if (!can_pick (op, tmp)) |
367 | if (!can_pick (op, tmp)) |
407 | goto leave; |
368 | goto leave; |
408 | |
369 | |
409 | if (op->type == PLAYER) |
370 | if (op->type == PLAYER) |
… | |
… | |
414 | } |
375 | } |
415 | else |
376 | else |
416 | count = tmp->nrof; |
377 | count = tmp->nrof; |
417 | |
378 | |
418 | /* container is open, so use it */ |
379 | /* container is open, so use it */ |
|
|
380 | if (tmp->flag [FLAG_STARTEQUIP]) |
|
|
381 | alt = op; |
419 | if (op->container) |
382 | else if (op->container) |
420 | { |
383 | { |
421 | alt = op->container; |
384 | alt = op->container; |
422 | if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) |
385 | if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) |
423 | goto leave; |
386 | goto leave; |
424 | } |
387 | } |
… | |
… | |
443 | /* here it could be possible to check rent, |
406 | /* here it could be possible to check rent, |
444 | * if someone wants to implement it |
407 | * if someone wants to implement it |
445 | */ |
408 | */ |
446 | alt = op; |
409 | alt = op; |
447 | } |
410 | } |
|
|
411 | |
448 | #ifdef PICKUP_DEBUG |
412 | #ifdef PICKUP_DEBUG |
449 | LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); |
413 | LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); |
450 | #endif |
414 | #endif |
451 | |
415 | |
452 | /* startequip items are not allowed to be put into containers: */ |
416 | /* startequip items are not allowed to be put into containers: */ |
… | |
… | |
502 | |
466 | |
503 | /* Makes processing easier */ |
467 | /* Makes processing easier */ |
504 | if (params && *params == '\0') |
468 | if (params && *params == '\0') |
505 | params = 0; |
469 | params = 0; |
506 | |
470 | |
|
|
471 | int cnt = MAX_ITEM_PER_DROP; |
|
|
472 | |
507 | while (tmp) |
473 | while (tmp) |
508 | { |
474 | { |
509 | next = tmp->below; |
475 | next = tmp->below; |
510 | |
476 | |
511 | if (tmp->invisible) |
477 | if (tmp->invisible) |
… | |
… | |
517 | /* This following two if and else if could be merged into line |
483 | /* This following two if and else if could be merged into line |
518 | * but that probably will make it more difficult to read, and |
484 | * but that probably will make it more difficult to read, and |
519 | * not make it any more efficient |
485 | * not make it any more efficient |
520 | */ |
486 | */ |
521 | if (params && item_matched_string (op, tmp, params)) |
487 | if (params && item_matched_string (op, tmp, params)) |
|
|
488 | { |
|
|
489 | if (--cnt < 0) break; |
522 | pick_up (op, tmp); |
490 | pick_up (op, tmp); |
|
|
491 | } |
523 | else if (can_pick (op, tmp) && !params) |
492 | else if (can_pick (op, tmp) && !params) |
524 | { |
493 | { |
|
|
494 | if (--cnt < 0) break; |
525 | pick_up (op, tmp); |
495 | pick_up (op, tmp); |
526 | break; |
496 | break; |
527 | } |
497 | } |
528 | |
498 | |
529 | tmp = next; |
499 | tmp = next; |
|
|
500 | } |
|
|
501 | |
|
|
502 | if (cnt < 0) |
|
|
503 | { |
|
|
504 | op->failmsg ("Couldn't pick up so many items at once."); |
|
|
505 | return 0; |
530 | } |
506 | } |
531 | |
507 | |
532 | if (!params && !tmp) |
508 | if (!params && !tmp) |
533 | { |
509 | { |
534 | for (tmp = op->below; tmp; tmp = tmp->below) |
510 | for (tmp = op->below; tmp; tmp = tmp->below) |
535 | if (!tmp->invisible) |
511 | if (!tmp->invisible) |
536 | { |
512 | { |
537 | char buf[MAX_BUF]; |
|
|
538 | |
|
|
539 | sprintf (buf, "You can't pick up a %s.", &tmp->name); |
513 | new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name); |
540 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
|
|
541 | break; |
514 | break; |
542 | } |
515 | } |
543 | |
516 | |
544 | if (!tmp) |
517 | if (!tmp) |
545 | new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); |
518 | new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); |
546 | } |
519 | } |
547 | |
520 | |
548 | return 0; |
521 | return 0; |
549 | } |
522 | } |
550 | |
|
|
551 | |
523 | |
552 | /* |
524 | /* |
553 | * This function was part of drop, now is own function. |
525 | * This function was part of drop, now is own function. |
554 | * Player 'op' tries to put object 'tmp' into sack 'sack', |
526 | * Player 'op' tries to put object 'tmp' into sack 'sack', |
555 | * if nrof is non zero, then nrof objects is tried to put into sack. |
527 | * if nrof is non zero, then nrof objects is tried to put into sack. |
… | |
… | |
571 | return; |
543 | return; |
572 | } |
544 | } |
573 | |
545 | |
574 | if (tmp->type == CONTAINER && tmp->inv) |
546 | if (tmp->type == CONTAINER && tmp->inv) |
575 | { |
547 | { |
576 | |
|
|
577 | /* Eneq(@csd.uu.se): If the object to be dropped is a container |
548 | /* Eneq(@csd.uu.se): If the object to be dropped is a container |
578 | * we instead move the contents of that container into the active |
549 | * we instead move the contents of that container into the active |
579 | * container, this is only done if the object has something in it. |
550 | * container, this is only done if the object has something in it. |
580 | */ |
551 | */ |
581 | sack2 = tmp; |
552 | sack2 = tmp; |
… | |
… | |
584 | for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) |
555 | for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) |
585 | { |
556 | { |
586 | tmp = tmp2->below; |
557 | tmp = tmp2->below; |
587 | |
558 | |
588 | if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) |
559 | if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) |
589 | { |
|
|
590 | put_object_in_sack (op, sack, tmp2, 0); |
560 | put_object_in_sack (op, sack, tmp2, 0); |
591 | } |
|
|
592 | else |
561 | else |
593 | { |
562 | { |
594 | sprintf (buf, "Your %s fills up.", query_name (sack)); |
563 | sprintf (buf, "Your %s fills up.", query_name (sack)); |
595 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
564 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
596 | break; |
565 | break; |
597 | } |
566 | } |
598 | } |
567 | } |
599 | |
568 | |
600 | esrv_update_item (UPD_WEIGHT, op, sack2); |
|
|
601 | return; |
569 | return; |
602 | } |
570 | } |
603 | |
571 | |
604 | /* Don't worry about this for containers - our caller should have |
572 | /* Don't worry about this for containers - our caller should have |
605 | * already checked this. |
573 | * already checked this. |
… | |
… | |
610 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
578 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
611 | if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) |
579 | if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) |
612 | return; |
580 | return; |
613 | |
581 | |
614 | /* we want to put some portion of the item into the container */ |
582 | /* we want to put some portion of the item into the container */ |
615 | if (nrof && tmp->nrof != nrof) |
583 | if (!can_split (op, tmp, nrof)) |
616 | { |
|
|
617 | object *tmp2 = tmp; |
|
|
618 | |
|
|
619 | tmp = get_split_ob (tmp, nrof); |
|
|
620 | |
|
|
621 | if (!tmp) |
|
|
622 | { |
|
|
623 | new_draw_info (NDI_UNIQUE, 0, op, errmsg); |
|
|
624 | return; |
584 | return; |
625 | } |
|
|
626 | /* Tell a client what happened other objects */ |
|
|
627 | if (tmp2->destroyed ()) |
|
|
628 | esrv_del_item (op->contr, tmp2->count); |
|
|
629 | else /* this can proably be replaced with an update */ |
|
|
630 | esrv_send_item (op, tmp2); |
|
|
631 | } |
|
|
632 | else |
|
|
633 | tmp->remove (); |
|
|
634 | |
585 | |
635 | new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); |
586 | new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); |
636 | tmp2 = insert_ob_in_ob (tmp, sack); |
587 | sack->insert (tmp); |
637 | op->update_stats (); /* This is overkill, fix_player() is called somewhere */ |
|
|
638 | /* in object.c */ |
|
|
639 | |
|
|
640 | /* If an object merged (and thus, different object), we need to |
|
|
641 | * delete the original. |
|
|
642 | */ |
|
|
643 | if (tmp2 != tmp) |
|
|
644 | esrv_del_item (op->contr, tmp->count); |
|
|
645 | |
|
|
646 | esrv_send_item (op, tmp2); |
|
|
647 | |
|
|
648 | /* update the sacks weight */ |
|
|
649 | esrv_update_item (UPD_WEIGHT, op, sack); |
|
|
650 | } |
588 | } |
651 | |
589 | |
652 | /* |
590 | /* |
653 | * This function was part of drop, now is own function. |
591 | * This function was part of drop, now is own function. |
654 | * Player 'op' tries to drop object 'tmp', if tmp is non zero, then |
592 | * Player 'op' tries to drop object 'tmp', if tmp is non zero, then |
… | |
… | |
656 | * This is used when dropping objects onto the floor. |
594 | * This is used when dropping objects onto the floor. |
657 | */ |
595 | */ |
658 | void |
596 | void |
659 | drop_object (object *op, object *tmp, uint32 nrof) |
597 | drop_object (object *op, object *tmp, uint32 nrof) |
660 | { |
598 | { |
661 | char buf[MAX_BUF]; |
|
|
662 | object *floor; |
|
|
663 | |
|
|
664 | if (QUERY_FLAG (tmp, FLAG_NO_DROP)) |
599 | if (QUERY_FLAG (tmp, FLAG_NO_DROP)) |
665 | return; |
600 | return; |
666 | |
601 | |
667 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
602 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
668 | if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) |
603 | if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) |
… | |
… | |
671 | //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D |
606 | //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D |
672 | |
607 | |
673 | /* We are only dropping some of the items. We split the current object |
608 | /* We are only dropping some of the items. We split the current object |
674 | * off |
609 | * off |
675 | */ |
610 | */ |
676 | if (nrof && tmp->nrof != nrof) |
611 | if (!can_split (op, tmp, nrof)) |
677 | { |
|
|
678 | object *tmp2 = tmp; |
|
|
679 | |
|
|
680 | tmp = get_split_ob (tmp, nrof); |
|
|
681 | if (!tmp) |
|
|
682 | { |
|
|
683 | new_draw_info (NDI_UNIQUE, 0, op, errmsg); |
|
|
684 | return; |
612 | return; |
685 | } |
|
|
686 | /* Tell a client what happened rest of objects. tmp2 is now the |
|
|
687 | * original object |
|
|
688 | */ |
|
|
689 | if (op->type == PLAYER) |
|
|
690 | { |
|
|
691 | if (tmp2->destroyed ()) |
|
|
692 | esrv_del_item (op->contr, tmp2->count); |
|
|
693 | else |
|
|
694 | esrv_send_item (op, tmp2); |
|
|
695 | } |
|
|
696 | } |
|
|
697 | else |
|
|
698 | tmp->remove (); |
|
|
699 | |
613 | |
700 | if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) |
614 | if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) |
701 | return; |
615 | return; |
702 | |
616 | |
703 | if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) |
617 | if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) |
704 | { |
618 | { |
705 | sprintf (buf, "You drop the %s.", query_name (tmp)); |
619 | op->statusmsg (format ("You drop the %s.", query_name (tmp))); |
706 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
620 | op->statusmsg ("The god who lent it to you retrieves it."); |
707 | new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it."); |
|
|
708 | |
|
|
709 | if (op->type == PLAYER) |
|
|
710 | esrv_del_item (op->contr, tmp->count); |
|
|
711 | |
621 | |
712 | tmp->destroy (); |
622 | tmp->destroy (); |
713 | op->update_stats (); |
623 | op->update_stats (); |
714 | return; |
624 | return; |
715 | } |
625 | } |
716 | |
626 | |
717 | if (op->type == PLAYER) |
|
|
718 | esrv_del_item (op->contr, tmp->count); |
|
|
719 | |
|
|
720 | /* Call this before we update the various windows/players. At least |
627 | /* Call this before we update the various windows/players. At least |
721 | * that we, we know the weight is correct. |
628 | * that we, we know the weight is correct. |
722 | */ |
629 | */ |
723 | op->update_stats (); /* This is overkill, fix_player() is called somewhere */ |
630 | // 2007-11-26: moved op->update_stats away and calling it later after |
724 | /* in object.c */ |
631 | // all items of a drop command have been processed. |
725 | |
632 | |
726 | if (op->type == PLAYER) |
|
|
727 | { |
|
|
728 | /* Need to update the weight for the player */ |
|
|
729 | esrv_send_item (op, op); |
|
|
730 | op->contr->ns->floorbox_update (); |
|
|
731 | } |
|
|
732 | |
|
|
733 | for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) |
633 | for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) |
734 | if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) |
634 | if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) |
735 | return; |
635 | return; |
736 | |
636 | |
737 | if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) |
637 | if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) |
|
|
638 | { |
738 | sell_item (tmp, op); |
639 | if (!sell_item (tmp, op)) |
|
|
640 | { |
|
|
641 | // if we can't sell it we don't drop it, so give it back to the seller |
|
|
642 | op->insert (tmp); |
|
|
643 | return; |
|
|
644 | } |
|
|
645 | } |
739 | |
646 | |
740 | tmp->x = op->x; |
647 | tmp->x = op->x; |
741 | tmp->y = op->y; |
648 | tmp->y = op->y; |
742 | |
649 | |
743 | insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); |
650 | insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); |
… | |
… | |
757 | if (tmp->env && tmp->env->type != PLAYER) |
664 | if (tmp->env && tmp->env->type != PLAYER) |
758 | { |
665 | { |
759 | /* Just toss the object - probably shouldn't be hanging |
666 | /* Just toss the object - probably shouldn't be hanging |
760 | * around anyways |
667 | * around anyways |
761 | */ |
668 | */ |
762 | tmp->remove (); |
|
|
763 | tmp->destroy (); |
669 | tmp->destroy (); |
764 | return; |
670 | return; |
765 | } |
671 | } |
766 | else |
672 | else |
767 | { |
673 | { |
768 | while (tmp != NULL && tmp->invisible) |
674 | while (tmp && tmp->invisible) |
769 | tmp = tmp->below; |
675 | tmp = tmp->below; |
770 | } |
676 | } |
771 | } |
677 | } |
772 | |
678 | |
773 | if (tmp == NULL) |
679 | if (tmp == NULL) |
774 | { |
680 | { |
775 | new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); |
681 | new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); |
776 | return; |
682 | return; |
777 | } |
683 | } |
|
|
684 | |
778 | if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) |
685 | if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) |
779 | { |
686 | { |
780 | new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); |
687 | new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); |
781 | return; |
688 | return; |
782 | } |
689 | } |
|
|
690 | |
783 | if (QUERY_FLAG (tmp, FLAG_NO_DROP)) |
691 | if (QUERY_FLAG (tmp, FLAG_NO_DROP)) |
784 | { |
692 | { |
785 | #if 0 |
693 | #if 0 |
786 | /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ |
694 | /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ |
787 | new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); |
695 | new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); |
… | |
… | |
811 | |
719 | |
812 | if (op->type == PLAYER) |
720 | if (op->type == PLAYER) |
813 | op->contr->count = 0; |
721 | op->contr->count = 0; |
814 | } |
722 | } |
815 | |
723 | |
816 | |
|
|
817 | |
|
|
818 | /* Command will drop all items that have not been locked */ |
724 | /* Command will drop all items that have not been locked */ |
819 | int |
725 | int |
820 | command_dropall (object *op, char *params) |
726 | command_dropall (object *op, char *params) |
821 | { |
727 | { |
822 | |
728 | |
823 | object *curinv, *nextinv; |
|
|
824 | |
|
|
825 | if (op->inv == NULL) |
729 | if (op->inv == NULL) |
826 | { |
730 | { |
827 | new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); |
731 | new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); |
828 | return 0; |
732 | return 0; |
829 | } |
733 | } |
830 | |
734 | |
831 | curinv = op->inv; |
735 | object *curinv = op->inv; |
|
|
736 | object *nextinv; |
832 | |
737 | |
833 | /* |
738 | /* |
834 | This is the default. Drops everything not locked or considered |
739 | This is the default. Drops everything not locked or considered |
835 | not something that should be dropped. |
740 | not something that should be dropped. |
836 | */ |
741 | */ |
… | |
… | |
838 | Care must be taken that the next item pointer is not to money as |
743 | Care must be taken that the next item pointer is not to money as |
839 | the drop() routine will do unknown things to it when dropping |
744 | the drop() routine will do unknown things to it when dropping |
840 | in a shop. --Tero.Pelander@utu.fi |
745 | in a shop. --Tero.Pelander@utu.fi |
841 | */ |
746 | */ |
842 | |
747 | |
843 | if (params == NULL) |
748 | int cnt = MAX_ITEM_PER_DROP; |
|
|
749 | |
|
|
750 | if (!params) |
844 | { |
751 | { |
845 | while (curinv != NULL) |
752 | while (curinv) |
846 | { |
753 | { |
847 | nextinv = curinv->below; |
754 | nextinv = curinv->below; |
|
|
755 | |
848 | while (nextinv && nextinv->type == MONEY) |
756 | while (nextinv && nextinv->type == MONEY) |
849 | nextinv = nextinv->below; |
757 | nextinv = nextinv->below; |
|
|
758 | |
850 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && |
759 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && |
851 | curinv->type != FOOD && curinv->type != KEY && |
760 | curinv->type != FOOD && curinv->type != KEY && |
852 | curinv->type != SPECIAL_KEY && curinv->type != GEM && |
761 | curinv->type != SPECIAL_KEY && curinv->type != GEM && |
853 | !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) |
762 | !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) |
854 | { |
763 | { |
855 | drop (op, curinv); |
764 | drop (op, curinv); |
|
|
765 | if (--cnt <= 0) break; |
856 | } |
766 | } |
|
|
767 | |
857 | curinv = nextinv; |
768 | curinv = nextinv; |
858 | } |
769 | } |
859 | } |
770 | } |
860 | |
|
|
861 | else if (strcmp (params, "weapons") == 0) |
771 | else if (strcmp (params, "weapons") == 0) |
862 | { |
772 | { |
863 | while (curinv != NULL) |
773 | while (curinv) |
864 | { |
774 | { |
865 | nextinv = curinv->below; |
775 | nextinv = curinv->below; |
|
|
776 | |
866 | while (nextinv && nextinv->type == MONEY) |
777 | while (nextinv && nextinv->type == MONEY) |
867 | nextinv = nextinv->below; |
778 | nextinv = nextinv->below; |
|
|
779 | |
868 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) |
780 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) |
869 | { |
781 | { |
870 | drop (op, curinv); |
782 | drop (op, curinv); |
|
|
783 | if (--cnt <= 0) break; |
871 | } |
784 | } |
|
|
785 | |
872 | curinv = nextinv; |
786 | curinv = nextinv; |
873 | } |
787 | } |
874 | } |
788 | } |
875 | |
|
|
876 | else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) |
789 | else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) |
877 | { |
790 | { |
878 | while (curinv != NULL) |
791 | while (curinv) |
879 | { |
792 | { |
880 | nextinv = curinv->below; |
793 | nextinv = curinv->below; |
|
|
794 | |
881 | while (nextinv && nextinv->type == MONEY) |
795 | while (nextinv && nextinv->type == MONEY) |
882 | nextinv = nextinv->below; |
796 | nextinv = nextinv->below; |
|
|
797 | |
883 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) |
798 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) |
884 | { |
799 | { |
885 | drop (op, curinv); |
800 | drop (op, curinv); |
|
|
801 | if (--cnt <= 0) break; |
886 | } |
802 | } |
|
|
803 | |
887 | curinv = nextinv; |
804 | curinv = nextinv; |
888 | } |
805 | } |
889 | } |
806 | } |
890 | |
|
|
891 | else if (strcmp (params, "misc") == 0) |
807 | else if (strcmp (params, "misc") == 0) |
892 | { |
808 | { |
893 | while (curinv != NULL) |
809 | while (curinv) |
894 | { |
810 | { |
895 | nextinv = curinv->below; |
811 | nextinv = curinv->below; |
|
|
812 | |
896 | while (nextinv && nextinv->type == MONEY) |
813 | while (nextinv && nextinv->type == MONEY) |
897 | nextinv = nextinv->below; |
814 | nextinv = nextinv->below; |
|
|
815 | |
898 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) |
816 | if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) |
899 | { |
817 | { |
900 | switch (curinv->type) |
818 | switch (curinv->type) |
901 | { |
819 | { |
902 | case HORN: |
820 | case HORN: |
… | |
… | |
920 | break; |
838 | break; |
921 | default: |
839 | default: |
922 | curinv = nextinv; |
840 | curinv = nextinv; |
923 | break; |
841 | break; |
924 | } |
842 | } |
|
|
843 | |
|
|
844 | if (--cnt <= 0) break; |
925 | } |
845 | } |
|
|
846 | |
926 | curinv = nextinv; |
847 | curinv = nextinv; |
927 | } |
848 | } |
928 | } |
849 | } |
929 | |
850 | |
930 | op->contr->ns->floorbox_update (); |
851 | if (cnt <= 0) |
|
|
852 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
931 | |
853 | |
932 | /* draw_look(op);*/ |
854 | /* draw_look(op);*/ |
933 | return 0; |
855 | return 0; |
934 | } |
856 | } |
935 | |
857 | |
936 | /* Object op wants to drop object(s) params. params can be a |
858 | /* Object op wants to drop object(s) params. params can be a |
937 | * comma seperated list. |
859 | * comma seperated list. |
938 | */ |
860 | */ |
939 | |
|
|
940 | int |
861 | int |
941 | command_drop (object *op, char *params) |
862 | command_drop (object *op, char *params) |
942 | { |
863 | { |
943 | object *tmp, *next; |
864 | object *tmp, *next; |
944 | int did_one = 0; |
865 | int did_one = 0; |
… | |
… | |
948 | new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); |
869 | new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); |
949 | return 0; |
870 | return 0; |
950 | } |
871 | } |
951 | else |
872 | else |
952 | { |
873 | { |
|
|
874 | int cnt = MAX_ITEM_PER_DROP; |
|
|
875 | |
953 | for (tmp = op->inv; tmp; tmp = next) |
876 | for (tmp = op->inv; tmp; tmp = next) |
954 | { |
877 | { |
955 | next = tmp->below; |
878 | next = tmp->below; |
956 | if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) |
879 | if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) |
957 | continue; |
880 | continue; |
|
|
881 | |
958 | if (item_matched_string (op, tmp, params)) |
882 | if (item_matched_string (op, tmp, params)) |
959 | { |
883 | { |
960 | drop (op, tmp); |
884 | drop (op, tmp); |
|
|
885 | if (--cnt <= 0) break; |
961 | did_one = 1; |
886 | did_one = 1; |
962 | } |
887 | } |
963 | } |
888 | } |
|
|
889 | |
964 | if (!did_one) |
890 | if (!did_one) |
965 | new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); |
891 | new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); |
966 | } |
892 | |
967 | if (op->type == PLAYER) |
893 | if (cnt <= 0) |
968 | { |
894 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
969 | op->contr->count = 0; |
|
|
970 | op->contr->ns->floorbox_update (); |
|
|
971 | }; |
895 | } |
972 | |
896 | |
973 | /* draw_look(op);*/ |
|
|
974 | return 0; |
897 | return 0; |
975 | } |
898 | } |
976 | |
899 | |
977 | int |
900 | int |
978 | command_examine (object *op, char *params) |
901 | command_examine (object *op, char *params) |
… | |
… | |
981 | { |
904 | { |
982 | object *tmp = op->below; |
905 | object *tmp = op->below; |
983 | |
906 | |
984 | while (tmp && !tmp->client_visible ()) |
907 | while (tmp && !tmp->client_visible ()) |
985 | tmp = tmp->below; |
908 | tmp = tmp->below; |
|
|
909 | |
986 | if (tmp) |
910 | if (tmp) |
987 | examine (op, tmp); |
911 | examine (op, tmp); |
988 | } |
912 | } |
989 | else |
913 | else |
990 | { |
914 | { |
991 | object *tmp = find_best_object_match (op, params); |
915 | object *tmp = find_best_object_match (op, params); |
992 | |
916 | |
993 | if (tmp) |
917 | if (tmp) |
994 | examine (op, tmp); |
918 | examine (op, tmp); |
995 | else |
919 | else |
996 | new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); |
920 | op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params)); |
997 | } |
921 | } |
|
|
922 | |
998 | return 0; |
923 | return 0; |
999 | } |
924 | } |
1000 | |
925 | |
1001 | /* op should be a player. |
926 | /* op should be a player. |
1002 | * we return the object the player has marked with the 'mark' command |
927 | * we return the object the player has marked with the 'mark' command |
… | |
… | |
1049 | dynbuf_text buf (512, 512); |
974 | dynbuf_text buf (512, 512); |
1050 | |
975 | |
1051 | object *mon = head ? head : this; |
976 | object *mon = head ? head : this; |
1052 | |
977 | |
1053 | if (QUERY_FLAG (mon, FLAG_UNDEAD)) |
978 | if (QUERY_FLAG (mon, FLAG_UNDEAD)) |
1054 | buf << "It is an undead force.\n"; |
979 | buf << "It is an undead force.\r"; |
1055 | |
980 | |
1056 | if (mon->level > who->level) |
981 | if (mon->level > who->level) |
1057 | buf << "It is likely more powerful than you.\n"; |
982 | buf << "It is likely more powerful than you.\r"; |
1058 | else if (mon->level < who->level) |
983 | else if (mon->level < who->level) |
1059 | buf << "It is likely less powerful than you.\n"; |
984 | buf << "It is likely less powerful than you.\r"; |
1060 | else |
985 | else |
1061 | buf << "It is probably as powerful as you.\n"; |
986 | buf << "It is probably as powerful as you.\r"; |
1062 | |
987 | |
1063 | if (mon->attacktype & AT_ACID) |
988 | if (mon->attacktype & AT_ACID) |
1064 | buf << "You seem to smell an acrid odor.\n"; |
989 | buf << "You seem to smell an acrid odor.\r"; |
1065 | |
990 | |
1066 | /* Anyone know why this used to use the clone value instead of the |
991 | /* Anyone know why this used to use the clone value instead of the |
1067 | * maxhp field? This seems that it should give more accurate results. |
992 | * maxhp field? This seems that it should give more accurate results. |
1068 | */ |
993 | */ |
1069 | switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) |
994 | switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) |
1070 | { /* From 1-4 */ |
995 | { /* From 1-4 */ |
1071 | case 1: |
996 | case 1: |
1072 | buf << "It is in a bad shape.\n"; |
997 | buf << "It is in a bad shape.\r"; |
1073 | break; |
998 | break; |
1074 | case 2: |
999 | case 2: |
1075 | buf << "It is hurt.\n"; |
1000 | buf << "It is hurt.\r"; |
1076 | break; |
1001 | break; |
1077 | case 3: |
1002 | case 3: |
1078 | buf << "It is somewhat hurt.\n"; |
1003 | buf << "It is somewhat hurt.\r"; |
1079 | break; |
1004 | break; |
1080 | case 4: |
1005 | case 4: |
1081 | buf << "It is in excellent shape.\n"; |
1006 | buf << "It is in excellent shape.\r"; |
1082 | break; |
1007 | break; |
1083 | } |
1008 | } |
1084 | |
1009 | |
1085 | if (present_in_ob (POISONING, mon)) |
1010 | if (present_in_ob (POISONING, mon)) |
1086 | buf << "It looks very ill.\n"; |
1011 | buf << "It looks very ill.\r"; |
|
|
1012 | |
|
|
1013 | buf << '\n'; |
1087 | |
1014 | |
1088 | return buf; |
1015 | return buf; |
1089 | } |
1016 | } |
1090 | |
1017 | |
1091 | /* tmp is the object being described, pl is who is examing it. */ |
1018 | /* tmp is the object being described, pl is who is examing it. */ |
1092 | const char * |
1019 | const char * |
1093 | long_desc (object *tmp, object *pl) |
1020 | long_desc (object *tmp, object *pl) |
1094 | { |
1021 | { |
1095 | static std::string s = tmp->long_desc (pl); |
1022 | static std::string s; |
1096 | return s.c_str (); |
1023 | |
|
|
1024 | return (s = tmp->long_desc (pl)).c_str (); |
1097 | } |
1025 | } |
1098 | |
1026 | |
1099 | std::string |
1027 | std::string |
1100 | object::long_desc (object *who) |
1028 | object::long_desc (object *who) |
1101 | { |
1029 | { |
… | |
… | |
1121 | case DRINK: |
1049 | case DRINK: |
1122 | case FLESH: |
1050 | case FLESH: |
1123 | case SKILL_TOOL: |
1051 | case SKILL_TOOL: |
1124 | case POWER_CRYSTAL: |
1052 | case POWER_CRYSTAL: |
1125 | { |
1053 | { |
1126 | //TODO |
|
|
1127 | const char *cp = ::describe_item (this, who); |
1054 | const char *cp = ::describe_item (this, who); |
1128 | |
1055 | |
1129 | if (*cp) |
1056 | if (*cp) |
1130 | { |
1057 | { |
1131 | buf.append (" "); |
1058 | buf.append (" "); |
… | |
… | |
1149 | std::string |
1076 | std::string |
1150 | object::describe (object *who) |
1077 | object::describe (object *who) |
1151 | { |
1078 | { |
1152 | dynbuf_text buf (1024, 1024); |
1079 | dynbuf_text buf (1024, 1024); |
1153 | |
1080 | |
1154 | buf.printf ("That is %s\n", long_desc (who).c_str ()); |
1081 | buf.printf ("That is: %s.\r", long_desc (who).c_str ()); |
1155 | |
1082 | |
1156 | if (custom_name) |
1083 | if (custom_name) |
1157 | buf,printf ("You call it %s\n", &custom_name); |
1084 | buf.printf ("You call it %s.\r", &custom_name); |
1158 | |
1085 | |
1159 | switch (type) |
1086 | switch (type) |
1160 | { |
1087 | { |
1161 | case SPELLBOOK: |
1088 | case SPELLBOOK: |
1162 | if (flag [FLAG_IDENTIFIED] && inv) |
1089 | if (flag [FLAG_IDENTIFIED] && inv) |
1163 | buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); |
1090 | buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill); |
1164 | break; |
1091 | break; |
1165 | |
1092 | |
1166 | case BOOK: |
1093 | case BOOK: |
1167 | if (msg) |
1094 | if (msg) |
1168 | buf << "Something is written in it.\n"; |
1095 | buf << "Something is written in it.\r"; |
1169 | break; |
1096 | break; |
1170 | |
1097 | |
1171 | case CONTAINER: |
1098 | case CONTAINER: |
1172 | if (race != NULL) |
1099 | if (race) |
1173 | { |
1100 | { |
1174 | if (weight_limit && stats.Str < 100) |
1101 | if (weight_limit && stats.Str < 100) |
1175 | buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n", |
1102 | buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r", |
1176 | &race, weight_limit / (10.0 * (100 - stats.Str))); |
1103 | &race, weight_limit / (10.0 * (100 - stats.Str))); |
1177 | else |
1104 | else |
1178 | buf.printf ("It can hold only %s.\n", &race); |
1105 | buf.printf ("It can hold only %s.\r", &race); |
1179 | } |
1106 | } |
1180 | else if (weight_limit && stats.Str < 100) |
1107 | else if (weight_limit && stats.Str < 100) |
1181 | buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str))); |
1108 | buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str))); |
1182 | break; |
1109 | break; |
1183 | |
1110 | |
1184 | case WAND: |
1111 | case WAND: |
1185 | if (flag [FLAG_IDENTIFIED]) |
1112 | if (flag [FLAG_IDENTIFIED]) |
1186 | buf.printf ("It has %s charges left.\n", stats.food); |
1113 | buf.printf ("It has %d charges left.\r", stats.food); |
1187 | break; |
1114 | break; |
1188 | } |
1115 | } |
1189 | |
1116 | |
1190 | if (materialname && !msg) |
1117 | if (materialname && !msg) |
1191 | buf.printf ("It is made of: %s.\n", &materialname); |
1118 | buf.printf ("It is made of: %s.\r", &materialname); |
1192 | |
1119 | |
1193 | if (who) |
1120 | if (who) |
1194 | /* Where to wear this item */ |
1121 | /* Where to wear this item */ |
1195 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1122 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1196 | if (body_info [i]) |
1123 | if (slot[i].info) |
1197 | { |
1124 | { |
1198 | buf << "It goes "; |
|
|
1199 | buf << (who->body_info[i] ? body_locations[i].use_name : body_locations[i].nonuse_name); |
1125 | buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); |
1200 | |
1126 | |
1201 | if (body_info[i] < -1 && who->body_info[i]) |
1127 | if (slot[i].info < -1 && who->slot[i].info) |
1202 | buf.printf ("(%d)", -body_info[i]); |
1128 | buf.printf ("(%d)", -slot[i].info); |
1203 | |
1129 | |
1204 | buf << ".\n"; |
1130 | buf << ".\r"; |
1205 | } |
1131 | } |
1206 | |
1132 | |
1207 | if (weight) |
1133 | if (weight) |
1208 | buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0); |
1134 | buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0); |
1209 | |
1135 | |
1210 | if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) |
1136 | if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) |
1211 | { |
1137 | { |
1212 | buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); |
1138 | buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); |
1213 | |
1139 | |
1214 | if (is_in_shop (who)) |
1140 | if (is_in_shop (who)) |
1215 | { |
1141 | { |
1216 | if (flag [FLAG_UNPAID]) |
1142 | if (flag [FLAG_UNPAID]) |
1217 | buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); |
1143 | buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); |
1218 | else |
1144 | else |
1219 | buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); |
1145 | buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); |
1220 | } |
1146 | } |
1221 | } |
1147 | } |
1222 | |
1148 | |
1223 | if (flag [FLAG_MONSTER]) |
1149 | if (flag [FLAG_MONSTER]) |
1224 | buf << describe_monster (who); |
1150 | buf << describe_monster (who); |
1225 | |
1151 | |
1226 | /* Is this item buildable? */ |
1152 | /* Is this item buildable? */ |
1227 | if (flag [FLAG_IS_BUILDABLE]) |
1153 | if (flag [FLAG_IS_BUILDABLE]) |
1228 | buf << "This is a buildable item.\n"; |
1154 | buf << "This is a buildable item.\r"; |
1229 | |
1155 | |
1230 | /* Does the object have a message? Don't show message for all object |
1156 | /* Does the object have a message? Don't show message for all object |
1231 | * types - especially if the first entry is a match |
1157 | * types - especially if the first entry is a match |
1232 | */ |
1158 | */ |
1233 | if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7)) |
1159 | if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ()) |
1234 | { |
1160 | { |
1235 | /* This is just a hack so when identifying the items, we print |
1161 | /* This is just a hack so when identifying the items, we print |
1236 | * out the extra message |
1162 | * out the extra message |
1237 | */ |
1163 | */ |
1238 | if (need_identify (this) && flag [FLAG_IDENTIFIED]) |
1164 | if (need_identify (this) && flag [FLAG_IDENTIFIED]) |
1239 | buf << "The object has a story:\n"; |
1165 | buf << "The object has a story:\r"; |
1240 | |
1166 | |
1241 | buf << msg << '\n'; |
1167 | buf << msg << '\n'; |
1242 | } |
1168 | } |
1243 | |
1169 | |
1244 | buf << '\n'; |
1170 | buf << '\n'; |
1245 | |
1171 | |
1246 | return std::string (buf.linearise (), buf.size ()); |
1172 | return std::string (buf.linearise (), buf.size ()); |
1247 | } |
|
|
1248 | |
|
|
1249 | void |
|
|
1250 | examine (object *op, object *tmp) |
|
|
1251 | { |
|
|
1252 | std::string s = tmp->describe (op); |
|
|
1253 | |
|
|
1254 | new_draw_info (NDI_UNIQUE, 0, op, s.c_str ()); |
|
|
1255 | } |
|
|
1256 | |
|
|
1257 | /* |
|
|
1258 | * inventory prints object's inventory. If inv==NULL then print player's |
|
|
1259 | * inventory. |
|
|
1260 | * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ] |
|
|
1261 | */ |
|
|
1262 | void |
|
|
1263 | inventory (object *op, object *inv) |
|
|
1264 | { |
|
|
1265 | object *tmp; |
|
|
1266 | const char *in; |
|
|
1267 | int items = 0, length; |
|
|
1268 | |
|
|
1269 | if (inv == NULL && op == NULL) |
|
|
1270 | { |
|
|
1271 | new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?"); |
|
|
1272 | return; |
|
|
1273 | } |
|
|
1274 | |
|
|
1275 | tmp = inv ? inv->inv : op->inv; |
|
|
1276 | |
|
|
1277 | while (tmp) |
|
|
1278 | { |
|
|
1279 | if ((!tmp->invisible && |
|
|
1280 | (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ))) |
|
|
1281 | items++; |
|
|
1282 | tmp = tmp->below; |
|
|
1283 | } |
|
|
1284 | |
|
|
1285 | if (inv == NULL) |
|
|
1286 | { /* player's inventory */ |
|
|
1287 | if (items == 0) |
|
|
1288 | { |
|
|
1289 | new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing."); |
|
|
1290 | return; |
|
|
1291 | } |
|
|
1292 | else |
|
|
1293 | { |
|
|
1294 | length = 28; |
|
|
1295 | in = ""; |
|
|
1296 | if (op) |
|
|
1297 | clear_win_info (op); |
|
|
1298 | new_draw_info (NDI_UNIQUE, 0, op, "Inventory:"); |
|
|
1299 | } |
|
|
1300 | } |
|
|
1301 | else |
|
|
1302 | { |
|
|
1303 | if (items == 0) |
|
|
1304 | return; |
|
|
1305 | else |
|
|
1306 | { |
|
|
1307 | length = 28; |
|
|
1308 | in = " "; |
|
|
1309 | } |
|
|
1310 | } |
|
|
1311 | |
|
|
1312 | for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below) |
|
|
1313 | { |
|
|
1314 | if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED)))) |
|
|
1315 | continue; |
|
|
1316 | if ((!op || QUERY_FLAG (op, FLAG_WIZ))) |
|
|
1317 | new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length, |
|
|
1318 | query_name (tmp), tmp->count, query_weight (tmp)); |
|
|
1319 | else |
|
|
1320 | new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp)); |
|
|
1321 | } |
|
|
1322 | |
|
|
1323 | if (!inv && op) |
|
|
1324 | new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op)); |
|
|
1325 | } |
1173 | } |
1326 | |
1174 | |
1327 | static void |
1175 | static void |
1328 | display_new_pickup (object *op) |
1176 | display_new_pickup (object *op) |
1329 | { |
1177 | { |