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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.171 by root, Sat Sep 8 07:06:51 2007 UTC vs.
Revision 1.180 by root, Tue Apr 15 14:06:36 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <sproto.h> 25#include <sproto.h>
26#include <sounds.h> 26#include <sounds.h>
… …
241 241
242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243 243
244 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
245 245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
300
246 ob->flag [FLAG_READY_WEAPON] = false; 301 ob->flag [FLAG_READY_WEAPON] = false;
247 ob->flag [FLAG_READY_SKILL] = false; 302 ob->flag [FLAG_READY_SKILL] = false;
248 ob->flag [FLAG_READY_BOW] = false; 303 ob->flag [FLAG_READY_BOW] = false;
249 304
250 for (object *op = ob->inv; op; op = op->below) 305 for (object *op = ob->inv; op; op = op->below)
… …
266 combat_ob = op; 321 combat_ob = op;
267 break; 322 break;
268 } 323 }
269 324
270 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
271 ob->update_stats (); 326 ob->deactivate (); // change_Weapon activates, fix this better
272
273 ns->floorbox_update ();
274 esrv_send_inventory (ob, ob);
275 esrv_add_spells (this, 0);
276
277 activate ();
278
279 send_rules (ob);
280 send_news (ob);
281 display_motd (ob);
282
283 INVOKE_PLAYER (CONNECT, this);
284 INVOKE_PLAYER (LOGIN, this);
285}
286
287void
288player::disconnect ()
289{
290 if (ob)
291 {
292 ob->close_container (); //TODO: client-specific
293 ob->drop_unpaid_items ();
294 }
295
296 if (ns)
297 {
298 if (active)
299 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
300
301 INVOKE_PLAYER (DISCONNECT, this);
302
303 ns->reset_stats ();
304 ns->pl = 0;
305 ns = 0;
306 }
307
308 observe = ob;
309
310 deactivate ();
311}
312
313// the need for this function can be explained
314// by load_object not returning the object
315void
316player::set_object (object *op)
317{
318 ob = observe = op;
319 ob->contr = this; /* this aren't yet in archetype */
320
321 ob->speed = 1.0f;
322 ob->speed_left = 0.5f;
323
324 ob->direction = 5; /* So player faces south */
325} 327}
326 328
327void 329void
328player::set_observe (object *op) 330player::set_observe (object *op)
329{ 331{
… …
632} 634}
633 635
634void 636void
635give_initial_items (object *pl, treasurelist * items) 637give_initial_items (object *pl, treasurelist * items)
636{ 638{
637 object *op, *next = NULL;
638
639 if (pl->randomitems != NULL) 639 if (pl->randomitems)
640 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 640 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
641 641
642 for (op = pl->inv; op; op = next) 642 for (object *next, *op = pl->inv; op; op = next)
643 { 643 {
644 next = op->below; 644 next = op->below;
645 645
646 /* Forces get applied per default, unless they have the 646 /* Forces get applied per default, unless they have the
647 * flag "neutral" set. Sorry but I can't think of a better way 647 * flag "neutral" set. Sorry but I can't think of a better way
… …
689 if (op->nrof > 1) 689 if (op->nrof > 1)
690 op->nrof = 1; 690 op->nrof = 1;
691 } 691 }
692 692
693 if (op->type == SPELLBOOK && op->inv) 693 if (op->type == SPELLBOOK && op->inv)
694 {
695 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 694 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
696 }
697 695
698 /* Give starting characters identified, uncursed, and undamned 696 /* Give starting characters identified, uncursed, and undamned
699 * items. Just don't identify gold or silver, or it won't be 697 * items. Just don't identify gold or silver, or it won't be
700 * merged properly. 698 * merged properly.
701 */ 699 */
… …
831static void 829static void
832start_info (object *op) 830start_info (object *op)
833{ 831{
834 char buf[MAX_BUF]; 832 char buf[MAX_BUF];
835 833
836 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 834 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
837 new_draw_info (NDI_UNIQUE, 0, op, buf); 835 new_draw_info (NDI_UNIQUE, 0, op, buf);
838 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
839 //new_draw_info (NDI_UNIQUE, 0, op, " ");
840} 836}
841 837
842/* This function takes the key that is passed, and does the 838/* This function takes the key that is passed, and does the
843 * appropriate action with it (change race, or other things). 839 * appropriate action with it (change race, or other things).
844 * The function name is for historical reasons - now we have 840 * The function name is for historical reasons - now we have
… …
1007 if (op->move_type & MOVE_FLYING) 1003 if (op->move_type & MOVE_FLYING)
1008 return 1; 1004 return 1;
1009 1005
1010 next = op->below; 1006 next = op->below;
1011 1007
1008 int cnt = MAX_ITEM_PER_DROP;
1009#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1010
1012 /* loop while there are items on the floor that are not marked as 1011 /* loop while there are items on the floor that are not marked as
1013 * destroyed */ 1012 * destroyed */
1014 while (next && !next->destroyed ()) 1013 while (next && !next->destroyed ())
1015 { 1014 {
1016 tmp = next; 1015 tmp = next;
1017 next = tmp->below; 1016 next = tmp->below;
1018 1017
1018 if (cnt <= 0)
1019 {
1020 op->failmsg ("Couldn't pickup all items at once.");
1021 return 0;
1022 }
1023
1019 if (op->destroyed ()) 1024 if (op->destroyed ())
1020 return 0; 1025 return 0;
1021 1026
1022 if (!can_pick (op, tmp)) 1027 if (!can_pick (op, tmp))
1023 continue; 1028 continue;
1024 1029
1025 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1030 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1026 { 1031 {
1027 if (item_matched_string (op, tmp, op->contr->search_str)) 1032 if (item_matched_string (op, tmp, op->contr->search_str))
1028 pick_up (op, tmp); 1033 CHK_PICK_PICKUP;
1029 continue; 1034 continue;
1030 } 1035 }
1031 1036
1032 /* high not bit set? We're using the old autopickup model */ 1037 /* high not bit set? We're using the old autopickup model */
1033 if (!(op->contr->mode & PU_NEWMODE)) 1038 if (!(op->contr->mode & PU_NEWMODE))
… …
1035 switch (op->contr->mode) 1040 switch (op->contr->mode)
1036 { 1041 {
1037 case 0: 1042 case 0:
1038 return 1; /* don't pick up */ 1043 return 1; /* don't pick up */
1039 case 1: 1044 case 1:
1040 pick_up (op, tmp); 1045 CHK_PICK_PICKUP;
1041 return 1; 1046 return 1;
1042 case 2: 1047 case 2:
1043 pick_up (op, tmp); 1048 CHK_PICK_PICKUP;
1044 return 0; 1049 return 0;
1045 case 3: 1050 case 3:
1046 return 0; /* stop before pickup */ 1051 return 0; /* stop before pickup */
1047 case 4: 1052 case 4:
1048 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1049 break; 1054 break;
1050 case 5: 1055 case 5:
1051 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1052 stop = 1; 1057 stop = 1;
1053 break; 1058 break;
1054 case 6: 1059 case 6:
1055 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1060 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1056 pick_up (op, tmp); 1061 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1062 CHK_PICK_PICKUP;
1057 break; 1063 break;
1058 1064
1059 case 7: 1065 case 7:
1060 if (tmp->type == MONEY || tmp->type == GEM) 1066 if (tmp->type == MONEY || tmp->type == GEM)
1061 pick_up (op, tmp); 1067 CHK_PICK_PICKUP;
1062 break; 1068 break;
1063 1069
1064 default: 1070 default:
1065 /* use value density */ 1071 /* use value density */
1066 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1072 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1067 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1073 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1068 pick_up (op, tmp); 1074 CHK_PICK_PICKUP;
1069 } 1075 }
1070 } 1076 }
1071 else 1077 else
1072 { /* old model */ 1078 { /* old model */
1073 /* NEW pickup handling */ 1079 /* NEW pickup handling */
… …
1128 /* all food and drink if desired */ 1134 /* all food and drink if desired */
1129 /* question: don't pick up known-poisonous stuff? */ 1135 /* question: don't pick up known-poisonous stuff? */
1130 if (op->contr->mode & PU_FOOD) 1136 if (op->contr->mode & PU_FOOD)
1131 if (tmp->type == FOOD) 1137 if (tmp->type == FOOD)
1132 { 1138 {
1133 pick_up (op, tmp); 1139 CHK_PICK_PICKUP;
1134 continue; 1140 continue;
1135 } 1141 }
1136 1142
1137 if (op->contr->mode & PU_DRINK) 1143 if (op->contr->mode & PU_DRINK)
1138 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1144 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1139 { 1145 {
1140 pick_up (op, tmp); 1146 CHK_PICK_PICKUP;
1141 continue; 1147 continue;
1142 } 1148 }
1143 1149
1144 if (op->contr->mode & PU_POTION) 1150 if (op->contr->mode & PU_POTION)
1145 if (tmp->type == POTION) 1151 if (tmp->type == POTION)
1146 { 1152 {
1147 pick_up (op, tmp); 1153 CHK_PICK_PICKUP;
1148 continue; 1154 continue;
1149 } 1155 }
1150 1156
1151 /* spellbooks, skillscrolls and normal books/scrolls */ 1157 /* spellbooks, skillscrolls and normal books/scrolls */
1152 if (op->contr->mode & PU_SPELLBOOK) 1158 if (op->contr->mode & PU_SPELLBOOK)
1153 if (tmp->type == SPELLBOOK) 1159 if (tmp->type == SPELLBOOK)
1154 { 1160 {
1155 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1156 continue; 1162 continue;
1157 } 1163 }
1158 1164
1159 if (op->contr->mode & PU_SKILLSCROLL) 1165 if (op->contr->mode & PU_SKILLSCROLL)
1160 if (tmp->type == SKILLSCROLL) 1166 if (tmp->type == SKILLSCROLL)
1161 { 1167 {
1162 pick_up (op, tmp); 1168 CHK_PICK_PICKUP;
1163 continue; 1169 continue;
1164 } 1170 }
1165 1171
1166 if (op->contr->mode & PU_READABLES) 1172 if (op->contr->mode & PU_READABLES)
1167 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE) 1173 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1168 { 1174 {
1169 pick_up (op, tmp); 1175 CHK_PICK_PICKUP;
1170 continue; 1176 continue;
1171 } 1177 }
1172 1178
1173 /* wands/staves/rods/horns */ 1179 /* wands/staves/rods/horns */
1174 if (op->contr->mode & PU_MAGIC_DEVICE) 1180 if (op->contr->mode & PU_MAGIC_DEVICE)
1175 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1181 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1176 { 1182 {
1177 pick_up (op, tmp); 1183 CHK_PICK_PICKUP;
1178 continue; 1184 continue;
1179 } 1185 }
1180 1186
1181 /* pick up all magical items */ 1187 /* pick up all magical items */
1182 if (op->contr->mode & PU_MAGICAL) 1188 if (op->contr->mode & PU_MAGICAL)
1183 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1189 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1184 { 1190 {
1185 pick_up (op, tmp); 1191 CHK_PICK_PICKUP;
1186 continue; 1192 continue;
1187 } 1193 }
1188 1194
1189 if (op->contr->mode & PU_VALUABLES) 1195 if (op->contr->mode & PU_VALUABLES)
1190 { 1196 {
1191 if (tmp->type == MONEY || tmp->type == GEM) 1197 if (tmp->type == MONEY || tmp->type == GEM)
1192 { 1198 {
1193 pick_up (op, tmp); 1199 CHK_PICK_PICKUP;
1194 continue; 1200 continue;
1195 } 1201 }
1196 } 1202 }
1197 1203
1198 /* rings & amulets - talismans seems to be typed AMULET */ 1204 /* rings & amulets - talismans seems to be typed AMULET */
1199 if (op->contr->mode & PU_JEWELS) 1205 if (op->contr->mode & PU_JEWELS)
1200 if (tmp->type == RING || tmp->type == AMULET) 1206 if (tmp->type == RING || tmp->type == AMULET)
1201 { 1207 {
1202 pick_up (op, tmp); 1208 CHK_PICK_PICKUP;
1203 continue; 1209 continue;
1204 } 1210 }
1205 1211
1206 /* we don't forget dragon food */ 1212 /* we don't forget dragon food */
1207 if (op->contr->mode & PU_FLESH) 1213 if (op->contr->mode & PU_FLESH)
1208 if (tmp->type == FLESH) 1214 if (tmp->type == FLESH)
1209 { 1215 {
1210 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1211 continue; 1217 continue;
1212 } 1218 }
1213 1219
1214 /* bows and arrows. Bows are good for selling! */ 1220 /* bows and arrows. Bows are good for selling! */
1215 if (op->contr->mode & PU_BOW) 1221 if (op->contr->mode & PU_BOW)
1216 if (tmp->type == BOW) 1222 if (tmp->type == BOW)
1217 { 1223 {
1218 pick_up (op, tmp); 1224 CHK_PICK_PICKUP;
1219 continue; 1225 continue;
1220 } 1226 }
1221 1227
1222 if (op->contr->mode & PU_ARROW) 1228 if (op->contr->mode & PU_ARROW)
1223 if (tmp->type == ARROW) 1229 if (tmp->type == ARROW)
1224 { 1230 {
1225 pick_up (op, tmp); 1231 CHK_PICK_PICKUP;
1226 continue; 1232 continue;
1227 } 1233 }
1228 1234
1229 /* all kinds of armor etc. */ 1235 /* all kinds of armor etc. */
1230 if (op->contr->mode & PU_ARMOUR) 1236 if (op->contr->mode & PU_ARMOUR)
1231 if (tmp->type == ARMOUR) 1237 if (tmp->type == ARMOUR)
1232 { 1238 {
1233 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1234 continue; 1240 continue;
1235 } 1241 }
1236 1242
1237 if (op->contr->mode & PU_HELMET) 1243 if (op->contr->mode & PU_HELMET)
1238 if (tmp->type == HELMET) 1244 if (tmp->type == HELMET)
1239 { 1245 {
1240 pick_up (op, tmp); 1246 CHK_PICK_PICKUP;
1241 continue; 1247 continue;
1242 } 1248 }
1243 1249
1244 if (op->contr->mode & PU_SHIELD) 1250 if (op->contr->mode & PU_SHIELD)
1245 if (tmp->type == SHIELD) 1251 if (tmp->type == SHIELD)
1246 { 1252 {
1247 pick_up (op, tmp); 1253 CHK_PICK_PICKUP;
1248 continue; 1254 continue;
1249 } 1255 }
1250 1256
1251 if (op->contr->mode & PU_BOOTS) 1257 if (op->contr->mode & PU_BOOTS)
1252 if (tmp->type == BOOTS) 1258 if (tmp->type == BOOTS)
1253 { 1259 {
1254 pick_up (op, tmp); 1260 CHK_PICK_PICKUP;
1255 continue; 1261 continue;
1256 } 1262 }
1257 1263
1258 if (op->contr->mode & PU_GLOVES) 1264 if (op->contr->mode & PU_GLOVES)
1259 if (tmp->type == GLOVES) 1265 if (tmp->type == GLOVES)
1260 { 1266 {
1261 pick_up (op, tmp); 1267 CHK_PICK_PICKUP;
1262 continue; 1268 continue;
1263 } 1269 }
1264 1270
1265 if (op->contr->mode & PU_CLOAK) 1271 if (op->contr->mode & PU_CLOAK)
1266 if (tmp->type == CLOAK) 1272 if (tmp->type == CLOAK)
1267 { 1273 {
1268 pick_up (op, tmp); 1274 CHK_PICK_PICKUP;
1269 continue; 1275 continue;
1270 } 1276 }
1271 1277
1272 /* hoping to catch throwing daggers here */ 1278 /* hoping to catch throwing daggers here */
1273 if (op->contr->mode & PU_MISSILEWEAPON) 1279 if (op->contr->mode & PU_MISSILEWEAPON)
1274 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1280 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1275 { 1281 {
1276 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1277 continue; 1283 continue;
1278 } 1284 }
1279 1285
1280 /* careful: chairs and tables are weapons! */ 1286 /* careful: chairs and tables are weapons! */
1281 if (op->contr->mode & PU_ALLWEAPON) 1287 if (op->contr->mode & PU_ALLWEAPON)
… …
1283 if (tmp->type == WEAPON && tmp->name != NULL) 1289 if (tmp->type == WEAPON && tmp->name != NULL)
1284 { 1290 {
1285 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL && 1291 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1286 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) 1292 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1287 { 1293 {
1288 pick_up (op, tmp); 1294 CHK_PICK_PICKUP;
1289 continue; 1295 continue;
1290 } 1296 }
1291 } 1297 }
1292 1298
1293 if (tmp->type == WEAPON && tmp->name == NULL) 1299 if (tmp->type == WEAPON && tmp->name == NULL)
1294 { 1300 {
1295 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL) 1301 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1296 { 1302 {
1297 pick_up (op, tmp); 1303 CHK_PICK_PICKUP;
1298 continue; 1304 continue;
1299 } 1305 }
1300 } 1306 }
1301 } 1307 }
1302 1308
1303 /* misc stuff that's useful */ 1309 /* misc stuff that's useful */
1304 if (op->contr->mode & PU_KEY) 1310 if (op->contr->mode & PU_KEY)
1305 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1311 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1306 { 1312 {
1307 pick_up (op, tmp); 1313 CHK_PICK_PICKUP;
1308 continue; 1314 continue;
1309 } 1315 }
1310 1316
1311 /* any of the last 4 bits set means we use the ratio for value 1317 /* any of the last 4 bits set means we use the ratio for value
1312 * pickups */ 1318 * pickups */
… …
1317 /* >=7 is the old standard setting. Now we take the last 4 bits 1323 /* >=7 is the old standard setting. Now we take the last 4 bits
1318 * and multiply them by 5, giving 0..15*5== 5..75 */ 1324 * and multiply them by 5, giving 0..15*5== 5..75 */
1319 wvratio = (op->contr->mode & PU_RATIO) * 5; 1325 wvratio = (op->contr->mode & PU_RATIO) * 5;
1320 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1326 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1321 { 1327 {
1322 pick_up (op, tmp); 1328 CHK_PICK_PICKUP;
1323#if 0 1329#if 0
1324 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1330 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1325 if (tmp->name != NULL) 1331 if (tmp->name != NULL)
1326 { 1332 {
1327 fprintf (stderr, "%s", tmp->name); 1333 fprintf (stderr, "%s", tmp->name);
… …
1346 * found object is returned. 1352 * found object is returned.
1347 */ 1353 */
1348object * 1354object *
1349find_arrow (object *op, const char *type) 1355find_arrow (object *op, const char *type)
1350{ 1356{
1351 object *tmp = 0;
1352
1353 for (op = op->inv; op; op = op->below) 1357 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1354 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1355 tmp = find_arrow (op, type);
1356 else if (op->type == ARROW && op->race == type) 1358 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1359 return splay (tmp);
1360
1361 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1362 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1363 if (object *arrow = find_arrow (tmp, type))
1364 {
1365 splay (tmp);
1357 return op; 1366 return arrow;
1367 }
1358 1368
1359 return tmp; 1369 return 0;
1360} 1370}
1361 1371
1362/* 1372/*
1363 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1373 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1364 * against the target. A full test is not performed, simply a basic test 1374 * against the target. A full test is not performed, simply a basic test

Diff Legend

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