Skip to content

Commit 3c5872b

Browse files
committed
Merge branch 'hotfix/0.13.1.1413'
2 parents e8834d8 + 64932a9 commit 3c5872b

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# Version 0.13.1.1413 - 2017-12-28
2+
3+
## Fixes
4+
- Fixed crash when trying to create a save game.
5+
- Fixed crash when trying to path through a closed door with a creature that doesn't have enough action points to open the door.
6+
7+
8+
9+
110
# Version 0.13.0.1401 - 2017-12-24
211

312
## Additions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# On The Roadside
22

3-
[![Version](https://img.shields.io/badge/Version-0.13.0.1401-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
3+
[![Version](https://img.shields.io/badge/Version-0.13.1.1413-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
44
[![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.2-EA316E.svg)](http://love2d.org/)
55
[![Build Status](https://travis-ci.com/rm-code/On-The-Roadside.svg?token=q3rLXeyGTBN9VB2zsWMr&branch=develop)](https://travis-ci.com/rm-code/On-The-Roadside)
66

src/characters/pathfinding/Path.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ local function handleOpenableObjects( worldObject, character, tile, index )
3535
if not worldObject:isPassable() then
3636
local success = character:enqueueAction( Open( character, tile ))
3737
-- Don't create a walk action if the tile is the last one in the path.
38-
if index ~= 1 then
38+
if success and index ~= 1 then
3939
success = character:enqueueAction( Walk( character, tile ))
4040
end
4141
return success

src/items/weapons/RangedWeapon.lua

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,10 @@ function RangedWeapon:attack()
3333
end
3434

3535
function RangedWeapon:serialize()
36-
local t = {
37-
['id'] = self.template.id,
38-
['itemType'] = self.template.itemType,
39-
['modeIndex'] = self:getAttackModeIndex()
40-
}
41-
36+
local t = RangedWeapon.super.serialize( self )
4237
if self.magazine then
4338
t['magazine'] = self.magazine:serialize()
4439
end
45-
4640
return t
4741
end
4842

src/items/weapons/Weapon.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ function Weapon:selectPrevFiringMode()
4242
end
4343

4444
function Weapon:serialize()
45-
local t = {
46-
['id'] = self.id,
47-
['itemType'] = self.itemType,
48-
['modeIndex'] = self.modeIndex
49-
}
45+
local t = Weapon.super.serialize( self )
46+
t['modeIndex'] = self.modeIndex
5047
return t
5148
end
5249

version.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
local version = {
22
major = 0,
33
minor = 13,
4-
patch = 0,
5-
build = 1401,
4+
patch = 1,
5+
build = 1413,
66
}
77

88
return string.format( "%d.%d.%d.%d", version.major, version.minor, version.patch, version.build );

0 commit comments

Comments
 (0)