Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic

Conflicts:
	misc/tools/progs-analyzer.pl

diff --cc misc/tools/progs-analyzer.pl
index e6941251a952bb3393baf9919b8e283ee7446b2b,e1594f1d7939eb028a5f1950f9eaabd78ab78062..df4927e5e9524ae2b5255eeed537b1c761abc1e8
--- 1/misc/tools/progs-analyzer.pl
--- 2/misc/tools/progs-analyzer.pl
+++ b/misc/tools/progs-analyzer.pl
@@@ -268,6 -269,19 +269,19 @@@ sub run_nfa($$$$$$
                        {
                                last;
                        }
 -                                              if $def->{debugname} eq '_error';
+                       elsif($c->{iscall})
+                       {
+                               my $func = $s->{a};
+                               my $funcid = $progs->{globals}[$func]{v}{int};
+                               my $funcobj = $progs->{functions}[$funcid];
+                               if($funcobj && $funcobj->{first_statement} < 0) # builtin
+                               {
+                                       my $def = $progs->{globaldef_byoffset}->($func);
+                                       last
++                                              if $def->{debugname} eq '$error';
+                               }
+                               $ip += 1;
+                       }
                        elsif($c->{isjump})
                        {
                                if($c->{isconditional})