Mercurial > hg > early-roguelike

comparison urogue/sticks.c @ 304:e52a8a7ad4c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.
author John "Elwin" Edwards
date Wed, 14 Apr 2021 18:55:33 -0400
parents c495a4f288c6
children
comparison
equal deleted inserted replaced
303:e06ebc407615 304:e52a8a7ad4c5
264 264
265 if (blessed) 265 if (blessed)
266 save_adj = -5; 266 save_adj = -5;
267 267
268 if (cursed) 268 if (cursed)
269 {
269 if (which == WS_POLYMORPH) 270 if (which == WS_POLYMORPH)
270 save_adj = -5; /* not save vs becoming tougher */ 271 save_adj = -5; /* not save vs becoming tougher */
271 else 272 else
272 save_adj = 5; 273 save_adj = 5;
274 }
273 275
274 if (save_throw(VS_MAGIC - save_adj, tp)) 276 if (save_throw(VS_MAGIC - save_adj, tp))
275 { 277 {
276 nothing_message(flags); 278 nothing_message(flags);
277 break; 279 break;
1237 char dirch; 1239 char dirch;
1238 int change; 1240 int change;
1239 short y, x; 1241 short y, x;
1240 coord pos; 1242 coord pos;
1241 coord spotpos[BOLT_LENGTH + 1]; 1243 coord spotpos[BOLT_LENGTH + 1];
1242 int ret_val = FALSE;/* True if breathing monster gets killed */
1243 struct linked_list *item; 1244 struct linked_list *item;
1244 struct thing *tp; 1245 struct thing *tp;
1245 char *mname; 1246 char *mname;
1246 int bounced; /* where along BOLT_LENGTH it hit a wall */ 1247 int bounced; /* where along BOLT_LENGTH it hit a wall */
1247 int player_damage; /* damage if player saved */ 1248 int player_damage; /* damage if player saved */
1417 { 1418 {
1418 seemsg("The %s is burned to death by the flame.", 1419 seemsg("The %s is burned to death by the flame.",
1419 mname); 1420 mname);
1420 1421
1421 take_that[y] += tp->t_stats.s_hpt + 1; 1422 take_that[y] += tp->t_stats.s_hpt + 1;
1422 ret_val = TRUE;
1423 } 1423 }
1424 } 1424 }
1425 else if (strcmp(name, "lightning bolt") == 0) 1425 else if (strcmp(name, "lightning bolt") == 0)
1426 { 1426 {
1427 if (on(*tp, NOBOLT)) 1427 if (on(*tp, NOBOLT))
1602 if (cansee(tp->t_pos.y, tp->t_pos.x)) 1602 if (cansee(tp->t_pos.y, tp->t_pos.x))
1603 msg("The %s kills the %s.", name, 1603 msg("The %s kills the %s.", name,
1604 on(player, ISBLIND) ? "monster" : mname); 1604 on(player, ISBLIND) ? "monster" : mname);
1605 1605
1606 killed(shooter, item, NOMESSAGE, get_points); 1606 killed(shooter, item, NOMESSAGE, get_points);
1607 ret_val = TRUE;
1608 } 1607 }
1609 else if (get_points) 1608 else if (get_points)
1610 { 1609 {
1611 chase_it(&spotpos[x], &player); 1610 chase_it(&spotpos[x], &player);
1612 summon_help(tp, NOFORCE); 1611 summon_help(tp, NOFORCE);