mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Merged revision(s) 7440-7444 from trunk/GameSource/ja2_v1.13
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+5
-5
@@ -6611,8 +6611,8 @@ void HandleWWWSubSites( void )
|
|||||||
fLoadPendingFlag = FALSE;
|
fLoadPendingFlag = FALSE;
|
||||||
|
|
||||||
// set fact we were here
|
// set fact we were here
|
||||||
gfWWWaitSubSitesVisitedFlags[ LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX ] = TRUE;
|
gfWWWaitSubSitesVisitedFlags[LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX] = TRUE;
|
||||||
gfWWWaitSubSitesVisitedFlags[ LAPTOP_MODE_AIM_MEMBERS ] = TRUE;
|
gfWWWaitSubSitesVisitedFlags[LAPTOP_MODE_AIM_MEMBERS] = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6620,7 +6620,7 @@ void HandleWWWSubSites( void )
|
|||||||
void UpdateStatusOfDisplayingBookMarks( void )
|
void UpdateStatusOfDisplayingBookMarks( void )
|
||||||
{
|
{
|
||||||
// this function will disable showing of bookmarks if in process of download or if we miniming web browser
|
// this function will disable showing of bookmarks if in process of download or if we miniming web browser
|
||||||
if( ( fLoadPendingFlag == TRUE ) || ( guiCurrentLaptopMode < LAPTOP_MODE_WWW ) )
|
if ( (fLoadPendingFlag == TRUE) || (guiCurrentLaptopMode < LAPTOP_MODE_WWW) )
|
||||||
{
|
{
|
||||||
gfShowBookmarks = FALSE;
|
gfShowBookmarks = FALSE;
|
||||||
}
|
}
|
||||||
@@ -6630,9 +6630,9 @@ void UpdateStatusOfDisplayingBookMarks( void )
|
|||||||
void InitalizeSubSitesList( void )
|
void InitalizeSubSitesList( void )
|
||||||
{
|
{
|
||||||
// init all subsites list to not visited
|
// init all subsites list to not visited
|
||||||
for( INT32 iCounter = LAPTOP_MODE_WWW + 1 ; iCounter <= LAPTOP_MODE_MAX; ++iCounter )
|
for ( INT32 iCounter = LAPTOP_MODE_WWW + 1; iCounter < LAPTOP_MODE_MAX; ++iCounter )
|
||||||
{
|
{
|
||||||
gfWWWaitSubSitesVisitedFlags[ iCounter ] = FALSE;
|
gfWWWaitSubSitesVisitedFlags[iCounter] = FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user