7 files changed, 110 insertions, 9 deletions

diff --git a/games/wormux-devel/Makefile b/games/wormux-devel/Makefile
index 6b83ed0f7cdc..9ed78a9671b7 100644
--- a/games/wormux-devel/Makefile
+++ b/games/wormux-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wormux
-DISTVERSION=	20070726
+DISTVERSION=	20070818
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 PKGNAMESUFFIX=	-devel
diff --git a/games/wormux-devel/distinfo b/games/wormux-devel/distinfo
index a29789b25e4c..8ea8f4c702c1 100644
--- a/games/wormux-devel/distinfo
+++ b/games/wormux-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wormux-20070726.tar.gz) = b1ef48cce7a25e70c858dc22fc3f9441
-SHA256 (wormux-20070726.tar.gz) = 9ff8829b32eaaeb0e854d87d1cf0d80f0a5f39679544c20693a05f9c20e63698
-SIZE (wormux-20070726.tar.gz) = 46830300
+MD5 (wormux-20070818.tar.gz) = 8a7ef731bbc9a6052543df2aaf519e6e
+SHA256 (wormux-20070818.tar.gz) = 70de66380273aa8a29e2091fc6f03dc5bc2ca5dd3cc1f41df649ffc5cc4d1990
+SIZE (wormux-20070818.tar.gz) = 47354440
diff --git a/games/wormux-devel/files/patch-src-character_character.cpp b/games/wormux-devel/files/patch-src-character_character.cpp
new file mode 100644
index 000000000000..5bbf3f648069
--- /dev/null
+++ b/games/wormux-devel/files/patch-src-character_character.cpp
@@ -0,0 +1,40 @@
+--- src/character/character.cpp	2007/08/17 23:39:31
++++ src/character/character.cpp	2007/08/18 07:50:31
+@@ -588,8 +588,7 @@
+     static double speed_init = GameMode::GetInstance()->character.back_jump_strength *
+        sin(GameMode::GetInstance()->character.back_jump_angle);
+
+-    Point2d speed;
+-    GetSpeedXY(speed);
++    Point2d speed = GetSpeedXY();
+     rotation = M_PI * speed.y / speed_init;
+     body->SetRotation(rotation);
+   }
+@@ -637,7 +636,7 @@
+   if (IsDead()) return;
+
+   pause_bouge_dg = Time::GetInstance()->Read();
+-  double norme, degat;
++  double norm, degat;
+   Point2d speed_vector;
+   GameMode * game_mode = GameMode::GetInstance();
+   if(body->GetClothe() != "weapon-" + m_team.GetWeapon().GetID()
+@@ -651,12 +650,12 @@
+   body->SetRotation(0.0);
+   back_jumping = false;
+
+-  GetSpeedXY (speed_vector);
+-  norme = speed_vector.Norm();
+-  if (norme > game_mode->safe_fall && speed_vector.y>0.0)
++  speed_vector= GetSpeedXY();
++  norm = speed_vector.Norm();
++  if (norm > game_mode->safe_fall && speed_vector.y>0.0)
+   {
+-    norme -= game_mode->safe_fall;
+-    degat = norme * game_mode->damage_per_fall_unit;
++    norm -= game_mode->safe_fall;
++    degat = norm * game_mode->damage_per_fall_unit;
+     SetEnergyDelta (-(int)degat);
+     GameLoop::GetInstance()->SignalCharacterDamage(this);
+     SetClothe("normal");
+
diff --git a/games/wormux-devel/files/patch-src-particles_body_member.cpp b/games/wormux-devel/files/patch-src-particles_body_member.cpp
new file mode 100644
index 000000000000..ce09c29a3c71
--- /dev/null
+++ b/games/wormux-devel/files/patch-src-particles_body_member.cpp
@@ -0,0 +1,12 @@
+--- src/particles/body_member.cpp	2007/07/30 00:32:42
++++ src/particles/body_member.cpp	2007/08/18 07:50:31
+@@ -44,8 +44,7 @@
+ {
+   m_left_time_to_live--;
+   UpdatePosition();
+-  Point2d speed;
+-  GetSpeedXY(speed);
++  Point2d speed = GetSpeedXY();
+ 
+   angle_rad += speed.Norm() * 20;
+   angle_rad = fmod(angle_rad, 2 *M_PI);
diff --git a/games/wormux-devel/files/patch-src-weapon_air_attack.cpp b/games/wormux-devel/files/patch-src-weapon_air_attack.cpp
new file mode 100644
index 000000000000..ddee36b5eee0
--- /dev/null
+++ b/games/wormux-devel/files/patch-src-weapon_air_attack.cpp
@@ -0,0 +1,12 @@
+--- src/weapon/air_attack.cpp	2007/08/08 19:24:24
++++ src/weapon/air_attack.cpp	2007/08/18 07:50:31
+@@ -137,8 +137,7 @@
+   Obus * instance = new Obus(cfg);
+   instance->SetXY(Point2i(GetX(), obus_dy) );
+ 
+-  Point2d speed_vector;
+-  GetSpeedXY(speed_vector);
++  Point2d speed_vector = GetSpeedXY();
+ 
+   int fx = randomSync.GetLong(FORCE_X_MIN, FORCE_X_MAX);
+   fx *= GetDirection();
diff --git a/games/wormux-devel/files/patch-src-weapon_mine.cpp b/games/wormux-devel/files/patch-src-weapon_mine.cpp
new file mode 100644
index 000000000000..2b921f9ee633
--- /dev/null
+++ b/games/wormux-devel/files/patch-src-weapon_mine.cpp
@@ -0,0 +1,24 @@
+--- src/weapon/mine.cpp	2007/08/08 19:24:24
++++ src/weapon/mine.cpp	2007/08/18 07:50:31
+@@ -218,15 +218,14 @@
+   return true;
+ }
+ 
+-void Mine::Add (int x, int y)
++void Mine::Add(int x, int y)
+ {
+-  projectile -> SetXY ( Point2i(x, y) );
+-  projectile -> SetOverlappingObject(&ActiveCharacter());
++  projectile->SetXY(Point2i(x, y));
++  projectile->SetOverlappingObject(&ActiveCharacter());
+ 
+-  Point2d speed_vector;
+-  ActiveCharacter().GetSpeedXY(speed_vector);
+-  projectile -> SetSpeedXY (speed_vector);
+-  lst_objects.AddObject (projectile);
++  Point2d speed_vector = ActiveCharacter().GetSpeedXY();
++  projectile->SetSpeedXY(speed_vector);
++  lst_objects.AddObject(projectile);
+   projectile = NULL;
+   ReloadLauncher();
+ }
diff --git a/games/wormux-devel/pkg-plist b/games/wormux-devel/pkg-plist
index 47d14703cccc..ac06fffec050 100644
--- a/games/wormux-devel/pkg-plist
+++ b/games/wormux-devel/pkg-plist
@@ -372,6 +372,11 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/map/electronik/config.xml
 %%DATADIR%%/map/electronik/preview.jpg
 %%DATADIR%%/map/electronik/sky.jpg
+%%DATADIR%%/map/funkyIsland/clouds.png
+%%DATADIR%%/map/funkyIsland/config.xml
+%%DATADIR%%/map/funkyIsland/island.png
+%%DATADIR%%/map/funkyIsland/island_bg.jpg
+%%DATADIR%%/map/funkyIsland/preview.jpg
 %%DATADIR%%/map/goodandevil/config.xml
 %%DATADIR%%/map/goodandevil/goodandevil.png
 %%DATADIR%%/map/goodandevil/preview.jpg
@@ -434,6 +439,10 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/map/random/texture.png
 %%DATADIR%%/map/random/tresor1.png
 %%DATADIR%%/map/random/tresor2.png
+%%DATADIR%%/map/randomamoebas/config.xml
+%%DATADIR%%/map/randomamoebas/preview.jpg
+%%DATADIR%%/map/randomamoebas/sky.jpg
+%%DATADIR%%/map/randomamoebas/texture.png
 %%DATADIR%%/map/space2/config.xml
 %%DATADIR%%/map/space2/map.png
 %%DATADIR%%/map/space2/preview.jpg
@@ -446,8 +455,8 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/map/wildwestdv/config.xml
 %%DATADIR%%/map/wildwestdv/preview.jpg
 %%DATADIR%%/map/wildwestdv/wildwestdv.png
-%%DATADIR%%/menu/arrow-left.png
-%%DATADIR%%/menu/arrow-right.png
+%%DATADIR%%/menu/annulus_background.png
+%%DATADIR%%/menu/annulus_foreground.png
 %%DATADIR%%/menu/audio_label.png
 %%DATADIR%%/menu/background.png
 %%DATADIR%%/menu/background_credits.png
@@ -459,6 +468,7 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/menu/button.png
 %%DATADIR%%/menu/cancel.png
 %%DATADIR%%/menu/check.png
+%%DATADIR%%/menu/config_label.png
 %%DATADIR%%/menu/disabled_back.png
 %%DATADIR%%/menu/disabled_front.png
 %%DATADIR%%/menu/display_energy.png
@@ -466,8 +476,7 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/menu/display_wind_particles.png
 %%DATADIR%%/menu/down.png
 %%DATADIR%%/menu/enabled.png
-%%DATADIR%%/menu/full_circle.png
-%%DATADIR%%/menu/full_circle_border.png
+%%DATADIR%%/menu/fps.png
 %%DATADIR%%/menu/fullscreen.png
 %%DATADIR%%/menu/ico_maps.png
 %%DATADIR%%/menu/ico_skins.png
@@ -488,7 +497,6 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/menu/teams_label.png
 %%DATADIR%%/menu/timing_end_turn.png
 %%DATADIR%%/menu/timing_turn.png
-%%DATADIR%%/menu/title.png
 %%DATADIR%%/menu/up.png
 %%DATADIR%%/menu/validate.png
 %%DATADIR%%/menu/video_label.png
@@ -682,6 +690,8 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/weapon/sound/aircraft_bomb_falling.ogg
 %%DATADIR%%/weapon/sound/aircraft_flying.ogg
 %%DATADIR%%/weapon/sound/airhammer.ogg
+%%DATADIR%%/weapon/sound/airhammer_selected.ogg
+%%DATADIR%%/weapon/sound/airhammer_used.ogg
 %%DATADIR%%/weapon/sound/alleluia.ogg
 %%DATADIR%%/weapon/sound/anvil_collision.ogg
 %%DATADIR%%/weapon/sound/anvil_fall.ogg
@@ -724,6 +734,7 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 %%DATADIR%%/wormux_256x256.png
 %%DATADIR%%/wormux_32x32.png
 %%DATADIR%%/wormux_32x32.xpm
+%%DATADIR%%/wormux_default_config.xml
 @dirrm %%DATADIR%%/weapon/teleportation
 @dirrm %%DATADIR%%/weapon/syringe
 @dirrm %%DATADIR%%/weapon/supertux
@@ -783,6 +794,7 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 @dirrm %%DATADIR%%/map/wildwestdv
 @dirrm %%DATADIR%%/map/vulcano
 @dirrm %%DATADIR%%/map/space2
+@dirrm %%DATADIR%%/map/randomamoebas
 @dirrm %%DATADIR%%/map/random
 @dirrm %%DATADIR%%/map/qingqong
 @dirrm %%DATADIR%%/map/prehistorik
@@ -796,6 +808,7 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 @dirrm %%DATADIR%%/map/grenouilles
 @dirrm %%DATADIR%%/map/greehills
 @dirrm %%DATADIR%%/map/goodandevil
+@dirrm %%DATADIR%%/map/funkyIsland
 @dirrm %%DATADIR%%/map/electronik
 @dirrm %%DATADIR%%/map/easterisland
 @dirrm %%DATADIR%%/map/desert