mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Format files

pull/393/head
Anders Jenbo 7 years ago
parent
86bf1fe0d5
commit
3e7d352fde
9 changed files with 60 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/automap.cpp
  2. 52
      Source/control.cpp
  3. 2
      Source/engine.h
  4. 4
      Source/init.cpp
  5. 43
      Source/lighting.cpp
  6. 8
      Source/missiles.cpp
  7. 2
      Source/monster.cpp
  8. 2
      Source/msg.cpp
  9. 6
      Source/multi.cpp

2
Source/automap.cpp
Unescape View File

@ -170,7 +170,7 @@ void DrawAutomap()
return; return;
} }
gpBufEnd = &gpBuffer[(PANEL_Y) * BUFFER_WIDTH]; gpBufEnd = &gpBuffer[(PANEL_Y)*BUFFER_WIDTH];
MapX = (ViewX - 16) >> 1; MapX = (ViewX - 16) >> 1;
while (MapX + AutoMapXOfs < 0) while (MapX + AutoMapXOfs < 0)

52
Source/control.cpp
Unescape View File

@ -80,39 +80,39 @@ const BYTE fontkern[68] = {
*/ */
const int lineOffsets[5][5] = { const int lineOffsets[5][5] = {
{ {
BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
BUFFER_WIDTH * 32 + 180, BUFFER_WIDTH * 32 + 180,
}, },
{ {
BUFFER_WIDTH * (422 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH * (422 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (446 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(446 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
}, },
{ {
BUFFER_WIDTH * (416 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH * (416 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(434 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (452 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(452 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
}, },
{ {
BUFFER_WIDTH * (412 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH * (412 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (427 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(427 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (441 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(441 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (456 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(456 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * 32, BUFFER_WIDTH * 32,
}, },
{ {
BUFFER_WIDTH * (410 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH * (410 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (422 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(422 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(434 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (446 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(446 + SCREEN_Y) + 177 + SCREEN_X,
BUFFER_WIDTH * (457 + SCREEN_Y) + 177 + SCREEN_X, BUFFER_WIDTH *(457 + SCREEN_Y) + 177 + SCREEN_X,
} }
}; };
const BYTE gbFontTransTbl[256] = { const BYTE gbFontTransTbl[256] = {
@ -2257,7 +2257,7 @@ void PrintSBookStr(int x, int y, BOOL cjustflag, char *pszStr, char col)
char *tmp; char *tmp;
int screen_x, line, width; int screen_x, line, width;
width = PitchTbl[y] + x + SCREEN_WIDTH - 320 + 120;; width = PitchTbl[y] + x + SCREEN_WIDTH - 320 + 120;
line = 0; line = 0;
if (cjustflag) { if (cjustflag) {
screen_x = 0; screen_x = 0;

2
Source/engine.h
Unescape View File

@ -5,7 +5,7 @@
//offset 0 //offset 0
//pCelBuff->pFrameTable[0] //pCelBuff->pFrameTable[0]
extern char gbPixelCol; // automap pixel color 8-bit (palette entry) extern char gbPixelCol; // automap pixel color 8-bit (palette entry)
extern BOOL gbRotateMap; // flip - if y < x extern BOOL gbRotateMap; // flip - if y < x
extern int orgseed; extern int orgseed;
extern int SeedCount; extern int SeedCount;

4
Source/init.cpp
Unescape View File

@ -241,9 +241,9 @@ void init_archives()
diabdat_mpq = init_test_access(diabdat_mpq_path, "\\spawn.mpq", "DiabloSpawn", 1000, FS_PC); diabdat_mpq = init_test_access(diabdat_mpq_path, "\\spawn.mpq", "DiabloSpawn", 1000, FS_PC);
#else #else
#ifdef COPYPROT #ifdef COPYPROT
diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_CD); diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_CD);
#else #else
diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_PC); diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_PC);
#endif #endif
#endif #endif
#ifdef COPYPROT #ifdef COPYPROT

43
Source/lighting.cpp
Unescape View File

@ -402,28 +402,27 @@ char CrawlTable[2749] = {
// pCrawlTable maps from circle radius to the X- and Y-coordinate deltas from // pCrawlTable maps from circle radius to the X- and Y-coordinate deltas from
// the center of a circle. // the center of a circle.
char *pCrawlTable[19] = char *pCrawlTable[19] = {
{ CrawlTable,
CrawlTable, CrawlTable + 3,
CrawlTable + 3, CrawlTable + 12,
CrawlTable + 12, CrawlTable + 45,
CrawlTable + 45, CrawlTable + 94,
CrawlTable + 94, CrawlTable + 159,
CrawlTable + 159, CrawlTable + 240,
CrawlTable + 240, CrawlTable + 337,
CrawlTable + 337, CrawlTable + 450,
CrawlTable + 450, CrawlTable + 579,
CrawlTable + 579, CrawlTable + 724,
CrawlTable + 724, CrawlTable + 885,
CrawlTable + 885, CrawlTable + 1062,
CrawlTable + 1062, CrawlTable + 1255,
CrawlTable + 1255, CrawlTable + 1464,
CrawlTable + 1464, CrawlTable + 1689,
CrawlTable + 1689, CrawlTable + 1930,
CrawlTable + 1930, CrawlTable + 2187,
CrawlTable + 2187, CrawlTable + 2460
CrawlTable + 2460 };
};
BYTE vCrawlTable[23][30] = { BYTE vCrawlTable[23][30] = {
{ 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0 }, { 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0 },
{ 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 1, 9, 1, 10, 1, 11, 1, 12, 1, 13, 1, 14, 1, 15, 1 }, { 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 1, 9, 1, 10, 1, 11, 1, 12, 1, 13, 1, 14, 1, 15, 1 },

8
Source/missiles.cpp
Unescape View File

@ -491,14 +491,14 @@ BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, BOOLEAN shif
mir = missiledata[t].mResist; mir = missiledata[t].mResist;
mor = monster[m].mMagicRes; mor = monster[m].mMagicRes;
if (mor & IMUNE_MAGIC && mir == MISR_MAGIC if (mor & IMUNE_MAGIC && mir == MISR_MAGIC
|| mor & IMUNE_FIRE && mir == MISR_FIRE || mor & IMUNE_FIRE && mir == MISR_FIRE
|| mor & IMUNE_LIGHTNING && mir == MISR_LIGHTNING) { || mor & IMUNE_LIGHTNING && mir == MISR_LIGHTNING) {
return FALSE; return FALSE;
} }
if ((mor & RESIST_MAGIC && mir == MISR_MAGIC) if ((mor & RESIST_MAGIC && mir == MISR_MAGIC)
|| (mor & RESIST_FIRE && mir == MISR_FIRE) || (mor & RESIST_FIRE && mir == MISR_FIRE)
|| (mor & RESIST_LIGHTNING && mir == MISR_LIGHTNING)) { || (mor & RESIST_LIGHTNING && mir == MISR_LIGHTNING)) {
resist = TRUE; resist = TRUE;
} }

2
Source/monster.cpp
Unescape View File

@ -2835,7 +2835,7 @@ BOOL M_CallWalk2(int i, int md)
int mdtemp; int mdtemp;
mdtemp = md; mdtemp = md;
ok = DirOK(i, md); // Can we continue in the same direction ok = DirOK(i, md); // Can we continue in the same direction
if (random_(101, 2)) { // Randomly go left or right if (random_(101, 2)) { // Randomly go left or right
ok = ok || (mdtemp = left[md], DirOK(i, left[md])) || (mdtemp = right[md], DirOK(i, right[md])); ok = ok || (mdtemp = left[md], DirOK(i, left[md])) || (mdtemp = right[md], DirOK(i, right[md]));
} else { } else {

2
Source/msg.cpp
Unescape View File

@ -1848,7 +1848,7 @@ DWORD On_OPOBJT(TCmd *pCmd, int pnum)
if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) {
plr[pnum].destAction = ACTION_OPERATETK; plr[pnum].destAction = ACTION_OPERATETK;
plr[pnum].destParam1 =p->wParam1; plr[pnum].destParam1 = p->wParam1;
} }
return sizeof(*p); return sizeof(*p);

6
Source/multi.cpp
Unescape View File

@ -544,7 +544,7 @@ void multi_send_zero_packet(int pnum, BYTE bCmd, BYTE *pbSrc, DWORD dwLen)
dwOffset = 0; dwOffset = 0;
while(dwLen != 0) { while (dwLen != 0) {
pkt.hdr.wCheck = 'ip'; pkt.hdr.wCheck = 'ip';
pkt.hdr.px = 0; pkt.hdr.px = 0;
pkt.hdr.py = 0; pkt.hdr.py = 0;
@ -559,7 +559,7 @@ void multi_send_zero_packet(int pnum, BYTE bCmd, BYTE *pbSrc, DWORD dwLen)
p->bCmd = bCmd; p->bCmd = bCmd;
p->wOffset = dwOffset; p->wOffset = dwOffset;
dwBody = gdwLargestMsgSize - sizeof(pkt.hdr) - sizeof(*p); dwBody = gdwLargestMsgSize - sizeof(pkt.hdr) - sizeof(*p);
if(dwLen < dwBody) { if (dwLen < dwBody) {
dwBody = dwLen; dwBody = dwLen;
} }
/// ASSERT: assert(dwBody <= 0x0ffff); /// ASSERT: assert(dwBody <= 0x0ffff);
@ -569,7 +569,7 @@ void multi_send_zero_packet(int pnum, BYTE bCmd, BYTE *pbSrc, DWORD dwLen)
dwMsg += sizeof(*p); dwMsg += sizeof(*p);
dwMsg += p->wBytes; dwMsg += p->wBytes;
pkt.hdr.wLen = dwMsg; pkt.hdr.wLen = dwMsg;
if(!SNetSendMessage(pnum, &pkt, dwMsg)) { if (!SNetSendMessage(pnum, &pkt, dwMsg)) {
nthread_terminate_game("SNetSendMessage2"); nthread_terminate_game("SNetSendMessage2");
return; return;
} }

Write Preview
Loading…
Cancel
Save