• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision8b9d9005188c5d45f73e578ab1dc6ffae4cfcb59 (tree)
Zeit2019-01-18 21:28:28
AutorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 staff_effect()整理。 / Refactor staff_effect().

Ändern Zusammenfassung

Diff

--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -213,26 +213,25 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
213213
214214 case SV_STAFF_PROBING:
215215 {
216- probing();
217- ident = TRUE;
216+ ident = probing();
218217 break;
219218 }
220219
221220 case SV_STAFF_DISPEL_EVIL:
222221 {
223- if (dispel_evil(powerful ? 120 : 80)) ident = TRUE;
222+ ident = dispel_evil(powerful ? 120 : 80);
224223 break;
225224 }
226225
227226 case SV_STAFF_POWER:
228227 {
229- if (dispel_monsters(powerful ? 225 : 150)) ident = TRUE;
228+ ident = dispel_monsters(powerful ? 225 : 150) ;
230229 break;
231230 }
232231
233232 case SV_STAFF_HOLINESS:
234233 {
235- if (cleansing_nova(p_ptr, magic, powerful)) ident = TRUE;
234+ ident = cleansing_nova(p_ptr, magic, powerful);
236235 break;
237236 }
238237
@@ -254,17 +253,13 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
254253
255254 case SV_STAFF_DESTRUCTION:
256255 {
257- if (destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE))
258- ident = TRUE;
259-
256+ ident = destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE);
260257 break;
261258 }
262259
263260 case SV_STAFF_ANIMATE_DEAD:
264261 {
265- if (animate_dead(0, p_ptr->y, p_ptr->x))
266- ident = TRUE;
267-
262+ ident = animate_dead(0, p_ptr->y, p_ptr->x);
268263 break;
269264 }
270265
Show on old repository browser