Skip to content

OperateWeaponRack almost bin exact? #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 2, 2019
Merged

OperateWeaponRack almost bin exact? #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbbd6f2
OperateWeaponRack almost bin exact?
qndel Mar 30, 2019
6ee2fcb
Update Source/objects.cpp
mewmew Apr 2, 2019
81f6631
Update Source/objects.cpp
mewmew Apr 2, 2019
39d9793
Update Source/objects.cpp
mewmew Apr 2, 2019
7411521
Update Source/objects.cpp
mewmew Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 30 additions & 53 deletions Source/objects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,9 +1699,9 @@ void __fastcall AddPurifyingFountain(int i)

ox = object[i]._ox;
oy = object[i]._oy;
dObject[ox][oy-1] = -1 - i;
dObject[ox-1][oy] = -1 - i;
dObject[ox-1][oy - 1] = -1 - i;
dObject[ox][oy - 1] = -1 - i;
dObject[ox - 1][oy] = -1 - i;
dObject[ox - 1][oy - 1] = -1 - i;
object[i]._oRndSeed = GetRndSeed();
}

Expand Down Expand Up @@ -4586,61 +4586,38 @@ BOOLEAN __fastcall OperateFountains(int pnum, int i)
// 52571C: using guessed type int drawpanflag;
// 676190: using guessed type int deltaload;

void __fastcall OperateWeaponRack(int pnum, int i, unsigned char sendmsg)
void __fastcall OperateWeaponRack(int pnum, int i, BOOL sendmsg)
{
unsigned short v3; // di
int v4; // esi
int v6; // eax
int v7; // eax
int v8; // eax
int v9; // eax
BOOLEAN v10; // zf
int v11; // ecx
int v12; // edx
signed int v13; // [esp-4h] [ebp-14h]
int v14; // [esp+Ch] [ebp-4h]
int weaponType;

v3 = i;
v4 = i;
v14 = pnum;
if (!object[i]._oSelFlag)
return;
SetRndSeed(object[v4]._oRndSeed);
v6 = random(0, 4);
if (v6) {
v7 = v6 - 1;
if (!v7) {
v13 = ITYPE_AXE;
goto LABEL_7;
}
v8 = v7 - 1;
if (!v8) {
v13 = ITYPE_BOW;
goto LABEL_7;
}
if (v8 == 1) {
v13 = ITYPE_MACE;
LABEL_7:
v9 = v13;
goto LABEL_12;
}
v9 = sendmsg;
} else {
v9 = ITYPE_SWORD;
SetRndSeed(object[i]._oRndSeed);

switch (random(0, 4)) {
case ITYPE_BOW-1:
weaponType = ITYPE_BOW;
break;
case ITYPE_AXE-1:
weaponType = ITYPE_AXE;
break;
case ITYPE_MACE-1:
weaponType = ITYPE_MACE;
break;
case ITYPE_SWORD-1:
weaponType = ITYPE_SWORD;
break;
}
LABEL_12:
++object[v4]._oAnimFrame;
v10 = deltaload == 0;
object[v4]._oSelFlag = 0;
if (v10) {
v11 = object[v4]._ox;
v12 = object[v4]._oy;
if (leveltype <= 1u)
CreateTypeItem(v11, v12, 0, v9, 0, sendmsg, 0);

object[i]._oAnimFrame++;
object[i]._oSelFlag = 0;
if (!deltaload) {
if (leveltype > 1)
CreateTypeItem(object[i]._ox, object[i]._oy, 1, weaponType, 0, sendmsg, 0);
else
CreateTypeItem(v11, v12, 1u, v9, 0, sendmsg, 0);
if (v14 == myplr)
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, v3);
CreateTypeItem(object[i]._ox, object[i]._oy, 0, weaponType, 0, sendmsg, 0);
if (pnum == myplr)
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i);
}
}
// 676190: using guessed type int deltaload;
Expand Down Expand Up @@ -4947,7 +4924,7 @@ void __fastcall SyncOpObject(int pnum, int cmd, int i)
break;
case OBJ_WARWEAP:
case OBJ_WEAPONRACK:
OperateWeaponRack(pnum, i, 0);
OperateWeaponRack(pnum, i, FALSE);
break;
case OBJ_MUSHPATCH:
OperateMushPatch(pnum, i);
Expand Down
2 changes: 1 addition & 1 deletion Source/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ int __fastcall FindValidShrine(int i);
void __fastcall OperateGoatShrine(int pnum, int i, int sType);
void __fastcall OperateCauldron(int pnum, int i, int sType);
BOOLEAN __fastcall OperateFountains(int pnum, int i);
void __fastcall OperateWeaponRack(int pnum, int i, unsigned char sendmsg);
void __fastcall OperateWeaponRack(int pnum, int i, BOOL sendmsg);
void __fastcall OperateStoryBook(int pnum, int i);
void __fastcall OperateLazStand(int pnum, int i);
void __fastcall OperateObject(int pnum, int i, BOOL TeleFlag);
Expand Down