- Update to 20070823

This commit is contained in:
Martin Wilke 2007-08-23 21:29:58 +00:00
parent e8a706e264
commit 479e50ac9c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=198220
7 changed files with 11 additions and 93 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= wormux
DISTVERSION= 20070818
DISTVERSION= 20070823
CATEGORIES= games
MASTER_SITES= http://freebsd.unixfreunde.de/sources/
PKGNAMESUFFIX= -devel

View File

@ -1,3 +1,3 @@
MD5 (wormux-20070818.tar.gz) = 8a7ef731bbc9a6052543df2aaf519e6e
SHA256 (wormux-20070818.tar.gz) = 70de66380273aa8a29e2091fc6f03dc5bc2ca5dd3cc1f41df649ffc5cc4d1990
SIZE (wormux-20070818.tar.gz) = 47354440
MD5 (wormux-20070823.tar.gz) = 1efb2738361a680c17ff8c60ee305080
SHA256 (wormux-20070823.tar.gz) = c6a7bc4745b5df70126d9e43eeb0b5c1890f4252efef80a684ebff45deff3e91
SIZE (wormux-20070823.tar.gz) = 47377755

View File

@ -1,40 +0,0 @@
--- 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");

View File

@ -1,12 +0,0 @@
--- 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);

View File

@ -1,12 +0,0 @@
--- 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();

View File

@ -1,24 +0,0 @@
--- 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();
}

View File

@ -490,6 +490,7 @@ share/locale/tr/LC_MESSAGES/wormux.mo
%%DATADIR%%/menu/music_enable.png
%%DATADIR%%/menu/plus.png
%%DATADIR%%/menu/podium.png
%%DATADIR%%/menu/resolution.png
%%DATADIR%%/menu/right.png
%%DATADIR%%/menu/scroll_on_border.png
%%DATADIR%%/menu/send_txt.png
@ -564,13 +565,16 @@ share/locale/tr/LC_MESSAGES/wormux.mo
%%DATADIR%%/sound/francais/fire_01.ogg
%%DATADIR%%/sound/francais/fire_02.ogg
%%DATADIR%%/sound/francais/profile.xml
%%DATADIR%%/sound/share/character_change.ogg
%%DATADIR%%/sound/share/end_turn.ogg
%%DATADIR%%/sound/share/explosion.ogg
%%DATADIR%%/sound/share/frog_music.ogg
%%DATADIR%%/sound/share/laughing.ogg
%%DATADIR%%/sound/share/menu/cancel.ogg
%%DATADIR%%/sound/share/menu/clic.ogg
%%DATADIR%%/sound/share/menu/error.ogg
%%DATADIR%%/sound/share/menu/ok.ogg
%%DATADIR%%/sound/share/menu/weapon_menu_toggled.ogg
%%DATADIR%%/sound/share/profile.xml
%%DATADIR%%/sound/share/step.ogg
%%DATADIR%%/sound/share/victory.ogg
@ -630,10 +634,12 @@ share/locale/tr/LC_MESSAGES/wormux.mo
%%DATADIR%%/weapon/baseball/baseball_hit.png
%%DATADIR%%/weapon/baseball/baseball_ico.png
%%DATADIR%%/weapon/bazooka/baz_cible.png
%%DATADIR%%/weapon/bazooka/bazooka.png
%%DATADIR%%/weapon/bazooka/bazooka_auto_ico.png
%%DATADIR%%/weapon/bazooka/bazooka_ico.png
%%DATADIR%%/weapon/bazooka/brown_bazooka.png
%%DATADIR%%/weapon/bazooka/green_bazooka.png
%%DATADIR%%/weapon/bazooka/missile.png
%%DATADIR%%/weapon/bazooka/yellow_bazooka.png
%%DATADIR%%/weapon/blowtorch/blowtorch.png
%%DATADIR%%/weapon/blowtorch/blowtorch_ico.png
%%DATADIR%%/weapon/blowtorch/fire.png