• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisiond5a3a5747ae354a69a5378687b585e51964f6242 (tree)
Time2018-12-04 19:44:57
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 #if 0 プリプロセッサ削除 / Delete #if 0 code.

Change Summary

Incremental Difference

--- a/src/birth.c
+++ b/src/birth.c
@@ -2335,14 +2335,6 @@ void player_outfit(void)
23352335 }
23362336 break;
23372337
2338-#if 0
2339- case RACE_SKELETON:
2340- /* Some Skeletons */
2341- object_prep(q_ptr, lookup_kind(TV_SKELETON, SV_ANY));
2342- q_ptr->number = (byte)rand_range(7, 12);
2343- add_outfit(q_ptr);
2344- break;
2345-#endif
23462338 case RACE_SKELETON:
23472339 case RACE_GOLEM:
23482340 case RACE_ZOMBIE:
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -781,25 +781,6 @@ static int init_bg(void)
781781 use_bg = 0;
782782 return 0;
783783 }
784-#if 0 /* gomi */
785- HDC wnddc, dcimage, dcbg;
786- HBITMAP bmimage, bmimage_old, bmbg_old;
787- int i, j;
788-
789- delete_bg();
790-
791- wnddc = GetDC(hwnd);
792- dcimage = CreateCompatibleDC(wnddc);
793- dcbg = CreateCompatibleDC(wnddc);
794-
795- bmimage = LoadImage(NULL, "bg.bmp", LR_LOADFROMFILE, 0, 0, 0);
796- if (!bmimage) quit("bg.bmpが読みこめない!");
797- bmimage_old = SelectObject(dcimage, bmimage);
798-
799- CreateCompatibleBitmap();
800-
801- ReleaseDC(hwnd, wnddc);
802-#endif
803784 use_bg = 1;
804785 return 1;
805786 }
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -128,22 +128,21 @@ bool item_tester_hook_eatable(object_type *o_ptr)
128128 else
129129 #endif
130130
131- if (prace_is_(RACE_SKELETON) ||
132- prace_is_(RACE_GOLEM) ||
133- prace_is_(RACE_ZOMBIE) ||
134- prace_is_(RACE_SPECTRE))
135- {
136- if (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND)
137- return TRUE;
138- }
139- else if (prace_is_(RACE_DEMON) ||
140- (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON))
141- {
142- if (o_ptr->tval == TV_CORPSE &&
143- o_ptr->sval == SV_CORPSE &&
144- my_strchr("pht", r_info[o_ptr->pval].d_char))
145- return TRUE;
146- }
131+ if (prace_is_(RACE_SKELETON) ||
132+ prace_is_(RACE_GOLEM) ||
133+ prace_is_(RACE_ZOMBIE) ||
134+ prace_is_(RACE_SPECTRE))
135+ {
136+ if (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND)
137+ return TRUE;
138+ }
139+ else if (prace_is_(RACE_DEMON) || (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON))
140+ {
141+ if (o_ptr->tval == TV_CORPSE &&
142+ o_ptr->sval == SV_CORPSE &&
143+ my_strchr("pht", r_info[o_ptr->pval].d_char))
144+ return TRUE;
145+ }
147146
148147 /* Assume not */
149148 return (FALSE);
Show on old repository browser