Skip to content

Commit 1b66199

Browse files
authored
Merge pull request #848 from AJenbo/S_HealerEnter
Clean up S_HealerEnter
2 parents 891bd50 + fc881a9 commit 1b66199

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

Source/stores.cpp

+16-23
Original file line numberDiff line numberDiff line change
@@ -3239,36 +3239,29 @@ void __cdecl S_ConfirmEnter()
32393239

32403240
void __cdecl S_HealerEnter()
32413241
{
3242-
int v0; // ecx
3243-
int v1; // eax
3244-
3245-
v0 = 12;
3246-
if (stextsel == 12) {
3242+
switch (stextsel) {
3243+
case 12:
32473244
stextlhold = 12;
32483245
talker = 1;
32493246
stextshold = 14;
32503247
gossipstart = QUEST_PEPIN2;
32513248
gossipend = QUEST_PEPIN11;
3252-
_LOBYTE(v0) = STORE_GOSSIP;
3253-
goto LABEL_12;
3254-
}
3255-
if (stextsel != 14) {
3256-
if (stextsel != 16) {
3257-
if (stextsel == 18)
3258-
stextflag = 0;
3259-
return;
3260-
}
3261-
_LOBYTE(v0) = STORE_HBUY;
3262-
LABEL_12:
3263-
StartStore(v0);
3249+
StartStore(STORE_GOSSIP);
3250+
return;
3251+
case 14:
3252+
if (plr[myplr]._pHitPoints != plr[myplr]._pMaxHP)
3253+
PlaySFX(IS_CAST8);
3254+
drawhpflag = TRUE;
3255+
plr[myplr]._pHitPoints = plr[myplr]._pMaxHP;
3256+
plr[myplr]._pHPBase = plr[myplr]._pMaxHPBase;
3257+
return;
3258+
case 16:
3259+
StartStore(STORE_HBUY);
3260+
return;
3261+
case 18:
3262+
stextflag = 0;
32643263
return;
32653264
}
3266-
if (plr[myplr]._pHitPoints != plr[myplr]._pMaxHP)
3267-
PlaySFX(IS_CAST8);
3268-
drawhpflag = TRUE;
3269-
v1 = myplr;
3270-
plr[v1]._pHitPoints = plr[myplr]._pMaxHP;
3271-
plr[v1]._pHPBase = plr[v1]._pMaxHPBase;
32723265
}
32733266
// 69F110: using guessed type int stextlhold;
32743267
// 69FB38: using guessed type int talker;

0 commit comments

Comments
 (0)