gemwarrior 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eed4c481dd9b8c403851ed62c05ea92757f56d7
-  data.tar.gz: b2d8cbfee1c8dac0daed910d8436970e8cdab12a
+  metadata.gz: 88f93a63ffbbc7334133b9ea23c40aae700d9f78
+  data.tar.gz: fa4a6078ecbc1b11687fc42861e6a955481e2e56
 SHA512:
-  metadata.gz: 2c9168749c94929d96c7175698a90f44c393846d45d7d5d9d2000ac20fe077adf1305ddecbe46b6b7a24a47f5a552363720c7f4ee7d8c306e9c2f98396a70110
-  data.tar.gz: 7c7e3eb9aab5d32d8f20ef14577935ba3d4aa69666fbb6c28a64262b0fc6baf77f6e3d91e7a08764e8fa924651c010d5bb6a2ca97c57cf9f63ad239b5492d76c
+  metadata.gz: 2bb197442769ca3e5b792cfea0376a1adb5f8fb88af2d7ef75ff9c1d984f8dafdfa71dedcce4a2789fb7bf8d9f3a0d2ffcf77ad88a18d714f5797b60a50c6910
+  data.tar.gz: 33e4ea84b9312a221148b674d9ec9bff3c4d47793c6b257acb320d2897cf47eb0c8feb7c969c7ab623d2b67acd7b1b1b86a861968b8a14805ef8f983599d8881

data/lib/gemwarrior/misc/audio.rb

@@ -12,19 +12,19 @@ module Gemwarrior
         begin
           require 'win32/sound'
         rescue LoadError => e
-          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Gem Warrior will be silent for now."
+          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Silence for now."
         end
       elsif GameOptions.data['sound_system'].eql?('feep')
         begin
           require 'feep'
         rescue LoadError => e
-          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Gem Warrior will be silent for now."
+          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Silence for now."
         end
       elsif GameOptions.data['sound_system'].eql?('bloops')
         begin
           require 'bloops'
         rescue LoadError => e
-          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}aphone'. Gem Warrior will be silent for now."
+          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}aphone'. Silence for now."
         end
       end
     end

data/lib/gemwarrior/repl.rb

@@ -331,8 +331,8 @@ module Gemwarrior
           if result.nil?
             run_main_menu
           else
-            self.world = result
-            self.evaluator = Evaluator.new(self.world)
+            print_errors
+            load_saved_world(result)
             return
           end
         end
@@ -497,6 +497,11 @@ module Gemwarrior
       end
     end
 
+    def load_saved_world(result)
+      self.world = result
+      self.evaluator = Evaluator.new(self.world)
+    end
+
     def setup_screen(initial_command = nil, extra_command = nil, new_skip = false, resume_skip = false)
       # welcome player to game
       clear_screen
@@ -514,8 +519,7 @@ module Gemwarrior
           run_main_menu
         else
           print_errors
-          self.world = result
-          self.evaluator = Evaluator.new(self.world)
+          load_saved_world(result)
         end
       else
         run_main_menu

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.14.5'
+  VERSION = '0.14.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -363,6 +363,4 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files:
-- spec/gemwarrior_spec.rb
-- spec/spec_helper.rb
+test_files: []