From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 17 Jun 2010 07:35:10 +0000 (+0200)
Subject: a tiny fix for auto-super.pl
X-Git-Tag: xonotic-v0.1.0preview~541^2~23^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de52b3d61a7f7212fed9eabc1478843c4bf1e11e;p=xonotic%2Fxonotic-data.pk3dir.git

a tiny fix for auto-super.pl

Procedure to merge this branch into a branch with menuqc changes:

git fetch
git merge origin/master
git checkout origin/divVerent/menu-imprOOvements -- auto-super.pl
find . -type f -print0 | xargs -0 perl auto-super.pl
git commit -a
git merge origin/divVerent/menu-imprOOvements

The intermediate commit and auto-super.pl run is to prepare the menu code for the merge to reduce merge conflicts or compile errors in newly added files.
---

diff --git a/qcsrc/menu/auto-super.pl b/qcsrc/menu/auto-super.pl
index 9ea4bdaf2..00926d061 100644
--- a/qcsrc/menu/auto-super.pl
+++ b/qcsrc/menu/auto-super.pl
@@ -74,7 +74,7 @@ for my $f(@ARGV)
 		$s =~ s/\b$_\b/$old2new{$_}/g;
 	}
 
-	my @methods_super = map { [ $_ . $methods{$base}{$_}, "SUPER($class).$_" ]; } keys %{$methods{$base}};
+	my @methods_super = map { [ $methods{$base}{$_} . "_" . $_, "SUPER($class).$_" ]; } keys %{$methods{$base}};
 	for(@methods_super)
 	{
 		my ($search, $replace) = @$_;