MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unifcy a chunk of Hellfire's code pathts

Browse source
This commit is contained in:
Anders Jenbo 2020-12-28 01:11:25 +01:00
commit d20eddf48e
36 changed files with 10 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Source/objects.cpp
View file

@ -198,7 +198,6 @@ const char *const StoryBookName[] = {
"The Realms Beyond",
"Tale of the Three",
"The Black King",
#ifdef HELLFIRE
"Journal: The Ensorcellment",
"Journal: The Meeting",
"Journal: The Tirade",
@ -206,7 +205,6 @@ const char *const StoryBookName[] = {
"Journal: NA-KRUL",
"Journal: The End",
"A Spellbook",
#endif
};
/** Specifies the speech IDs of each dungeon type narrator book, for each player class. */
int StoryText[3][3] = {
@ -223,22 +221,15 @@ void InitObjectGFX()
memset(fileload, FALSE, sizeof(fileload));
#ifdef HELLFIRE
int lvl = currlevel;
if (currlevel >= 21 && currlevel <= 24)
lvl -= 20;
else if (currlevel >= 17 && currlevel <= 20)
lvl -= 8;
#endif
for (i = 0; AllObjects[i].oload != -1; i++) {
if (AllObjects[i].oload == 1
#ifdef HELLFIRE
&& (int)lvl >= AllObjects[i].ominlvl
&& (int)lvl <= AllObjects[i].omaxlvl) {
#else
&& (int)currlevel >= AllObjects[i].ominlvl
&& (int)currlevel <= AllObjects[i].omaxlvl) {
#endif
fileload[AllObjects[i].ofindex] = TRUE;
}
if (AllObjects[i].otheme != THEME_NONE) {
@ -258,12 +249,10 @@ void InitObjectGFX()
if (fileload[i]) {
ObjFileList[numobjfiles] = i;
sprintf(filestr, "Objects\\%s.CEL", ObjMasterLoadList[i]);
#ifdef HELLFIRE
if (currlevel >= 17 && currlevel < 21)
sprintf(filestr, "Objects\\%s.CEL", ObjHiveLoadList[i]);
else if (currlevel >= 21)
sprintf(filestr, "Objects\\%s.CEL", ObjCryptLoadList[i]);
#endif
pObjCels[numobjfiles] = LoadFileInMem(filestr, NULL);
numobjfiles++;
}
@ -567,7 +556,6 @@ void AddL1Objs(int x1, int y1, int x2, int y2)
}
}
#ifdef HELLFIRE
void add_crypt_objs(int x1, int y1, int x2, int y2)
{
int i, j, pn;
@ -583,7 +571,6 @@ void add_crypt_objs(int x1, int y1, int x2, int y2)
}
}
#endif
void AddL2Objs(int x1, int y1, int x2, int y2)
{
int i, j, pn;
@ -1429,11 +1416,7 @@ void AddShrine(int i)
{
int val;
DIABOOL slist[NUM_SHRINETYPE];
#ifdef HELLFIRE
unsigned int j;
#else
int j;
#endif
object[i]._oPreFlag = TRUE;
for (j = 0; j < NUM_SHRINETYPE; j++) {
if (currlevel < shrinemin[j] || currlevel > shrinemax[j]) {
@ -1566,17 +1549,9 @@ void AddStoryBook(int i)
object[i]._oVar1 = random_(0, 3);
if (currlevel == 4)
object[i]._oVar2 = StoryText[object[i]._oVar1][0];
#ifdef HELLFIRE
if (currlevel == 8)
#else
else if (currlevel == 8)
#endif
object[i]._oVar2 = StoryText[object[i]._oVar1][1];
#ifdef HELLFIRE
if (currlevel == 12)
#else
else if (currlevel == 12)
#endif
object[i]._oVar2 = StoryText[object[i]._oVar1][2];
object[i]._oVar3 = (currlevel >> 2) + 3 * object[i]._oVar1 - 1;
object[i]._oAnimFrame = 5 - 2 * object[i]._oVar1;
@ -2986,14 +2961,12 @@ void OperateLever(int pnum, int i)
}
}
}
#ifdef HELLFIRE
if (currlevel == 24) {
operate_lv24_lever();
IsUberLeverActivated = 1;
mapflag = FALSE;
quests[Q_NAKRUL]._qactive = 3;
}
#endif
if (mapflag)
ObjChangeMap(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4);
if (pnum == myplr)
@ -5230,13 +5203,11 @@ void GetObjectStr(int i)
break;
case OBJ_BARREL:
case OBJ_BARRELEX:
#ifdef HELLFIRE
if (currlevel > 16 && currlevel < 21) // for hive levels
strcpy(infostr, "Pod"); //Then a barrel is called a pod
else if (currlevel > 20 && currlevel < 25) // for crypt levels
strcpy(infostr, "Urn"); //Then a barrel is called an urn
else
#endif
strcpy(infostr, "Barrel");
break;
case OBJ_SKELBOOK: