Merge branch 'release/0.12.2.1222'

CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 0.12.2.1222 - 2017-11-29
+
+## Fixes
+- Fixed outdated save game versions crashing the game
+- Fixed buttons not being set to inactive state correctly
+
+
+
+
 # Version 0.12.1.1218 - 2017-11-29
 
 ## Fixes

README.md

@@ -1,6 +1,6 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.12.1.1218-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
+[![Version](https://img.shields.io/badge/Version-0.12.2.1222-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)
 

src/SaveHandler.lua

@@ -63,7 +63,12 @@ function SaveHandler.load( path )
 end
 
 function SaveHandler.loadVersion( path )
-    return Compressor.load( path .. '/' .. VERSION_FILE ).version
+    local result, error = Compressor.load( path .. '/' .. VERSION_FILE )
+    if not result then
+        Log.warn( error, 'SaveHandler' )
+        return '<undefined>'
+    end
+    return result.version
 end
 
 function SaveHandler.getSaveFolder()

src/ui/elements/UIButton.lua

@@ -41,13 +41,13 @@ end
 -- Public Methods
 -- ------------------------------------------------
 
-function UIButton:initialize( px, py, x, y, w, h, callback, text, alignMode, active )
+function UIButton:initialize( px, py, x, y, w, h, callback, text, alignMode )
     UIElement.initialize( self, px, py, x, y, w, h )
 
     self.callback = callback
     self.text = text
     self.alignMode = alignMode or 'center'
-    self.active = active or true
+    self.active = true
 end
 
 function UIButton:draw()

src/ui/screens/SavegameScreen.lua

@@ -111,7 +111,9 @@ function SavegameScreen.new()
             end
         end
 
-        return UIButton( lx, ly, 0, 0, BUTTON_LIST_WIDTH, 1, callback, str, 'center', version == getVersion() )
+        local button = UIButton( lx, ly, 0, 0, BUTTON_LIST_WIDTH, 1, callback, str, 'center' )
+        button:setActive( version == getVersion() )
+        return button
     end
 
 

src/util/Compressor.lua

@@ -31,6 +31,13 @@ function Compressor.load( path )
 
     -- Decompress and return the loaded lua file.
     local rawstring = love.math.decompress( compressedData, 'lz4' )
+
+    -- Print a warning if it can't be loaded and return false.
+    local result, error = load( rawstring )
+    if not result then
+        return result, error
+    end
+
     return load( rawstring )()
 end
 

version.lua

@@ -1,8 +1,8 @@
 local version = {
     major = 0,
     minor = 12,
-    patch = 1,
-    build = 1218,
+    patch = 2,
+    build = 1222,
 }
 
 return string.format( "%d.%d.%d.%d", version.major, version.minor, version.patch, version.build );