Merge branch 'hotfix/0.8.1.949'

rm-code · Apr 8, 2017 · 3ee60bd · 3ee60bd
2 parents 0e9788b + 874aca9
commit 3ee60bd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Version 0.8.1.949 - 2017-04-09
+
+## Fixes
+- Fixed bug where a character's inventory volume wasn't reset correctly
+
+
+
+
 # Version 0.8.0.933 - 2017-04-02
 
 ## Additions

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.8.0.933-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
+[![Version](https://img.shields.io/badge/Version-0.8.1.949-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
 [![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.2-EA316E.svg)](http://love2d.org/)
 [![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)
 

diff --git a/src/ui/screens/InventoryScreen.lua b/src/ui/screens/InventoryScreen.lua
@@ -105,7 +105,7 @@ function InventoryScreen.new()
 
     local function returnItemToOrigin( item, origin )
         if origin:instanceOf( 'EquipmentSlot' ) then
-            origin:addItem( item );
+            character:getEquipment():addItem( origin, item )
         else
             origin:drop( item );
         end

diff --git a/version.lua b/version.lua
@@ -1,8 +1,8 @@
 local version = {
     major = 0,
     minor = 8,
-    patch = 0,
-    build = 933,
+    patch = 1,
+    build = 949,
 }
 
 return string.format( "%d.%d.%d.%d", version.major, version.minor, version.patch, version.build );