- Updated Briefing room / Encyclopedia (by Jazz)

o Both features are currently disabled, because the use huge amount of memory. There also seems to be some big memory leaks in Encyclopedia
o see builddefines.h (ENABLE_ENCYCLOPEDIA, ENABLE_BRIEFINGROOM)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6118 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-06-10 20:12:56 +00:00
parent b5835754cc
commit 742494ec77
17 changed files with 219 additions and 100 deletions
+14 -3
View File
@@ -1632,17 +1632,28 @@ void LoadGameExternalOptions()
//################# Laptop Settings ##################
gGameExternalOptions.gBriefingRoom = iniReader.ReadBoolean("Laptop Settings", "BRIEFING_ROOM", FALSE);
#ifdef ENABLE_BRIEFINGROOM
if (!is_networked)
gGameExternalOptions.gBriefingRoom = iniReader.ReadBoolean("Laptop Settings", "BRIEFING_ROOM", FALSE);
else
gGameExternalOptions.gBriefingRoom = FALSE;
#else
gGameExternalOptions.gBriefingRoom = FALSE;
#endif
#ifdef ENABLE_ENCYCLOPEDIA
gGameExternalOptions.gEncyclopedia = iniReader.ReadBoolean("Laptop Settings", "ENCYCLOPEDIA", FALSE);
if (!is_networked)
gGameExternalOptions.gEncyclopedia = iniReader.ReadBoolean("Laptop Settings", "ENCYCLOPEDIA", FALSE);
else
gGameExternalOptions.gEncyclopedia = FALSE;
#else
gGameExternalOptions.gEncyclopedia = FALSE;
#endif
gGameExternalOptions.fDisableLaptopTransition = iniReader.ReadBoolean("Laptop Settings", "DISABLE_LAPTOP_TRANSITION", FALSE);
gGameExternalOptions.fFastWWWSitesLoading = iniReader.ReadBoolean("Laptop Settings", "FAST_WWW_SITES_LOADING", FALSE);
gGameExternalOptions.fLaptopMouseCaptured = iniReader.ReadBoolean("Laptop Settings", "LAPTOP_MOUSE_CAPTURED", FALSE);
//################# Bobby Ray Settings ##################