Skip to content

Commit 96220c8

Browse files
Fix: samurai splint mails were not always rustproof
Their starting splint mails' material was random, and then set to iron later in u_init. If their original material was inherently fixed, oerodeproof would not be set. A consequence of overzealous use of the new maybe_erodeproof function; revert to the previous code. I also did it for convict iron balls just to be safe, though I imagine those are, y'know, always iron.
1 parent ad042cf commit 96220c8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

doc/evilhack-changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -3382,3 +3382,4 @@ The following changes to date are:
33823382
- Fix: spec_applies didn't consider if target was underwater
33833383
- Fix: monster priests shouldn't wield edged weapons either
33843384
- Fix: reactivate offhand weapon intrinsics when catching a returning weapon
3385+
- Fix: samurai splint mails were not always rustproof

src/mkobj.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1130,10 +1130,10 @@ boolean artif;
11301130
&& (moves <= 1 || In_quest(&u.uz))) {
11311131
#ifdef UNIXPC
11321132
/* optimizer bitfield bug */
1133-
maybe_erodeproof(otmp, 1);
1133+
otmp->oerodeproof = 1;
11341134
otmp->rknown = 1;
11351135
#else
1136-
maybe_erodeproof(otmp, otmp->rknown = 1);
1136+
otmp->oerodeproof = otmp->rknown = 1;
11371137
#endif
11381138
}
11391139
/* since it's fairly easy for objects to erode/burn
@@ -1143,10 +1143,10 @@ boolean artif;
11431143
&& (moves <= 1)) {
11441144
#ifdef UNIXPC
11451145
/* optimizer bitfield bug */
1146-
maybe_erodeproof(otmp, 1);
1146+
otmp->oerodeproof = 1;
11471147
otmp->rknown = 1;
11481148
#else
1149-
maybe_erodeproof(otmp, otmp->rknown = 1);
1149+
otmp->oerodeproof = otmp->rknown = 1;
11501150
#endif
11511151
}
11521152
break;

0 commit comments

Comments
 (0)