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

Clean up unformatted files

pull/189/head^2
Anders Jenbo 7 years ago
parent
7883043adc
commit
55b5ce883d
7 changed files with 79 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/engine.cpp
  2. 12
      Source/lighting.cpp
  3. 8
      Source/lighting.h
  4. 5
      Source/msgcmd.cpp
  5. 102
      Source/scrollrt.cpp
  6. 24
      Source/town.cpp
  7. 4
      Source/town.h

2
Source/engine.cpp
Unescape View File

@ -5,7 +5,7 @@
#pragma warning(disable : 4731) // frame pointer register 'ebp' modified by inline assembly code
#endif
char gbPixelCol; // automap pixel color 8-bit (palette entry)
char gbPixelCol; // automap pixel color 8-bit (palette entry)
BOOL gbRotateMap; // flip - if y < x
int orgseed;
int sgnWidth;

12
Source/lighting.cpp
Unescape View File

@ -1,7 +1,7 @@
#include "diablo.h"
LightListStruct VisionList[MAXVISION];
unsigned char lightactive[MAXLIGHTS];
BYTE lightactive[MAXLIGHTS];
LightListStruct LightList[MAXLIGHTS];
int numlights;
BYTE lightradius[16][128];
@ -400,7 +400,7 @@ char *pCrawlTable[19] = /* figure out what this is for */
CrawlTable + 2187,
CrawlTable + 2460
};
unsigned char 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, 1, 9, 1, 10, 1, 11, 1, 12, 1, 13, 1, 14, 1, 15, 1 },
{ 1, 0, 2, 0, 3, 0, 4, 1, 5, 1, 6, 1, 7, 1, 8, 1, 9, 1, 10, 1, 11, 1, 12, 2, 13, 2, 14, 2, 15, 2 },
@ -425,7 +425,7 @@ unsigned char vCrawlTable[23][30] = {
{ 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 1, 8, 1, 9, 1, 10, 1, 11, 1, 12, 1, 13, 1, 14, 1, 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 }
};
unsigned char byte_49463C[18][18] = /* unused */
BYTE byte_49463C[18][18] = /* unused */
{
{ 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
{ 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
@ -447,7 +447,7 @@ unsigned char byte_49463C[18][18] = /* unused */
{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 }
};
unsigned char RadiusAdj[23] = { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 4, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0 };
BYTE RadiusAdj[23] = { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 4, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0 };
void RotateRadius(int *x, int *y, int *dx, int *dy, int *lx, int *ly, int *bx, int *by)
{
@ -723,7 +723,7 @@ void DoVision(int nXPos, int nYPos, int nRadius, BOOL doautomap, BOOL visible)
break;
}
if (nCrawlX >= 0 && nCrawlX <= MAXDUNX && nCrawlY >= 0 && nCrawlY <= MAXDUNY) {
nBlockerFlag = (unsigned char)nBlockTable[dPiece[nCrawlX][nCrawlY]];
nBlockerFlag = (BYTE)nBlockTable[dPiece[nCrawlX][nCrawlY]];
if (!nBlockTable[dPiece[x1adj + nCrawlX][y1adj + nCrawlY]]
|| !nBlockTable[dPiece[x2adj + nCrawlX][y2adj + nCrawlY]]) {
if (doautomap) {
@ -1097,7 +1097,7 @@ void ChangeLight(int i, int x, int y, int r)
void ProcessLightList()
{
int i, j;
unsigned char temp;
BYTE temp;
if (lightflag) {
return;

8
Source/lighting.h
Unescape View File

@ -3,7 +3,7 @@
#define __LIGHTING_H__
extern LightListStruct VisionList[MAXVISION];
extern unsigned char lightactive[MAXLIGHTS];
extern BYTE lightactive[MAXLIGHTS];
extern LightListStruct LightList[MAXLIGHTS];
extern int numlights;
extern BYTE lightradius[16][128];
@ -49,8 +49,8 @@ void lighting_color_cycling();
extern char CrawlTable[2749];
extern char *pCrawlTable[19];
extern unsigned char vCrawlTable[23][30];
extern unsigned char byte_49463C[18][18];
extern unsigned char RadiusAdj[23];
extern BYTE vCrawlTable[23][30];
extern BYTE byte_49463C[18][18];
extern BYTE RadiusAdj[23];
#endif /* __LIGHTING_H__ */

5
Source/msgcmd.cpp
Unescape View File

@ -10,7 +10,8 @@
// static float msgcmd_init_cpp_value = 0x7F800000;
struct EXTERNMESSAGE {
LIST_LINK(EXTERNMESSAGE) m_Link;
LIST_LINK(EXTERNMESSAGE)
m_Link;
char command[COMMAND_LEN];
void *operator new(size_t n, DWORD extralen, int flags)
{
@ -33,7 +34,7 @@ void *EXTERNMESSAGE::Delete(DWORD flags)
if ((flags & 0x1) && this) {
SMemFree(this, "delete", SLOG_FUNCTION, 0);
}
return this;
return this;
}
static TList<EXTERNMESSAGE> sgChat_Cmd;

102
Source/scrollrt.cpp
Unescape View File

@ -13,10 +13,10 @@ DWORD sgdwCursXOld;
DWORD sgdwCursYOld;
char arch_draw_type;
DDSURFACEDESC DDS_desc;
int cel_transparency_active; // weak
int cel_transparency_active;
int level_piece_id;
DWORD sgdwCursWdt;
void(*DrawPlrProc)(int, int, int, int, int, BYTE *, int, int, int, int);
void (*DrawPlrProc)(int, int, int, int, int, BYTE *, int, int, int, int);
BYTE sgSaveBack[8192];
int draw_monster_num;
DWORD sgdwCursHgtOld;
@ -204,7 +204,7 @@ void DrawDeadPlayer(int x, int y, int sx, int sy, int CelSkip, int CelCap, BOOL
for (i = 0; i < MAX_PLRS; i++) {
p = &plr[i];
if (p->plractive && !p->_pHitPoints && p->plrlevel == (unsigned char)currlevel && p->WorldX == x && p->WorldY == y) {
if (p->plractive && !p->_pHitPoints && p->plrlevel == (BYTE)currlevel && p->WorldX == x && p->WorldY == y) {
pCelBuff = p->_pAnimData;
if (!pCelBuff) {
// app_fatal("Drawing dead player %d \"%s\": NULL Cel Buffer", i, p->_pName);
@ -372,50 +372,50 @@ void DrawClippedPlayer(int pnum, int x, int y, int px, int py, BYTE *pCelBuff, i
void DrawView(int StartX, int StartY)
{
if(zoomflag) {
if (zoomflag) {
DrawGame(StartX, StartY);
} else {
DrawZoom(StartX, StartY);
}
if(automapflag) {
if (automapflag) {
DrawAutomap();
}
if(invflag) {
if (invflag) {
DrawInv();
} else if(sbookflag) {
} else if (sbookflag) {
DrawSpellBook();
}
DrawDurIcon();
if(chrflag) {
if (chrflag) {
DrawChr();
} else if(questlog) {
} else if (questlog) {
DrawQuestLog();
} else if(plr[myplr]._pStatPts != 0 && !spselflag) {
} else if (plr[myplr]._pStatPts != 0 && !spselflag) {
DrawLevelUpIcon();
}
if(uitemflag) {
if (uitemflag) {
DrawUniqueInfo();
}
if(qtextflag) {
if (qtextflag) {
DrawQText();
}
if(spselflag) {
if (spselflag) {
DrawSpellList();
}
if(dropGoldFlag) {
if (dropGoldFlag) {
DrawGoldSplit(dropGoldValue);
}
if(helpflag) {
if (helpflag) {
DrawHelp();
}
if(msgflag) {
if (msgflag) {
DrawDiabloMsg();
}
if(deathflag) {
if (deathflag) {
RedBack();
} else if(PauseMode != 0) {
} else if (PauseMode != 0) {
gmenu_draw_pause();
}
@ -545,7 +545,7 @@ void scrollrt_draw_lower(int x, int y, int sx, int sy, int chunks, int eflag)
light_table_index = dLight[x][y];
if (level_piece_id != 0) {
dst = &gpBuffer[sx + 32 + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
arch_draw_type = 2;
level_cel_block = pMap->mt[1];
if (level_cel_block != 0) {
@ -602,7 +602,7 @@ void scrollrt_draw_lower(int x, int y, int sx, int sy, int chunks, int eflag)
world_draw_black_tile(&gpBuffer[sx + PitchTbl[sy]]);
} else {
dst = &gpBuffer[sx + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
arch_draw_type = 1;
level_cel_block = pMap->mt[0];
if (level_cel_block != 0) {
@ -641,7 +641,7 @@ void scrollrt_draw_lower(int x, int y, int sx, int sy, int chunks, int eflag)
world_draw_black_tile(&gpBuffer[sx + PitchTbl[sy]]);
} else {
dst = &gpBuffer[sx + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
arch_draw_type = 1;
level_cel_block = pMap->mt[0];
if (level_cel_block != 0) {
@ -739,7 +739,7 @@ void scrollrt_draw_clipped_dungeon(BYTE *pBuff, int sx, int sy, int dx, int dy,
pItem = &item[bItem - 1];
if (!pItem->_iPostDraw) {
/// ASSERT: assert((unsigned char)bItem <= MAXITEMS);
if ((unsigned char)bItem <= MAXITEMS) {
if ((BYTE)bItem <= MAXITEMS) {
pCelBuff = pItem->_iAnimData;
if (pCelBuff != NULL) {
pFrameTable = (DWORD *)pCelBuff;
@ -859,7 +859,7 @@ void scrollrt_draw_clipped_dungeon(BYTE *pBuff, int sx, int sy, int dx, int dy,
pItem = &item[bItem - 1];
if (pItem->_iPostDraw) {
/// ASSERT: assert((unsigned char)bItem <= MAXITEMS);
if ((unsigned char)bItem <= MAXITEMS) {
if ((BYTE)bItem <= MAXITEMS) {
pCelBuff = pItem->_iAnimData;
if (pCelBuff != NULL) {
pFrameTable = (DWORD *)pCelBuff;
@ -887,7 +887,7 @@ void scrollrt_draw_clipped_dungeon(BYTE *pBuff, int sx, int sy, int dx, int dy,
}
}
if (bArch != 0) {
cel_transparency_active = (unsigned char)TransList[bMap];
cel_transparency_active = (BYTE)TransList[bMap];
Cel2DecodeLightTrans(pBuff, pSpecialCels, bArch, 64, 0, 8);
}
}
@ -971,7 +971,7 @@ void DrawClippedObject(int x, int y, int ox, int oy, BOOL pre, int CelSkip, int
}
/// ASSERT: assert((unsigned char)bv < MAXOBJECTS);
if ((unsigned char)bv >= MAXOBJECTS)
if ((BYTE)bv >= MAXOBJECTS)
return;
pCelBuff = object[bv]._oAnimData;
@ -1007,7 +1007,7 @@ void scrollrt_draw_clipped_e_flag(BYTE *pBuff, int x, int y, int sx, int sy)
level_piece_id = dPiece[x][y];
light_table_index = dLight[x][y];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
pMap = &dpiece_defs_map_1[IsometricCoord(x, y)];
dst = pBuff;
@ -1060,7 +1060,7 @@ void scrollrt_draw_lower_2(int x, int y, int sx, int sy, int chunks, int skipChu
light_table_index = dLight[x][y];
if (level_piece_id != 0) {
dst = &gpBuffer[sx - (BUFFER_WIDTH * 32 - 32) + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
for (i = 0; i < (MicroTileLen >> 1) - 1; i++) {
if (skipChunks <= i) {
level_cel_block = pMap->mt[2 * i + 3];
@ -1093,7 +1093,7 @@ void scrollrt_draw_lower_2(int x, int y, int sx, int sy, int chunks, int skipChu
light_table_index = dLight[x][y];
if (level_piece_id != 0) {
dst = &gpBuffer[sx - BUFFER_WIDTH * 32 + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
i = 0;
while (i < (MicroTileLen >> 1) - 1) {
if (skipChunks <= i) {
@ -1126,7 +1126,7 @@ void scrollrt_draw_lower_2(int x, int y, int sx, int sy, int chunks, int skipChu
light_table_index = dLight[x][y];
if (level_piece_id != 0) {
dst = &gpBuffer[sx - BUFFER_WIDTH * 32 + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
for (i = 0; i < (MicroTileLen >> 1) - 1; i++) {
if (skipChunks <= i) {
level_cel_block = pMap->mt[2 * i + 2];
@ -1205,7 +1205,7 @@ void scrollrt_draw_clipped_dungeon_2(BYTE *pBuff, int sx, int sy, int skipChunks
pItem = &item[bItem - 1];
if (!pItem->_iPostDraw) {
/// ASSERT: assert((unsigned char)bItem <= MAXITEMS);
if ((unsigned char)bItem <= MAXITEMS) {
if ((BYTE)bItem <= MAXITEMS) {
pCelBuff = pItem->_iAnimData;
if (pCelBuff != NULL) {
pFrameTable = (DWORD *)pCelBuff;
@ -1325,7 +1325,7 @@ void scrollrt_draw_clipped_dungeon_2(BYTE *pBuff, int sx, int sy, int skipChunks
pItem = &item[bItem - 1];
if (pItem->_iPostDraw) {
/// ASSERT: assert((unsigned char)bItem <= MAXITEMS);
if ((unsigned char)bItem <= MAXITEMS) {
if ((BYTE)bItem <= MAXITEMS) {
pCelBuff = pItem->_iAnimData;
if (pCelBuff != NULL) {
pFrameTable = (DWORD *)pCelBuff;
@ -1353,7 +1353,7 @@ void scrollrt_draw_clipped_dungeon_2(BYTE *pBuff, int sx, int sy, int skipChunks
}
}
if (bArch != 0) {
cel_transparency_active = (unsigned char)TransList[bMap];
cel_transparency_active = (BYTE)TransList[bMap];
Cel2DecodeLightTrans(pBuff, pSpecialCels, bArch, 64, CelSkip, 8);
}
}
@ -1371,7 +1371,7 @@ void scrollrt_draw_clipped_e_flag_2(BYTE *pBuff, int x, int y, int skipChunks, s
level_piece_id = dPiece[x][y];
light_table_index = dLight[x][y];
dst = &pBuff[BUFFER_WIDTH * 32 * skipChunks];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
pMap = &dpiece_defs_map_1[IsometricCoord(x, y)];
switch (skipChunks) {
@ -1446,7 +1446,7 @@ void scrollrt_draw_upper(int x, int y, int sx, int sy, int chunks, int capChunks
light_table_index = dLight[x][y];
if (level_piece_id != 0) {
dst = &gpBuffer[sx + 32 + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
if (capChunks >= 0) {
level_cel_block = pMap->mt[1];
if (level_cel_block != 0) {
@ -1494,7 +1494,7 @@ void scrollrt_draw_upper(int x, int y, int sx, int sy, int chunks, int capChunks
light_table_index = dLight[x][y];
if (level_piece_id != 0) {
dst = &gpBuffer[sx + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
arch_draw_type = 1;
level_cel_block = pMap->mt[0];
if (level_cel_block != 0) {
@ -1536,7 +1536,7 @@ void scrollrt_draw_upper(int x, int y, int sx, int sy, int chunks, int capChunks
light_table_index = dLight[x][y];
if (level_piece_id != 0) {
dst = &gpBuffer[sx + PitchTbl[sy]];
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
arch_draw_type = 1;
if (capChunks >= 0) {
level_cel_block = pMap->mt[0];
@ -1635,7 +1635,7 @@ void scrollrt_draw_dungeon(BYTE *pBuff, int sx, int sy, int capChunks, int CelCa
pItem = &item[bItem - 1];
if (!pItem->_iPostDraw) {
/// ASSERT: assert((unsigned char)bItem <= MAXITEMS);
if ((unsigned char)bItem <= MAXITEMS) {
if ((BYTE)bItem <= MAXITEMS) {
pCelBuff = pItem->_iAnimData;
if (pCelBuff != NULL) {
pFrameTable = (DWORD *)pCelBuff;
@ -1748,7 +1748,7 @@ void scrollrt_draw_dungeon(BYTE *pBuff, int sx, int sy, int capChunks, int CelCa
pItem = &item[bItem - 1];
if (pItem->_iPostDraw) {
/// ASSERT: assert((unsigned char)bItem <= MAXITEMS);
if ((unsigned char)bItem <= MAXITEMS) {
if ((BYTE)bItem <= MAXITEMS) {
pCelBuff = pItem->_iAnimData;
if (pCelBuff != NULL) {
pFrameTable = (DWORD *)pCelBuff;
@ -1769,7 +1769,7 @@ void scrollrt_draw_dungeon(BYTE *pBuff, int sx, int sy, int capChunks, int CelCa
}
}
if (bArch != 0) {
cel_transparency_active = (unsigned char)TransList[bMap];
cel_transparency_active = (BYTE)TransList[bMap];
CelDecodeHdrLightTrans(pBuff, pSpecialCels, bArch, 64, 0, CelCap);
}
}
@ -1853,7 +1853,7 @@ void DrawObject(int x, int y, int ox, int oy, BOOL pre, int CelSkip, int CelCap)
}
/// ASSERT: assert((unsigned char)bv < MAXOBJECTS);
if ((unsigned char)bv >= MAXOBJECTS)
if ((BYTE)bv >= MAXOBJECTS)
return;
pCelBuff = object[bv]._oAnimData;
@ -1893,7 +1893,7 @@ void scrollrt_draw_e_flag(BYTE *pBuff, int x, int y, int capChunks, int CelCap,
level_piece_id = dPiece[x][y];
light_table_index = dLight[x][y];
dst = pBuff;
cel_transparency_active = (unsigned char)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
cel_transparency_active = (BYTE)(nTransTable[level_piece_id] & TransList[dTransVal[x][y]]);
pMap = &dpiece_defs_map_1[IsometricCoord(x, y)];
arch_draw_type = 1;
@ -2584,11 +2584,11 @@ void DrawAndBlit()
int hgt;
BOOL ddsdesc, ctrlPan;
if(!gbRunGame) {
if (!gbRunGame) {
return;
}
if(drawpanflag == 255) {
if (drawpanflag == 255) {
drawhpflag = TRUE;
drawmanaflag = TRUE;
drawbtnflag = TRUE;
@ -2596,7 +2596,7 @@ void DrawAndBlit()
ddsdesc = FALSE;
ctrlPan = TRUE;
hgt = 480;
} else if(drawpanflag == 1) {
} else if (drawpanflag == 1) {
ddsdesc = TRUE;
ctrlPan = FALSE;
hgt = 352;
@ -2607,27 +2607,27 @@ void DrawAndBlit()
drawpanflag = 0;
lock_buf(0);
if(leveltype != DTYPE_TOWN) {
if (leveltype != DTYPE_TOWN) {
DrawView(ViewX, ViewY);
} else {
T_DrawView(ViewX, ViewY);
}
if(ctrlPan) {
if (ctrlPan) {
ClearCtrlPan();
}
if(drawhpflag) {
if (drawhpflag) {
UpdateLifeFlask();
}
if(drawmanaflag) {
if (drawmanaflag) {
UpdateManaFlask();
}
if(drawbtnflag) {
if (drawbtnflag) {
DrawCtrlPan();
}
if(drawsbarflag) {
if (drawsbarflag) {
DrawInvBelt();
}
if(talkflag) {
if (talkflag) {
DrawTalkPan();
hgt = 480;
}

24
Source/town.cpp
Unescape View File

@ -1211,12 +1211,12 @@ void T_DrawView(int StartX, int StartY)
{
light_table_index = 0;
cel_transparency_active = 0;
if(zoomflag) {
if (zoomflag) {
T_DrawGame(StartX, StartY);
} else {
T_DrawZoom(StartX, StartY);
}
if(automapflag) {
if (automapflag) {
DrawAutomap();
}
if (stextflag && !qtextflag)
@ -1233,25 +1233,25 @@ void T_DrawView(int StartX, int StartY)
DrawChr();
} else if (questlog) {
DrawQuestLog();
} else if(plr[myplr]._pStatPts != 0 && !spselflag) {
} else if (plr[myplr]._pStatPts != 0 && !spselflag) {
DrawLevelUpIcon();
}
if(uitemflag) {
if (uitemflag) {
DrawUniqueInfo();
}
if(qtextflag) {
if (qtextflag) {
DrawQText();
}
if(spselflag) {
if (spselflag) {
DrawSpellList();
}
if(dropGoldFlag) {
if (dropGoldFlag) {
DrawGoldSplit(dropGoldValue);
}
if(helpflag) {
if (helpflag) {
DrawHelp();
}
if(msgflag) {
if (msgflag) {
DrawDiabloMsg();
}
if (PauseMode != 0 && !deathflag) {
@ -1303,7 +1303,7 @@ void SetTownMicros()
}
}
void T_FillSector(unsigned char *P3Tiles, unsigned char *pSector, int xi, int yi, int w, int h)
void T_FillSector(BYTE *P3Tiles, BYTE *pSector, int xi, int yi, int w, int h)
{
int i, j, xx, yy;
long v1, v2, v3, v4, ii;
@ -1375,7 +1375,7 @@ void T_FillSector(unsigned char *P3Tiles, unsigned char *pSector, int xi, int yi
}
}
void T_FillTile(unsigned char *P3Tiles, int xx, int yy, int t)
void T_FillTile(BYTE *P3Tiles, int xx, int yy, int t)
{
long v1, v2, v3, v4;
@ -1423,7 +1423,7 @@ void T_FillTile(unsigned char *P3Tiles, int xx, int yy, int t)
void T_Pass3()
{
int xx, yy, x;
unsigned char *P3Tiles, *pSector;
BYTE *P3Tiles, *pSector;
for (yy = 0; yy < MAXDUNY; yy += 2) {
for (xx = 0; xx < MAXDUNX; xx += 2) {

4
Source/town.h
Unescape View File

@ -19,8 +19,8 @@ void T_DrawGame(int x, int y);
void T_DrawZoom(int x, int y);
void T_DrawView(int StartX, int StartY);
void SetTownMicros();
void T_FillSector(unsigned char *P3Tiles, unsigned char *pSector, int xi, int yi, int w, int h);
void T_FillTile(unsigned char *P3Tiles, int xx, int yy, int t);
void T_FillSector(BYTE *P3Tiles, BYTE *pSector, int xi, int yi, int w, int h);
void T_FillTile(BYTE *P3Tiles, int xx, int yy, int t);
void T_Pass3();
void CreateTown(int entry);

Write Preview
Loading…
Cancel
Save