Skip to content

Commit

Permalink
Add network commands and cursors (diasurgical#1967)
Browse files Browse the repository at this point in the history
  • Loading branch information
@galaxyhaxz
galaxyhaxz authored Jan 17, 2020
1 parent 14aab09 commit 38c748b
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 44 deletions.
24 changes: 20 additions & 4 deletions Source/cursor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ int pcurstemp;
int pcurs;

/* rdata */
const int InvItemWidth[180] = {
const int InvItemWidth[] = {
// Cursors
0, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 23,
// Items
Expand All @@ -43,10 +43,18 @@ const int InvItemWidth[180] = {
2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28,
2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28,
2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28,
2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28
2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28,
#ifdef HELLFIRE
1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28,
1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28,
1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28,
2 * 28, 2 * 28, 1 * 28, 1 * 28, 1 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28,
2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28,
2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28, 2 * 28
#endif
};

const int InvItemHeight[180] = {
const int InvItemHeight[] = {
// Cursors
0, 29, 32, 32, 32, 32, 32, 32, 32, 32, 32, 35,
// Items
Expand All @@ -66,7 +74,15 @@ const int InvItemHeight[180] = {
3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28,
3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28,
3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28,
3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28
3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28,
#ifdef HELLFIRE
1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28,
1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28,
1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28, 1 * 28,
2 * 28, 2 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28,
3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28,
3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28, 3 * 28
#endif
};

void InitCursor()
Expand Down
4 changes: 2 additions & 2 deletions Source/cursor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void CheckRportal();
void CheckCursMove();

/* rdata */
extern const int InvItemWidth[180];
extern const int InvItemHeight[180];
extern const int InvItemWidth[];
extern const int InvItemHeight[];

#endif /* __CURSOR_H__ */
2 changes: 1 addition & 1 deletion Source/inv.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2415,7 +2415,7 @@ int InvPutItem(int pnum, int x, int y)
return -1;
}
if (plr[pnum].HoldItem.IDidx == IDI_MAPOFDOOM && xp >= 35 && xp <= 38 && yp >= 20 && yp <= 24) {
NetSendCmd(FALSE, CMD_SETHIVE);
NetSendCmd(FALSE, CMD_OPENCRYPT);
quests[QTYPE_GRAVE]._qactive = 3;
if (gbMaxPlayers != 1) {
NetSendCmdQuest(TRUE, QTYPE_GRAVE);
Expand Down
136 changes: 100 additions & 36 deletions Source/msg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@ void DeltaAddItem(int ii)
pD = sgLevels[currlevel].item;
for (i = 0; i < MAXITEMS; i++, pD++) {
if (pD->bCmd != 0xFF
&& pD->wIndx == item[ii].IDidx
&& pD->wCI == item[ii]._iCreateInfo
&& pD->dwSeed == item[ii]._iSeed
&& (pD->bCmd == CMD_WALKXY || pD->bCmd == CMD_STAND)) {
&& pD->wIndx == item[ii].IDidx
&& pD->wCI == item[ii]._iCreateInfo
&& pD->dwSeed == item[ii]._iSeed
&& (pD->bCmd == CMD_WALKXY || pD->bCmd == CMD_STAND)) {
return;
}
}
Expand Down Expand Up @@ -517,9 +517,9 @@ void DeltaLoadLevel()
if (sgLevels[currlevel].item[i].bCmd != 0xFF) {
if (sgLevels[currlevel].item[i].bCmd == CMD_WALKXY) {
ii = FindGetItem(
sgLevels[currlevel].item[i].wIndx,
sgLevels[currlevel].item[i].wCI,
sgLevels[currlevel].item[i].dwSeed);
sgLevels[currlevel].item[i].wIndx,
sgLevels[currlevel].item[i].wCI,
sgLevels[currlevel].item[i].dwSeed);
if (ii != -1) {
if (dItem[item[ii]._ix][item[ii]._iy] == ii + 1)
dItem[item[ii]._ix][item[ii]._iy] = 0;
Expand All @@ -532,23 +532,23 @@ void DeltaLoadLevel()
itemactive[numitems] = ii;
if (sgLevels[currlevel].item[i].wIndx == IDI_EAR) {
RecreateEar(
ii,
sgLevels[currlevel].item[i].wCI,
sgLevels[currlevel].item[i].dwSeed,
sgLevels[currlevel].item[i].bId,
sgLevels[currlevel].item[i].bDur,
sgLevels[currlevel].item[i].bMDur,
sgLevels[currlevel].item[i].bCh,
sgLevels[currlevel].item[i].bMCh,
sgLevels[currlevel].item[i].wValue,
sgLevels[currlevel].item[i].dwBuff);
ii,
sgLevels[currlevel].item[i].wCI,
sgLevels[currlevel].item[i].dwSeed,
sgLevels[currlevel].item[i].bId,
sgLevels[currlevel].item[i].bDur,
sgLevels[currlevel].item[i].bMDur,
sgLevels[currlevel].item[i].bCh,
sgLevels[currlevel].item[i].bMCh,
sgLevels[currlevel].item[i].wValue,
sgLevels[currlevel].item[i].dwBuff);
} else {
RecreateItem(
ii,
sgLevels[currlevel].item[i].wIndx,
sgLevels[currlevel].item[i].wCI,
sgLevels[currlevel].item[i].dwSeed,
sgLevels[currlevel].item[i].wValue);
ii,
sgLevels[currlevel].item[i].wIndx,
sgLevels[currlevel].item[i].wCI,
sgLevels[currlevel].item[i].dwSeed,
sgLevels[currlevel].item[i].wValue);
if (sgLevels[currlevel].item[i].bId)
item[ii]._iIdentified = TRUE;
item[ii]._iDurability = sgLevels[currlevel].item[i].bDur;
Expand Down Expand Up @@ -1130,6 +1130,15 @@ DWORD ParseCmd(int pnum, TCmd *pCmd)
return On_SETSHIELD(pCmd, pnum);
case CMD_REMSHIELD:
return On_REMSHIELD(pCmd, pnum);
#else
case CMD_REFLECT:
return On_REFLECT(pCmd, pnum);
case CMD_NAKRUL:
return On_NAKRUL(pCmd, pnum);
case CMD_OPENHIVE:
return On_OPENHIVE(pCmd, pnum);
case CMD_OPENCRYPT:
return On_OPENCRYPT(pCmd, pnum);
#endif
}

Expand Down Expand Up @@ -1264,12 +1273,12 @@ void DeltaImportJunk(BYTE *src)
memcpy(&sgJunk.portal[i], src, sizeof(DPortal));
src += sizeof(DPortal);
SetPortalStats(
i,
TRUE,
sgJunk.portal[i].x,
sgJunk.portal[i].y,
sgJunk.portal[i].level,
sgJunk.portal[i].ltype);
i,
TRUE,
sgJunk.portal[i].x,
sgJunk.portal[i].y,
sgJunk.portal[i].level,
sgJunk.portal[i].ltype);
}
}

Expand Down Expand Up @@ -1427,9 +1436,9 @@ BOOL i_own_level(int nReqLevel)

for (i = 0; i < MAX_PLRS; i++) {
if (plr[i].plractive
&& !plr[i]._pLvlChanging
&& plr[i].plrlevel == nReqLevel
&& (i != myplr || !gbBufferMsgs))
&& !plr[i]._pLvlChanging
&& plr[i].plrlevel == nReqLevel
&& (i != myplr || !gbBufferMsgs))
break;
}

Expand Down Expand Up @@ -1650,10 +1659,10 @@ void delta_put_item(TCmdPItem *pI, int x, int y, BYTE bLevel)
pD = sgLevels[bLevel].item;
for (i = 0; i < MAXITEMS; i++, pD++) {
if (pD->bCmd != CMD_WALKXY
&& pD->bCmd != 0xFF
&& pD->wIndx == pI->wIndx
&& pD->wCI == pI->wCI
&& pD->dwSeed == pI->dwSeed) {
&& pD->bCmd != 0xFF
&& pD->wIndx == pI->wIndx
&& pD->wCI == pI->wCI
&& pD->dwSeed == pI->dwSeed) {
if (pD->bCmd == CMD_ACK_PLRINFO)
return;
app_fatal("Trying to drop a floor item?");
Expand Down Expand Up @@ -2611,6 +2620,7 @@ DWORD On_DEBUG(TCmd *pCmd, int pnum)
return sizeof(*pCmd);
}

#ifndef HELLFIRE
DWORD On_NOVA(TCmd *pCmd, int pnum)
{
TCmdLoc *p = (TCmdLoc *)pCmd;
Expand All @@ -2628,7 +2638,6 @@ DWORD On_NOVA(TCmd *pCmd, int pnum)
return sizeof(*p);
}

#ifndef HELLFIRE
DWORD On_SETSHIELD(TCmd *pCmd, int pnum)
{
if (gbBufferMsgs != 1)
Expand All @@ -2644,4 +2653,59 @@ DWORD On_REMSHIELD(TCmd *pCmd, int pnum)

return sizeof(*pCmd);
}
#else
DWORD On_REFLECT(TCmd *pCmd, int pnum)
{
int i, mx;

if ( gbBufferMsgs != 1 && pnum != myplr && currlevel == plr[pnum].plrlevel )
{
for(i = 0; i < nummissiles; i++)
{
mx = missileactive[i];
if ( missile[mx]._mitype == MIS_REFLECT && missile[mx]._misource == pnum )
{
ClearMissileSpot(mx);
DeleteMissile(mx, i);
}
}
}

return sizeof(*pCmd);
}

DWORD On_NAKRUL(TCmd *pCmd, int pnum)
{
if ( gbBufferMsgs != 1 )
{
operate_lv24_lever();
IsUberRoomOpened = 1;
quests[QTYPE_NAKRUL]._qactive = 3;
monster_some_crypt();
}
return sizeof(*pCmd);
}

DWORD On_OPENHIVE(TCmd *pCmd, int pnum)
{
TCmdLocParam2 *p = (TCmdLocParam2 *)pCmd;
if ( gbBufferMsgs != 1 )
{
AddMissile(p->x, p->y, p->wParam1, p->wParam2, 0, MIS_HIVEEXP2, 0, pnum, 0, 0);
town_4751C6();
}
return sizeof(*p);
}

DWORD On_OPENCRYPT(TCmd *pCmd, int pnum)
{
if ( gbBufferMsgs != 1 )
{
town_475595();
InitTownTriggers();
if ( !currlevel )
PlaySFX(IS_SARC);
}
return sizeof(*pCmd);
}
#endif
7 changes: 7 additions & 0 deletions Source/msg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,15 @@ DWORD On_ENDSHIELD(TCmd *pCmd, int pnum);
DWORD On_CHEAT_EXPERIENCE(TCmd *pCmd, int pnum);
DWORD On_CHEAT_SPELL_LEVEL(TCmd *pCmd, int pnum);
DWORD On_DEBUG(TCmd *pCmd, int pnum);
#ifndef HELLFIRE
DWORD On_NOVA(TCmd *pCmd, int pnum);
DWORD On_SETSHIELD(TCmd *pCmd, int pnum);
DWORD On_REMSHIELD(TCmd *pCmd, int pnum);
#else
DWORD On_REFLECT(TCmd *pCmd, int pnum);
DWORD On_NAKRUL(TCmd *pCmd, int pnum);
DWORD On_OPENHIVE(TCmd *pCmd, int pnum);
DWORD On_OPENCRYPT(TCmd *pCmd, int pnum);
#endif

#endif /* __MSG_H__ */
2 changes: 1 addition & 1 deletion enums.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2701,7 +2701,7 @@ typedef enum _cmd_id {
CMD_REFLECT,
CMD_NAKRUL,
CMD_OPENHIVE,
CMD_SETHIVE,
CMD_OPENCRYPT,
#else
CMD_NOVA,
CMD_SETSHIELD,
Expand Down

0 comments on commit 38c748b

Please sign in to comment.