[Gemrb-commits] gemrb: branch master updated. v0.7.0-584-g12ac160

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  12ac160284b3904f38d007fa88a76eb0648b12b7 (commit)
       via  96d1f3425ae2d64c9ad7db71de0d19fb572de0ab (commit)

Summary of changes:
 gemrb/core/Map.cpp                  |   20 ++++++++++----------
 gemrb/plugins/SDLVideo/SDLVideo.cpp |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)
      from  42270609d630c224bcb36d3069b1b5cda9471e4c (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=12ac160284b3904f38d007fa88a76eb0648b12b7

commit 12ac160284b3904f38d007fa88a76eb0648b12b7
Author: Avenger <ave...@so...>
Date:   Sun Mar 25 18:44:41 2012 +0200

    just whitespace

diff --git a/gemrb/core/Map.cpp b/gemrb/core/Map.cpp
index f21db3c..fc71bf3 100644
--- a/gemrb/core/Map.cpp
+++ b/gemrb/core/Map.cpp
@@ -1368,13 +1368,13 @@ void Map::ActorSpottedByPlayer(Actor *actor)
 //call this once, after area was loaded
 void Map::InitActors()
 {
-  size_t i = actors.size();
-  while(i--) {
-    Actor* actor = actors[i];
+	size_t i = actors.size();
+	while(i--) {
+		Actor* actor = actors[i];
 
-    actor->SetMap(this);
-    InitActor(actor);
-  }
+		actor->SetMap(this);
+		InitActor(actor);
+	}
 }
 
 void Map::InitActor(Actor *actor)
@@ -1398,10 +1398,10 @@ void Map::AddActor(Actor* actor, bool init)
 	//setting the current area for the actor as this one
 	strnlwrcpy(actor->Area, scriptName, 8);
 	actors.push_back( actor );
-  if (init) {
-	  actor->SetMap(this);
-    InitActor(actor);
-  }
+	if (init) {
+		actor->SetMap(this);
+		InitActor(actor);
+	}
 }
 
 bool Map::AnyPCSeesEnemy()

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

commit 96d1f3425ae2d64c9ad7db71de0d19fb572de0ab
Author: Avenger <ave...@so...>
Date:   Sun Mar 25 18:44:05 2012 +0200

    fixed a valgrind warning (uninitialized memory)

diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index 31ad944..50520b3 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -55,7 +55,7 @@ SDLVideoDriver::SDLVideoDriver(void)
 	lastTime = 0;
 	backBuf=NULL;
 	extra=NULL;
-	lastMouseMoveTime = GetTickCount();
+	lastMouseDownTime = lastMouseMoveTime = GetTickCount();
 	subtitlestrref = 0;
 	subtitletext = NULL;
 }

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


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