From c1eb02a10690805150eacb856e573a7fbbe02da1 Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Mon, 4 May 2020 11:56:26 -0500 Subject: [PATCH] Fixed game not launching when packaged --- Gemfile.lock | 2 +- i-mic-fps-server.rb | 1 + i-mic-fps.rb | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00fd2d9..a9e5cd5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/cyberarm/cyberarm_engine - revision: 4055f645f3446c61f57ad1c7748284106c1516ff + revision: da5d740c6e8767c9351a44c4b9cca43535ff8536 specs: cyberarm_engine (0.13.1) gosu (~> 0.15.0) diff --git a/i-mic-fps-server.rb b/i-mic-fps-server.rb index dba8ca1..7db6a2d 100644 --- a/i-mic-fps-server.rb +++ b/i-mic-fps-server.rb @@ -1,3 +1,4 @@ +IMICFPS_SERVER_MODE = true require_relative "i-mic-fps" director = IMICFPS::Networking::Director.new(mode: :server, hostname: "0.0.0.0", port: 56789, interface: IMICFPS::Networking::MemoryServer) diff --git a/i-mic-fps.rb b/i-mic-fps.rb index 66de036..6149bd9 100644 --- a/i-mic-fps.rb +++ b/i-mic-fps.rb @@ -131,8 +131,9 @@ require_relative "lib/window" require_relative "lib/tools/asset_viewer" require_relative "lib/tools/map_editor" -# Don't launch game if __FILE__ != launching command -if __FILE__ == $0 +# Don't launch game if IMICFPS_SERVER_MODE is defined +# or if game is being packaged +unless defined?(IMICFPS_SERVER_MODE) or defined?(Ocra) if ARGV.join.include?("--profile") begin require "ruby-prof"