gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-12 03:26:31 -05:00
Code Issues Releases Wiki Activity

Prevent some map load crashes. (#206)

Browse Source
This commit is contained in:
Tim Sarbin 2019-11-17 22:55:31 -05:00 committed by GitHub
parent 30b680d9d1
commit 908d186fea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
d2render/animated_entity.go
View File

@ -161,7 +161,7 @@ func (v *AnimatedEntity) Render(target *ebiten.Image, offsetX, offsetY int) {
} }
} }
} }
if v.currentFrame < 0 || v.frames == nil || v.currentFrame > len(v.frames) || v.frames[v.currentFrame] == nil { if v.currentFrame < 0 || v.frames == nil || v.currentFrame >= len(v.frames) || v.frames[v.currentFrame] == nil {
return return
} }
localX := (v.subcellX - v.subcellY) * 16 localX := (v.subcellX - v.subcellY) * 16
@ -248,7 +248,7 @@ func (v *AnimatedEntity) updateFrameCache() {
if v.Cof.CofLayers[cofLayerIdx].Transparent { if v.Cof.CofLayers[cofLayerIdx].Transparent {
transparency = byte(128) transparency = byte(128)
} }
if animationIdx > len(dccLayer.Directions[v.direction].Frames) { if animationIdx >= len(dccLayer.Directions[v.direction].Frames) {
log.Printf("Invalid animation index of %d for animated entity", animationIdx) log.Printf("Invalid animation index of %d for animated entity", animationIdx)
continue continue
} }

3
d2render/d2mapengine/region.go
View File

@ -203,6 +203,9 @@ func (v *Region) renderWall(tile d2ds1.WallRecord, offsetX, offsetY int, target
img := v.GetImageCacheRecord(tile.MainIndex, tile.SubIndex, tile.Orientation) img := v.GetImageCacheRecord(tile.MainIndex, tile.SubIndex, tile.Orientation)
if img == nil { if img == nil {
img = v.generateWallCache(tile) img = v.generateWallCache(tile)
if img == nil {
return
}
} }
tileData := v.getTile(int32(tile.MainIndex), int32(tile.SubIndex), int32(tile.Orientation)) tileData := v.getTile(int32(tile.MainIndex), int32(tile.SubIndex), int32(tile.Orientation))
if tileData == nil { if tileData == nil {