[Gemrb-commits] gemrb: branch master updated. v0.7.2-704-g3c42ec6

[Jens G. <fi...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  3c42ec6c608a5ec0e968401244ebd64d16c8d9f1 (commit)
       via  c4abf7282ac3b2115deadd017f5a42aec7073710 (commit)

Summary of changes:
 gemrb/core/Scriptable/Scriptable.cpp      |    6 +++---
 gemrb/plugins/MUSImporter/MUSImporter.cpp |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
      from  6d474d60543fc4ff370fd28da982e7b0230d2b7d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=3c42ec6c608a5ec0e968401244ebd64d16c8d9f1

commit 3c42ec6c608a5ec0e968401244ebd64d16c8d9f1
Author: Jens Granseuer <je...@gm...>
Date:   Tue Feb 12 21:14:50 2013 +0100

    loop music playlists by default

diff --git a/gemrb/plugins/MUSImporter/MUSImporter.cpp b/gemrb/plugins/MUSImporter/MUSImporter.cpp
index becac70..8556a6e 100644
--- a/gemrb/plugins/MUSImporter/MUSImporter.cpp
+++ b/gemrb/plugins/MUSImporter/MUSImporter.cpp
@@ -193,7 +193,7 @@ void MUSImporter::Start()
 		} else {
 			PLnext = PLpos + 1;
 			if ((unsigned int) PLnext >= playlist.size())
-				PLnext = -1;
+				PLnext = 0;
 		}
 		PlayMusic( PLpos );
 		core->GetAudioDrv()->Play();

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c4abf7282ac3b2115deadd017f5a42aec7073710

commit c4abf7282ac3b2115deadd017f5a42aec7073710
Author: Jens Granseuer <je...@gm...>
Date:   Tue Feb 12 20:35:40 2013 +0100

    RandomWalk: try to get rid of strong north-west bias over time

diff --git a/gemrb/core/Scriptable/Scriptable.cpp b/gemrb/core/Scriptable/Scriptable.cpp
index d5f931f..2456a42 100644
--- a/gemrb/core/Scriptable/Scriptable.cpp
+++ b/gemrb/core/Scriptable/Scriptable.cpp
@@ -2210,9 +2210,9 @@ void Movable::RandomWalk(bool can_stop, bool run)
 	//p.x+=x;
 	//p.y+=(int) sqrt(100-x*x);
 
-	//selecting points in a square around actor
-	p.x+=core->Roll(1,50,-25);
-	p.y+=core->Roll(1,50,-25);
+	//selecting points in a square around actor (-24 to +24)
+	p.x+=core->Roll(1,49,-25);
+	p.y+=core->Roll(1,49,-25);
 	//the 5th parameter is controlling the orientation of the actor
 	//0 - back away, 1 - face direction
 	path = area->RunAway( Pos, p, size, 50, 1 );

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator