ich777/devilution
1
0
Fork 0
mirror of https://github.com/diasurgical/devilution.git synced 2025-07-23 20:40:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Format source

Browse Source
This commit is contained in:
Anders Jenbo
2020-04-08 22:28:53 +02:00
parent cee695c890
commit 2ec7c78eae
15 changed files with 277 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cursor.cpp
View File

@@ -27,6 +27,7 @@ int pcurs;
/* rdata */
/** Maps from objcurs.cel frame number to frame width. */
const int InvItemWidth[] = {
// clang-format off
// Cursors
0, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 23,
// Items
@@ -47,10 +48,12 @@ const int InvItemWidth[] = {
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,
// clang-format on
};
/** Maps from objcurs.cel frame number to frame height. */
const int InvItemHeight[] = {
// clang-format off
// Cursors
0, 29, 32, 32, 32, 32, 32, 32, 32, 32, 32, 35,
// Items
@@ -71,6 +74,7 @@ const int InvItemHeight[] = {
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,
// clang-format on
};
void InitCursor()

3
Source/monster.cpp
View File

@@ -700,8 +700,7 @@ void PlaceUniqueMonst(int uniqindex, int miniontype, int unpackfilesize)
} else {
Monst->_mgoal = MGOAL_NORMAL;
}
}
else if (Monst->mtalkmsg)
} else if (Monst->mtalkmsg)
Monst->_mgoal = MGOAL_INQUIRING;
if (gnDifficulty == DIFF_NIGHTMARE) {

3
Source/player.cpp
View File

@@ -1829,8 +1829,7 @@ void DropHalfPlayersGold(int pnum)
hGold = plr[pnum]._pGold >> 1;
for (i = 0; i < MAXBELTITEMS && hGold > 0; i++) {
if (plr[pnum].SpdList[i]._itype == ITYPE_GOLD &&
plr[pnum].SpdList[i]._ivalue != GOLD_MAX_LIMIT) {
if (plr[pnum].SpdList[i]._itype == ITYPE_GOLD && plr[pnum].SpdList[i]._ivalue != GOLD_MAX_LIMIT) {
if (hGold < plr[pnum].SpdList[i]._ivalue) {
plr[pnum].SpdList[i]._ivalue -= hGold;
SetSpdbarGoldCurs(pnum, i);