From 7992aeb2c9759def815bae376d6be731e52d4337 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 11 Jul 2006 17:50:03 +0000 Subject: [PATCH] Well, I told you it is broken. func_group has to be kept as is too. Just for the record: trust me, it is still broken. Didn't test it much... use at your own risk. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1755 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/maps/entmerge.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/maps/entmerge.rb b/data/maps/entmerge.rb index 99f3ad539..691d29122 100755 --- a/data/maps/entmerge.rb +++ b/data/maps/entmerge.rb @@ -127,12 +127,14 @@ map = mapparse(preprocess(mapstr)) ent = mapparse(preprocess(entstr)) submodels = [] -lights = [] +unchanged = [] map.each() do |e| case when e['classname'] == 'light' - lights << e + unchanged << e + when e['classname'] == 'func_group' + unchanged << e when e[:brushes] submodels << e[:brushes] end @@ -147,7 +149,7 @@ ent.each() do |e| end File.open("#{base}.map", "w") do |fh| - mapout(ent + lights) do |l| + mapout(ent + unchanged) do |l| fh.puts(l) end end -- 2.39.2