Welcome to openmortal-0.6

2004-03-03 Version 0.6 is released. Brief changelog:

    * New character: Aisha
    * One new arena
    * Improved network mode (fair game for both players)
    * Portugese translation
    * Joystick / gamepad support
    * Improved blocking and slightly :) better game balance.
    * Projectiles for all! :)

2004-01-31. Version 0.5 is released. Brief changelog:

    * Translations (4 languages)
    * Shadows
    * Network mode and MortalNet
    * Parallax scrolled background (in 3 arenas so far)
    * New fonts
    * One more arena
    * Friendlier player key selection

5 files changed, 82 insertions, 27 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 93c38d1af39..993a5837082 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5109 2004/03/06 15:11:48 jlam Exp $
+$NetBSD: CHANGES,v 1.5110 2004/03/06 17:32:11 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1187,3 +1187,4 @@ Changes to the packages collection and infrastructure in 2004:
         Updated mozilla-gtk2 to 1.6nb3 [jmmv 2004-03-06]
 	Added postfix-current-20040209 [grant 2004-03-06]
 	Updated createbuildlink to 3.3 [jlam 2004-03-06]
+	Updated openmortal to 0.6 [xtraeme 2004-03-06]
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index 09397ae1f7a..72fab0dd88b 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:56 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/06 17:32:11 xtraeme Exp $
 #
 
-DISTNAME=	openmortal-0.4
+DISTNAME=	openmortal-0.6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openmortal/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,16 +11,17 @@ HOMEPAGE=	http://apocalypse.rulez.org/~upi/Mortal/
 COMMENT=	Parody of Mortal Kombat with real characters
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
 USE_X11=		yes
 
 REPLACE_PERL=		data/script/*.pl
 
-.include "../../audio/SDL_mixer/buildlink2.mk"
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../graphics/SDL_image/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../net/SDL_net/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/openmortal/PLIST b/games/openmortal/PLIST
index 01b2a603f3e..362a16ce31c 100644
--- a/games/openmortal/PLIST
+++ b/games/openmortal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/08 15:24:14 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/03/06 17:32:11 xtraeme Exp $
 bin/openmortal
 share/openmortal/characters/Agent.dat
 share/openmortal/characters/Agent.dat.txt
@@ -8,6 +8,8 @@ share/openmortal/characters/Agent.jpg
 share/openmortal/characters/Agent.pl
 share/openmortal/characters/Ambrus.dat
 share/openmortal/characters/Ambrus.dat.txt
+share/openmortal/characters/Ambrus.full.png
+share/openmortal/characters/Ambrus.icon.png
 share/openmortal/characters/Ambrus.jpg
 share/openmortal/characters/Ambrus.pl
 share/openmortal/characters/Bence.dat
@@ -25,6 +27,7 @@ share/openmortal/characters/Cumi.pl
 share/openmortal/characters/Dani.dat
 share/openmortal/characters/Dani.dat.txt
 share/openmortal/characters/Dani.full.png
+share/openmortal/characters/Dani.icon.png
 share/openmortal/characters/Dani.jpg
 share/openmortal/characters/Dani.pl
 share/openmortal/characters/Descant.dat
@@ -47,6 +50,12 @@ share/openmortal/characters/Jozsi.dat
 share/openmortal/characters/Jozsi.dat.txt
 share/openmortal/characters/Jozsi.icon.png
 share/openmortal/characters/Jozsi.pl
+share/openmortal/characters/Kinga.dat
+share/openmortal/characters/Kinga.dat.txt
+share/openmortal/characters/Kinga.full.png
+share/openmortal/characters/Kinga.icon.png
+share/openmortal/characters/Kinga.jpg
+share/openmortal/characters/Kinga.pl
 share/openmortal/characters/Macy.dat
 share/openmortal/characters/Macy.dat.txt
 share/openmortal/characters/Macy.full.png
@@ -86,12 +95,13 @@ share/openmortal/characters/Zoli.full.png
 share/openmortal/characters/Zoli.icon.png
 share/openmortal/characters/Zoli.jpg
 share/openmortal/characters/Zoli.pl
+share/openmortal/fonts/CreditsFont2.png
 share/openmortal/fonts/aardvark.ttf
-share/openmortal/fonts/fangfont.png
+share/openmortal/fonts/bradybun.ttf
+share/openmortal/fonts/brandybun3.png
+share/openmortal/fonts/deadgrit.ttf
 share/openmortal/fonts/glossyfont.png
-share/openmortal/fonts/gooddogc.ttf
-share/openmortal/fonts/impactfont2.png
-share/openmortal/fonts/manslem.ttf
+share/openmortal/fonts/thin.ttf
 share/openmortal/gfx/Credits.png
 share/openmortal/gfx/Doodads.png
 share/openmortal/gfx/FighterStats.png
@@ -99,30 +109,58 @@ share/openmortal/gfx/Foot.png
 share/openmortal/gfx/GameOver.png
 share/openmortal/gfx/Mortal.png
 share/openmortal/gfx/PlayerSelect.png
+share/openmortal/gfx/PlayerSelect_chat.png
 share/openmortal/gfx/Story1.png
 share/openmortal/gfx/Story2.png
 share/openmortal/gfx/icon.bmp
 share/openmortal/gfx/icon.png
 share/openmortal/gfx/level1.png
+share/openmortal/gfx/level10.desc
+share/openmortal/gfx/level10_ground.png
+share/openmortal/gfx/level10_hill.png
+share/openmortal/gfx/level10_sky.png
 share/openmortal/gfx/level2.png
-share/openmortal/gfx/level3.png
-share/openmortal/gfx/level4.png
+share/openmortal/gfx/level3.desc
+share/openmortal/gfx/level3_city.png
+share/openmortal/gfx/level3_ground.png
+share/openmortal/gfx/level3_moon.png
+share/openmortal/gfx/level3_sky.png
+share/openmortal/gfx/level4.desc
+share/openmortal/gfx/level4_earth.png
+share/openmortal/gfx/level4_ground.png
+share/openmortal/gfx/level4_moon.png
+share/openmortal/gfx/level4_nebula.png
+share/openmortal/gfx/level4_rock.png
+share/openmortal/gfx/level4_saturn.png
 share/openmortal/gfx/level5.png
 share/openmortal/gfx/level6.png
-share/openmortal/gfx/level7.png
+share/openmortal/gfx/level7.desc
+share/openmortal/gfx/level7_cumi.png
+share/openmortal/gfx/level7_ground1.png
+share/openmortal/gfx/level7_ground2.png
+share/openmortal/gfx/level7_ground3.png
+share/openmortal/gfx/level7_ground4.png
+share/openmortal/gfx/level7_logo.png
+share/openmortal/gfx/level7_sky.png
+share/openmortal/gfx/level7_upi.png
+share/openmortal/gfx/level8.png
+share/openmortal/gfx/level9.png
 share/openmortal/script/Backend.pl
+share/openmortal/script/CollectStats.pl
+share/openmortal/script/CollectedStats.pl
 share/openmortal/script/Collision.pl
 share/openmortal/script/Damage.pl
 share/openmortal/script/DataHelper.pl
 share/openmortal/script/Doodad.pl
 share/openmortal/script/Fighter.pl
-share/openmortal/script/FighterStats.hu
 share/openmortal/script/FighterStats.pl
 share/openmortal/script/Keys.pl
 share/openmortal/script/PlayerInput.pl
+share/openmortal/script/QuickSave.pl
+share/openmortal/script/Rewind.pl
 share/openmortal/script/State.pl
+share/openmortal/script/Translate.pl
 share/openmortal/sound/2nd_pm.s3m
-share/openmortal/sound/Last_Ninja_-_The_Wilderness.mid
 share/openmortal/sound/alarm.voc
 share/openmortal/sound/aroooga.voc
 share/openmortal/sound/ba_gooock.voc
@@ -135,6 +173,8 @@ share/openmortal/sound/machine_start.voc
 share/openmortal/sound/magic.voc
 share/openmortal/sound/moo2.voc
 share/openmortal/sound/pop.voc
+share/openmortal/sound/pop.wav
+share/openmortal/sound/ride.mod
 share/openmortal/sound/shades_rollup.voc
 share/openmortal/sound/slip4.voc
 share/openmortal/sound/splat.wav
diff --git a/games/openmortal/distinfo b/games/openmortal/distinfo
index 972585e7efb..5c5f22dd0ef 100644
--- a/games/openmortal/distinfo
+++ b/games/openmortal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/01/18 18:43:05 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/03/06 17:32:11 xtraeme Exp $
 
-SHA1 (openmortal-0.4.tar.bz2) = c659e1ea72e45a81e21d14011556f613559e9945
-Size (openmortal-0.4.tar.bz2) = 45431661 bytes
-SHA1 (patch-aa) = 4a4d0090a75cc48c5db8f6b215590cb0b48bb81f
+SHA1 (openmortal-0.6.tar.bz2) = 784f9c3daafeccff840c896c80282c1988189312
+Size (openmortal-0.6.tar.bz2) = 50548986 bytes
+SHA1 (patch-aa) = d18089a348fb7718bed0f47fbff7aaf772915340
diff --git a/games/openmortal/patches/patch-aa b/games/openmortal/patches/patch-aa
index e68a53fe988..963d3dd4098 100644
--- a/games/openmortal/patches/patch-aa
+++ b/games/openmortal/patches/patch-aa
@@ -1,8 +1,21 @@
-$NetBSD: patch-aa,v 1.1 2004/01/18 18:43:05 kristerw Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/06 17:32:11 xtraeme Exp $
 
---- src/State.cpp.orig	Sun Jan 18 19:18:52 2004
-+++ src/State.cpp	Sun Jan 18 19:22:52 2004
-@@ -110,7 +110,11 @@
+--- src/State.cpp.orig	2004-03-06 18:20:58.000000000 +0100
++++ src/State.cpp	2004-03-06 18:22:07.000000000 +0100
+@@ -151,10 +151,10 @@
+ 		debug( "GetUserName failed: %d.\n", iResult );
+ 	}
+ #else
+-	int iResult = getlogin_r( m_acNick, 127 );
++	int iResult = (int)getlogin();
+ 	if ( iResult )
+ 	{
+-		debug( "getlogin_r failed: %d\n", iResult );
++		debug( "getlogin failed: %d\n", iResult );
+ 		strcpy( m_acNick, getenv("USER") );
+ 	}
+ #endif
+@@ -273,7 +273,11 @@
  void SState::Save()
  {
  	std::string sFilename = GetConfigFilename();