[Gemrb-commits] gemrb/gemrb/plugins/Core GameControl.cpp,1.44,1.45

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

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

Modified Files:
	GameControl.cpp 
Log Message:
Fix: ctrl-4 works, traps will be highlighted red when they are known and mouse is over them


Index: GameControl.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** GameControl.cpp	22 Dec 2003 23:35:30 -0000	1.44
--- GameControl.cpp	22 Dec 2003 23:42:16 -0000	1.45
***************
*** 155,167 ****
  			InfoPoint *i;
  			for(unsigned int idx=0; i=area->tm->GetInfoPoint(idx); idx++) {
! 				if(i->TrapDetected && i->Trapped) {
! 					video->DrawPolyline(i->outline, red, true);
  				}
! 				else if(DebugFlags&4) {
  					video->DrawPolyline(i->outline, blue, true);
  				}
  			}
  		}
! 		else { //overInfoPoint
  		}
  		for(size_t i = 0; i < infoPoints.size(); i++) {
--- 155,170 ----
  			InfoPoint *i;
  			for(unsigned int idx=0; i=area->tm->GetInfoPoint(idx); idx++) {
! 				if( (i->TrapDetected || (DebugFlags&1) ) && i->Trapped) {
! 						video->DrawPolyline(i->outline, red, true);
  				}
! 				else if(DebugFlags&1) {
  					video->DrawPolyline(i->outline, blue, true);
  				}
  			}
  		}
! 		else if(overInfoPoint) {
! 			if(overInfoPoint->TrapDetected && overInfoPoint->Trapped) {
! 				video->DrawPolyline(overInfoPoint->outline, red, true);
! 			}
  		}
  		for(size_t i = 0; i < infoPoints.size(); i++) {
***************
*** 246,249 ****
--- 249,259 ----
  		case 'a':  //'a'
  			{
+ 				if(overInfoPoint) {
+ 					if(overInfoPoint->Trapped && !(overInfoPoint->TrapDetected)) {
+ 						overInfoPoint->TrapDetected = 1;
+ 						core->GetVideoDriver()->FreeSprite(overInfoPoint->outline->fill);
+ 						overInfoPoint->outline->fill = NULL;
+ 					}
+ 				}
  				if(overContainer) {
  					if(overContainer->Trapped && !(overContainer->TrapDetected)) {