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.104 by root, Fri Feb 16 19:43:41 2007 UTC vs.
Revision 1.171 by root, Sat Sep 8 07:06:51 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <pwd.h>
27#include <sproto.h> 25#include <sproto.h>
28#include <sounds.h> 26#include <sounds.h>
29#include <living.h> 27#include <living.h>
30#include <object.h> 28#include <object.h>
31#include <spells.h> 29#include <spells.h>
… …
124 continue; 122 continue;
125 123
126 if (*buf == '%') 124 if (*buf == '%')
127 { /* send one news */ 125 { /* send one news */
128 if (size > 0) 126 if (size > 0)
129 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
130 128
131 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
132 strip_endline (subject); 130 strip_endline (subject);
133 size = 0; 131 size = 0;
134 news[0] = '\0'; 132 news[0] = '\0';
… …
144 size += strlen (buf); 142 size += strlen (buf);
145 } 143 }
146 } 144 }
147 145
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
151} 149}
152 150
153/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
154static void 152static void
155set_first_map (object *op) 153set_first_map (object *op)
156{ 154{
157 op->contr->maplevel = first_map_path; 155 op->contr->maplevel = first_map_path;
158 op->x = -1; 156 op->x = -1;
159 op->y = -1; 157 op->y = -1;
160}
161
162void
163player::enter_map ()
164{
165 object *tmp = object::create ();
166
167 EXIT_PATH (tmp) = maplevel;
168 EXIT_X (tmp) = ob->x;
169 EXIT_Y (tmp) = ob->y;
170 ob->enter_exit (tmp);
171
172 tmp->destroy ();
173} 158}
174 159
175void 160void
176player::activate () 161player::activate ()
177{ 162{
… …
182 ob->remove (); 167 ob->remove ();
183 ob->map = 0; 168 ob->map = 0;
184 ob->activate_recursive (); 169 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY); 170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob); 171 add_friendly_object (ob);
187 enter_map ();
188} 172}
189 173
190void 174void
191player::deactivate () 175player::deactivate ()
192{ 176{
… …
194 return; 178 return;
195 179
196 terminate_all_pets (ob); 180 terminate_all_pets (ob);
197 remove_friendly_object (ob); 181 remove_friendly_object (ob);
198 ob->deactivate_recursive (); 182 ob->deactivate_recursive ();
183
184 if (ob->map)
199 maplevel = ob->map->path; 185 maplevel = ob->map->path;
186
200 ob->remove (); 187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
201 ob->map = 0; 189 ob->map = 0;
202 party = 0; 190 party = 0;
203 191
204 // for weird reasons, this is often "ob", keeping a circular reference 192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
205 ranges [range_skill] = 0;
206 193
207 players.erase (this); 194 players.erase (this);
208} 195}
209 196
210// connect the player with a specific client 197// connect the player with a specific client
211// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
212void 199void
213player::connect (client *ns) 200player::connect (client *ns)
214{ 201{
215 this->ns = ns; 202 this->ns = ns;
216 ns->pl = this; 203 ns->pl = this;
… …
220 ob->close_container (); //TODO: client-specific 207 ob->close_container (); //TODO: client-specific
221 208
222 ns->update_look = 0; 209 ns->update_look = 0;
223 ns->look_position = 0; 210 ns->look_position = 0;
224 211
225 clear_los (ob); 212 clear_los (this);
226 213
227 ns->reset_stats (); 214 ns->reset_stats ();
228 215
229 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
230 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
231 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
232
233 if (!legal_range (ob, shoottype))
234 shoottype = range_none;
235 219
236 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
237 link_player_skills (ob); 221 link_player_skills (ob);
238 222
239 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
240 224
241 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
242 226
243 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
244 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
245 { 229 {
246 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
247 231
248 shstr_cmp dragon_ability_force ("dragon_ability_force");
249 shstr_cmp dragon_skin_force ("dragon_skin_force");
250
251 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
252 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
253 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
254 abil = tmp; 235 abil = tmp;
255 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
256 skin = tmp; 237 skin = tmp;
257 238
258 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
259 } 240 }
260 241
261 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
262 243
263 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
264 245
246 ob->flag [FLAG_READY_WEAPON] = false;
247 ob->flag [FLAG_READY_SKILL] = false;
248 ob->flag [FLAG_READY_BOW] = false;
249
250 for (object *op = ob->inv; op; op = op->below)
251 if (op->flag [FLAG_APPLIED])
252 switch (op->type)
253 {
254 case SKILL:
255 ob->flag [FLAG_APPLIED] = false;
256 break;
257
258 case WAND:
259 case ROD:
260 case HORN:
261 case BOW:
262 ranged_ob = op;
263 break;
264
265 case WEAPON:
266 combat_ob = op;
267 break;
268 }
269
270 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
265 ob->update_stats (); 271 ob->update_stats ();
272
266 ns->floorbox_update (); 273 ns->floorbox_update ();
267
268 esrv_send_inventory (ob, ob); 274 esrv_send_inventory (ob, ob);
269 esrv_add_spells (this, 0); 275 esrv_add_spells (this, 0);
270 276
271 activate (); 277 activate ();
272 278
… …
279} 285}
280 286
281void 287void
282player::disconnect () 288player::disconnect ()
283{ 289{
290 if (ob)
291 {
292 ob->close_container (); //TODO: client-specific
293 ob->drop_unpaid_items ();
294 }
295
284 if (ns) 296 if (ns)
285 { 297 {
286 if (active) 298 if (active)
287 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 299 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
288 300
289 INVOKE_PLAYER (DISCONNECT, this); 301 INVOKE_PLAYER (DISCONNECT, this);
290 302
291 ns->reset_stats (); 303 ns->reset_stats ();
292 ns->pl = 0; 304 ns->pl = 0;
293 this->ns = 0; 305 ns = 0;
294 } 306 }
295 307
296 ob->close_container (); //TODO: client-specific 308 observe = ob;
309
297 deactivate (); 310 deactivate ();
298} 311}
299 312
300// the need for this function can be explained 313// the need for this function can be explained
301// by load_object not returning the object 314// by load_object not returning the object
302void 315void
303player::set_object (object *op) 316player::set_object (object *op)
304{ 317{
305 ob = op; 318 ob = observe = op;
306 ob->contr = this; /* this aren't yet in archetype */ 319 ob->contr = this; /* this aren't yet in archetype */
307 320
308 ob->speed_left = 0.5;
309 ob->speed = 1.0; 321 ob->speed = 1.0f;
322 ob->speed_left = 0.5f;
323
310 ob->direction = 5; /* So player faces south */ 324 ob->direction = 5; /* So player faces south */
325}
326
327void
328player::set_observe (object *op)
329{
330 observe = op ? op : ob;
331 do_los = 1;
311} 332}
312 333
313player::player () 334player::player ()
314{ 335{
315 /* There are some elements we want initialised to non zero value - 336 /* There are some elements we want initialised to non zero value -
316 * we deal with that below this point. 337 * we deal with that below this point.
317 */ 338 */
318 outputs_sync = 16; /* Every 2 seconds */ 339 outputs_sync = 4;
319 outputs_count = 8; /* Keeps present behaviour */ 340 outputs_count = 4;
320 unapply = unapply_nochoice; 341 unapply = unapply_nochoice;
321 342
322 savebed_map = first_map_path; /* Init. respawn position */ 343 savebed_map = first_map_path; /* Init. respawn position */
323 344
324 gen_sp_armour = 10; 345 gen_sp_armour = 10;
325 shoottype = range_none;
326 bowtype = bow_normal; 346 bowtype = bow_normal;
327 petmode = pet_normal; 347 petmode = pet_normal;
328 listening = 10; 348 listening = 10;
329 usekeys = containers; 349 usekeys = containers;
330 peaceful = 1; /* default peaceful */ 350 peaceful = 1; /* default peaceful */
331 do_los = 1; 351 do_los = 1;
352
353 weapon_sp = 1.0f;
354 weapon_sp_left = 0.5f;
332} 355}
333 356
334void 357void
335player::do_destroy () 358player::do_destroy ()
336{ 359{
… …
341 if (ob) 364 if (ob)
342 { 365 {
343 ob->destroy_inv (false); 366 ob->destroy_inv (false);
344 ob->destroy (); 367 ob->destroy ();
345 } 368 }
369
370 ob = observe = 0;
346} 371}
347 372
348player::~player () 373player::~player ()
349{ 374{
350 /* Clear item stack */ 375 /* Clear item stack */
… …
377 * Note: there MUST be at least one player archetype! 402 * Note: there MUST be at least one player archetype!
378 */ 403 */
379archetype * 404archetype *
380get_player_archetype (archetype *at) 405get_player_archetype (archetype *at)
381{ 406{
382 archetype *start = at; 407 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
383 408
384 for (;;) 409 for (;;)
385 { 410 {
386 if (at == NULL || at->next == NULL) 411 if (++i == archetypes.end ())
387 at = first_archetype; 412 i = archetypes.begin ();
388 else 413 else if (*i == at)
389 at = at->next; 414 cleanup ("not a single player archetype found");
390 415
391 if (at->clone.type == PLAYER) 416 if ((*i)->type == PLAYER)
392 return at; 417 return *i;
393
394 if (at == start)
395 {
396 LOG (llevError, "No Player archetypes\n");
397 exit (-1);
398 }
399 } 418 }
400} 419}
401 420
402object * 421object *
403get_nearest_player (object *mon) 422get_nearest_player (object *mon)
… …
407 unsigned lastdist; 426 unsigned lastdist;
408 rv_vector rv; 427 rv_vector rv;
409 428
410 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 429 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
411 { 430 {
412 /* We should not find free objects on this friendly list, but it
413 * does periodically happen. Given that, lets deal with it.
414 * While unlikely, it is possible the next object on the friendly
415 * list is also free, so encapsulate this in a while loop.
416 */
417 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
418 {
419 object *tmp = ol->ob;
420
421 /* Can't do much more other than log the fact, because the object
422 * itself will have been cleared.
423 */
424 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
425 tmp->debug_desc ());
426 ol = ol->next;
427 remove_friendly_object (tmp);
428 if (!ol)
429 return op;
430 }
431
432 /* Remove special check for player from this. First, it looks to cause
433 * some crashes (ol->ob->contr not set properly?), but secondly, a more
434 * complicated method of state checking would be needed in any case -
435 * as it was, a clever player could type quit, and the function would
436 * skip them over while waiting for confirmation. Remove
437 * on_same_map check, as can_detect_enemy also does this
438 */
439 if (!can_detect_enemy (mon, ol->ob, &rv)) 431 if (!can_detect_enemy (mon, ol->ob, &rv))
440 continue; 432 continue;
441 433
442 if (lastdist > rv.distance) 434 if (lastdist > rv.distance)
443 { 435 {
… …
769} 761}
770 762
771void 763void
772object::roll_stats () 764object::roll_stats ()
773{ 765{
774 int statsort [7]; 766 int statsort [NUM_STATS];
775 767
776 for (;;) 768 for (;;)
777 { 769 {
778 int sum = 0; 770 int sum = 0;
779 for (int i = 7; i--; ) 771 for (int i = NUM_STATS; i--; )
780 sum += statsort [i] = roll_stat (); 772 sum += statsort [i] = roll_stat ();
781 773
782 if (sum >= 82 && sum <= 116) 774 if (sum >= 82 && sum <= 116)
783 break; 775 break;
784 } 776 }
785 777
786 // Sort the stats so that rerolling is easier... 778 // Sort the stats so that rerolling is easier...
787 std::sort (statsort, statsort + 7, std::greater<int>()); 779 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
788 780
781 for (int i = 0; i < NUM_STATS; ++i)
789 stats.Str = statsort[0]; 782 stats.stat (i) = statsort [i];
790 stats.Dex = statsort[1];
791 stats.Con = statsort[2];
792 stats.Int = statsort[3];
793 stats.Wis = statsort[4];
794 stats.Pow = statsort[5];
795 stats.Cha = statsort[6];
796 783
797 stats.exp = 0; 784 stats.exp = 0;
798 stats.ac = 0; 785 stats.ac = 0;
799 786
800 stats.hp = stats.maxhp; 787 stats.hp = stats.maxhp;
… …
812} 799}
813 800
814void 801void
815object::swap_stats (int a, int b) 802object::swap_stats (int a, int b)
816{ 803{
817 int tmp = get_attr_value (&contr->orig_stats, a); 804 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
818 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
819 set_attr_value (&contr->orig_stats, b, tmp);
820 805
806 for (int i = 0; i < NUM_STATS; ++i)
821 stats.Str = contr->orig_stats.Str; 807 stats.stat (i) = contr->orig_stats.stat (i);
822 stats.Dex = contr->orig_stats.Dex;
823 stats.Con = contr->orig_stats.Con;
824 stats.Int = contr->orig_stats.Int;
825 stats.Wis = contr->orig_stats.Wis;
826 stats.Pow = contr->orig_stats.Pow;
827 stats.Cha = contr->orig_stats.Cha;
828 808
829 //TODO: the following code looks so borked and should, at the very least, 809 //TODO: the following code looks so borked and should, at the very least,
830 // be merged with the similar code in roll_stats 810 // be merged with the similar code in roll_stats
831 stats.ac = 0; 811 stats.ac = 0;
832 812
… …
863 * appropriate action with it (change race, or other things). 843 * appropriate action with it (change race, or other things).
864 * The function name is for historical reasons - now we have 844 * The function name is for historical reasons - now we have
865 * separate race and class; this actually changes the RACE, 845 * separate race and class; this actually changes the RACE,
866 * not the class. 846 * not the class.
867 */ 847 */
868int 848void
869key_change_class (object *op, char key) 849player::chargen_race_done ()
870{ 850{
871 int tmp_loop;
872
873 if (key == 'd' || key == 'D')
874 {
875 char buf[MAX_BUF];
876
877 /* this must before then initial items are given */ 851 /* this must before then initial items are given */
878 esrv_new_player (op->contr, op->weight + op->carrying); 852 esrv_new_player (ob->contr, ob->weight + ob->carrying);
879 853
880 treasurelist *tl = find_treasurelist ("starting_wealth"); 854 treasurelist *tl = treasurelist::find ("starting_wealth");
881 if (tl) 855 if (tl)
882 create_treasure (tl, op, 0, 0, 0); 856 create_treasure (tl, ob, 0, 0, 0);
883 857
884 INVOKE_PLAYER (BIRTH, op->contr); 858 INVOKE_PLAYER (BIRTH, ob->contr);
885 INVOKE_PLAYER (LOGIN, op->contr); 859 INVOKE_PLAYER (LOGIN, ob->contr);
886 860
887 op->contr->ns->state = ST_PLAYING; 861 ob->contr->ns->state = ST_PLAYING;
888 862
889 if (op->msg) 863 if (ob->msg)
890 op->msg = NULL; 864 ob->msg = 0;
891 865
892 /* We create this now because some of the unique maps will need it 866 /* We create this now because some of the unique maps will need it
893 * to save here. 867 * to save here.
894 */ 868 */
869 {
870 char buf[MAX_BUF];
895 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 871 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
896 make_path_to_file (buf); 872 make_path_to_file (buf);
873 }
897 874
898 start_info (op); 875 start_info (ob);
899 CLEAR_FLAG (op, FLAG_WIZ); 876 CLEAR_FLAG (ob, FLAG_WIZ);
900 give_initial_items (op, op->randomitems); 877 give_initial_items (ob, ob->randomitems);
901 link_player_skills (op); 878 link_player_skills (ob);
902 esrv_send_inventory (op, op); 879 esrv_send_inventory (ob, ob);
903 op->update_stats (); 880 ob->update_stats ();
904 881
905 /* This moves the player to a different start map, if there 882 /* This moves the player to a different start map, if there
906 * is one for this race 883 * is one for this race
907 */ 884 */
908 if (*first_map_ext_path) 885 if (*first_map_ext_path)
909 { 886 {
910 object *tmp; 887 object *tmp;
911 char mapname[MAX_BUF]; 888 char mapname[MAX_BUF];
912 889
913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 890 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
914 tmp = object::create (); 891 tmp = object::create ();
915 EXIT_PATH (tmp) = mapname; 892 EXIT_PATH (tmp) = mapname;
916 EXIT_X (tmp) = op->x; 893 EXIT_X (tmp) = ob->x;
917 EXIT_Y (tmp) = op->y; 894 EXIT_Y (tmp) = ob->y;
918 op->enter_exit (tmp); /* we don't really care if it succeeded; 895 ob->enter_exit (tmp); /* we don't really care if it succeeded;
919 * if the map isn't there, then stay on the 896 * if the map isn't there, then stay on the
920 * default initial map */ 897 * default initial map */
921 tmp->destroy (); 898 tmp->destroy ();
922 } 899 }
923 else 900 else
924 LOG (llevDebug, "first_map_ext_path not set\n"); 901 LOG (llevDebug, "first_map_ext_path not set\n");
902}
925 903
926 return 0; 904void
927 } 905player::chargen_race_next ()
928 906{
929 /* Following actually changes the race - this is the default command 907 /* Following actually changes the race - this is the default command
930 * if we don't match with one of the options above. 908 * if we don't match with one of the options above.
931 */ 909 */
932 910
933 tmp_loop = 0; 911 do
934 while (!tmp_loop)
935 { 912 {
936 shstr name = op->name; 913 shstr name = ob->name;
937 int x = op->x, y = op->y; 914 int x = ob->x, y = ob->y;
938 915
939 op->remove_statbonus (); 916 ob->remove_statbonus ();
940 op->remove (); 917 ob->remove ();
941 op->arch = get_player_archetype (op->arch); 918 ob->arch = get_player_archetype (ob->arch);
942 op->arch->clone.copy_to (op); 919 ob->arch->copy_to (ob);
943 op->instantiate (); 920 ob->instantiate ();
944 op->stats = op->contr->orig_stats; 921 ob->stats = ob->contr->orig_stats;
945 op->name = op->name_pl = name; 922 ob->name = ob->name_pl = name;
946 op->x = x; 923 ob->x = x;
947 op->y = y; 924 ob->y = y;
948 SET_ANIMATION (op, 2); /* So player faces south */ 925 SET_ANIMATION (ob, 2); /* So player faces south */
949 insert_ob_in_map (op, op->map, op, 0); 926 insert_ob_in_map (ob, ob->map, ob, 0);
950 assign (op->contr->title, op->arch->clone.name); 927 assign (ob->contr->title, ob->arch->object::name);
951 op->add_statbonus (); 928 ob->add_statbonus ();
952 tmp_loop = allowed_class (op);
953 } 929 }
930 while (!allowed_class (ob));
954 931
955 update_object (op, UP_OBJ_FACE); 932 update_object (ob, UP_OBJ_FACE);
956 esrv_update_item (UPD_FACE, op, op); 933 esrv_update_item (UPD_FACE, ob, ob);
957 op->update_stats (); 934 ob->update_stats ();
958 op->stats.hp = op->stats.maxhp; 935 ob->stats.hp = ob->stats.maxhp;
959 op->stats.sp = op->stats.maxsp; 936 ob->stats.sp = ob->stats.maxsp;
960 op->stats.grace = 0; 937 ob->stats.grace = 0;
961
962 if (op->msg)
963 new_draw_info (NDI_BLUE, 0, op, op->msg);
964
965 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
966 return 0;
967} 938}
968 939
969void 940void
970flee_player (object *op) 941flee_player (object *op)
971{ 942{
… …
1018 /* Cornered, get rid of scared */ 989 /* Cornered, get rid of scared */
1019 CLEAR_FLAG (op, FLAG_SCARED); 990 CLEAR_FLAG (op, FLAG_SCARED);
1020 op->enemy = NULL; 991 op->enemy = NULL;
1021} 992}
1022 993
1023
1024/* check_pick sees if there is stuff to be picked up/picks up stuff. 994/* check_pick sees if there is stuff to be picked up/picks up stuff.
1025 * IT returns 1 if the player should keep on moving, 0 if he should 995 * It returns 1 if the player should keep on moving, 0 if he should
1026 * stop. 996 * stop.
1027 */ 997 */
1028int 998int
1029check_pick (object *op) 999check_pick (object *op)
1030{ 1000{
1031 object *tmp, *next; 1001 object *tmp, *next;
1032 int stop = 0; 1002 int stop = 0;
1033 int j, k, wvratio; 1003 int wvratio;
1034 char putstring[128], tmpstr[16]; 1004 char putstring[128];
1035 1005
1036 /* if you're flying, you cna't pick up anything */ 1006 /* if you're flying, you cna't pick up anything */
1037 if (op->move_type & MOVE_FLYING) 1007 if (op->move_type & MOVE_FLYING)
1038 return 1; 1008 return 1;
1039 1009
… …
1107 if (tmp->name != NULL) 1077 if (tmp->name != NULL)
1108 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1078 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1109 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1079 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1110 else 1080 else
1111 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1081 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1112 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1082 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1113 1083
1114 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1084 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1115 } 1085 }
1116 1086
1117 /* philosophy: 1087 /* philosophy:
… …
1192 pick_up (op, tmp); 1162 pick_up (op, tmp);
1193 continue; 1163 continue;
1194 } 1164 }
1195 1165
1196 if (op->contr->mode & PU_READABLES) 1166 if (op->contr->mode & PU_READABLES)
1197 if (tmp->type == BOOK || tmp->type == SCROLL) 1167 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1198 { 1168 {
1199 pick_up (op, tmp); 1169 pick_up (op, tmp);
1200 continue; 1170 continue;
1201 } 1171 }
1202 1172
… …
1310 /* careful: chairs and tables are weapons! */ 1280 /* careful: chairs and tables are weapons! */
1311 if (op->contr->mode & PU_ALLWEAPON) 1281 if (op->contr->mode & PU_ALLWEAPON)
1312 { 1282 {
1313 if (tmp->type == WEAPON && tmp->name != NULL) 1283 if (tmp->type == WEAPON && tmp->name != NULL)
1314 { 1284 {
1315 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1285 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1316 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1286 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1317 { 1287 {
1318 pick_up (op, tmp); 1288 pick_up (op, tmp);
1319 continue; 1289 continue;
1320 } 1290 }
1321 } 1291 }
1322 1292
1323 if (tmp->type == WEAPON && tmp->name == NULL) 1293 if (tmp->type == WEAPON && tmp->name == NULL)
1324 { 1294 {
1325 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1295 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1326 { 1296 {
1327 pick_up (op, tmp); 1297 pick_up (op, tmp);
1328 continue; 1298 continue;
1329 } 1299 }
1330 } 1300 }
… …
1355 if (tmp->name != NULL) 1325 if (tmp->name != NULL)
1356 { 1326 {
1357 fprintf (stderr, "%s", tmp->name); 1327 fprintf (stderr, "%s", tmp->name);
1358 } 1328 }
1359 else 1329 else
1360 fprintf (stderr, "%s", tmp->arch->name); 1330 fprintf (stderr, "%s", tmp->arch->archname);
1361 fprintf (stderr, ",%d] = ", tmp->type); 1331 fprintf (stderr, ",%d] = ", tmp->type);
1362 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1332 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1363#endif 1333#endif
1364 continue; 1334 continue;
1365 } 1335 }
… …
1435 else 1405 else
1436 { 1406 {
1437 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1407 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1438 { 1408 {
1439 attacktype = 1 << attacknum; 1409 attacktype = 1 << attacknum;
1440 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1410 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1441 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1411 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1442 { 1412 {
1443 tmp = arrow; 1413 tmp = arrow;
1444 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1414 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1445 } 1415 }
1446 } 1416 }
1447 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1417 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1448 { 1418 {
1449 tmp = arrow; 1419 tmp = arrow;
… …
1468 * find_better_arrow to find a decent arrow to use. 1438 * find_better_arrow to find a decent arrow to use.
1469 * op = the shooter 1439 * op = the shooter
1470 * type = bow->race 1440 * type = bow->race
1471 * dir = fire direction 1441 * dir = fire direction
1472 */ 1442 */
1473
1474object * 1443object *
1475pick_arrow_target (object *op, const char *type, int dir) 1444pick_arrow_target (object *op, const char *type, int dir)
1476{ 1445{
1477 object *tmp = NULL; 1446 object *tmp = NULL;
1478 maptile *m; 1447 maptile *m;
… …
1543 */ 1512 */
1544int 1513int
1545fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1514fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1546{ 1515{
1547 object *left, *bow; 1516 object *left, *bow;
1548 int bowspeed, mflags; 1517 int mflags;
1549 maptile *m; 1518 maptile *m;
1550 1519
1551 if (!dir) 1520 if (!dir)
1552 { 1521 {
1553 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1522 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1554 return 0; 1523 return 0;
1555 } 1524 }
1556 1525
1557 if (op->type == PLAYER) 1526 if (op->contr)
1558 bow = op->contr->ranges[range_bow]; 1527 bow = op->current_weapon;
1559 else 1528 else
1560 { 1529 {
1561 for (bow = op->inv; bow; bow = bow->below) 1530 for (bow = op->inv; bow; bow = bow->below)
1562 /* Don't check for applied - monsters don't apply bows - in that way, they 1531 /* Don't check for applied - monsters don't apply bows - in that way, they
1563 * don't need to switch back and forth between bows and weapons. 1532 * don't need to switch back and forth between bows and weapons.
… …
1568 if (!bow) 1537 if (!bow)
1569 { 1538 {
1570 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1539 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1571 return 0; 1540 return 0;
1572 } 1541 }
1542
1543 // optimisation: move object to top so we will find it quickly again
1544 if (bow->below)
1545 {
1546 bow->remove ();
1547 op->insert (bow);
1548 }
1549
1573 } 1550 }
1574 1551
1575 if (!bow->race || !bow->skill) 1552 if (!bow->race || !bow->skill)
1576 { 1553 {
1577 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1554 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1578 return 0; 1555 return 0;
1579 } 1556 }
1580
1581 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1582
1583 /* penalize ROF for bestarrow */
1584 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1585 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1586
1587 if (bowspeed < 1)
1588 bowspeed = 1;
1589 1557
1590 if (arrow == NULL) 1558 if (arrow == NULL)
1591 { 1559 {
1592 if ((arrow = find_arrow (op, bow->race)) == NULL) 1560 if ((arrow = find_arrow (op, bow->race)) == NULL)
1593 { 1561 {
1594 if (op->type == PLAYER) 1562 if (op->type == PLAYER)
1595 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1563 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1596 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1564 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1597 else 1565 else
1598 CLEAR_FLAG (op, FLAG_READY_BOW); 1566 CLEAR_FLAG (op, FLAG_READY_BOW);
1567
1599 return 0; 1568 return 0;
1600 } 1569 }
1601 } 1570 }
1602 1571
1603 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1572 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1627 1596
1628 arrow->set_owner (op); 1597 arrow->set_owner (op);
1629 arrow->skill = bow->skill; 1598 arrow->skill = bow->skill;
1630 arrow->direction = dir; 1599 arrow->direction = dir;
1631 1600
1601 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1602 arrow->stats.hp = arrow->stats.dam;
1603 arrow->stats.grace = arrow->attacktype;
1604
1605 if (arrow->slaying)
1606 arrow->spellarg = strdup (arrow->slaying);
1607
1608#if 0
1609 if (player *pl = op->contr)
1610 {
1611 float speed = pl->weapon_sp;
1612
1613 /* penalize ROF for bestarrow */
1614 if (pl->bowtype == bow_bestarrow)
1615 speed *= .9f;
1616 else
1617 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1618
1619 op->speed_left += speed - op->speed;
1620 }
1621#endif
1622
1623 SET_ANIMATION (arrow, arrow->direction);
1624
1625 /* update the speed */
1626 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1627 + bow->stats.dam / 7.f;
1628
1629 arrow->set_speed (max (arrow->speed, 2.f));
1630 arrow->speed_left = 0;
1631
1632 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1633
1632 if (op->type == PLAYER) 1634 if (op->type == PLAYER)
1633 { 1635 {
1634 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1635 op->update_stats ();
1636 }
1637
1638 SET_ANIMATION (arrow, arrow->direction);
1639 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1640 arrow->stats.hp = arrow->stats.dam;
1641 arrow->stats.grace = arrow->attacktype;
1642 if (arrow->slaying != NULL)
1643 arrow->spellarg = strdup (arrow->slaying);
1644
1645 /* Note that this was different for monsters - they got their level
1646 * added to the damage. I think the strength bonus is more proper.
1647 */
1648
1649 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1650
1651 /* update the speed */
1652 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1653 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1654
1655 arrow->set_speed (max (arrow->speed, 1.0));
1656 arrow->speed_left = 0;
1657
1658 if (op->type == PLAYER)
1659 {
1660 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1661 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1662 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1663
1664 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1636 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1637 wc -= dex_bonus[op->stats.Dex];
1638
1639 if (!arrow->slaying)
1640 arrow->slaying = op->slaying;
1641
1642 arrow->attacktype |= op->attacktype;
1665 } 1643 }
1666 else 1644 else
1667 { 1645 {
1668 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1669 arrow->level = op->level; 1646 arrow->level = op->level;
1670 } 1647 arrow->stats.wc -= bow->magic;
1671 1648
1672 if (arrow->attacktype == AT_PHYSICAL) 1649 if (!arrow->slaying)
1650 arrow->slaying = bow->slaying;
1651
1673 arrow->attacktype |= bow->attacktype; 1652 arrow->attacktype |= bow->attacktype;
1653 }
1674 1654
1675 if (bow->slaying) 1655 wc -= arrow->level;
1676 arrow->slaying = bow->slaying; 1656 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1677 1657
1658 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1678 arrow->move_type = MOVE_FLY_LOW; 1659 arrow->move_type = MOVE_FLY_LOW;
1679 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1660 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1680 1661
1681 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1662 op->play_sound (sound_find ("fire_arrow"));
1682 m->insert (arrow, sx, sy, op); 1663 m->insert (arrow, sx, sy, op);
1683 1664
1684 if (!arrow->destroyed ()) 1665 if (!arrow->destroyed ())
1685 move_arrow (arrow); 1666 move_arrow (arrow);
1686 1667
… …
1707{ 1688{
1708 int ret = 0, wcmod = 0; 1689 int ret = 0, wcmod = 0;
1709 1690
1710 if (op->contr->bowtype == bow_bestarrow) 1691 if (op->contr->bowtype == bow_bestarrow)
1711 { 1692 {
1712 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1693 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1713 } 1694 }
1714 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1695 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1715 { 1696 {
1716 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1697 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1717 wcmod = -1; 1698 wcmod = -1;
… …
1727 else if (op->contr->bowtype == bow_spreadshot) 1708 else if (op->contr->bowtype == bow_spreadshot)
1728 { 1709 {
1729 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1710 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1730 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1711 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1731 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1712 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1732
1733 } 1713 }
1734 else 1714 else
1735 { 1715 {
1736 /* Simple case */ 1716 /* Simple case */
1737 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1717 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1738 } 1718 }
1719
1739 return ret; 1720 return ret;
1740} 1721}
1741
1742 1722
1743/* Fires a misc (wand/rod/horn) object in 'dir'. 1723/* Fires a misc (wand/rod/horn) object in 'dir'.
1744 * Broken apart from 'fire' to keep it more readable. 1724 * Broken apart from 'fire' to keep it more readable.
1745 */ 1725 */
1746void 1726void
1747fire_misc_object (object *op, int dir) 1727fire_misc_object (object *op, int dir)
1748{ 1728{
1749 object *item; 1729 object *item = op->contr->ranged_ob;
1750 1730
1751 if (!op->contr->ranges[range_misc]) 1731 if (!item)
1752 { 1732 {
1753 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1733 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1754 return; 1734 return;
1755 } 1735 }
1756 1736
1757 item = op->contr->ranges[range_misc];
1758 if (!item->inv) 1737 if (!item->inv)
1759 { 1738 {
1760 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1739 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1761 return; 1740 return;
1762 } 1741 }
1742
1743 if (!op->change_weapon (item))
1744 return;
1745
1763 if (item->type == WAND) 1746 if (item->type == WAND)
1764 { 1747 {
1765 if (item->stats.food <= 0) 1748 if (item->stats.food <= 0)
1766 { 1749 {
1767 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1750 op->contr->play_sound (sound_find ("wand_poof"));
1768 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1752
1769 return; 1753 return;
1770 } 1754 }
1771 } 1755 }
1772 else if (item->type == ROD || item->type == HORN) 1756 else if (item->type == ROD || item->type == HORN)
1773 { 1757 {
1774 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1758 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1775 { 1759 {
1776 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1760 op->contr->play_sound (sound_find ("wand_poof"));
1761
1777 if (item->type == ROD) 1762 if (item->type == ROD)
1778 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1763 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1779 else 1764 else
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1765 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1766
1781 return; 1767 return;
1782 } 1768 }
1783 } 1769 }
1784 1770
1785 if (cast_spell (op, item, dir, item->inv, NULL)) 1771 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1792 object *tmp; 1778 object *tmp;
1793 1779
1794 if (item->arch) 1780 if (item->arch)
1795 { 1781 {
1796 CLEAR_FLAG (item, FLAG_ANIMATE); 1782 CLEAR_FLAG (item, FLAG_ANIMATE);
1797 item->face = item->arch->clone.face; 1783 item->face = item->arch->face;
1798 item->set_speed (0); 1784 item->set_speed (0);
1799 } 1785 }
1800 1786
1801 if ((tmp = item->in_player ())) 1787 if ((tmp = item->in_player ()))
1802 esrv_update_item (UPD_ANIM, tmp, item); 1788 esrv_update_item (UPD_ANIM, tmp, item);
… …
1807 } 1793 }
1808} 1794}
1809 1795
1810/* Received a fire command for the player - go and do it. 1796/* Received a fire command for the player - go and do it.
1811 */ 1797 */
1812void 1798bool
1813fire (object *op, int dir) 1799fire (object *op, int dir)
1814{ 1800{
1815 int spellcost = 0; 1801 int spellcost = 0;
1816 1802
1817 /* check for loss of invisiblity/hide */ 1803 /* check for loss of invisiblity/hide */
1818 if (action_makes_visible (op)) 1804 if (action_makes_visible (op))
1819 make_visible (op); 1805 make_visible (op);
1820 1806
1821 switch (op->contr->shoottype) 1807 player *pl = op->contr;
1808
1809 if (pl->golem)
1810 {
1811 control_golem (op->contr->golem, dir);
1812 return false;
1822 { 1813 }
1823 case range_none:
1824 return;
1825 1814
1826 case range_bow: 1815 object *ob = pl->ranged_ob;
1816
1817 if (!ob)
1818 return false;
1819
1820 if (!op->change_weapon (ob))
1821 return false;
1822
1823 if (op->speed_left > 0.f)
1824 --op->speed_left;
1825 else
1826 return false;
1827
1828 switch (ob->type)
1829 {
1830 case BOW:
1827 player_fire_bow (op, dir); 1831 player_fire_bow (op, dir);
1828 return; 1832 break;
1829 1833
1830 case range_magic: /* Casting spells */ 1834 case SPELL:
1831 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1835 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1832 return; 1836 break;
1833 1837
1834 case range_misc: 1838 case BUILDER:
1839 apply_map_builder (op, dir);
1840 break;
1841
1842 case SKILL:
1843 do_skill (op, op, ob, dir, 0);
1844 break;
1845
1846 default:
1835 fire_misc_object (op, dir); 1847 fire_misc_object (op, dir);
1836 return; 1848 break;
1837
1838 case range_golem: /* Control summoned monsters from scrolls */
1839 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1840 {
1841 op->contr->ranges[range_golem] = 0;
1842 op->contr->shoottype = range_none;
1843 }
1844 else
1845 control_golem (op->contr->ranges[range_golem], dir);
1846 return;
1847
1848 case range_skill:
1849 if (!op->chosen_skill)
1850 {
1851 if (op->type == PLAYER)
1852 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1853 return;
1854 }
1855
1856 do_skill (op, op, op->chosen_skill, dir, NULL);
1857 return;
1858 case range_builder:
1859 apply_map_builder (op, dir);
1860 return;
1861 default:
1862 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1863 return;
1864 } 1849 }
1850
1851 return true;
1865} 1852}
1866 1853
1867/* find_key 1854/* find_key
1868 * We try to find a key for the door as passed. If we find a key 1855 * We try to find a key for the door as passed. If we find a key
1869 * and successfully use it, we return the key, otherwise NULL 1856 * and successfully use it, we return the key, otherwise NULL
… …
1956 * 0 otherwise 1943 * 0 otherwise
1957 */ 1944 */
1958static int 1945static int
1959player_attack_door (object *op, object *door) 1946player_attack_door (object *op, object *door)
1960{ 1947{
1961 /* If its a door, try to find a use a key. If we do destroy the door, 1948 /* If its a door, try to find a key. If we do destroy the door,
1962 * might as well return immediately as there is nothing more to do - 1949 * might as well return immediately as there is nothing more to do -
1963 * otherwise, we fall through to the rest of the code. 1950 * otherwise, we fall through to the rest of the code.
1964 */ 1951 */
1965 object *key = find_key (op, op, door); 1952 object *key = find_key (op, op, door);
1966 1953
1967 /* IF we found a key, do some extra work */ 1954 /* If we found a key, do some extra work */
1968 if (key) 1955 if (key)
1969 { 1956 {
1970 object *container = key->env; 1957 object *container = key->env;
1971 1958
1972 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1973 if (action_makes_visible (op)) 1959 if (action_makes_visible (op))
1974 make_visible (op); 1960 make_visible (op);
1961
1975 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1962 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1976 spring_trap (door->inv, op); 1963 spring_trap (door->inv, op);
1977 1964
1978 if (door->type == DOOR) 1965 if (door->type == DOOR)
1979 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1966 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1980 else if (door->type == LOCKED_DOOR) 1967 else if (door->type == LOCKED_DOOR)
1981 { 1968 {
1982 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1969 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1983 remove_door2 (door); /* remove door without violence ;-) */ 1970 remove_door2 (door); /* remove door without violence ;-) */
1984 } 1971 }
1985 1972
1986 /* Do this after we print the message */ 1973 /* Do this after we print the message */
1987 decrease_ob (key); /* Use up one of the keys */ 1974 decrease_ob (key); /* Use up one of the keys */
… …
1992 return 1; /* Nothing more to do below */ 1979 return 1; /* Nothing more to do below */
1993 } 1980 }
1994 else if (door->type == LOCKED_DOOR) 1981 else if (door->type == LOCKED_DOOR)
1995 { 1982 {
1996 /* Might as well return now - no other way to open this */ 1983 /* Might as well return now - no other way to open this */
1997 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1984 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
1998 return 1; 1985 return 1;
1999 } 1986 }
2000 1987
2001 return 0; 1988 return 0;
2002} 1989}
… …
2005 * It should keep the code cleaner. 1992 * It should keep the code cleaner.
2006 * When this is called, the players direction has been updated 1993 * When this is called, the players direction has been updated
2007 * (taking into account confusion.) The player is also actually 1994 * (taking into account confusion.) The player is also actually
2008 * going to try and move (not fire weapons). 1995 * going to try and move (not fire weapons).
2009 */ 1996 */
2010void 1997bool
2011move_player_attack (object *op, int dir) 1998move_player_attack (object *op, int dir)
2012{ 1999{
2013 object *tmp, *mon;
2014 sint16 nx, ny;
2015 int on_battleground; 2000 int on_battleground;
2016 maptile *m;
2017 2001
2018 nx = freearr_x[dir] + op->x; 2002 sint16 nx = freearr_x[dir] + op->x;
2019 ny = freearr_y[dir] + op->y; 2003 sint16 ny = freearr_y[dir] + op->y;
2020 2004
2021 on_battleground = op_on_battleground (op, 0, 0); 2005 on_battleground = op_on_battleground (op, 0, 0);
2006
2007 if (out_of_map (op->map, nx, ny))
2008 return false;
2009
2010 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2011 {
2012 --op->speed_left;
2013 return true;
2014 }
2022 2015
2023 /* If braced, or can't move to the square, and it is not out of the 2016 /* If braced, or can't move to the square, and it is not out of the
2024 * map, attack it. Note order of if statement is important - don't 2017 * map, attack it. Note order of if statement is important - don't
2025 * want to be calling move_ob if braced, because move_ob will move the 2018 * want to be calling move_ob if braced, because move_ob will move the
2026 * player. This is a pretty nasty hack, because if we could 2019 * player. This is a pretty nasty hack, because if we could
2027 * move to some space, it then means that if we are braced, we should 2020 * move to some space, it then means that if we are braced, we should
2028 * do nothing at all. As it is, if we are braced, we go through 2021 * do nothing at all. As it is, if we are braced, we go through
2029 * quite a bit of processing. However, it probably is less than what 2022 * quite a bit of processing. However, it probably is less than what
2030 * move_ob uses. 2023 * move_ob uses.
2031 */ 2024 */
2032 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2033 {
2034 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2035 {
2036 m = op->map->xy_find (nx, ny); 2025 maptile *m = op->map->xy_find (nx, ny);
2037 if (!m)
2038 return; /* Don't think this should happen */
2039 }
2040 else
2041 m = op->map;
2042 2026
2043 if (!(tmp = m->at (nx, ny).bot))
2044 return;
2045
2046 mon = 0;
2047 /* Go through all the objects, and find ones of interest. Only stop if 2027 /* Go through all the objects, and find ones of interest. Only stop if
2048 * we find a monster - that is something we know we want to attack. 2028 * we find a monster - that is something we know we want to attack.
2049 * if its a door or barrel (can roll) see if there may be monsters 2029 * if its a door or barrel (can roll) see if there may be monsters
2050 * on the space 2030 * on the space
2051 */ 2031 */
2052 while (tmp) 2032 object *mon;
2053 { 2033 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2054 if (tmp == op) 2034 {
2055 { 2035 if ((mon->flag [FLAG_ALIVE]
2056 tmp = tmp->above; 2036 || mon->type == LOCKED_DOOR
2057 continue; 2037 || mon->flag [FLAG_CAN_ROLL])
2058 }
2059
2060 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2061 {
2062 mon = tmp; 2038 && mon != op)
2063 break; 2039 break;
2064 } 2040 }
2065 2041
2066 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2067 mon = tmp;
2068
2069 tmp = tmp->above;
2070 }
2071
2072 if (!mon) /* This happens anytime the player tries to move */ 2042 if (!mon) /* This happens anytime the player tries to move */
2073 return; /* into a wall */ 2043 return false; /* into a wall */
2074 2044
2075 if (mon->head)
2076 mon = mon->head; 2045 mon = mon->head_ ();
2077 2046
2078 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2047 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2048 if (op->contr->weapon_sp_left > 0.f)
2079 if (player_attack_door (op, mon)) 2049 if (player_attack_door (op, mon))
2050 {
2051 --op->contr->weapon_sp_left;
2080 return; 2052 return true;
2053 }
2081 2054
2082 /* The following deals with possibly attacking peaceful 2055 /* The following deals with possibly attacking peaceful
2083 * or frienddly creatures. Basically, all players are considered 2056 * or friendly creatures. Basically, all players are considered
2084 * unaggressive. If the moving player has peaceful set, then the 2057 * unaggressive. If the moving player has peaceful set, then the
2085 * object should be pushed instead of attacked. It is assumed that 2058 * object should be pushed instead of attacked. It is assumed that
2086 * if you are braced, you will not attack friends accidently, 2059 * if you are braced, you will not attack friends accidently,
2087 * and thus will not push them. 2060 * and thus will not push them.
2088 */ 2061 */
2089 2062
2090 /* If the creature is a pet, push it even if the player is not 2063 /* If the creature is a pet, push it even if the player is not
2091 * peaceful. Our assumption is the creature is a pet if the 2064 * peaceful. Our assumption is the creature is a pet if the
2092 * player owns it and it is either friendly or unagressive. 2065 * player owns it and it is either friendly or unagressive.
2093 */ 2066 */
2094 if ((op->type == PLAYER) 2067 if (op->type == PLAYER
2095#if COZY_SERVER
2096 &&
2097 ((mon->owner && mon->owner->contr 2068 && ((mon->owner && mon->owner->contr
2098 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2069 && same_party (mon->owner->contr->party, op->contr->party))
2099#else
2100 && mon->owner == op 2070 || mon->owner == op)
2101#endif
2102 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2071 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2103 { 2072 {
2104 /* If we're braced, we don't want to switch places with it */ 2073 /* If we're braced, we don't want to switch places with it */
2105 if (op->contr->braced) 2074 if (op->contr->braced)
2106 return; 2075 return false;
2107 2076
2108 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2077 if (op->speed_left > 0.f)
2078 {
2079 --op->speed_left;
2080
2081 op->play_sound (sound_find ("push_player"));
2109 (void) push_ob (mon, dir, op); 2082 push_ob (mon, dir, op);
2083
2110 if (op->contr->tmp_invis || op->hide) 2084 if (op->contr->tmp_invis || op->hide)
2111 make_visible (op); 2085 make_visible (op);
2112 2086
2113 return; 2087 return true;
2114 } 2088 }
2089 else
2090 return false;
2091 }
2115 2092
2116 /* in certain circumstances, you shouldn't attack friendly 2093 /* in certain circumstances, you shouldn't attack friendly
2117 * creatures. Note that if you are braced, you can't push 2094 * creatures. Note that if you are braced, you can't push
2118 * someone, but put it inside this loop so that you won't 2095 * someone, but put it inside this loop so that you won't
2119 * attack them either. 2096 * attack them either.
2120 */ 2097 */
2121 if ((mon->type == PLAYER || mon->enemy != op) && 2098 if ((mon->type == PLAYER || mon->enemy != op)
2122 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2099 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2123#ifdef PROHIBIT_PLAYERKILL
2124 (op->contr->peaceful 2100 && ((op->contr->peaceful
2125 || (mon->type == PLAYER 2101 || (mon->type == PLAYER && mon->contr->peaceful))
2126 && mon->contr->
2127 peaceful)) &&
2128#else
2129 op->contr->peaceful &&
2130#endif
2131 !on_battleground)) 2102 && !on_battleground))
2103 {
2104 if (op->speed_left > 0.f)
2132 { 2105 {
2106 --op->speed_left;
2107
2133 if (!op->contr->braced) 2108 if (!op->contr->braced)
2134 { 2109 {
2135 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2110 op->play_sound (sound_find ("push_player"));
2136 push_ob (mon, dir, op); 2111 push_ob (mon, dir, op);
2137 } 2112 }
2138 else 2113 else
2139 new_draw_info (0, 0, op, "You withhold your attack"); 2114 op->statusmsg ("You withhold your attack");
2140 2115
2141 if (op->contr->tmp_invis || op->hide) 2116 if (op->contr->tmp_invis || op->hide)
2142 make_visible (op); 2117 make_visible (op);
2143 }
2144 2118
2119 return true;
2120 }
2121 }
2145 /* If the object is a boulder or other rollable object, then 2122 /* If the object is a boulder or other rollable object, then
2146 * roll it if not braced. You can't roll it if you are braced. 2123 * roll it if not braced. You can't roll it if you are braced.
2147 */ 2124 */
2148 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2125 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2126 {
2127 if (op->speed_left > 0.f)
2149 { 2128 {
2129 --op->speed_left;
2130
2150 recursive_roll (mon, dir, op); 2131 recursive_roll (mon, dir, op);
2151 if (action_makes_visible (op)) 2132 if (action_makes_visible (op))
2152 make_visible (op); 2133 make_visible (op);
2153 }
2154 2134
2135 return true;
2136 }
2137 }
2155 /* Any generic living creature. Including things like doors. 2138 /* Any generic living creature. Including things like doors.
2156 * Way it works is like this: First, it must have some hit points 2139 * Way it works is like this: First, it must have some hit points
2157 * and be living. Then, it must be one of the following: 2140 * and be living. Then, it must be one of the following:
2158 * 1) Not a player, 2) A player, but of a different party. Note 2141 * 1) Not a player, 2) A player, but of a different party. Note
2159 * that party_number -1 is no party, so attacks can still happen. 2142 * that party_number -1 is no party, so attacks can still happen.
2160 */ 2143 */
2161 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2144 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2162 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2145 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2163 { 2146 {
2164 2147 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2165 /* If the player hasn't hit something this tick, and does
2166 * so, give them speed boost based on weapon speed. Doing
2167 * it here is better than process_players2, which basically
2168 * incurred a 1 tick offset.
2169 */
2170 if (!op->contr->has_hit)
2171 { 2148 {
2172 op->speed_left += op->speed / op->contr->weapon_sp; 2149 --op->contr->weapon_sp_left;
2173
2174 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2175 }
2176 2150
2177 skill_attack (mon, op, 0, 0, 0); 2151 skill_attack (mon, op, 0, 0, 0);
2178
2179 /* If attacking another player, that player gets automatic
2180 * hitback, and doesn't loose luck either.
2181 * Disable hitback on the battleground or if the target is
2182 * the wiz.
2183 */
2184 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2185 {
2186 short luck = mon->stats.luck;
2187
2188 mon->contr->has_hit = 1;
2189 skill_attack (op, mon, 0, 0, 0);
2190 mon->stats.luck = luck;
2191 }
2192 2152
2193 if (action_makes_visible (op)) 2153 if (action_makes_visible (op))
2194 make_visible (op); 2154 make_visible (op);
2195 }
2196 } /* if player should attack something */
2197}
2198 2155
2199int 2156 return true;
2157 }
2158 }
2159
2160 return false;
2161}
2162
2163bool
2200move_player (object *op, int dir) 2164move_player (object *op, int dir)
2201{ 2165{
2202 int pick; 2166 int pick;
2203 2167
2204 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2168 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2218 op->facing = dir; 2182 op->facing = dir;
2219 2183
2220 if (op->hide) 2184 if (op->hide)
2221 do_hidden_move (op); 2185 do_hidden_move (op);
2222 2186
2187 bool retval;
2188
2223 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2189 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2224 /*nop */ ; 2190 retval = RESULT_INT (0);
2225 else if (op->contr->fire_on) 2191 else if (op->contr->fire_on)
2226 fire (op, dir); 2192 retval = fire (op, dir);
2227 else 2193 else
2228 { 2194 {
2229 move_player_attack (op, dir); 2195 retval = move_player_attack (op, dir);
2230 pick = check_pick (op); 2196 pick = check_pick (op);
2231 } 2197 }
2232 2198
2233 /* Add special check for newcs players and fire on - this way, the 2199 /* Add special check for newcs players and fire on - this way, the
2234 * server can handle repeat firing. 2200 * server can handle repeat firing.
… …
2241 /* Update how the player looks. Use the facing, so direction may 2207 /* Update how the player looks. Use the facing, so direction may
2242 * get reset to zero. This allows for full animation capabilities 2208 * get reset to zero. This allows for full animation capabilities
2243 * for players. 2209 * for players.
2244 */ 2210 */
2245 animate_object (op, op->facing); 2211 animate_object (op, op->facing);
2246 return 0; 2212
2213 return retval;
2247} 2214}
2248 2215
2249/* This is similar to handle_player, below, but is only used by the 2216/* This is similar to handle_player, below, but is only used by the
2250 * new client/server stuff. 2217 * new client/server stuff.
2251 * This is sort of special, in that the new client/server actually uses 2218 * This is sort of special, in that the new client/server actually uses
2252 * the new speed values for commands. 2219 * the new speed values for commands.
2253 * 2220 *
2254 * Returns true if there are more actions we can do. 2221 * Returns true if there are more actions we can do. Should not do
2222 * many actions in a row, as that would be too unfair to other
2223 * players.
2255 */ 2224 */
2256int 2225bool
2257handle_newcs_player (object *op) 2226handle_newcs_player (object *op)
2258{ 2227{
2259 if (op->contr->hidden)
2260 {
2261 op->invisible = 1000;
2262 /* the socket code flashes the player visible/invisible
2263 * depending on the value of invisible, so we need to
2264 * alternate it here for it to work correctly.
2265 */
2266 if (pticks & 2)
2267 op->invisible--;
2268 }
2269 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2270 {
2271 op->invisible--;
2272 if (!op->invisible)
2273 {
2274 make_visible (op);
2275 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2276 }
2277 }
2278
2279 if (QUERY_FLAG (op, FLAG_SCARED)) 2228 if (QUERY_FLAG (op, FLAG_SCARED))
2280 { 2229 {
2281 flee_player (op); 2230 if (op->speed_left > 0.f)
2282 /* If player is still scared, that is his action for this tick */
2283 if (QUERY_FLAG (op, FLAG_SCARED))
2284 { 2231 {
2285 op->speed_left--; 2232 --op->speed_left;
2233 flee_player (op);
2234
2286 return 0; 2235 return true;
2287 } 2236 }
2237 else
2238 return false;
2288 } 2239 }
2289
2290 /* I've been seeing crashes where the golem has been destroyed, but
2291 * the player object still points to the defunct golem. The code that
2292 * destroys the golem looks correct, and it doesn't always happen, so
2293 * put this in a a workaround to clean up the golem pointer.
2294 */
2295 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2296 op->contr->ranges[range_golem] = 0;
2297 2240
2298 /* call this here - we also will call this in do_ericserver, but 2241 /* call this here - we also will call this in do_ericserver, but
2299 * the players time has been increased when doericserver has been 2242 * the players time has been increased when doericserver has been
2300 * called, so we recheck it here. 2243 * called, so we recheck it here.
2301 */ 2244 */
2302 if (op->contr->ns->handle_command ()) 2245 if (op->contr->ns->handle_command ())
2303 return 1; 2246 return true;
2304 2247
2305 if (op->speed_left > 0)
2306 {
2307 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2248 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2308 {
2309 /* All move commands take 1 tick, at least for now */
2310 op->speed_left--;
2311
2312 /* Instead of all the stuff below, let move_player take care
2313 * of it. Also, some of the skill stuff is only put in
2314 * there, as well as the confusion stuff.
2315 */
2316 move_player (op, op->direction); 2249 return move_player (op, op->direction);
2317 2250
2318 return op->speed_left > 0;
2319 }
2320 }
2321
2322 return 0; 2251 return false;
2323} 2252}
2324 2253
2325int 2254int
2326save_life (object *op) 2255save_life (object *op)
2327{ 2256{
… …
2329 return 0; 2258 return 0;
2330 2259
2331 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2260 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2332 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2261 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2333 { 2262 {
2334 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2263 op->play_sound (sound_find ("ob_evaporate"));
2335 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2264 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2336 2265
2337 if (op->contr) 2266 if (op->contr)
2338 esrv_del_item (op->contr, tmp->count); 2267 esrv_del_item (op->contr, tmp->count);
2339 2268
… …
2359/* This goes throws the inventory and removes unpaid objects, and puts them 2288/* This goes throws the inventory and removes unpaid objects, and puts them
2360 * back in the map (location and map determined by values of env). This 2289 * back in the map (location and map determined by values of env). This
2361 * function will descend into containers. op is the object to start the search 2290 * function will descend into containers. op is the object to start the search
2362 * from. 2291 * from.
2363 */ 2292 */
2364void 2293static void
2365remove_unpaid_objects (object *op, object *env) 2294drop_unpaid_items (object *op, object *env)
2366{ 2295{
2367 while (op) 2296 while (op)
2368 { 2297 {
2369 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2298 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2370 2299
… …
2374 esrv_del_item (env->contr, op->count); 2303 esrv_del_item (env->contr, op->count);
2375 2304
2376 op->insert_at (env); 2305 op->insert_at (env);
2377 } 2306 }
2378 else if (op->inv) 2307 else if (op->inv)
2379 remove_unpaid_objects (op->inv, env); 2308 drop_unpaid_items (op->inv, env);
2380 2309
2381 op = next; 2310 op = next;
2382 } 2311 }
2312}
2313
2314void
2315object::drop_unpaid_items ()
2316{
2317 if (!flag [FLAG_REMOVED])
2318 ::drop_unpaid_items (inv, this);
2383} 2319}
2384 2320
2385/* 2321/*
2386 * Returns pointer a static string containing gravestone text 2322 * Returns pointer a static string containing gravestone text
2387 * Moved from apply.c to player.c - player.c is what 2323 * Moved from apply.c to player.c - player.c is what
… …
2437 int rate_grace = 2000; 2373 int rate_grace = 2000;
2438 const int max_hp = 1; 2374 const int max_hp = 1;
2439 const int max_sp = 1; 2375 const int max_sp = 1;
2440 const int max_grace = 1; 2376 const int max_grace = 1;
2441 2377
2442 if (op->contr->outputs_sync) 2378 if (op->contr->hidden)
2379 {
2380 op->invisible = 1000;
2381 /* the socket code flashes the player visible/invisible
2382 * depending on the value of invisible, so we need to
2383 * alternate it here for it to work correctly.
2384 */
2385 if (pticks & 2)
2386 op->invisible--;
2443 { 2387 }
2444 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2388 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2445 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2389 {
2446 flush_output_element (op, &op->contr->outputs[i]); 2390 if (!op->invisible--)
2391 {
2392 make_visible (op);
2393 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2394 }
2447 } 2395 }
2448 2396
2449 if (op->contr->ns->state == ST_PLAYING) 2397 if (op->contr->ns->state == ST_PLAYING)
2450 { 2398 {
2451 /* these next three if clauses make it possible to SLOW DOWN 2399 /* these next three if clauses make it possible to SLOW DOWN
… …
2470 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2418 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2471 else 2419 else
2472 { 2420 {
2473 gen_grace = op->stats.maxgrace; 2421 gen_grace = op->stats.maxgrace;
2474 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2422 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2475 }
2476
2477 /* Regenerate Spell Points */
2478 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2479 {
2480 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2481 if (op->stats.sp < op->stats.maxsp)
2482 {
2483 op->stats.sp++;
2484 /* dms do not consume food */
2485 if (!QUERY_FLAG (op, FLAG_WIZ))
2486 {
2487 op->stats.food--;
2488 if (op->contr->digestion < 0)
2489 op->stats.food += op->contr->digestion;
2490 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2491 op->stats.food = last_food;
2492 }
2493 }
2494
2495 if (max_sp > 1)
2496 {
2497 over_sp = (gen_sp + 10) / rate_sp;
2498 if (over_sp > 0)
2499 {
2500 if (op->stats.sp < op->stats.maxsp)
2501 {
2502 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2503
2504 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2505 op->stats.sp--;
2506
2507 if (op->stats.sp > op->stats.maxsp)
2508 op->stats.sp = op->stats.maxsp;
2509 }
2510 op->last_sp = 0;
2511 }
2512 else
2513 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2514 }
2515 else
2516 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2517 } 2423 }
2518 2424
2519 /* Regenerate Grace */ 2425 /* Regenerate Grace */
2520 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2426 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2521 if (--op->last_grace < 0) 2427 if (--op->last_grace < 0)
… …
2542 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2448 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2543 } 2449 }
2544 /* wearing stuff doesn't detract from grace generation. */ 2450 /* wearing stuff doesn't detract from grace generation. */
2545 } 2451 }
2546 2452
2453 if (op->stats.food > 0)
2454 {
2547 /* Regenerate Hit Points */ 2455 /* Regenerate Spell Points */
2548 if (--op->last_heal < 0) 2456 if (!op->contr->golem && --op->last_sp < 0)
2549 {
2550 if (op->stats.hp < op->stats.maxhp)
2551 { 2457 {
2552 op->stats.hp++; 2458 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2553 /* dms do not consume food */ 2459
2554 if (!QUERY_FLAG (op, FLAG_WIZ)) 2460 if (op->stats.sp < op->stats.maxsp)
2555 { 2461 {
2462 op->stats.sp++;
2463
2464 /* dms do not consume food */
2465 if (!QUERY_FLAG (op, FLAG_WIZ))
2466 {
2556 op->stats.food--; 2467 op->stats.food--;
2468
2557 if (op->contr->digestion < 0) 2469 if (op->contr->digestion < 0)
2558 op->stats.food += op->contr->digestion; 2470 op->stats.food += op->contr->digestion;
2559 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2471 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2560 op->stats.food = last_food; 2472 op->stats.food = last_food;
2473 }
2561 } 2474 }
2562 }
2563 2475
2564 if (max_hp > 1) 2476 if (max_sp > 1)
2565 {
2566 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2567 if (over_hp > 0)
2568 { 2477 {
2569 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2478 over_sp = (gen_sp + 10) / rate_sp;
2479 if (over_sp > 0)
2480 {
2481 if (op->stats.sp < op->stats.maxsp)
2482 {
2483 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2484
2485 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2486 op->stats.sp--;
2487
2488 if (op->stats.sp > op->stats.maxsp)
2489 op->stats.sp = op->stats.maxsp;
2490 }
2491
2570 op->last_heal = 0; 2492 op->last_sp = 0;
2493 }
2494 else
2495 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2571 } 2496 }
2572 else 2497 else
2498 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2499 }
2500
2501 /* Regenerate Hit Points */
2502 if (--op->last_heal < 0)
2503 {
2504 if (op->stats.hp < op->stats.maxhp)
2573 { 2505 {
2574 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2506 op->stats.hp++;
2507
2508 /* dms do not consume food */
2509 if (!QUERY_FLAG (op, FLAG_WIZ))
2510 {
2511 op->stats.food--;
2512
2513 if (op->contr->digestion < 0)
2514 op->stats.food += op->contr->digestion;
2515 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2516 op->stats.food = last_food;
2517 }
2575 } 2518 }
2519
2520 if (max_hp > 1)
2521 {
2522 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2523
2524 if (over_hp > 0)
2525 {
2526 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2527 op->last_heal = 0;
2528 }
2529 else
2530 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2576 } 2531 }
2577 else 2532 else
2578 {
2579 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2533 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2580 } 2534 }
2581 } 2535 }
2582 2536
2583 /* Digestion */ 2537 /* Digestion */
2584 if (--op->last_eat < 0) 2538 if (--op->last_eat < 0)
2585 { 2539 {
2586#ifdef COZY_SERVER 2540 int bonus = max (0, op->contr->digestion),
2587 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2541 penalty = max (0, -op->contr->digestion);
2588 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2589#else
2590 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2591#endif
2592 2542
2593 if (op->contr->gen_hp > 0)
2594 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2543 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2595 else
2596 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2597 2544
2598 /* dms do not consume food */ 2545 /* dms do not consume food */
2599 if (!QUERY_FLAG (op, FLAG_WIZ)) 2546 if (!QUERY_FLAG (op, FLAG_WIZ))
2600 op->stats.food--; 2547 op->stats.food--;
2601 } 2548 }
… …
2628 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2575 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2629 manual_apply (op, flesh, 0); 2576 manual_apply (op, flesh, 0);
2630 } 2577 }
2631 } 2578 }
2632 2579
2633 while (op->stats.food < 0 && op->stats.hp >= 0) 2580 if (op->stats.food < 0)
2634 op->stats.food++, op->stats.hp--; 2581 {
2582 op->stats.hp += op->stats.food;
2583 op->stats.food = 0;
2584 }
2635 2585
2636 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2586 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2637 kill_player (op); 2587 kill_player (op);
2638 } 2588 }
2639} 2589}
… …
2644 * file. 2594 * file.
2645 */ 2595 */
2646void 2596void
2647kill_player (object *op) 2597kill_player (object *op)
2648{ 2598{
2599 int x, y;
2649 char buf[MAX_BUF]; 2600 char buf[MAX_BUF];
2650 int x, y;
2651
2652 //int i;
2653 maptile *map; /* this is for resurrection */ 2601 maptile *map; /* this is for resurrection */
2654
2655 /* int z;
2656 int num_stats_lose;
2657 int lost_a_stat;
2658 int lose_this_stat;
2659 int this_stat; */
2660 int will_kill_again; 2602 int will_kill_again;
2661 archetype *at; 2603 archetype *at;
2662 object *tmp; 2604 object *tmp;
2663 2605
2664 if (save_life (op)) 2606 if (save_life (op))
2665 return; 2607 return;
2666
2667 2608
2668 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2609 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2669 * in cities ONLY!!! It is very important that this doesn't get abused. 2610 * in cities ONLY!!! It is very important that this doesn't get abused.
2670 * Look at op_on_battleground() for more info --AndreasV 2611 * Look at op_on_battleground() for more info --AndreasV
2671 */ 2612 */
… …
2687 { 2628 {
2688 tmp->destroy (); 2629 tmp->destroy ();
2689 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2630 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2690 } 2631 }
2691 2632
2692 cure_disease (op, 0); /* remove any disease */ 2633 cure_disease (op, 0, 0); /* remove any disease */
2693 op->stats.hp = op->stats.maxhp; 2634 op->stats.hp = op->stats.maxhp;
2694 if (op->stats.food <= 0) 2635 if (op->stats.food <= 0)
2695 op->stats.food = 999; 2636 op->stats.food = 999;
2696 2637
2697 /* create a bodypart-trophy to make the winner happy */ 2638 /* create a bodypart-trophy to make the winner happy */
2698 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2639 if (object *tmp = arch_to_object (archetype::find ("finger")))
2699 { 2640 {
2700 sprintf (buf, "%s's finger", &op->name); 2641 tmp->name = format ("%s's finger" , &op->name);
2701 tmp->name = buf; 2642 tmp->name_pl = format ("%s's fingers", &op->name);
2702 sprintf (buf, " This finger has been cut off %s\n" 2643 tmp->msg = format (
2703 " the %s, when he was defeated at\n level %d by %s.\n", 2644 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2704 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2645 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2705 tmp->msg = buf; 2646 );
2706 tmp->value = 0, tmp->type = 0; 2647 tmp->value = 0, tmp->type = 0;
2707 tmp->materialname = "organics"; 2648 tmp->materialname = "organics";
2708 tmp->insert_at (op, tmp); 2649 tmp->insert_at (op, tmp);
2709 } 2650 }
2710 2651
… …
2717 INVOKE_PLAYER (DEATH, op->contr); 2658 INVOKE_PLAYER (DEATH, op->contr);
2718 2659
2719 command_kill_pets (op, 0); 2660 command_kill_pets (op, 0);
2720 2661
2721 if (op->stats.food < 0) 2662 if (op->stats.food < 0)
2722 {
2723 sprintf (buf, "%s starved to death.", &op->name);
2724 strcpy (op->contr->killer, "starvation"); 2663 strcpy (op->contr->killer, "starvation");
2725 }
2726 else
2727 sprintf (buf, "%s died.", &op->name);
2728 2664
2729 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2665 op->contr->play_sound (sound_find ("player_dies"));
2730 2666
2731 /* save the map location for corpse, gravestone */ 2667 /* save the map location for corpse, gravestone */
2732 x = op->x; 2668 x = op->x;
2733 y = op->y; 2669 y = op->y;
2734 map = op->map; 2670 map = op->map;
… …
2897 { 2833 {
2898 tmp->destroy (); 2834 tmp->destroy ();
2899 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2835 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2900 } 2836 }
2901 2837
2902 cure_disease (op, 0); /* remove any disease */ 2838 cure_disease (op, 0, 0); /* remove any disease */
2903 2839
2904 /*add_exp(op, (op->stats.exp * -0.20)); */ 2840 /*add_exp(op, (op->stats.exp * -0.20)); */
2905 apply_death_exp_penalty (op); 2841 apply_death_exp_penalty (op);
2906 if (op->stats.food < 100) 2842 if (op->stats.food < 100)
2907 op->stats.food = 900; 2843 op->stats.food = 900;
2908 op->stats.hp = op->stats.maxhp; 2844 op->stats.hp = op->stats.maxhp;
2909 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2845 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2910 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2846 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2911 2847
2912 /* 2848 /*
2913 * Check to see if the player is in a shop. IF so, then check to see if
2914 * the player has any unpaid items. If so, remove them and put them back 2849 * Check to see if the player has any unpaid items. If so, remove them
2915 * in the map. 2850 * and put them back in the map.
2916 */ 2851 */
2917 2852 op->drop_unpaid_items ();
2918 if (is_in_shop (op))
2919 remove_unpaid_objects (op->inv, op);
2920 2853
2921 /****************************************/ 2854 /****************************************/
2922 /* */ 2855 /* */
2923 /* Move player to his current respawn- */ 2856 /* Move player to his current respawn- */
2924 /* position (usually last savebed) */ 2857 /* position (usually last savebed) */
… …
2944 object *force; 2877 object *force;
2945 int at; 2878 int at;
2946 2879
2947 force = get_archetype (FORCE_NAME); 2880 force = get_archetype (FORCE_NAME);
2948 /* 50 ticks should be enough time for the spell to abate */ 2881 /* 50 ticks should be enough time for the spell to abate */
2949 force->speed = 0.1; 2882 force->speed = 0.1f;
2950 force->speed_left = -5.0; 2883 force->speed_left = -5.f;
2951 SET_FLAG (force, FLAG_APPLIED); 2884 SET_FLAG (force, FLAG_APPLIED);
2952 for (at = 0; at < NROFATTACKS; at++) 2885 for (at = 0; at < NROFATTACKS; at++)
2953 if (will_kill_again & (1 << at)) 2886 if (will_kill_again & (1 << at))
2954 force->resist[at] = 100; 2887 force->resist[at] = 100;
2955 2888
… …
3064void 2997void
3065make_visible (object *op) 2998make_visible (object *op)
3066{ 2999{
3067 op->hide = 0; 3000 op->hide = 0;
3068 op->invisible = 0; 3001 op->invisible = 0;
3002
3069 if (op->type == PLAYER) 3003 if (op->type == PLAYER)
3070 { 3004 {
3071 op->contr->tmp_invis = 0; 3005 op->contr->tmp_invis = 0;
3072 op->contr->invis_race = 0; 3006 op->contr->invis_race = 0;
3073 } 3007 }
3008
3074 update_object (op, UP_OBJ_FACE); 3009 update_object (op, UP_OBJ_CHANGE);
3075} 3010}
3076 3011
3077int 3012int
3078is_true_undead (object *op) 3013is_true_undead (object *op)
3079{ 3014{
3080 object *tmp = NULL;
3081
3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3015 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3083 return 1; 3016 return 1;
3084 3017
3085 return 0; 3018 return 0;
3086} 3019}
3087 3020
3088/* look at the surrounding terrain to determine 3021/* look at the surrounding terrain to determine
3089 * the hideability of this object. Positive levels 3022 * the hideability of this object. Positive levels
3090 * indicate greater hideability. 3023 * indicate greater hideability.
3091 */ 3024 */
3092
3093int 3025int
3094hideability (object *ob) 3026hideability (object *ob)
3095{ 3027{
3096 int i, level = 0, mflag; 3028 int i, level = 0, mflag;
3097 sint16 x, y; 3029 sint16 x, y;
… …
3131/* For Hidden creatures - a chance of becoming 'unhidden' 3063/* For Hidden creatures - a chance of becoming 'unhidden'
3132 * every time they move - as we subtract off 'invisibility' 3064 * every time they move - as we subtract off 'invisibility'
3133 * AND, for players, if they move into a ridiculously unhideable 3065 * AND, for players, if they move into a ridiculously unhideable
3134 * spot (surrounded by clear terrain in broad daylight). -b.t. 3066 * spot (surrounded by clear terrain in broad daylight). -b.t.
3135 */ 3067 */
3136
3137void 3068void
3138do_hidden_move (object *op) 3069do_hidden_move (object *op)
3139{ 3070{
3140 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3071 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3141 object *skop; 3072 object *skop;
… …
3223 * object op. This function works fine for monsters, 3154 * object op. This function works fine for monsters,
3224 * but we dont worry if the object isnt the top one in 3155 * but we dont worry if the object isnt the top one in
3225 * a pile (say a coin under a table would return "viewable" 3156 * a pile (say a coin under a table would return "viewable"
3226 * by this routine). Another question, should we be 3157 * by this routine). Another question, should we be
3227 * concerned with the direction the player is looking 3158 * concerned with the direction the player is looking
3228 * in? Realistically, most of use cant see stuff behind 3159 * in? Realistically, most of us can't see stuff behind
3229 * our backs...on the other hand, does the "facing" direction 3160 * our backs...on the other hand, does the "facing" direction
3230 * imply the way your head, or body is facing? Its possible 3161 * imply the way your head, or body is facing? It's possible
3231 * for them to differ. Sigh, this fctn could get a bit more complex. 3162 * for them to differ. Sigh, this fctn could get a bit more complex.
3232 * -b.t. 3163 * -b.t.
3233 * This function is now map tiling safe. 3164 * This function is now map tiling safe.
3234 */ 3165 */
3235
3236int 3166int
3237player_can_view (object *pl, object *op) 3167player_can_view (object *pl, object *op)
3238{ 3168{
3239 rv_vector rv; 3169 rv_vector rv;
3240 int dx, dy; 3170 int dx, dy;
… …
3252 3182
3253 get_rangevector (pl, op, &rv, 0x1); 3183 get_rangevector (pl, op, &rv, 0x1);
3254 3184
3255 /* starting with the 'head' part, lets loop 3185 /* starting with the 'head' part, lets loop
3256 * through the object and find if it has any 3186 * through the object and find if it has any
3257 * part that is in the los array but isnt on 3187 * part that is in the los array but isn't on
3258 * a blocked los square. 3188 * a blocked los square.
3259 * we use the archetype to figure out offsets. 3189 * we use the archetype to figure out offsets.
3260 */ 3190 */
3261 while (op) 3191 while (op)
3262 { 3192 {
3263 dx = rv.distance_x + op->arch->clone.x; 3193 dx = rv.distance_x + op->arch->x;
3264 dy = rv.distance_y + op->arch->clone.y; 3194 dy = rv.distance_y + op->arch->y;
3265 3195
3266 /* only the viewable area the player sees is updated by LOS 3196 /* only the viewable area the player sees is updated by LOS
3267 * code, so we need to restrict ourselves to that range of values 3197 * code, so we need to restrict ourselves to that range of values
3268 * for any meaningful values. 3198 * for any meaningful values.
3269 */ 3199 */
3270 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3200 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3271 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3201 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3272 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3202 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3273 return 1; 3203 return 1;
3204
3274 op = op->more; 3205 op = op->more;
3275 } 3206 }
3207
3276 return 0; 3208 return 0;
3277} 3209}
3278 3210
3279/* routine for both players and monsters. We call this when 3211/* routine for both players and monsters. We call this when
3280 * there is a possibility for our action distrubing our hiding 3212 * there is a possibility for our action distrubing our hiding
… …
3283 * return 0. 3215 * return 0.
3284 */ 3216 */
3285int 3217int
3286action_makes_visible (object *op) 3218action_makes_visible (object *op)
3287{ 3219{
3288
3289 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3220 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3290 { 3221 {
3291 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3222 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3292 return 0; 3223 return 0;
3293 3224
… …
3299 { 3230 {
3300 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3231 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3301 return 1; 3232 return 1;
3302 } 3233 }
3303 } 3234 }
3235
3304 return 0; 3236 return 0;
3305} 3237}
3306 3238
3307/* op_on_battleground - checks if the given object op (usually 3239/* op_on_battleground - checks if the given object op (usually
3308 * a player) is standing on a valid battleground-tile, 3240 * a player) is standing on a valid battleground-tile,
… …
3313 * Default is to do the same as before, so only people wanting to have different points need worry about this 3245 * Default is to do the same as before, so only people wanting to have different points need worry about this
3314 */ 3246 */
3315int 3247int
3316op_on_battleground (object *op, int *x, int *y) 3248op_on_battleground (object *op, int *x, int *y)
3317{ 3249{
3318 object *tmp;
3319
3320 /* A battleground-tile needs the following attributes to be valid: 3250 /* A battleground-tile needs the following attributes to be valid:
3321 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3251 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3322 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3252 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3323 * and the exit-coordinates sp/hp must both be > 0. 3253 * and the exit-coordinates sp/hp must both be > 0.
3324 * => The intention here is to prevent abuse of the battleground- 3254 * => The intention here is to prevent abuse of the battleground-
3325 * feature (like pickable or hidden battleground tiles). */ 3255 * feature (like pickable or hidden battleground tiles). */
3326 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3256 for (object *tmp = op->below; tmp; tmp = tmp->below)
3327 { 3257 {
3328 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3258 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3329 { 3259 {
3330 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3260 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3331 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3261 && tmp->type == BATTLEGROUND
3262 && tmp->name == shstr_battleground
3263 && EXIT_X (tmp) && EXIT_Y (tmp))
3332 { 3264 {
3333 /*before we assign the exit, check if this is a teambattle */ 3265 /* before we assign the exit, check if this is a teambattle */
3334 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3266 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3335 { 3267 {
3336 object *invtmp;
3337
3338 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3268 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3339 { 3269 {
3340 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3270 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3341 { 3271 {
3342 if (x != NULL && y != NULL) 3272 if (x && y)
3343 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3273 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3274
3344 return 1; 3275 return 1;
3345 } 3276 }
3346 } 3277 }
3347 } 3278 }
3279
3348 if (x != NULL && y != NULL) 3280 if (x && y)
3349 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3281 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3282
3350 return 1; 3283 return 1;
3351 } 3284 }
3352 } 3285 }
3353 } 3286 }
3287
3354 /* If we got here, did not find a battleground */ 3288 /* If we got here, did not find a battleground */
3355 return 0; 3289 return 0;
3356} 3290}
3357 3291
3358/* 3292/*
… …
3374 char buf[MAX_BUF]; /* tmp. string buffer */ 3308 char buf[MAX_BUF]; /* tmp. string buffer */
3375 int i = 0, j = 0; 3309 int i = 0, j = 0;
3376 3310
3377 /* get the appropriate treasurelist */ 3311 /* get the appropriate treasurelist */
3378 if (atnr == ATNR_FIRE) 3312 if (atnr == ATNR_FIRE)
3379 trlist = find_treasurelist ("dragon_ability_fire"); 3313 trlist = treasurelist::find (shstr_dragon_ability_fire);
3380 else if (atnr == ATNR_COLD) 3314 else if (atnr == ATNR_COLD)
3381 trlist = find_treasurelist ("dragon_ability_cold"); 3315 trlist = treasurelist::find (shstr_dragon_ability_cold);
3382 else if (atnr == ATNR_ELECTRICITY) 3316 else if (atnr == ATNR_ELECTRICITY)
3383 trlist = find_treasurelist ("dragon_ability_elec"); 3317 trlist = treasurelist::find (shstr_dragon_ability_elec);
3384 else if (atnr == ATNR_POISON) 3318 else if (atnr == ATNR_POISON)
3385 trlist = find_treasurelist ("dragon_ability_poison"); 3319 trlist = treasurelist::find (shstr_dragon_ability_poison);
3386 3320
3387 if (trlist == NULL || who->type != PLAYER) 3321 if (trlist == NULL || who->type != PLAYER)
3388 return; 3322 return;
3389 3323
3390 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3324 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3394 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3328 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3395 return; 3329 return;
3396 } 3330 }
3397 3331
3398 /* everything seems okay - now bring on the gift: */ 3332 /* everything seems okay - now bring on the gift: */
3399 item = &(tr->item->clone); 3333 item = tr->item;
3400 3334
3401 if (item->type == SPELL) 3335 if (item->type == SPELL)
3402 { 3336 {
3403 if (check_spell_known (who, item->name)) 3337 if (check_spell_known (who, item->name))
3404 return; 3338 return;
… …
3463 { 3397 {
3464 /* forces in the treasurelist can alter the player's stats */ 3398 /* forces in the treasurelist can alter the player's stats */
3465 object *skin; 3399 object *skin;
3466 3400
3467 /* first get the dragon skin force */ 3401 /* first get the dragon skin force */
3468 shstr_cmp dragon_skin_force ("dragon_skin_force");
3469 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3402 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3470 ; 3403 ;
3471 3404
3472 if (!skin) 3405 if (!skin)
3473 return; 3406 return;
3474 3407
… …
3522 * not readied. 3455 * not readied.
3523 */ 3456 */
3524void 3457void
3525player_unready_range_ob (player *pl, object *ob) 3458player_unready_range_ob (player *pl, object *ob)
3526{ 3459{
3527 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3460 if (pl->ob->current_weapon == ob)
3461 pl->ob->current_weapon = 0;
3462
3463 if (pl->combat_ob == ob)
3464 pl->combat_ob = 0;
3465
3528 if (pl->ranges[i] == ob) 3466 if (pl->ranged_ob == ob)
3529 {
3530 pl->ranges[i] = 0; 3467 pl->ranged_ob = 0;
3531 if (pl->shoottype == i)
3532 pl->shoottype = range_none;
3533 }
3534} 3468}
3535 3469
3536sint8 3470sint8
3537player::visibility_at (maptile *map, int x, int y) const 3471player::visibility_at (maptile *map, int x, int y) const
3538{ 3472{
… …
3549 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) 3483 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3550 return 0; 3484 return 0;
3551 3485
3552 return 100 - blocked_los [x][y]; 3486 return 100 - blocked_los [x][y];
3553} 3487}
3488
3489void
3490player::infobox (const char *title, const char *msg, int color)
3491{
3492 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3493}
3494
3495void
3496player::statusmsg (const char *msg, int color)
3497{
3498 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3499}
3500
3501void
3502player::failmsg (const char *msg, int color)
3503{
3504 play_sound (sound_find ("generic_failure"));
3505 statusmsg (msg, color);
3506}
3507

Diff Legend

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