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

🐛 [hellfire] Fix missing braziers in crypt (causing instability)

Browse source 
- Crypt candles (braziers) around the storybook were occasionally missing
- Marked OFILE_CANDLE2 to load for all levels 1 through 12, so it is always loaded for crypt as well
- Made search for object graphics a bit more secure, as in the bugged case it would run off past the end of an array
This commit is contained in:
thebigMuh 2021-04-29 01:59:00 +02:00 • committed by GitHub
commit f41fdedbc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/objects.cpp
View file

@ -24,6 +24,7 @@
#include "towners.h"
#include "track.h"
#include "utils/language.h"
#include "utils/log.hpp"
namespace devilution {
@ -1276,10 +1277,15 @@ void SetupObject(int i, int x, int y, _object_id ot)
object[i]._otype = ot;
object_graphic_id ofi = AllObjects[ot].ofindex;
object[i].position = { x, y };
int j = 0;
while (ObjFileList[j] != ofi) {
j++;
const auto &found = std::find(std::begin(ObjFileList), std::end(ObjFileList), ofi);
if (found == std::end(ObjFileList)) {
LogCritical("Unable to find object_graphic_id {} in list of objects to load, level generation error.", ofi);
return;
}
const int j = std::distance(std::begin(ObjFileList), found);
object[i]._oAnimData = pObjCels[j];
object[i]._oAnimFlag = AllObjects[ot].oAnimFlag;
if (AllObjects[ot].oAnimFlag != 0) {
@ -5418,11 +5424,15 @@ void SyncL3Doors(int i)
void SyncObjectAnim(int o)
{
object_graphic_id index = AllObjects[object[o]._otype].ofindex;
int i = 0;
while (ObjFileList[i] != index) {
i++;
const auto &found = std::find(std::begin(ObjFileList), std::end(ObjFileList), index);
if (found == std::end(ObjFileList)) {
LogCritical("Unable to find object_graphic_id {} in list of objects to load, level generation error.", index);
return;
}
const int i = std::distance(std::begin(ObjFileList), found);
object[o]._oAnimData = pObjCels[i];
switch (object[o]._otype) {
case OBJ_L1LDOOR:
@ -5526,9 +5536,9 @@ void GetObjectStr(int i)
case OBJ_BARREL:
case OBJ_BARRELEX:
if (currlevel >= 17 && currlevel <= 20) // for hive levels
strcpy(infostr, _("Pod")); //Then a barrel is called a pod
strcpy(infostr, _("Pod")); //Then a barrel is called a pod
else if (currlevel >= 21 && currlevel <= 24) // for crypt levels
strcpy(infostr, _("Urn")); //Then a barrel is called an urn
strcpy(infostr, _("Urn")); //Then a barrel is called an urn
else
strcpy(infostr, _("Barrel"));
break;