… | |
… | |
20 | * <http://www.gnu.org/licenses/>. |
20 | * <http://www.gnu.org/licenses/>. |
21 | * |
21 | * |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
23 | */ |
24 | |
24 | |
|
|
25 | //+GPL |
|
|
26 | |
25 | #include <global.h> |
27 | #include <global.h> |
26 | #include <sproto.h> |
28 | #include <sproto.h> |
27 | #include <sounds.h> |
29 | #include <sounds.h> |
28 | #include <living.h> |
30 | #include <living.h> |
29 | #include <object.h> |
31 | #include <object.h> |
… | |
… | |
105 | ob->race = ob->arch->race; |
107 | ob->race = ob->arch->race; |
106 | |
108 | |
107 | ob->update_weight (); |
109 | ob->update_weight (); |
108 | link_skills (); |
110 | link_skills (); |
109 | |
111 | |
110 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
|
|
111 | |
|
|
112 | assign (title, ob->arch->object::name); |
112 | assign (title, ob->arch->object::name); |
113 | |
113 | |
114 | /* if it's a dragon player, set the correct title here */ |
114 | /* if it's a dragon player, set the correct title here */ |
115 | if (is_dragon_pl (ob)) |
115 | if (ob->is_dragon ()) |
116 | { |
116 | { |
117 | object *tmp, *abil = 0, *skin = 0; |
117 | object *tmp, *abil = 0, *skin = 0; |
118 | |
118 | |
119 | for (tmp = ob->inv; tmp; tmp = tmp->below) |
119 | for (tmp = ob->inv; tmp; tmp = tmp->below) |
120 | if (tmp->type == FORCE) |
120 | if (tmp->type == FORCE) |
… | |
… | |
134 | |
134 | |
135 | ns->floorbox_update (); |
135 | ns->floorbox_update (); |
136 | esrv_send_inventory (ob, ob); |
136 | esrv_send_inventory (ob, ob); |
137 | esrv_add_spells (this, 0); |
137 | esrv_add_spells (this, 0); |
138 | |
138 | |
139 | activate (); |
|
|
140 | |
|
|
141 | INVOKE_PLAYER (CONNECT, this); |
|
|
142 | INVOKE_PLAYER (LOGIN, this); |
|
|
143 | } |
|
|
144 | |
|
|
145 | void |
|
|
146 | player::disconnect () |
|
|
147 | { |
|
|
148 | if (ob) |
|
|
149 | { |
|
|
150 | ob->close_container (); //TODO: client-specific |
|
|
151 | ob->drop_unpaid_items (); |
|
|
152 | } |
|
|
153 | |
|
|
154 | if (ns) |
|
|
155 | { |
|
|
156 | if (active) |
|
|
157 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
|
|
158 | |
|
|
159 | INVOKE_PLAYER (DISCONNECT, this); |
|
|
160 | |
|
|
161 | ns->reset_stats (); |
|
|
162 | ns->pl = 0; |
|
|
163 | ns = 0; |
|
|
164 | } |
|
|
165 | |
|
|
166 | // this is important for the player scheduler to get the correct refcount |
|
|
167 | // when ns = 0 |
|
|
168 | observe = viewpoint = ob; |
|
|
169 | |
|
|
170 | deactivate (); |
|
|
171 | } |
|
|
172 | |
|
|
173 | // the need for this function can be explained |
|
|
174 | // by load_object not returning the object |
|
|
175 | void |
|
|
176 | player::set_object (object *op) |
|
|
177 | { |
|
|
178 | ob = observe = viewpoint = op; |
|
|
179 | ob->contr = this; /* this aren't yet in archetype */ |
|
|
180 | |
|
|
181 | ob->speed = 1.0f; |
|
|
182 | ob->speed_left = 0.5f; |
|
|
183 | |
|
|
184 | ob->direction = 5; /* So player faces south */ |
|
|
185 | |
|
|
186 | ob->flag [FLAG_READY_WEAPON] = false; |
139 | ob->flag [FLAG_READY_WEAPON] = false; |
187 | ob->flag [FLAG_READY_SKILL] = false; |
140 | ob->flag [FLAG_READY_SKILL] = false; |
188 | ob->flag [FLAG_READY_BOW] = false; |
141 | ob->flag [FLAG_READY_BOW] = false; |
189 | |
142 | |
190 | for (object *op = ob->inv; op; op = op->below) |
143 | for (object *op = ob->inv; op; op = op->below) |
191 | if (op->flag [FLAG_APPLIED]) |
144 | if (op->flag [FLAG_APPLIED]) |
192 | switch (op->type) |
145 | switch (op->type) |
193 | { |
146 | { |
194 | case SKILL: |
147 | case SKILL: |
195 | ob->flag [FLAG_APPLIED] = false; |
148 | op->flag [FLAG_APPLIED] = false; |
196 | break; |
149 | break; |
197 | |
150 | |
198 | case WAND: |
151 | case WAND: |
199 | case ROD: |
152 | case ROD: |
200 | case HORN: |
153 | case HORN: |
… | |
… | |
205 | case WEAPON: |
158 | case WEAPON: |
206 | combat_ob = op; |
159 | combat_ob = op; |
207 | break; |
160 | break; |
208 | } |
161 | } |
209 | |
162 | |
|
|
163 | ob->current_weapon = 0; |
210 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); |
164 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); |
211 | ob->deactivate (); // change_weapon activates, fix this better |
165 | activate (); // change_weapon also activates, but this doesn't hurt |
|
|
166 | |
|
|
167 | INVOKE_PLAYER (CONNECT, this); |
|
|
168 | INVOKE_PLAYER (LOGIN, this); |
|
|
169 | } |
|
|
170 | |
|
|
171 | void |
|
|
172 | player::disconnect () |
|
|
173 | { |
|
|
174 | if (ob) |
|
|
175 | { |
|
|
176 | ob->close_container (); //TODO: client-specific |
|
|
177 | ob->drop_unpaid_items (); |
|
|
178 | } |
|
|
179 | |
|
|
180 | if (ns) |
|
|
181 | { |
|
|
182 | if (active) |
|
|
183 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
|
|
184 | |
|
|
185 | INVOKE_PLAYER (DISCONNECT, this); |
|
|
186 | |
|
|
187 | ns->reset_stats (); |
|
|
188 | ns->pl = 0; |
|
|
189 | ns = 0; |
|
|
190 | } |
|
|
191 | |
|
|
192 | // this is important for the player scheduler to get the correct refcount |
|
|
193 | // when ns = 0 |
|
|
194 | observe = viewpoint = ob; |
|
|
195 | |
|
|
196 | deactivate (); |
|
|
197 | } |
|
|
198 | |
|
|
199 | //-GPL |
|
|
200 | |
|
|
201 | // the need for this function can be explained |
|
|
202 | // by load_object not returning the object |
|
|
203 | void |
|
|
204 | player::set_object (object *op) |
|
|
205 | { |
|
|
206 | ob = observe = viewpoint = op; |
|
|
207 | ob->contr = this; /* this aren't yet in archetype */ |
|
|
208 | |
|
|
209 | ob->speed = 1.0f; |
|
|
210 | ob->speed_left = 0.5f; |
|
|
211 | |
|
|
212 | ob->direction = 5; /* So player faces south */ |
212 | } |
213 | } |
213 | |
214 | |
214 | void |
215 | void |
215 | player::set_observe (object *op) |
216 | player::set_observe (object *op) |
216 | { |
217 | { |
… | |
… | |
222 | player::set_viewpoint (object *op) |
223 | player::set_viewpoint (object *op) |
223 | { |
224 | { |
224 | viewpoint = op ? op : (object *)observe; |
225 | viewpoint = op ? op : (object *)observe; |
225 | do_los = 1; |
226 | do_los = 1; |
226 | } |
227 | } |
|
|
228 | |
|
|
229 | //+GPL |
227 | |
230 | |
228 | player::player () |
231 | player::player () |
229 | { |
232 | { |
230 | /* There are some elements we want initialised to non zero value - |
233 | /* There are some elements we want initialised to non zero value - |
231 | * we deal with that below this point. |
234 | * we deal with that below this point. |
… | |
… | |
267 | { |
270 | { |
268 | /* Clear item stack */ |
271 | /* Clear item stack */ |
269 | free (stack_items); |
272 | free (stack_items); |
270 | } |
273 | } |
271 | |
274 | |
|
|
275 | /* |
|
|
276 | * get_player_archetype() return next player archetype from archetype |
|
|
277 | * list. Not very efficient routine, but used only creating new players. |
|
|
278 | * Note: there MUST be at least one player archetype! |
|
|
279 | */ |
|
|
280 | static archetype * |
|
|
281 | get_player_archetype (archetype *at) |
|
|
282 | { |
|
|
283 | // archetypes could have been reloaded |
|
|
284 | archetype *nat = at ? archetype::find (at->archname) : archetypes [0]; |
|
|
285 | |
|
|
286 | if (!nat) |
|
|
287 | return at; |
|
|
288 | |
|
|
289 | archvec::iterator i = archetypes.find (nat); |
|
|
290 | |
|
|
291 | for (;;) |
|
|
292 | { |
|
|
293 | if (++i == archetypes.end ()) |
|
|
294 | i = archetypes.begin (); |
|
|
295 | else if (*i == at) |
|
|
296 | cleanup ("not a single player archetype found"); |
|
|
297 | |
|
|
298 | if ((*i)->type == PLAYER) |
|
|
299 | return *i; |
|
|
300 | } |
|
|
301 | } |
|
|
302 | |
272 | /* Tries to add player on the connection passed in ns. |
303 | /* Tries to add player on the connection passed in ns. |
273 | * All we can really get in this is some settings like host and display |
304 | * All we can really get in this is some settings like host and display |
274 | * mode. |
305 | * mode. |
275 | */ |
306 | */ |
276 | player * |
307 | player * |
277 | player::create () |
308 | player::create () |
278 | { |
309 | { |
279 | player *pl = new player; |
310 | player *pl = new player; |
280 | |
311 | |
281 | pl->set_object (arch_to_object (get_player_archetype (0))); |
312 | pl->set_object (get_player_archetype (0)->instance ()); |
282 | |
313 | |
283 | pl->ob->roll_stats (); |
314 | pl->ob->roll_stats (); |
284 | pl->ob->stats.wc = 2; |
315 | pl->ob->stats.wc = 2; |
285 | pl->ob->run_away = 25; /* Then we panick... */ |
316 | pl->ob->run_away = 25; /* Then we panick... */ |
286 | |
317 | |
287 | set_first_map (pl->ob); |
318 | set_first_map (pl->ob); |
288 | |
319 | |
289 | return pl; |
320 | return pl; |
290 | } |
|
|
291 | |
|
|
292 | /* |
|
|
293 | * get_player_archetype() return next player archetype from archetype |
|
|
294 | * list. Not very efficient routine, but used only creating new players. |
|
|
295 | * Note: there MUST be at least one player archetype! |
|
|
296 | */ |
|
|
297 | archetype * |
|
|
298 | get_player_archetype (archetype *at) |
|
|
299 | { |
|
|
300 | // archetypes could have been reloaded |
|
|
301 | archetype *nat = at ? archetype::find (at->archname) : archetypes [0]; |
|
|
302 | |
|
|
303 | if (!nat) |
|
|
304 | return at; |
|
|
305 | |
|
|
306 | archvec::iterator i = archetypes.find (nat); |
|
|
307 | |
|
|
308 | for (;;) |
|
|
309 | { |
|
|
310 | if (++i == archetypes.end ()) |
|
|
311 | i = archetypes.begin (); |
|
|
312 | else if (*i == at) |
|
|
313 | cleanup ("not a single player archetype found"); |
|
|
314 | |
|
|
315 | if ((*i)->type == PLAYER) |
|
|
316 | return *i; |
|
|
317 | } |
|
|
318 | } |
321 | } |
319 | |
322 | |
320 | object * |
323 | object * |
321 | get_nearest_player (object *mon) |
324 | get_nearest_player (object *mon) |
322 | { |
325 | { |
… | |
… | |
631 | send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); |
634 | send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); |
632 | } |
635 | } |
633 | |
636 | |
634 | /* This rolls four 1-6 rolls and sums the best 3 of the 4. */ |
637 | /* This rolls four 1-6 rolls and sums the best 3 of the 4. */ |
635 | static int |
638 | static int |
636 | roll_stat (void) |
639 | roll_stat () |
637 | { |
640 | { |
638 | int a[4], i, j, k; |
641 | int a[4], i, j, k; |
639 | |
642 | |
640 | for (i = 0; i < 4; i++) |
643 | for (i = 0; i < 4; i++) |
641 | a[i] = (int) rndm (6) + 1; |
644 | a[i] = (int) rndm (6) + 1; |
… | |
… | |
738 | player::chargen_race_done () |
741 | player::chargen_race_done () |
739 | { |
742 | { |
740 | /* this must before then initial items are given */ |
743 | /* this must before then initial items are given */ |
741 | esrv_new_player (ob->contr); |
744 | esrv_new_player (ob->contr); |
742 | |
745 | |
743 | treasurelist *tl = treasurelist::find ("starting_wealth"); |
746 | treasurelist *tl = treasurelist::find (shstr_starting_wealth); |
744 | if (tl) |
747 | if (tl) |
745 | create_treasure (tl, ob, 0, 0, 0); |
748 | create_treasure (tl, ob, 0, 0, 0); |
746 | |
749 | |
747 | INVOKE_PLAYER (BIRTH, ob->contr); |
750 | INVOKE_PLAYER (BIRTH, ob->contr); |
748 | INVOKE_PLAYER (LOGIN, ob->contr); |
751 | INVOKE_PLAYER (LOGIN, ob->contr); |
… | |
… | |
801 | ob->stats.hp = ob->stats.maxhp; |
804 | ob->stats.hp = ob->stats.maxhp; |
802 | ob->stats.sp = ob->stats.maxsp; |
805 | ob->stats.sp = ob->stats.maxsp; |
803 | ob->stats.grace = 0; |
806 | ob->stats.grace = 0; |
804 | } |
807 | } |
805 | |
808 | |
806 | void |
809 | static void |
807 | flee_player (object *op) |
810 | flee_player (object *op) |
808 | { |
811 | { |
809 | int dir, diff; |
812 | int dir, diff; |
810 | rv_vector rv; |
813 | rv_vector rv; |
811 | |
814 | |
… | |
… | |
861 | if (op->move_type & MOVE_FLYING) |
864 | if (op->move_type & MOVE_FLYING) |
862 | return 1; |
865 | return 1; |
863 | |
866 | |
864 | next = op->below; |
867 | next = op->below; |
865 | |
868 | |
866 | int cnt = MAX_ITEM_PER_DROP; |
869 | int cnt = MAX_ITEM_PER_ACTION; |
867 | #define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) |
870 | #define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) |
868 | |
871 | |
869 | /* loop while there are items on the floor that are not marked as |
872 | /* loop while there are items on the floor that are not marked as |
870 | * destroyed */ |
873 | * destroyed */ |
871 | while (next && !next->destroyed ()) |
874 | while (next && !next->destroyed ()) |
… | |
… | |
897 | if (op->contr->mode & PU_DEBUG) |
900 | if (op->contr->mode & PU_DEBUG) |
898 | { |
901 | { |
899 | /* some debugging code to figure out item information */ |
902 | /* some debugging code to figure out item information */ |
900 | const char *str = tmp->name |
903 | const char *str = tmp->name |
901 | ? format ("item name: %s item type: %d weight/value: %d", |
904 | ? format ("item name: %s item type: %d weight/value: %d", |
902 | &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))) |
905 | &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1)))) |
903 | : format ("item name: %s item type: %d weight/value: %d", |
906 | : format ("item name: %s item type: %d weight/value: %d", |
904 | &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
907 | &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1)))); |
905 | |
908 | |
906 | new_draw_info (NDI_UNIQUE, 0, op, str); |
909 | new_draw_info (NDI_UNIQUE, 0, op, str); |
907 | } |
910 | } |
908 | |
911 | |
909 | if (op->contr->mode & PU_INHIBIT) |
912 | if (op->contr->mode & PU_INHIBIT) |
… | |
… | |
996 | continue; |
999 | continue; |
997 | } |
1000 | } |
998 | |
1001 | |
999 | /* wands/staves/rods/horns */ |
1002 | /* wands/staves/rods/horns */ |
1000 | if (op->contr->mode & PU_MAGIC_DEVICE) |
1003 | if (op->contr->mode & PU_MAGIC_DEVICE) |
1001 | if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) |
1004 | if (tmp->type == WAND |
|
|
1005 | || tmp->type == ROD |
|
|
1006 | || tmp->type == HORN |
|
|
1007 | || tmp->type == POWER_CRYSTAL) |
1002 | { |
1008 | { |
1003 | CHK_PICK_PICKUP; |
1009 | CHK_PICK_PICKUP; |
1004 | continue; |
1010 | continue; |
1005 | } |
1011 | } |
1006 | |
1012 | |
1007 | /* pick up all magical items */ |
1013 | /* pick up all magical items */ |
1008 | if (op->contr->mode & PU_MAGICAL) |
1014 | if (op->contr->mode & PU_MAGICAL) |
1009 | if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) |
1015 | if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) |
|
|
1016 | && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) |
1010 | { |
1017 | { |
1011 | CHK_PICK_PICKUP; |
1018 | CHK_PICK_PICKUP; |
1012 | continue; |
1019 | continue; |
1013 | } |
1020 | } |
1014 | |
1021 | |
… | |
… | |
1021 | } |
1028 | } |
1022 | } |
1029 | } |
1023 | |
1030 | |
1024 | /* rings & amulets - talismans seems to be typed AMULET */ |
1031 | /* rings & amulets - talismans seems to be typed AMULET */ |
1025 | if (op->contr->mode & PU_JEWELS) |
1032 | if (op->contr->mode & PU_JEWELS) |
1026 | if (tmp->type == RING || tmp->type == AMULET) |
1033 | if (tmp->type == RING |
|
|
1034 | || tmp->type == AMULET |
|
|
1035 | || tmp->type == GIRDLE |
|
|
1036 | || tmp->type == SKILL_TOOL) |
1027 | { |
1037 | { |
1028 | CHK_PICK_PICKUP; |
1038 | CHK_PICK_PICKUP; |
1029 | continue; |
1039 | continue; |
1030 | } |
1040 | } |
1031 | |
1041 | |
… | |
… | |
1080 | CHK_PICK_PICKUP; |
1090 | CHK_PICK_PICKUP; |
1081 | continue; |
1091 | continue; |
1082 | } |
1092 | } |
1083 | |
1093 | |
1084 | if (op->contr->mode & PU_GLOVES) |
1094 | if (op->contr->mode & PU_GLOVES) |
1085 | if (tmp->type == GLOVES) |
1095 | if (tmp->type == GLOVES || tmp->type == BRACERS) |
1086 | { |
1096 | { |
1087 | CHK_PICK_PICKUP; |
1097 | CHK_PICK_PICKUP; |
1088 | continue; |
1098 | continue; |
1089 | } |
1099 | } |
1090 | |
1100 | |
… | |
… | |
1140 | fprintf (stderr, "%s", tmp->name); |
1150 | fprintf (stderr, "%s", tmp->name); |
1141 | } |
1151 | } |
1142 | else |
1152 | else |
1143 | fprintf (stderr, "%s", tmp->arch->archname); |
1153 | fprintf (stderr, "%s", tmp->arch->archname); |
1144 | fprintf (stderr, ",%d] = ", tmp->type); |
1154 | fprintf (stderr, ",%d] = ", tmp->type); |
1145 | fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1155 | fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1)))); |
1146 | #endif |
1156 | #endif |
1147 | CHK_PICK_PICKUP; |
1157 | CHK_PICK_PICKUP; |
1148 | continue; |
1158 | continue; |
1149 | } |
1159 | } |
1150 | } /* the new pickup model */ |
1160 | } /* the new pickup model */ |
1151 | } |
1161 | } |
1152 | |
1162 | |
1153 | return !stop; |
1163 | return !stop; |
1154 | } |
1164 | } |
1155 | |
1165 | |
|
|
1166 | /* routine for both players and monsters. We call this when |
|
|
1167 | * there is a possibility for our action distrubing our hiding |
|
|
1168 | * place or invisiblity spell. Artefact invisiblity causes |
|
|
1169 | * "noise" instead. If we arent invisible to begin with, we |
|
|
1170 | * return 0. |
|
|
1171 | */ |
|
|
1172 | static int |
|
|
1173 | action_makes_visible (object *op) |
|
|
1174 | { |
|
|
1175 | if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) |
|
|
1176 | { |
|
|
1177 | if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) |
|
|
1178 | { |
|
|
1179 | // artefact invisibility is permanent, but we still make noise |
|
|
1180 | // this is important for game-balance. |
|
|
1181 | if (op->contr) |
|
|
1182 | op->make_noise (); |
|
|
1183 | |
|
|
1184 | return 0; |
|
|
1185 | } |
|
|
1186 | |
|
|
1187 | if (op->contr && op->contr->tmp_invis == 0) |
|
|
1188 | return 0; |
|
|
1189 | |
|
|
1190 | /* If monsters, they should become visible */ |
|
|
1191 | if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis)) |
|
|
1192 | { |
|
|
1193 | new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible"); |
|
|
1194 | return 1; |
|
|
1195 | } |
|
|
1196 | } |
|
|
1197 | |
|
|
1198 | return 0; |
|
|
1199 | } |
|
|
1200 | |
1156 | /* |
1201 | /* |
1157 | * Find an arrow in the inventory and after that |
1202 | * Find an arrow in the inventory and after that |
1158 | * in the right type container (quiver). Pointer to the |
1203 | * in the right type container (quiver). Pointer to the |
1159 | * found object is returned. |
1204 | * found object is returned. |
1160 | */ |
1205 | */ |
1161 | object * |
1206 | static object * |
1162 | find_arrow (object *op, const char *type) |
1207 | find_arrow (object *op, const char *type) |
1163 | { |
1208 | { |
1164 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1209 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1165 | if (tmp->type == ARROW && !strcmp (&tmp->race, type)) |
1210 | if (tmp->type == ARROW && !strcmp (&tmp->race, type)) |
1166 | return splay (tmp); |
1211 | return splay (tmp); |
… | |
… | |
1180 | * Similar to find_arrow, but looks for (roughly) the best arrow to use |
1225 | * Similar to find_arrow, but looks for (roughly) the best arrow to use |
1181 | * against the target. A full test is not performed, simply a basic test |
1226 | * against the target. A full test is not performed, simply a basic test |
1182 | * of resistances. The archer is making a quick guess at what he sees down |
1227 | * of resistances. The archer is making a quick guess at what he sees down |
1183 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1228 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1184 | */ |
1229 | */ |
1185 | object * |
1230 | static object * |
1186 | find_better_arrow (object *op, object *target, shstr_cmp type, int *better) |
1231 | find_better_arrow (object *op, object *target, shstr_cmp type, int *better) |
1187 | { |
1232 | { |
1188 | object *tmp = NULL, *arrow, *ntmp; |
1233 | object *tmp = NULL, *arrow, *ntmp; |
1189 | int attacknum, attacktype, betterby = 0, i; |
1234 | int attacknum, attacktype, betterby = 0, i; |
1190 | |
1235 | |
… | |
… | |
1259 | * find_better_arrow to find a decent arrow to use. |
1304 | * find_better_arrow to find a decent arrow to use. |
1260 | * op = the shooter |
1305 | * op = the shooter |
1261 | * type = bow->race |
1306 | * type = bow->race |
1262 | * dir = fire direction |
1307 | * dir = fire direction |
1263 | */ |
1308 | */ |
1264 | object * |
1309 | static object * |
1265 | pick_arrow_target (object *op, shstr_cmp type, int dir) |
1310 | pick_arrow_target (object *op, shstr_cmp type, int dir) |
1266 | { |
1311 | { |
1267 | object *tmp = NULL; |
1312 | object *tmp = NULL; |
1268 | maptile *m; |
1313 | maptile *m; |
1269 | int i, mflags, found, number; |
1314 | int i, mflags, found, number; |
… | |
… | |
1484 | * but monsters can't. Putting that code here |
1529 | * but monsters can't. Putting that code here |
1485 | * makes the fire_bow code much cleaner. |
1530 | * makes the fire_bow code much cleaner. |
1486 | * this function should only be called if 'op' is a player, |
1531 | * this function should only be called if 'op' is a player, |
1487 | * hence the function name. |
1532 | * hence the function name. |
1488 | */ |
1533 | */ |
1489 | int |
1534 | static int |
1490 | player_fire_bow (object *op, int dir) |
1535 | player_fire_bow (object *op, int dir) |
1491 | { |
1536 | { |
1492 | int ret; |
1537 | int ret; |
1493 | |
1538 | |
1494 | if (op->contr->bowtype == bow_bestarrow) |
1539 | if (op->contr->bowtype == bow_bestarrow) |
… | |
… | |
1522 | } |
1567 | } |
1523 | |
1568 | |
1524 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1569 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1525 | * Broken apart from 'fire' to keep it more readable. |
1570 | * Broken apart from 'fire' to keep it more readable. |
1526 | */ |
1571 | */ |
1527 | void |
1572 | static void |
1528 | fire_misc_object (object *op, int dir) |
1573 | fire_misc_object (object *op, int dir) |
1529 | { |
1574 | { |
1530 | object *item = op->contr->ranged_ob; |
1575 | object *item = op->contr->ranged_ob; |
1531 | |
1576 | |
1532 | if (!item) |
1577 | if (!item) |
… | |
… | |
1554 | return; |
1599 | return; |
1555 | } |
1600 | } |
1556 | } |
1601 | } |
1557 | else if (item->type == ROD || item->type == HORN) |
1602 | else if (item->type == ROD || item->type == HORN) |
1558 | { |
1603 | { |
1559 | sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); |
1604 | sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace); |
1560 | |
1605 | |
1561 | // using the maximum of the rods charge allows at least one spell cast |
1606 | // using the maximum of the rods charge allows at least one spell cast |
1562 | // for a rod or horn, this fixes some broken rods. |
1607 | // for a rod or horn, this fixes some broken rods. |
1563 | if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) |
1608 | if (item->stats.hp < min (spell_sp, item->stats.maxhp)) |
1564 | { |
1609 | { |
1565 | op->contr->play_sound (sound_find ("wand_poof")); |
1610 | op->contr->play_sound (sound_find ("wand_poof")); |
1566 | |
1611 | |
1567 | if (item->type == ROD) |
1612 | if (item->type == ROD) |
1568 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1613 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
… | |
… | |
1817 | { |
1862 | { |
1818 | --op->speed_left; |
1863 | --op->speed_left; |
1819 | return true; |
1864 | return true; |
1820 | } |
1865 | } |
1821 | |
1866 | |
1822 | int on_battleground; |
|
|
1823 | |
|
|
1824 | sint16 nx = freearr_x[dir] + op->x; |
1867 | sint16 nx = freearr_x[dir] + op->x; |
1825 | sint16 ny = freearr_y[dir] + op->y; |
1868 | sint16 ny = freearr_y[dir] + op->y; |
1826 | |
|
|
1827 | on_battleground = op_on_battleground (op, 0, 0); |
|
|
1828 | |
1869 | |
1829 | if (out_of_map (op->map, nx, ny)) |
1870 | if (out_of_map (op->map, nx, ny)) |
1830 | return false; |
1871 | return false; |
1831 | |
1872 | |
1832 | /* If braced, or can't move to the square, and it is not out of the |
1873 | /* If braced, or can't move to the square, and it is not out of the |
… | |
… | |
1904 | } |
1945 | } |
1905 | else |
1946 | else |
1906 | return false; |
1947 | return false; |
1907 | } |
1948 | } |
1908 | |
1949 | |
|
|
1950 | bool on_battleground = op_on_battleground (op, 0, 0); |
|
|
1951 | |
1909 | /* in certain circumstances, you shouldn't attack friendly |
1952 | /* in certain circumstances, you shouldn't attack friendly |
1910 | * creatures. Note that if you are braced, you can't push |
1953 | * creatures. Note that if you are braced, you can't push |
1911 | * someone, but put it inside this loop so that you won't |
1954 | * someone, but put it inside this loop so that you won't |
1912 | * attack them either. |
1955 | * attack them either. |
1913 | */ |
1956 | */ |
… | |
… | |
1977 | } |
2020 | } |
1978 | |
2021 | |
1979 | bool |
2022 | bool |
1980 | move_player (object *op, int dir) |
2023 | move_player (object *op, int dir) |
1981 | { |
2024 | { |
1982 | int pick; |
|
|
1983 | |
|
|
1984 | if (!op->map || op->map->in_memory != MAP_ACTIVE) |
2025 | if (!op->map || op->map->in_memory != MAP_ACTIVE) |
1985 | return 0; |
2026 | return 0; |
1986 | |
2027 | |
1987 | /* Sanity check: make sure dir is valid */ |
2028 | /* Sanity check: make sure dir is valid */ |
1988 | if ((dir < 0) || (dir >= 9)) |
2029 | if (dir < 0 || dir >= 9) |
1989 | { |
2030 | { |
1990 | LOG (llevError, "move_player: invalid direction %d\n", dir); |
2031 | LOG (llevError, "move_player: invalid direction %d\n", dir); |
1991 | return 0; |
2032 | return 0; |
1992 | } |
2033 | } |
1993 | |
2034 | |
… | |
… | |
1999 | |
2040 | |
2000 | if (op->flag [FLAG_HIDDEN]) |
2041 | if (op->flag [FLAG_HIDDEN]) |
2001 | do_hidden_move (op); |
2042 | do_hidden_move (op); |
2002 | |
2043 | |
2003 | bool retval; |
2044 | bool retval; |
|
|
2045 | int pick = 0; |
2004 | |
2046 | |
2005 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
2047 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
2006 | retval = RESULT_INT (0); |
2048 | retval = RESULT_INT (0); |
2007 | else if (op->contr->fire_on) |
2049 | else if (op->contr->fire_on) |
2008 | retval = fire (op, dir); |
2050 | retval = fire (op, dir); |
… | |
… | |
2065 | return move_player (op, op->direction); |
2107 | return move_player (op, op->direction); |
2066 | |
2108 | |
2067 | return false; |
2109 | return false; |
2068 | } |
2110 | } |
2069 | |
2111 | |
2070 | int |
2112 | static int |
2071 | save_life (object *op) |
2113 | save_life (object *op) |
2072 | { |
2114 | { |
2073 | if (!QUERY_FLAG (op, FLAG_LIFESAVE)) |
2115 | if (!QUERY_FLAG (op, FLAG_LIFESAVE)) |
2074 | return 0; |
2116 | return 0; |
2075 | |
2117 | |
… | |
… | |
2122 | void |
2164 | void |
2123 | object::drop_unpaid_items () |
2165 | object::drop_unpaid_items () |
2124 | { |
2166 | { |
2125 | if (!flag [FLAG_REMOVED]) |
2167 | if (!flag [FLAG_REMOVED]) |
2126 | ::drop_unpaid_items (inv, this); |
2168 | ::drop_unpaid_items (inv, this); |
2127 | } |
|
|
2128 | |
|
|
2129 | /* |
|
|
2130 | * Returns pointer a static string containing gravestone text |
|
|
2131 | * Moved from apply.c to player.c - player.c is what |
|
|
2132 | * actually uses this function. player.c may not be quite the |
|
|
2133 | * best, a misc file for object actions is probably better, |
|
|
2134 | * but there isn't one in the server directory. |
|
|
2135 | */ |
|
|
2136 | const char * |
|
|
2137 | gravestone_text (object *op) |
|
|
2138 | { |
|
|
2139 | static dynbuf_text buf; |
|
|
2140 | |
|
|
2141 | buf << "---- R.I.P. ----\n\n" |
|
|
2142 | << op->name; |
|
|
2143 | |
|
|
2144 | if (op->type == PLAYER) |
|
|
2145 | buf << " the " << op->contr->title; |
|
|
2146 | |
|
|
2147 | buf << "\n\n"; |
|
|
2148 | |
|
|
2149 | buf << "who was level "; |
|
|
2150 | buf << (sint32)op->level << "\n\n" // OO breakdown |
|
|
2151 | << " when " << (op->contr ? "killed" : "died") << "\n\n"; |
|
|
2152 | |
|
|
2153 | if (op->type == PLAYER) |
|
|
2154 | buf << "by " << op->contr->killer_name () << ".\n\n"; |
|
|
2155 | |
|
|
2156 | { |
|
|
2157 | static char buf2[128]; |
|
|
2158 | time_t now = time (NULL); |
|
|
2159 | strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now)); |
|
|
2160 | buf << buf2; |
|
|
2161 | } |
|
|
2162 | |
|
|
2163 | return buf; |
|
|
2164 | } |
2169 | } |
2165 | |
2170 | |
2166 | void |
2171 | void |
2167 | do_some_living (object *op) |
2172 | do_some_living (object *op) |
2168 | { |
2173 | { |
… | |
… | |
2423 | return; |
2428 | return; |
2424 | |
2429 | |
2425 | dynbuf_text deathtab; |
2430 | dynbuf_text deathtab; |
2426 | |
2431 | |
2427 | /* restore player */ |
2432 | /* restore player */ |
2428 | at = archetype::find ("poisoning"); |
2433 | at = archetype::find (shstr_poisoning); |
2429 | if (object *tmp = present_arch_in_ob (at, op)) |
2434 | if (object *tmp = present_arch_in_ob (at, op)) |
2430 | { |
2435 | { |
2431 | tmp->destroy (); |
2436 | tmp->destroy (); |
2432 | deathtab << "Your body feels cleansed...\r"; |
2437 | deathtab << "Your body feels cleansed...\r"; |
2433 | } |
2438 | } |
2434 | |
2439 | |
2435 | at = archetype::find ("confusion"); |
2440 | at = archetype::find (shstr_confusion); |
2436 | if (object *tmp = present_arch_in_ob (at, op)) |
2441 | if (object *tmp = present_arch_in_ob (at, op)) |
2437 | { |
2442 | { |
2438 | tmp->destroy (); |
2443 | tmp->destroy (); |
2439 | deathtab << "Your mind feels clearer...\r"; |
2444 | deathtab << "Your mind feels clearer...\r"; |
2440 | } |
2445 | } |
… | |
… | |
2467 | if (op_on_battleground (op, &x, &y)) |
2472 | if (op_on_battleground (op, &x, &y)) |
2468 | { |
2473 | { |
2469 | deathtab << "You almost died in combat, but local medics have saved your life...\r"; |
2474 | deathtab << "You almost died in combat, but local medics have saved your life...\r"; |
2470 | |
2475 | |
2471 | /* create a bodypart-trophy to make the winner happy */ |
2476 | /* create a bodypart-trophy to make the winner happy */ |
2472 | if (object *tmp = arch_to_object (archetype::find ("finger"))) |
2477 | object *tmp = archetype::find (shstr_finger)->instance (); |
2473 | { |
2478 | |
2474 | tmp->name = format ("%s's finger" , &op->name); |
2479 | tmp->name = format ("%s's finger" , &op->name); |
2475 | tmp->name_pl = format ("%s's fingers", &op->name); |
2480 | tmp->name_pl = format ("%s's fingers", &op->name); |
2476 | tmp->msg = format ( |
2481 | tmp->msg = format ( |
2477 | "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", |
2482 | "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", |
2478 | &op->name, op->contr->title, |
2483 | &op->name, op->contr->title, |
2479 | (int)op->level, |
2484 | (int)op->level, |
2480 | op->contr->killer_name () |
2485 | op->contr->killer_name () |
2481 | ); |
2486 | ); |
2482 | tmp->value = 0, tmp->type = 0; |
2487 | tmp->value = 0, tmp->type = 0; |
2483 | tmp->materialname = "organics"; |
2488 | tmp->material = name_to_material (shstr_organic); |
2484 | tmp->insert_at (op, tmp); |
2489 | tmp->insert_at (op, tmp); |
2485 | } |
|
|
2486 | |
2490 | |
2487 | /* teleport defeated player to new destination */ |
2491 | /* teleport defeated player to new destination */ |
2488 | transfer_ob (op, x, y, 0, NULL); |
2492 | transfer_ob (op, x, y, 0, NULL); |
2489 | op->contr->braced = 0; |
2493 | op->contr->braced = 0; |
2490 | |
2494 | |
… | |
… | |
2552 | lost_a_stat = 1; |
2556 | lost_a_stat = 1; |
2553 | } |
2557 | } |
2554 | else |
2558 | else |
2555 | { |
2559 | { |
2556 | /* deplete a stat */ |
2560 | /* deplete a stat */ |
2557 | archetype *deparch = archetype::find ("depletion"); |
2561 | archetype *deparch = archetype::find (shstr_depletion); |
2558 | object *dep; |
2562 | object *dep; |
2559 | |
2563 | |
2560 | dep = present_arch_in_ob (deparch, op); |
2564 | dep = present_arch_in_ob (deparch, op); |
2561 | if (!dep) |
2565 | if (!dep) |
2562 | { |
2566 | { |
2563 | dep = arch_to_object (deparch); |
2567 | dep = deparch->instance (); |
2564 | insert_ob_in_ob (dep, op); |
2568 | insert_ob_in_ob (dep, op); |
2565 | } |
2569 | } |
2566 | lose_this_stat = 1; |
2570 | lose_this_stat = 1; |
2567 | if (settings.balanced_stat_loss) |
2571 | if (settings.balanced_stat_loss) |
2568 | { |
2572 | { |
… | |
… | |
2634 | #endif |
2638 | #endif |
2635 | |
2639 | |
2636 | /* Put a gravestone up where the character 'almost' died. List the |
2640 | /* Put a gravestone up where the character 'almost' died. List the |
2637 | * exp loss on the stone. |
2641 | * exp loss on the stone. |
2638 | */ |
2642 | */ |
2639 | tmp = arch_to_object (archetype::find ("gravestone")); |
2643 | tmp = archetype::find (shstr_gravestone)->instance (); |
2640 | tmp->name = format ("%s's gravestone", &op->name); |
2644 | tmp->name = format ("%s's gravestone", &op->name); |
2641 | tmp->name_pl = format ("%s's gravestones", &op->name); |
2645 | tmp->name_pl = format ("%s's gravestones", &op->name); |
2642 | tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", |
2646 | tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", |
2643 | &op->name, op->contr->title, op->contr->killer_name ()); |
2647 | &op->name, op->contr->title, op->contr->killer_name ()); |
2644 | tmp->x = op->x, tmp->y = op->y; |
2648 | tmp->x = op->x, tmp->y = op->y; |
… | |
… | |
2699 | } |
2703 | } |
2700 | |
2704 | |
2701 | op->contr->infobox (MSG_CHANNEL ("death"), deathtab); |
2705 | op->contr->infobox (MSG_CHANNEL ("death"), deathtab); |
2702 | } |
2706 | } |
2703 | |
2707 | |
2704 | void |
2708 | static void |
2705 | loot_object (object *op) |
2709 | loot_object (object *op) |
2706 | { /* Grab and destroy some treasure */ |
2710 | { /* Grab and destroy some treasure */ |
2707 | object *tmp, *tmp2, *next; |
2711 | object *tmp, *tmp2, *next; |
2708 | |
2712 | |
2709 | op->close_container (); /* close open sack first */ |
2713 | op->close_container (); /* close open sack first */ |
… | |
… | |
2740 | * fix_weight(): Check recursively the weight of all players, and fix |
2744 | * fix_weight(): Check recursively the weight of all players, and fix |
2741 | * what needs to be fixed. Refresh windows and fix speed if anything |
2745 | * what needs to be fixed. Refresh windows and fix speed if anything |
2742 | * was changed. |
2746 | * was changed. |
2743 | */ |
2747 | */ |
2744 | void |
2748 | void |
2745 | fix_weight (void) |
2749 | fix_weight () |
2746 | { |
2750 | { |
2747 | for_all_players (pl) |
2751 | for_all_players (pl) |
2748 | { |
2752 | { |
2749 | sint32 old = pl->ob->carrying; |
2753 | sint32 old = pl->ob->carrying; |
2750 | |
2754 | |
… | |
… | |
2757 | } |
2761 | } |
2758 | } |
2762 | } |
2759 | } |
2763 | } |
2760 | |
2764 | |
2761 | void |
2765 | void |
2762 | fix_luck (void) |
2766 | fix_luck () |
2763 | { |
2767 | { |
2764 | for_all_players (pl) |
2768 | for_all_players (pl) |
2765 | if (!pl->ob->contr->ns->state) |
2769 | if (!pl->ob->contr->ns->state) |
2766 | pl->ob->change_luck (0); |
2770 | pl->ob->change_luck (0); |
2767 | } |
2771 | } |
… | |
… | |
3011 | } |
3015 | } |
3012 | |
3016 | |
3013 | return 0; |
3017 | return 0; |
3014 | } |
3018 | } |
3015 | |
3019 | |
3016 | /* routine for both players and monsters. We call this when |
|
|
3017 | * there is a possibility for our action distrubing our hiding |
|
|
3018 | * place or invisiblity spell. Artefact invisiblity causes |
|
|
3019 | * "noise" instead. If we arent invisible to begin with, we |
|
|
3020 | * return 0. |
|
|
3021 | */ |
|
|
3022 | int |
|
|
3023 | action_makes_visible (object *op) |
|
|
3024 | { |
|
|
3025 | if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) |
|
|
3026 | { |
|
|
3027 | if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) |
|
|
3028 | { |
|
|
3029 | // artefact invisibility is permanent, but we still make noise |
|
|
3030 | // this is important for game-balance. |
|
|
3031 | if (op->contr) |
|
|
3032 | op->make_noise (); |
|
|
3033 | |
|
|
3034 | return 0; |
|
|
3035 | } |
|
|
3036 | |
|
|
3037 | if (op->contr && op->contr->tmp_invis == 0) |
|
|
3038 | return 0; |
|
|
3039 | |
|
|
3040 | /* If monsters, they should become visible */ |
|
|
3041 | if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis)) |
|
|
3042 | { |
|
|
3043 | new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible"); |
|
|
3044 | return 1; |
|
|
3045 | } |
|
|
3046 | } |
|
|
3047 | |
|
|
3048 | return 0; |
|
|
3049 | } |
|
|
3050 | |
|
|
3051 | /* op_on_battleground - checks if the given object op (usually |
3020 | /* op_on_battleground - checks if the given object op (usually |
3052 | * a player) is standing on a valid battleground-tile, |
3021 | * a player) is standing on a valid battleground-tile, |
3053 | * function returns TRUE/FALSE. If true x, y returns the battleground |
3022 | * function returns TRUE/FALSE. If true x, y returns the battleground |
3054 | * -exit-coord. (and if x, y not NULL) |
3023 | * -exit-coord. (and if x, y not NULL) |
3055 | * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set |
3024 | * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set |
… | |
… | |
3074 | && tmp->name == shstr_battleground |
3043 | && tmp->name == shstr_battleground |
3075 | && EXIT_X (tmp) && EXIT_Y (tmp)) |
3044 | && EXIT_X (tmp) && EXIT_Y (tmp)) |
3076 | { |
3045 | { |
3077 | /* before we assign the exit, check if this is a teambattle */ |
3046 | /* before we assign the exit, check if this is a teambattle */ |
3078 | if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) |
3047 | if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) |
3079 | { |
|
|
3080 | for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) |
3048 | for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) |
|
|
3049 | if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying) |
3081 | { |
3050 | { |
3082 | if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying) |
|
|
3083 | { |
|
|
3084 | if (x && y) |
3051 | if (x && y) |
3085 | *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); |
3052 | *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); |
3086 | |
3053 | |
3087 | return 1; |
3054 | return 1; |
3088 | } |
|
|
3089 | } |
3055 | } |
3090 | } |
|
|
3091 | |
3056 | |
3092 | if (x && y) |
3057 | if (x && y) |
3093 | *x = EXIT_X (tmp), *y = EXIT_Y (tmp); |
3058 | *x = EXIT_X (tmp), *y = EXIT_Y (tmp); |
3094 | |
3059 | |
3095 | return 1; |
3060 | return 1; |
… | |
… | |
3252 | new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); |
3217 | new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); |
3253 | } |
3218 | } |
3254 | else |
3219 | else |
3255 | { |
3220 | { |
3256 | /* generate misc. treasure */ |
3221 | /* generate misc. treasure */ |
3257 | tmp = arch_to_object (tr->item); |
3222 | tmp = tr->item->instance (); |
3258 | new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); |
3223 | new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); |
3259 | who->insert (tmp); |
3224 | who->insert (tmp); |
3260 | } |
3225 | } |
3261 | } |
3226 | } |
3262 | |
3227 | |
… | |
… | |
3275 | |
3240 | |
3276 | if (pl->ranged_ob == ob) |
3241 | if (pl->ranged_ob == ob) |
3277 | pl->ranged_ob = 0; |
3242 | pl->ranged_ob = 0; |
3278 | } |
3243 | } |
3279 | |
3244 | |
|
|
3245 | //-GPL |
|
|
3246 | |
3280 | sint8 |
3247 | sint8 |
3281 | player::darkness_at (maptile *map, int x, int y) const |
3248 | player::darkness_at (maptile *map, int x, int y) const |
3282 | { |
3249 | { |
3283 | if (!ns) |
3250 | if (!ns) |
3284 | return LOS_BLOCKED; |
3251 | return LOS_BLOCKED; |