[Gemrb-commits] gemrb/gemrb/plugins/Core Interface.cpp,1.380,1.381 SaveGameIterator.cpp,1.35,1.36 SaveGameIterator.h,1.20,1.21 WorldMap.cpp,1.20,1.21 WorldMap.h,1.17,1.18 WorldMapControl.cpp,1.20,1.21

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

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11440/Core

Modified Files:
	Interface.cpp SaveGameIterator.cpp SaveGameIterator.h 
	WorldMap.cpp WorldMap.h WorldMapControl.cpp 
Log Message:
some more worldmap work


Index: WorldMapControl.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/WorldMapControl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** WorldMapControl.cpp	3 Jan 2006 17:16:04 -0000	1.20
--- WorldMapControl.cpp	3 Jan 2006 19:45:53 -0000	1.21
***************
*** 79,83 ****
  	for(i=0;i<ec;i++) {
  		WMPAreaEntry *m = worldmap->GetEntry(i);
! 		if (! (m->AreaStatus & WMP_ENTRY_VISIBLE)) continue;
  
  		short xOffs = MAP_TO_SCREENX(m->X);
--- 79,83 ----
  	for(i=0;i<ec;i++) {
  		WMPAreaEntry *m = worldmap->GetEntry(i);
! 		if (! (m->GetAreaStatus() & WMP_ENTRY_VISIBLE)) continue;
  
  		short xOffs = MAP_TO_SCREENX(m->X);
***************
*** 98,102 ****
  	for(i=0;i<ec;i++) {
  		WMPAreaEntry *m = worldmap->GetEntry(i);
! 		if (! (m->AreaStatus & WMP_ENTRY_VISIBLE)) continue;
  		Sprite2D *icon=m->MapIcon;
  		int h=0,w=0;
--- 98,102 ----
  	for(i=0;i<ec;i++) {
  		WMPAreaEntry *m = worldmap->GetEntry(i);
! 		if (! (m->GetAreaStatus() & WMP_ENTRY_VISIBLE)) continue;
  		Sprite2D *icon=m->MapIcon;
  		int h=0,w=0;
***************
*** 121,125 ****
  			fore.g = 0x80;
  		} else {
! 			if (! (m->AreaStatus & WMP_ENTRY_VISITED)) {
  				//if not visited, make it pale blue
  				fore.r=0x80;
--- 121,125 ----
  			fore.g = 0x80;
  		} else {
! 			if (! (m->GetAreaStatus() & WMP_ENTRY_VISITED)) {
  				//if not visited, make it pale blue
  				fore.r=0x80;
***************
*** 196,200 ****
  			WMPAreaEntry *ae = worldmap->GetEntry(i);
  
! 			if ((ae->AreaStatus & WMP_ENTRY_VISIBLE|WMP_ENTRY_ACCESSIBLE)!= (WMP_ENTRY_VISIBLE|WMP_ENTRY_ACCESSIBLE) ) {
  				continue; //invisible or inaccessible
  			}
--- 196,200 ----
  			WMPAreaEntry *ae = worldmap->GetEntry(i);
  
! 			if ( (ae->GetAreaStatus() & WMP_ENTRY_WALKABLE)!=WMP_ENTRY_WALKABLE) {
  				continue; //invisible or inaccessible
  			}

Index: SaveGameIterator.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/SaveGameIterator.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** SaveGameIterator.h	30 Dec 2005 19:02:21 -0000	1.20
--- SaveGameIterator.h	3 Jan 2006 19:45:53 -0000	1.21
***************
*** 44,48 ****
  class GEM_EXPORT SaveGame {
  public:
! 	SaveGame(char* path, char* name, char* prefix, int pCount);
  	~SaveGame();
  	int GetPortraitCount()
--- 44,48 ----
  class GEM_EXPORT SaveGame {
  public:
! 	SaveGame(char* path, char* name, char* prefix, int pCount, int saveID);
  	~SaveGame();
  	int GetPortraitCount()
***************
*** 50,53 ****
--- 50,57 ----
  		return PortraitCount;
  	};
+ 	int GetSaveID()
+ 	{
+ 		return SaveID;
+ 	};
  	const char* GetName()
  	{
***************
*** 78,81 ****
--- 82,86 ----
  	char Date[_MAX_PATH];
  	int PortraitCount;
+ 	int SaveID;
  };
  

Index: WorldMap.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/WorldMap.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** WorldMap.h	17 Nov 2005 17:40:32 -0000	1.17
--- WorldMap.h	3 Jan 2006 19:45:53 -0000	1.18
***************
*** 78,81 ****
--- 78,83 ----
  	WMPAreaEntry();
  	~WMPAreaEntry();
+ 	ieDword GetAreaStatus();
+ public:
  	ieResRef AreaName;
  	ieResRef AreaResRef;

Index: WorldMap.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/WorldMap.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** WorldMap.cpp	3 Jan 2006 17:16:04 -0000	1.20
--- WorldMap.cpp	3 Jan 2006 19:45:53 -0000	1.21
***************
*** 37,40 ****
--- 37,49 ----
  }
  
+ ieDword WMPAreaEntry::GetAreaStatus()
+ {
+ 	ieDword tmp = AreaStatus;
+ 	if (core->HasFeature(GF_KNOW_WORLD) ) {
+ 		tmp |=WMP_ENTRY_VISITED;
+ 	}
+ 	return tmp;
+ }
+ 
  WorldMap::WorldMap(void)
  {

Index: SaveGameIterator.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/SaveGameIterator.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** SaveGameIterator.cpp	3 Jan 2006 17:16:04 -0000	1.35
--- SaveGameIterator.cpp	3 Jan 2006 19:45:53 -0000	1.36
***************
*** 29,33 ****
  #include <cassert>
  
! SaveGame::SaveGame(char* path, char* name, char* prefix, int pCount)
  {
  	strncpy( Prefix, prefix, sizeof( Prefix ) );
--- 29,33 ----
  #include <cassert>
  
! SaveGame::SaveGame(char* path, char* name, char* prefix, int pCount, int saveID)
  {
  	strncpy( Prefix, prefix, sizeof( Prefix ) );
***************
*** 35,38 ****
--- 35,39 ----
  	strncpy( Name, name, sizeof( Name ) );
  	PortraitCount = pCount;
+ 	SaveID = saveID;
  	char nPath[_MAX_PATH];
  	struct stat my_stat;
***************
*** 307,311 ****
  	closedir( ndir ); //No other files in the directory, close it
  
! 	SaveGame* sg = new SaveGame( Path, savegameName, core->GameNameResRef, prtrt );
  	return sg;
  }
--- 308,312 ----
  	closedir( ndir ); //No other files in the directory, close it
  
! 	SaveGame* sg = new SaveGame( Path, savegameName, core->GameNameResRef, prtrt, savegameNumber );
  	return sg;
  }

Index: Interface.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v
retrieving revision 1.380
retrieving revision 1.381
diff -C2 -d -r1.380 -r1.381
*** Interface.cpp	2 Jan 2006 20:44:30 -0000	1.380
--- Interface.cpp	3 Jan 2006 19:45:52 -0000	1.381
***************
*** 1735,1738 ****
--- 1735,1739 ----
  	SetFeature( ini->GetKeyAsInt( "resources", "ReverseDoor", 0 ), GF_REVERSE_DOOR );
  	SetFeature( ini->GetKeyAsInt( "resources", "DialogueScrolls", 0 ), GF_DIALOGUE_SCROLLS );
+ 	SetFeature( ini->GetKeyAsInt( "resources", "KnowWorld", 0 ), GF_KNOW_WORLD );
  	ForceStereo = ini->GetKeyAsInt( "resources", "ForceStereo", 0 );