From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 2 May 2012 07:02:08 +0000 (+0200)
Subject: Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.7.0~55^2~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e4fd60e0e55680227f223d967d272bf9212245b;p=xonotic%2Fxonotic.git

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

Conflicts:
	misc/tools/progs-analyzer.pl
---

9e4fd60e0e55680227f223d967d272bf9212245b
diff --cc misc/tools/progs-analyzer.pl
index e6941251,e1594f1d..df4927e5
--- a/misc/tools/progs-analyzer.pl
+++ b/misc/tools/progs-analyzer.pl
@@@ -268,6 -269,19 +269,19 @@@ sub run_nfa($$$$$$
  			{
  				last;
  			}
+ 			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';
++						if $def->{debugname} eq '$error';
+ 				}
+ 				$ip += 1;
+ 			}
  			elsif($c->{isjump})
  			{
  				if($c->{isconditional})