1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fixed an issue saving the map in vanilla mode (by DepressivesBrot)

Browse Source 
- fixed a minor cosmetic issue (loading wrong frame for the overhead map) (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-09-13 19:53:14 +00:00
parent 692fff36ed
commit 3cc8153a61
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Map Information.cpp
+4
View File
@@ -629,6 +629,10 @@ void UpdateOldVersionMap()
{ //Allow map edgepoints to be regenerated as new system has been reenabled.
gMapInformation.ubMapVersion = 27;
}
if( gMapInformation.ubMapVersion < 29 )
{
gMapInformation.ubMapVersion = 29;
}
}
void AutoCalculateItemNoOverwriteStatus()
TileEngine/overhead map.cpp
+1 -1
View File
@@ -641,7 +641,7 @@ void GoIntoOverheadMap( )
FilenameForBPP("INTERFACE\\MAP_BORD_800x600.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiOVERMAP ) )
AssertMsg(0, "Missing INTERFACE\\MAP_BORD_800x600.sti" );
}else if(iResolution >= _1680x1050){
}else if(iResolution >= _1680x1050 && gfUseBiggerOverview){
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\MAP_BORD_1920x1080.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &uiOVERMAP ) )
TileEngine/worlddef.cpp
+15 -5
View File
@@ -2214,12 +2214,22 @@ BOOLEAN SaveWorld(const STR8 puiFilename, FLOAT dMajorMapVersion, UINT8 ubMinorM
}
}
for ( cnt = 0; cnt < WORLD_MAX; cnt++ )
{
// Write out room information
FileWrite( hfile, &gusWorldRoomInfo[ cnt ], sizeof( UINT16 ), &uiBytesWritten );
}
if(ubMinorMapVersion < 29){
UINT8 tmproom;
for ( cnt = 0; cnt < WORLD_MAX; cnt++ )
{
tmproom = (UINT8)gusWorldRoomInfo[ cnt ];
FileWrite( hfile, &tmproom, sizeof( UINT8 ), &uiBytesWritten );
}
}else{
for ( cnt = 0; cnt < WORLD_MAX; cnt++ )
{
FileWrite( hfile, &gusWorldRoomInfo[ cnt ], sizeof( UINT16 ), &uiBytesWritten );
}
}
if ( uiFlags & MAP_WORLDITEMS_SAVED )
{