[Gemrb-commits] gemrb/gemrb/plugins/Core Map.cpp,1.36,1.37

[<bal...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1:/tmp/cvs-serv8053/plugins/Core

Modified Files:
	Map.cpp 
Log Message:
Bug Fixed : Map.cpp : Now the overHead text is on the Top of the sprite

Index: Map.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Map.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Map.cpp	4 Dec 2003 22:10:33 -0000	1.36
--- Map.cpp	4 Dec 2003 23:10:50 -0000	1.37
***************
*** 188,209 ****
  			video->DrawEllipse(actor->XPos-vp.x, actor->YPos-vp.y, ca->CircleSize*10, ((ca->CircleSize*15)/2), *color);
  		}
- 		if(actor->textDisplaying) {
- #ifdef WIN32
- 			unsigned long time = GetTickCount();
- #else
- 			struct timeval tv;
- 			gettimeofday(&tv, NULL);
- 			unsigned long time = (tv.tv_usec/1000) + (tv.tv_sec*1000);
- #endif
- 			if((time - actor->timeStartDisplaying) >= 3000) {
- 				actor->textDisplaying = 0;
- 			}
- 			if(actor->textDisplaying == 1) {
- 				Font * font = core->GetFont(9);
- 				Region rgn(actor->XPos-100, actor->YPos-100, 200, 400);
- 				font->Print(rgn, (unsigned char*)actor->overHeadText, NULL, IE_FONT_ALIGN_CENTER | IE_FONT_ALIGN_TOP, false);
- 			}
- 		}
- 
  		if(anim) {
  			Sprite2D * nextFrame = anim->NextFrame();
--- 188,191 ----
***************
*** 230,233 ****
--- 212,232 ----
  			//video->BlitSprite(nextFrame, actors[i].XPos, actors[i].YPos);
  			video->BlitSpriteTinted(nextFrame, ax, ay, tint);
+ 		}
+ 		if(actor->textDisplaying) {
+ #ifdef WIN32
+ 			unsigned long time = GetTickCount();
+ #else
+ 			struct timeval tv;
+ 			gettimeofday(&tv, NULL);
+ 			unsigned long time = (tv.tv_usec/1000) + (tv.tv_sec*1000);
+ #endif
+ 			if((time - actor->timeStartDisplaying) >= 3000) {
+ 				actor->textDisplaying = 0;
+ 			}
+ 			if(actor->textDisplaying == 1) {
+ 				Font * font = core->GetFont(9);
+ 				Region rgn(actor->XPos-100, actor->YPos-100, 200, 400);
+ 				font->Print(rgn, (unsigned char*)actor->overHeadText, NULL, IE_FONT_ALIGN_CENTER | IE_FONT_ALIGN_TOP, false);
+ 			}
  		}
  	}