[Gemrb-commits] gemrb/gemrb/plugins/Core Map.cpp,1.28,1.29 GameControl.cpp,1.22,1.23

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

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

Modified Files:
	Map.cpp GameControl.cpp 
Log Message:
Added Feature : Map.cpp / GameControl.cpp : Implemented Extended Search Map Handling

Index: Map.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Map.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Map.cpp	30 Nov 2003 18:16:14 -0000	1.28
--- Map.cpp	30 Nov 2003 18:51:42 -0000	1.29
***************
*** 237,240 ****
  
  int Map::GetBlocked(int cx, int cy) {
! 	Color block = SearchMap->GetPixel(cx/16, cy/16);
  }
--- 237,258 ----
  
  int Map::GetBlocked(int cx, int cy) {
! 	int block = SearchMap->GetPixelIndex(cx/16, cy/16);
! 	switch(block) {
! 		case 1:
! 		case 2:
! 		case 3:
! 		case 4:
! 		case 5:
! 		case 6:
! 		case 7:
! 		case 8:
! 		case 15:
! 			return 1;
! 		break;
! 
! 		case 14:
! 			return 2;
! 		break;
! 	}
! 	return 0;
  }

Index: GameControl.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** GameControl.cpp	30 Nov 2003 18:17:29 -0000	1.22
--- GameControl.cpp	30 Nov 2003 18:51:42 -0000	1.23
***************
*** 172,179 ****
  	Map * area = game->GetMap(MapIndex);
  	
! 	if(area->GetBlocked(GameX, GameY) )
! 		nextCursor = 6;
! 	else
! 		nextCursor = 4;
  
  	overInfoPoint = area->tm->GetInfoPoint(GameX, GameY);
--- 172,188 ----
  	Map * area = game->GetMap(MapIndex);
  	
! 	switch(area->GetBlocked(GameX, GameY)) {
! 		case 0:
! 			nextCursor = 6;
! 		break;
! 
! 		case 1:
! 			nextCursor = 4;
! 		break;
! 
! 		case 2:
! 			nextCursor = 34;
! 		break;
! 	}
  
  	overInfoPoint = area->tm->GetInfoPoint(GameX, GameY);
***************
*** 203,207 ****
  			lastActor = actor;
  			lastActor->actor->anims->DrawCircle = true;
! 			if(!lastActor->actor->Modified[IE_STATE_ID]&STATE_DEAD) {
  				switch(lastActor->actor->Modified[IE_EA]) {
  					case EVILCUTOFF:
--- 212,216 ----
  			lastActor = actor;
  			lastActor->actor->anims->DrawCircle = true;
! 			if((lastActor->actor->Modified[IE_STATE_ID]&STATE_DEAD) == 0) {
  				switch(lastActor->actor->Modified[IE_EA]) {
  					case EVILCUTOFF: