lib/gamebox/gamebox_application.rb in gamebox-0.3.4 vs lib/gamebox/gamebox_application.rb in gamebox-0.4.0.rc1

@@ -12,39 +12,31 @@
   def self.run(argv,env)
     GameboxApp.new.start argv, env
   end
 
   def initialize
-    gamebox_objects = YAML.load(File.read(GAMEBOX_PATH + 'data/config/objects.yml'))
-
-    game_objects_file = APP_ROOT + '/config/objects.yml'
-    game_specific_objects = {}
-    if File.exist? game_objects_file
-      game_specific_objects = YAML.load(File.read(game_objects_file))
-    end
-    objects = gamebox_objects.merge! game_specific_objects
-
-    @context = DIY::Context.from_yaml(YAML.dump(objects))
+    @context = Conject.default_object_context
   end
-  
+
   def setup
     @game = @context[:game]
-    
+    @game.configure
     @config_manager = @context[:config_manager]
     setup_debug_server if @config_manager[:debug_server] || ARGV.include?("-debug-server")
   end
-  
+
   def setup_debug_server
     Thread.new do
       loop do
         binding.remote_pry
       end
     end
   end
-  
+
   def main_loop
     @input_manager = @context[:input_manager]
-    @input_manager.main_loop @game
+    @input_manager.register @game
+    @input_manager.show
   end
 
   def shutdown
   end