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

♻️ LoadFileInMem: Remove `nullptr` at call sites 

This is now the default argument, no need to provide it explicitly.
pull/1800/head
Gleb Mazovetskiy 5 years ago committed by Anders Jenbo
parent
1b8b62a8c2
commit
052b4c12f5
13 changed files with 91 additions and 91 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. 8
      Source/DiabloUI/fonts.cpp
  2. 48
      Source/diablo.cpp
  3. 10
      Source/drlg_l1.cpp
  4. 10
      Source/drlg_l2.cpp
  5. 4
      Source/drlg_l3.cpp
  6. 8
      Source/drlg_l4.cpp
  7. 4
      Source/lighting.cpp
  8. 20
      Source/monster.cpp
  9. 18
      Source/objects.cpp
  10. 10
      Source/quests.cpp
  11. 2
      Source/setmaps.cpp
  12. 10
      Source/town.cpp
  13. 30
      Source/towners.cpp

8
Source/DiabloUI/fonts.cpp
Unescape View File

@ -24,10 +24,10 @@ void LoadArtFont(const char *pszFile, int size, int color)
void LoadArtFonts()
{
FontTables[AFT_SMALL] = LoadFileInMem("ui_art\\font16.bin", nullptr);
FontTables[AFT_MED] = LoadFileInMem("ui_art\\font24.bin", nullptr);
FontTables[AFT_BIG] = LoadFileInMem("ui_art\\font30.bin", nullptr);
FontTables[AFT_HUGE] = LoadFileInMem("ui_art\\font42.bin", nullptr);
FontTables[AFT_SMALL] = LoadFileInMem("ui_art\\font16.bin");
FontTables[AFT_MED] = LoadFileInMem("ui_art\\font24.bin");
FontTables[AFT_BIG] = LoadFileInMem("ui_art\\font30.bin");
FontTables[AFT_HUGE] = LoadFileInMem("ui_art\\font42.bin");
LoadArtFont("ui_art\\font16s.pcx", AFT_SMALL, AFC_SILVER);
LoadArtFont("ui_art\\font16g.pcx", AFT_SMALL, AFC_GOLD);
LoadArtFont("ui_art\\font24s.pcx", AFT_MED, AFC_SILVER);

48
Source/diablo.cpp
Unescape View File

@ -1740,51 +1740,51 @@ void LoadLvlGFX()
switch (leveltype) {
case DTYPE_TOWN:
if (gbIsHellfire) {
pDungeonCels = LoadFileInMem("NLevels\\TownData\\Town.CEL", nullptr);
pMegaTiles = LoadFileInMem("NLevels\\TownData\\Town.TIL", nullptr);
pLevelPieces = LoadFileInMem("NLevels\\TownData\\Town.MIN", nullptr);
pDungeonCels = LoadFileInMem("NLevels\\TownData\\Town.CEL");
pMegaTiles = LoadFileInMem("NLevels\\TownData\\Town.TIL");
pLevelPieces = LoadFileInMem("NLevels\\TownData\\Town.MIN");
} else {
pDungeonCels = LoadFileInMem("Levels\\TownData\\Town.CEL", nullptr);
pMegaTiles = LoadFileInMem("Levels\\TownData\\Town.TIL", nullptr);
pLevelPieces = LoadFileInMem("Levels\\TownData\\Town.MIN", nullptr);
pDungeonCels = LoadFileInMem("Levels\\TownData\\Town.CEL");
pMegaTiles = LoadFileInMem("Levels\\TownData\\Town.TIL");
pLevelPieces = LoadFileInMem("Levels\\TownData\\Town.MIN");
}
pSpecialCels = LoadCel("Levels\\TownData\\TownS.CEL", SpecialCelWidth);
break;
case DTYPE_CATHEDRAL:
if (currlevel < 21) {
pDungeonCels = LoadFileInMem("Levels\\L1Data\\L1.CEL", nullptr);
pMegaTiles = LoadFileInMem("Levels\\L1Data\\L1.TIL", nullptr);
pLevelPieces = LoadFileInMem("Levels\\L1Data\\L1.MIN", nullptr);
pDungeonCels = LoadFileInMem("Levels\\L1Data\\L1.CEL");
pMegaTiles = LoadFileInMem("Levels\\L1Data\\L1.TIL");
pLevelPieces = LoadFileInMem("Levels\\L1Data\\L1.MIN");
pSpecialCels = LoadCel("Levels\\L1Data\\L1S.CEL", SpecialCelWidth);
} else {
pDungeonCels = LoadFileInMem("NLevels\\L5Data\\L5.CEL", nullptr);
pMegaTiles = LoadFileInMem("NLevels\\L5Data\\L5.TIL", nullptr);
pLevelPieces = LoadFileInMem("NLevels\\L5Data\\L5.MIN", nullptr);
pDungeonCels = LoadFileInMem("NLevels\\L5Data\\L5.CEL");
pMegaTiles = LoadFileInMem("NLevels\\L5Data\\L5.TIL");
pLevelPieces = LoadFileInMem("NLevels\\L5Data\\L5.MIN");
pSpecialCels = LoadCel("NLevels\\L5Data\\L5S.CEL", SpecialCelWidth);
}
break;
case DTYPE_CATACOMBS:
pDungeonCels = LoadFileInMem("Levels\\L2Data\\L2.CEL", nullptr);
pMegaTiles = LoadFileInMem("Levels\\L2Data\\L2.TIL", nullptr);
pLevelPieces = LoadFileInMem("Levels\\L2Data\\L2.MIN", nullptr);
pDungeonCels = LoadFileInMem("Levels\\L2Data\\L2.CEL");
pMegaTiles = LoadFileInMem("Levels\\L2Data\\L2.TIL");
pLevelPieces = LoadFileInMem("Levels\\L2Data\\L2.MIN");
pSpecialCels = LoadCel("Levels\\L2Data\\L2S.CEL", SpecialCelWidth);
break;
case DTYPE_CAVES:
if (currlevel < 17) {
pDungeonCels = LoadFileInMem("Levels\\L3Data\\L3.CEL", nullptr);
pMegaTiles = LoadFileInMem("Levels\\L3Data\\L3.TIL", nullptr);
pLevelPieces = LoadFileInMem("Levels\\L3Data\\L3.MIN", nullptr);
pDungeonCels = LoadFileInMem("Levels\\L3Data\\L3.CEL");
pMegaTiles = LoadFileInMem("Levels\\L3Data\\L3.TIL");
pLevelPieces = LoadFileInMem("Levels\\L3Data\\L3.MIN");
} else {
pDungeonCels = LoadFileInMem("NLevels\\L6Data\\L6.CEL", nullptr);
pMegaTiles = LoadFileInMem("NLevels\\L6Data\\L6.TIL", nullptr);
pLevelPieces = LoadFileInMem("NLevels\\L6Data\\L6.MIN", nullptr);
pDungeonCels = LoadFileInMem("NLevels\\L6Data\\L6.CEL");
pMegaTiles = LoadFileInMem("NLevels\\L6Data\\L6.TIL");
pLevelPieces = LoadFileInMem("NLevels\\L6Data\\L6.MIN");
}
pSpecialCels = LoadCel("Levels\\L1Data\\L1S.CEL", SpecialCelWidth);
break;
case DTYPE_HELL:
pDungeonCels = LoadFileInMem("Levels\\L4Data\\L4.CEL", nullptr);
pMegaTiles = LoadFileInMem("Levels\\L4Data\\L4.TIL", nullptr);
pLevelPieces = LoadFileInMem("Levels\\L4Data\\L4.MIN", nullptr);
pDungeonCels = LoadFileInMem("Levels\\L4Data\\L4.CEL");
pMegaTiles = LoadFileInMem("Levels\\L4Data\\L4.TIL");
pLevelPieces = LoadFileInMem("Levels\\L4Data\\L4.MIN");
pSpecialCels = LoadCel("Levels\\L2Data\\L2S.CEL", SpecialCelWidth);
break;
default:

10
Source/drlg_l1.cpp
Unescape View File

@ -1120,15 +1120,15 @@ static void DRLG_LoadL1SP()
{
L5setloadflag = false;
if (QuestStatus(Q_BUTCHER)) {
L5pSetPiece = LoadFileInMem("Levels\\L1Data\\rnd6.DUN", nullptr);
L5pSetPiece = LoadFileInMem("Levels\\L1Data\\rnd6.DUN");
L5setloadflag = true;
}
if (QuestStatus(Q_SKELKING) && !gbIsMultiplayer) {
L5pSetPiece = LoadFileInMem("Levels\\L1Data\\SKngDO.DUN", nullptr);
L5pSetPiece = LoadFileInMem("Levels\\L1Data\\SKngDO.DUN");
L5setloadflag = true;
}
if (QuestStatus(Q_LTBANNER)) {
L5pSetPiece = LoadFileInMem("Levels\\L1Data\\Banner2.DUN", nullptr);
L5pSetPiece = LoadFileInMem("Levels\\L1Data\\Banner2.DUN");
L5setloadflag = true;
}
}
@ -1218,7 +1218,7 @@ void LoadL1Dungeon(const char *sFileName, int vx, int vy)
dmaxy = 96;
DRLG_InitTrans();
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
for (j = 0; j < DMAXY; j++) {
for (i = 0; i < DMAXX; i++) {
@ -1266,7 +1266,7 @@ void LoadPreL1Dungeon(const char *sFileName)
dmaxx = 96;
dmaxy = 96;
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
for (j = 0; j < DMAXY; j++) {
for (i = 0; i < DMAXX; i++) {

10
Source/drlg_l2.cpp
Unescape View File

@ -1843,15 +1843,15 @@ static void DRLG_LoadL2SP()
setloadflag = false;
if (QuestStatus(Q_BLIND)) {
pSetPiece = LoadFileInMem("Levels\\L2Data\\Blind1.DUN", nullptr);
pSetPiece = LoadFileInMem("Levels\\L2Data\\Blind1.DUN");
pSetPiece[26] = 154; // Close outer wall
pSetPiece[200] = 154; // Close outer wall
setloadflag = true;
} else if (QuestStatus(Q_BLOOD)) {
pSetPiece = LoadFileInMem("Levels\\L2Data\\Blood1.DUN", nullptr);
pSetPiece = LoadFileInMem("Levels\\L2Data\\Blood1.DUN");
setloadflag = true;
} else if (QuestStatus(Q_SCHAMB)) {
pSetPiece = LoadFileInMem("Levels\\L2Data\\Bonestr2.DUN", nullptr);
pSetPiece = LoadFileInMem("Levels\\L2Data\\Bonestr2.DUN");
setloadflag = true;
}
}
@ -3274,7 +3274,7 @@ static void LoadL2DungeonData(BYTE *pLevelMap)
void LoadL2Dungeon(const char *sFileName, int vx, int vy)
{
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
LoadL2DungeonData(pLevelMap.get());
@ -3323,7 +3323,7 @@ void LoadL2Dungeon(const char *sFileName, int vx, int vy)
void LoadPreL2Dungeon(const char *sFileName)
{
{
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
LoadL2DungeonData(pLevelMap.get());
}

4
Source/drlg_l3.cpp
Unescape View File

@ -2630,7 +2630,7 @@ void LoadL3Dungeon(const char *sFileName, int vx, int vy)
dmaxx = 96;
dmaxy = 96;
DRLG_InitTrans();
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
lm = pLevelMap.get();
rw = *lm;
@ -2685,7 +2685,7 @@ void LoadPreL3Dungeon(const char *sFileName)
InitL3Dungeon();
DRLG_InitTrans();
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
lm = pLevelMap.get();
rw = *lm;

8
Source/drlg_l4.cpp
Unescape View File

@ -202,11 +202,11 @@ void DRLG_LoadL4SP()
{
setloadflag = false;
if (QuestStatus(Q_WARLORD)) {
pSetPiece = LoadFileInMem("Levels\\L4Data\\Warlord.DUN", nullptr);
pSetPiece = LoadFileInMem("Levels\\L4Data\\Warlord.DUN");
setloadflag = true;
}
if (currlevel == 15 && gbIsMultiplayer) {
pSetPiece = LoadFileInMem("Levels\\L4Data\\Vile1.DUN", nullptr);
pSetPiece = LoadFileInMem("Levels\\L4Data\\Vile1.DUN");
setloadflag = true;
}
}
@ -1770,7 +1770,7 @@ void LoadL4Dungeon(char *sFileName, int vx, int vy)
DRLG_InitTrans();
InitL4Dungeon();
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
lm = pLevelMap.get();
rw = *lm;
@ -1811,7 +1811,7 @@ void LoadPreL4Dungeon(char *sFileName)
InitL4Dungeon();
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
lm = pLevelMap.get();
rw = *lm;

4
Source/lighting.cpp
Unescape View File

@ -905,14 +905,14 @@ void MakeLightTable()
}
{
auto trn = LoadFileInMem("PlrGFX\\Infra.TRN", nullptr);
auto trn = LoadFileInMem("PlrGFX\\Infra.TRN");
for (i = 0; i < 256; i++) {
*tbl++ = trn[i];
}
}
{
auto trn = LoadFileInMem("PlrGFX\\Stone.TRN", nullptr);
auto trn = LoadFileInMem("PlrGFX\\Stone.TRN");
for (i = 0; i < 256; i++) {
*tbl++ = trn[i];
}

20
Source/monster.cpp
Unescape View File

@ -351,7 +351,7 @@ void InitMonsterGFX(int monst)
BYTE *celBuf;
{
auto celData = LoadFileInMem(strBuff, nullptr);
auto celData = LoadFileInMem(strBuff);
celBuf = celData.get();
Monsters[monst].Anims[anim].CMem = std::move(celData);
}
@ -950,23 +950,23 @@ void PlaceQuestMonsters()
}
if (QuestStatus(Q_LTBANNER)) {
auto setp = LoadFileInMem("Levels\\L1Data\\Banner1.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L1Data\\Banner1.DUN");
SetMapMonsters(setp.get(), 2 * setpc_x, 2 * setpc_y);
}
if (QuestStatus(Q_BLOOD)) {
auto setp = LoadFileInMem("Levels\\L2Data\\Blood2.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L2Data\\Blood2.DUN");
SetMapMonsters(setp.get(), 2 * setpc_x, 2 * setpc_y);
}
if (QuestStatus(Q_BLIND)) {
auto setp = LoadFileInMem("Levels\\L2Data\\Blind2.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L2Data\\Blind2.DUN");
SetMapMonsters(setp.get(), 2 * setpc_x, 2 * setpc_y);
}
if (QuestStatus(Q_ANVIL)) {
auto setp = LoadFileInMem("Levels\\L3Data\\Anvil.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L3Data\\Anvil.DUN");
SetMapMonsters(setp.get(), 2 * setpc_x + 2, 2 * setpc_y + 2);
}
if (QuestStatus(Q_WARLORD)) {
auto setp = LoadFileInMem("Levels\\L4Data\\Warlord.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L4Data\\Warlord.DUN");
SetMapMonsters(setp.get(), 2 * setpc_x, 2 * setpc_y);
AddMonsterType(UniqMonst[UMT_WARLORD].mtype, PLACE_SCATTER);
}
@ -983,7 +983,7 @@ void PlaceQuestMonsters()
PlaceUniqueMonst(UMT_LAZURUS, 0, 0);
PlaceUniqueMonst(UMT_RED_VEX, 0, 0);
PlaceUniqueMonst(UMT_BLACKJADE, 0, 0);
auto setp = LoadFileInMem("Levels\\L4Data\\Vile1.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L4Data\\Vile1.DUN");
SetMapMonsters(setp.get(), 2 * setpc_x, 2 * setpc_y);
}
@ -1090,15 +1090,15 @@ void LoadDiabMonsts()
SetMapMonsters(lpSetPiece.get(), 2 * diabquad1x, 2 * diabquad1y);
}
{
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab2a.DUN", nullptr);
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab2a.DUN");
SetMapMonsters(lpSetPiece.get(), 2 * diabquad2x, 2 * diabquad2y);
}
{
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab3a.DUN", nullptr);
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab3a.DUN");
SetMapMonsters(lpSetPiece.get(), 2 * diabquad3x, 2 * diabquad3y);
}
{
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab4a.DUN", nullptr);
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab4a.DUN");
SetMapMonsters(lpSetPiece.get(), 2 * diabquad4x, 2 * diabquad4y);
}
}

18
Source/objects.cpp
Unescape View File

@ -314,7 +314,7 @@ void InitObjectGFX()
sprintf(filestr, "Objects\\%s.CEL", ObjHiveLoadList[i]);
else if (currlevel >= 21)
sprintf(filestr, "Objects\\%s.CEL", ObjCryptLoadList[i]);
pObjCels[numobjfiles] = LoadFileInMem(filestr, nullptr);
pObjCels[numobjfiles] = LoadFileInMem(filestr);
numobjfiles++;
}
}
@ -830,15 +830,15 @@ void LoadMapObjs(BYTE *pMap, int startx, int starty)
void AddDiabObjs()
{
{
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab1.DUN", nullptr);
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab1.DUN");
LoadMapObjects(lpSetPiece.get(), 2 * diabquad1x, 2 * diabquad1y, diabquad2x, diabquad2y, 11, 12, 1);
}
{
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab2a.DUN", nullptr);
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab2a.DUN");
LoadMapObjects(lpSetPiece.get(), 2 * diabquad2x, 2 * diabquad2y, diabquad3x, diabquad3y, 11, 11, 2);
}
{
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab3a.DUN", nullptr);
auto lpSetPiece = LoadFileInMem("Levels\\L4Data\\diab3a.DUN");
LoadMapObjects(lpSetPiece.get(), 2 * diabquad3x, 2 * diabquad3y, diabquad4x, diabquad4y, 9, 9, 3);
}
}
@ -1118,7 +1118,7 @@ void InitObjects()
quests[Q_BLIND]._qmsg = sp_id;
AddBookLever(setpc_x, setpc_y, setpc_w + setpc_x + 1, setpc_h + setpc_y + 1, sp_id);
{
auto mem = LoadFileInMem("Levels\\L2Data\\Blind2.DUN", nullptr);
auto mem = LoadFileInMem("Levels\\L2Data\\Blind2.DUN");
LoadMapObjs(mem.get(), 2 * setpc_x, 2 * setpc_y);
}
}
@ -1180,7 +1180,7 @@ void InitObjects()
quests[Q_WARLORD]._qmsg = sp_id;
AddBookLever(setpc_x, setpc_y, setpc_x + setpc_w, setpc_y + setpc_h, sp_id);
{
auto mem = LoadFileInMem("Levels\\L4Data\\Warlord.DUN", nullptr);
auto mem = LoadFileInMem("Levels\\L4Data\\Warlord.DUN");
LoadMapObjs(mem.get(), 2 * setpc_x, 2 * setpc_y);
}
}
@ -1245,7 +1245,7 @@ void SetMapObjects(BYTE *pMap, int startx, int starty)
ObjFileList[numobjfiles] = (object_graphic_id)i;
sprintf(filestr, "Objects\\%s.CEL", ObjMasterLoadList[i]);
pObjCels[numobjfiles] = LoadFileInMem(filestr, nullptr);
pObjCels[numobjfiles] = LoadFileInMem(filestr);
numobjfiles++;
}
@ -3350,7 +3350,7 @@ void OperatePedistal(int pnum, int i)
PlaySfxLoc(LS_BLODSTAR, object[i].position.x, object[i].position.y);
ObjChangeMap(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4);
{
auto mem = LoadFileInMem("Levels\\L2Data\\Blood2.DUN", nullptr);
auto mem = LoadFileInMem("Levels\\L2Data\\Blood2.DUN");
LoadMapObjs(mem.get(), 2 * setpc_x, 2 * setpc_y);
}
SpawnUnique(UITEM_ARMOFVAL, 2 * setpc_x + 25, 2 * setpc_y + 19);
@ -5368,7 +5368,7 @@ void SyncPedistal(int i)
}
if (object[i]._oVar6 == 3) {
ObjChangeMapResync(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4);
auto setp = LoadFileInMem("Levels\\L2Data\\Blood2.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L2Data\\Blood2.DUN");
LoadMapObjs(setp.get(), 2 * setpc_x, 2 * setpc_y);
}
}

10
Source/quests.cpp
Unescape View File

@ -383,7 +383,7 @@ void DrawWarLord(int x, int y)
BYTE *sp;
int v;
auto setp = LoadFileInMem("Levels\\L4Data\\Warlord2.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L4Data\\Warlord2.DUN");
rw = setp[0];
sp = &setp[2];
rh = *sp;
@ -413,7 +413,7 @@ void DrawSChamber(int q, int x, int y)
BYTE *sp;
int v;
auto setp = LoadFileInMem("Levels\\L2Data\\Bonestr1.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L2Data\\Bonestr1.DUN");
rw = setp[0];
sp = &setp[2];
rh = *sp;
@ -444,7 +444,7 @@ void DrawLTBanner(int x, int y)
int i, j;
BYTE *sp;
auto setp = LoadFileInMem("Levels\\L1Data\\Banner1.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L1Data\\Banner1.DUN");
rw = setp[0];
sp = &setp[2];
rh = *sp;
@ -469,7 +469,7 @@ void DrawBlind(int x, int y)
int i, j;
BYTE *sp;
auto setp = LoadFileInMem("Levels\\L2Data\\Blind1.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L2Data\\Blind1.DUN");
rw = setp[0];
sp = &setp[2];
rh = *sp;
@ -494,7 +494,7 @@ void DrawBlood(int x, int y)
int i, j;
BYTE *sp;
auto setp = LoadFileInMem("Levels\\L2Data\\Blood2.DUN", nullptr);
auto setp = LoadFileInMem("Levels\\L2Data\\Blood2.DUN");
rw = setp[0];
sp = &setp[2];
rh = *sp;

2
Source/setmaps.cpp
Unescape View File

@ -124,7 +124,7 @@ void DRLG_SetMapTrans(const char *sFileName)
BYTE *d;
DWORD dwOffset;
auto pLevelMap = LoadFileInMem(sFileName, nullptr);
auto pLevelMap = LoadFileInMem(sFileName);
d = &pLevelMap[2];
x = pLevelMap[0];
y = *d;

10
Source/town.cpp
Unescape View File

@ -175,21 +175,21 @@ void T_Pass3()
}
}
auto P3Tiles = LoadFileInMem("Levels\\TownData\\Town.TIL", nullptr);
auto P3Tiles = LoadFileInMem("Levels\\TownData\\Town.TIL");
{
auto pSector = LoadFileInMem("Levels\\TownData\\Sector1s.DUN", nullptr);
auto pSector = LoadFileInMem("Levels\\TownData\\Sector1s.DUN");
T_FillSector(P3Tiles.get(), pSector.get(), 46, 46, 25, 25);
}
{
auto pSector = LoadFileInMem("Levels\\TownData\\Sector2s.DUN", nullptr);
auto pSector = LoadFileInMem("Levels\\TownData\\Sector2s.DUN");
T_FillSector(P3Tiles.get(), pSector.get(), 46, 0, 25, 23);
}
{
auto pSector = LoadFileInMem("Levels\\TownData\\Sector3s.DUN", nullptr);
auto pSector = LoadFileInMem("Levels\\TownData\\Sector3s.DUN");
T_FillSector(P3Tiles.get(), pSector.get(), 0, 46, 23, 25);
}
{
auto pSector = LoadFileInMem("Levels\\TownData\\Sector4s.DUN", nullptr);
auto pSector = LoadFileInMem("Levels\\TownData\\Sector4s.DUN");
T_FillSector(P3Tiles.get(), pSector.get(), 0, 0, 23, 23);
}

30
Source/towners.cpp
Unescape View File

@ -233,7 +233,7 @@ void InitSmith()
InitTownerInfo(numtowners, 96, true, TOWN_SMITH, 62, 63, 0);
InitQstSnds(numtowners, TOWN_SMITH);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Smith\\SmithN.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Smith\\SmithN.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -247,7 +247,7 @@ void InitBarOwner()
{
InitTownerInfo(numtowners, 96, true, TOWN_TAVERN, 55, 62, 3);
InitQstSnds(numtowners, TOWN_TAVERN);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TwnF\\TwnFN.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TwnF\\TwnFN.CEL");
for (auto &towner : towners[numtowners]._tNAnim) {
towner = towners[numtowners]._tNData.get();
}
@ -263,7 +263,7 @@ void InitTownDead()
InitTownerInfo(numtowners, 96, true, TOWN_DEADGUY, 24, 32, -1);
InitQstSnds(numtowners, TOWN_DEADGUY);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Butch\\Deadguy.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Butch\\Deadguy.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -279,7 +279,7 @@ void InitWitch()
InitTownerInfo(numtowners, 96, true, TOWN_WITCH, 80, 20, 5);
InitQstSnds(numtowners, TOWN_WITCH);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TownWmn1\\Witch.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TownWmn1\\Witch.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -295,7 +295,7 @@ void InitBarmaid()
InitTownerInfo(numtowners, 96, true, TOWN_BMAID, 43, 66, -1);
InitQstSnds(numtowners, TOWN_BMAID);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TownWmn1\\WmnN.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TownWmn1\\WmnN.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -311,7 +311,7 @@ void InitBoy()
InitTownerInfo(numtowners, 96, true, TOWN_PEGBOY, 11, 53, -1);
InitQstSnds(numtowners, TOWN_PEGBOY);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TownBoy\\PegKid1.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\TownBoy\\PegKid1.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -327,7 +327,7 @@ void InitHealer()
InitTownerInfo(numtowners, 96, true, TOWN_HEALER, 55, 79, 1);
InitQstSnds(numtowners, TOWN_HEALER);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Healer\\Healer.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Healer\\Healer.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -343,7 +343,7 @@ void InitTeller()
InitTownerInfo(numtowners, 96, true, TOWN_STORY, 62, 71, 2);
InitQstSnds(numtowners, TOWN_STORY);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Strytell\\Strytell.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Strytell\\Strytell.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -359,7 +359,7 @@ void InitDrunk()
InitTownerInfo(numtowners, 96, true, TOWN_DRUNK, 71, 84, 4);
InitQstSnds(numtowners, TOWN_DRUNK);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Drunk\\TwnDrunk.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Drunk\\TwnDrunk.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -376,7 +376,7 @@ void InitCows()
//if ( pCowCels )
// assertion_failed(__LINE__, __FILE__, "! pCowCels");
pCowCels = LoadFileInMem("Towners\\Animals\\Cow.CEL", nullptr);
pCowCels = LoadFileInMem("Towners\\Animals\\Cow.CEL");
for (i = 0; i < 3; i++) {
x = TownCowX[i];
y = TownCowY[i];
@ -409,7 +409,7 @@ void InitFarmer()
InitTownerInfo(numtowners, 96, true, TOWN_FARMER, 62, 16, -1);
InitQstSnds(numtowners, TOWN_FARMER);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Farmer\\Farmrn2.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Farmer\\Farmrn2.CEL");
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
}
@ -426,9 +426,9 @@ void InitCowFarmer()
InitTownerInfo(numtowners, 96, true, TOWN_COWFARM, 61, 22, -1);
InitQstSnds(numtowners, TOWN_COWFARM);
if (quests[Q_JERSEY]._qactive != QUEST_DONE) {
towners[numtowners]._tNData = LoadFileInMem("Towners\\Farmer\\cfrmrn2.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Farmer\\cfrmrn2.CEL");
} else {
towners[numtowners]._tNData = LoadFileInMem("Towners\\Farmer\\mfrmrn2.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Farmer\\mfrmrn2.CEL");
}
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();
@ -446,9 +446,9 @@ void InitGirl()
InitTownerInfo(numtowners, 96, true, TOWN_GIRL, 77, 43, -1);
InitQstSnds(numtowners, TOWN_GIRL);
if (quests[Q_GIRL]._qactive != QUEST_DONE) {
towners[numtowners]._tNData = LoadFileInMem("Towners\\Girl\\Girlw1.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Girl\\Girlw1.CEL");
} else {
towners[numtowners]._tNData = LoadFileInMem("Towners\\Girl\\Girls1.CEL", nullptr);
towners[numtowners]._tNData = LoadFileInMem("Towners\\Girl\\Girls1.CEL");
}
for (i = 0; i < 8; i++) {
towners[numtowners]._tNAnim[i] = towners[numtowners]._tNData.get();

Write Preview
Loading…
Cancel
Save