mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP A detailed list of all the features (changes) is visible in the history log of the development trunk: INFO: There will be no further development in the development source trunk, so is obsolete from now on! This commit contains the following features (bugfixes are not listed): - New Feature: Show merc ranks in Strategy Screen before merc name o Toggle on/off in the ingame options screen o For each experience level (0-10) there are defined rank names in the language specific text files o Additional language text that is not translated yet is marked with // TODO.Translate - New Feature: Faster Bobby Ray Shipments o This feature is selectable in the ja2_options.ini o When activated Bobby Ray shipments will be really fast -> Overnight Express: 5 - 7 hours -> Air Service: 10, 12 or 14 hours -> Standard Service: 15, 18 or 21 hours o In a multiplayer game, this feature is disabled (because shipment arrive immediately in the destination sector) - New Feature: AP cost for manipulating the merc inventory o This feature is selectable in the start new game screen o For example, putting a weapon from hand in the backpack costs APs o The AP costs are defined in the APBPConstants.ini o In a multiplayer game, this feature is disabled - New Feature: Added possibility to set individual Gear Kit names o Set individual names in the optional new tag <mGearKitName> inside the <GEARKIT> root element (File: TableData\MercStartingGear.xml) - New Feature: Externalized the maximum purchase amount (JA2 vanilla: 10) for Bobby Rays purchases per shipment o Define the max. amount in the ja2_options.ini: BOBBY_RAY_MAX_PURCHASE_AMOUNT, Range: 10 - 100) o Nice scrolling bars to scroll through all the purchases - New Feature: Now it is possible to walk on "water" tiles or handle those tiles like "normal" tiles o (instead of showing the swimming animation and counting the APs for swimming), when the soldier is located on the second level (level > 0) - New Feature: Externalized AIM Veterans laptop site o Add maximum of 4 pages o Add new AIM to veterans page, and remove AIM from veterans page. o New XML file: OldAIMArchive.xml (language specific XML files: *.OldAIMArchive.xml) - New Feature: Added possibility to choose from 254 IMP faces o Modified IMPPortraits.xml o Added new GameDir folder "IMPFaces" which contains the IMP face portraits o Moved IMP faces in the new "IMPFaces" folder - New Feature: ARSP - All Resolution Support Project o See here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298698&page=1 o Support any kind of screen resolution. This works by choosing the matching full supported resolution (640x480, 800x600, 1024x768) and then centering the graphics o See ja2.ini for defining the screen resolution - New Feature: AI Turn Speed Up (FF-MOD) o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298699#Post298699 o When this feature is activated it allows fast enemy turns o New entry in ja2.ini to enable this feature: HIGHSPEED_TIMER = TRUE o Turn on/off auto fast turns in ingame options o New ja2_options.ini settings for fine tuning: [Clock Settings] ini block - New Feature: "Lock" / "Release" mouse cursor in tactical windowed mode, so the mouse can stay within window boundary o This is very helpful for doing scrolling with the mouse (by moving the mouse to the window edge) in windowed mode o You can toggle on/off the feature by pressing CTRL + Z. It is also possible to press CTRL + Y. So the user can decide which fits better :) o Whenever you toggle on/off a screen message appears on the tactical log to notify the player - New Feature: Weapon overheating o Basically, every shot fired from a gun increases its temperature. On higher temperatures, the gun jams more frequently o On/off toggle in the ingame options o Graphical thermometer indication on the weapon picture o New ja2_options.ini section with a few options, Section: [Tactical Weapon Overheating Settings] o XML changes (New Tags) --> AmmoTypes.xml: <temperatureModificator> --> Items.xml: <barrel>, <usOverheatingCooldownFactor> --> Weapons.xml: <usOverheatingJamThreshold>, <usOverheatingDamageThreshold>, <usOverheatingSingleShotTemperature> o Added a few barells to Items.xml (end of the file) o more infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301059&page=1 - New Feature: Resting weapons on a surfaces o You can now rest your weapon on crates, low walls, rocks, debris, open windows etc. while you are crouched. Resting will give yu the superior gun handling modifiers from PRONE position. o A little 'A' on your gun indicates if you are resting it or not. o Both settings can be turned on and off in Ja2_Options.ini under 'Tactical Gameplay Settings' - New Feature: Externalized option on whether mercs can exit sector using grid exit in turn based mode o new ja2_options.ini property: GRID_EXIT_IN_TURNBASED o This ini setting does not affect leaving sectors on map edges - Rework/Update: Ammo boxes and Ammo crates o Ammo crate items added for remaining calibers. Tweaked prices to correspond to magazines, tweaked capacities and weights to be reasonable (~800 or less). o Shift-R reload now looks at both boxes and crates in sector items and merc's inventory to reload, and tops off magazines in inventory as well. Only possible outside of combat. o Ctrl-Shift-A still creates crates as per usual, with some fixes to ensure all ammo is caught on the first press. o Shift-A now creates ammo boxes in the same loop. They mostly behave like crates, but fit in mercs inventories. o Ammo boxes are available to purchase at BR and tony, sam, etc. Individual magazines/drums/etc are no longer available. o Removed ammo crate xml tag. Added ubMagType tag to Magazines array. This allows us to differentiate between magazines, bullets, boxes and crates. o Changed ammo filtering in BR's to display boxes appropriately. Added back the "Mag:" display (changed text to "Size:") o Added ja2set.dat.xml file (WF map version in WF maps folder) to be used instead of ja2set.dat file (ja2.ini setting added) For now, if you want to play vanilla instead, just change the setting in the ini (see comments in file). o Added P4-P9Items image files (up to 5k images each) and tileslots. 1.13 core items will continue to use Guns and P1-P3Items for the foreseeable future. P4-P9 can be used by customizers/modders to avoid conflicts with Guns/P1-P3 items. TODO: Need to discuss a strategy for this in the forums. o Added in Ambient/0.bad and 32.bad to avoid an exception in the code. o Updated the XML Editor o Standardized the text on all the ammo items. - New Multiplayer Feature: Sharing same FOV (field of view) in a coop/team-dm (for friendly teams) game o You will also see enemies, that your teammate sees git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
393 lines
12 KiB
C++
393 lines
12 KiB
C++
#include "builddefines.h"
|
|
#include "IniReader.h"
|
|
#include "FileMan.h"
|
|
#include "debug.h"
|
|
#include "Font Control.h"
|
|
#include "message.h"
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sstream>
|
|
|
|
// Kaiden: INI reading function definitions:
|
|
|
|
#include <vfs/Core/vfs.h>
|
|
|
|
#ifdef USE_VFS
|
|
std::set<vfs::Path,vfs::Path::Less> CIniReader::m_merge_files;
|
|
#endif
|
|
std::stack<std::string> iniErrorMessages;
|
|
|
|
template<typename ValueType>
|
|
void PushErrorMessage(std::string const& filename,
|
|
std::string const& section,
|
|
std::string const& key,
|
|
ValueType value, ValueType used_value,
|
|
ValueType minVal, ValueType maxVal)
|
|
{
|
|
std::stringstream errMessage;
|
|
errMessage << "The value [" << section << "][" << key << "] = \"" << value << "\" "
|
|
<< "in file [" << filename << "] "
|
|
<< "is outside the valid range [" << minVal << " , " << maxVal << "]. "
|
|
<< used_value << " will be used.";
|
|
iniErrorMessages.push(errMessage.str());
|
|
}
|
|
|
|
#ifdef USE_VFS
|
|
void CIniReader::RegisterFileForMerging(vfs::Path const& filename)
|
|
{
|
|
m_merge_files.insert(filename);
|
|
}
|
|
#endif
|
|
|
|
CIniReader::CIniReader(const STR8 szFileName)
|
|
{
|
|
memset(m_szFileName,0,sizeof(m_szFileName));
|
|
#ifndef USE_VFS
|
|
// Snap: Look for the INI file in the custom Data directory.
|
|
// If not there, leave at default location.
|
|
if ( gCustomDataCat.FindFile(szFileName) ) {
|
|
sprintf(m_szFileName, "%s\\%s", gCustomDataCat.GetRootDir().c_str(), szFileName);
|
|
}
|
|
else {
|
|
sprintf(m_szFileName, "%s\\%s", gDefaultDataCat.GetRootDir().c_str(), szFileName);
|
|
}
|
|
#else
|
|
strncpy(m_szFileName,szFileName, std::min<int>(strlen(szFileName), sizeof(m_szFileName)-1));
|
|
if(m_merge_files.find(szFileName) == m_merge_files.end())
|
|
{
|
|
m_oProps.initFromIniFile(vfs::Path(szFileName));
|
|
}
|
|
else
|
|
{
|
|
vfs::CProfileStack* profs = getVFS()->getProfileStack();
|
|
vfs::CProfileStack::Iterator it = profs->begin();
|
|
std::stack<vfs::CVirtualProfile*> rev_order;
|
|
for(; !it.end(); it.next()) { rev_order.push(it.value()); }
|
|
while(!rev_order.empty())
|
|
{
|
|
vfs::IBaseFile* file = rev_order.top()->getFile(szFileName);
|
|
if(file)
|
|
{
|
|
m_oProps.initFromIniFile(vfs::tReadableFile::cast(file));
|
|
}
|
|
rev_order.pop();
|
|
}
|
|
}
|
|
// check for override file
|
|
{
|
|
CHAR8 OvrFileName[256], Drive[128], Dir[128], Name[128], Ext[128];
|
|
_splitpath(szFileName, Drive, Dir, Name, Ext);
|
|
_makepath(OvrFileName, Drive, Dir, Name, "Override");
|
|
if(getVFS()->fileExists(OvrFileName))
|
|
m_oProps.initFromIniFile(vfs::Path(OvrFileName));
|
|
}
|
|
#endif
|
|
}
|
|
|
|
CIniReader::CIniReader(const STR8 szFileName, BOOLEAN Force_Custom_Data_Path)
|
|
{
|
|
memset(m_szFileName,0,sizeof(m_szFileName));
|
|
// ary-05/05/2009 : force custom data path for potential non existing file -or- force default data path
|
|
// : Also, flag file detection to allow functions to determine course of action for case of file [not found/is found].
|
|
#ifndef USE_VFS
|
|
if ( Force_Custom_Data_Path )
|
|
{
|
|
if ( gCustomDataCat.FindFile(szFileName) )
|
|
{
|
|
CIniReader_File_Found = TRUE;
|
|
}
|
|
else
|
|
{
|
|
CIniReader_File_Found = FALSE;
|
|
}
|
|
sprintf(m_szFileName, "%s\\%s", gCustomDataCat.GetRootDir().c_str(), szFileName);
|
|
}
|
|
else
|
|
{
|
|
if ( gDefaultDataCat.FindFile(szFileName) )
|
|
{
|
|
CIniReader_File_Found = TRUE;
|
|
}
|
|
else
|
|
{
|
|
CIniReader_File_Found = FALSE;
|
|
}
|
|
sprintf(m_szFileName, "%s\\%s", gDefaultDataCat.GetRootDir().c_str(), szFileName);
|
|
}
|
|
#else
|
|
strncpy(m_szFileName,szFileName, std::min<int>(strlen(szFileName), sizeof(m_szFileName)-1));
|
|
if(m_merge_files.find(szFileName) == m_merge_files.end())
|
|
{
|
|
CIniReader_File_Found = m_oProps.initFromIniFile(vfs::Path(szFileName));
|
|
}
|
|
else
|
|
{
|
|
CIniReader_File_Found = TRUE;
|
|
vfs::CProfileStack* profs = getVFS()->getProfileStack();
|
|
vfs::CProfileStack::Iterator it = profs->begin();
|
|
std::stack<vfs::CVirtualProfile*> rev_order;
|
|
for(; !it.end(); it.next()) { rev_order.push(it.value()); }
|
|
while(!rev_order.empty())
|
|
{
|
|
vfs::IBaseFile* file = rev_order.top()->getFile(szFileName);
|
|
if(file)
|
|
{
|
|
CIniReader_File_Found = ((CIniReader_File_Found != FALSE) && m_oProps.initFromIniFile(vfs::tReadableFile::cast(file))) ? TRUE : FALSE;
|
|
}
|
|
rev_order.pop();
|
|
}
|
|
}
|
|
|
|
#endif
|
|
}
|
|
|
|
void CIniReader::Clear()
|
|
{
|
|
#ifndef USE_VFS
|
|
memset(m_szFileName, 0, MAX_PATH);
|
|
#else
|
|
memset(m_szFileName, 0, MAX_PATH);
|
|
m_oProps.clearContainer();
|
|
#endif
|
|
}
|
|
|
|
|
|
int CIniReader::ReadInteger(const STR8 szSection, const STR8 szKey, int iDefaultValue)
|
|
{
|
|
#ifndef USE_VFS
|
|
return GetPrivateProfileInt(szSection, szKey, iDefaultValue, m_szFileName);
|
|
#else
|
|
return (int)(m_oProps.getIntProperty(szSection, szKey, iDefaultValue));
|
|
#endif
|
|
}
|
|
|
|
|
|
int CIniReader::ReadInteger(const STR8 szSection, const STR8 szKey, int defaultValue, int minValue, int maxValue)
|
|
{
|
|
#ifndef USE_VFS
|
|
int iniValueReadFromFile = (int)(GetPrivateProfileInt(szSection, szKey, defaultValue, m_szFileName));
|
|
#else
|
|
int iniValueReadFromFile = (int)(m_oProps.getIntProperty(szSection, szKey, defaultValue));
|
|
#endif
|
|
//AssertGE(iniValueReadFromFile, minValue);
|
|
//AssertLE(iniValueReadFromFile, maxValue);
|
|
if (iniValueReadFromFile < minValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey, iniValueReadFromFile, minValue, minValue, maxValue);
|
|
return minValue;
|
|
}
|
|
else if (iniValueReadFromFile > maxValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey, iniValueReadFromFile, maxValue, minValue, maxValue);
|
|
return maxValue;
|
|
}
|
|
return iniValueReadFromFile;
|
|
}
|
|
|
|
|
|
|
|
//float CIniReader::ReadDouble(const STR8 szSection, const STR8 szKey, float fltDefaultValue)
|
|
//{
|
|
// char szResult[255];
|
|
// char szDefault[255];
|
|
// float fltResult;
|
|
// sprintf(szDefault, "%f",fltDefaultValue);
|
|
// GetPrivateProfileString(szSection, szKey, szDefault, szResult, 255, m_szFileName);
|
|
// fltResult = (float) atof(szResult);
|
|
// return fltResult;
|
|
//}
|
|
|
|
double CIniReader::ReadDouble(const STR8 szSection, const STR8 szKey, double defaultValue, double minValue, double maxValue)
|
|
{
|
|
double iniValueReadFromFile;
|
|
#ifndef USE_VFS
|
|
char szResult[255];
|
|
char szDefault[255];
|
|
sprintf(szDefault, "%f", defaultValue);
|
|
GetPrivateProfileString(szSection, szKey, szDefault, szResult, 255, m_szFileName);
|
|
iniValueReadFromFile = (float) atof(szResult);
|
|
#else
|
|
iniValueReadFromFile = m_oProps.getFloatProperty(szSection, szKey, defaultValue);
|
|
#endif
|
|
//AssertGE(iniValueReadFromFile, minValue);
|
|
//AssertLE(iniValueReadFromFile, maxValue);
|
|
if (iniValueReadFromFile < minValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey,iniValueReadFromFile, minValue, minValue, maxValue);
|
|
return minValue;
|
|
}
|
|
else if (iniValueReadFromFile > maxValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey, iniValueReadFromFile, maxValue, minValue, maxValue);
|
|
return maxValue;
|
|
}
|
|
return iniValueReadFromFile;
|
|
}
|
|
|
|
FLOAT CIniReader::ReadFloat(const STR8 szSection, const STR8 szKey, FLOAT defaultValue, FLOAT minValue, FLOAT maxValue)
|
|
{
|
|
FLOAT iniValueReadFromFile;
|
|
#ifndef USE_VFS
|
|
char szResult[255];
|
|
char szDefault[255];
|
|
sprintf(szDefault, "%f", defaultValue);
|
|
GetPrivateProfileString(szSection, szKey, szDefault, szResult, 255, m_szFileName);
|
|
iniValueReadFromFile = (FLOAT) atof(szResult);
|
|
#else
|
|
iniValueReadFromFile = (FLOAT) m_oProps.getFloatProperty(szSection, szKey, (float)defaultValue);
|
|
#endif
|
|
|
|
//AssertGE(iniValueReadFromFile, minValue);
|
|
//AssertLE(iniValueReadFromFile, maxValue);
|
|
|
|
if (iniValueReadFromFile < minValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey, iniValueReadFromFile, minValue, minValue, maxValue);
|
|
return minValue;
|
|
}
|
|
else if (iniValueReadFromFile > maxValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey, iniValueReadFromFile, maxValue, minValue, maxValue);
|
|
return maxValue;
|
|
}
|
|
return iniValueReadFromFile;
|
|
}
|
|
|
|
BOOLEAN CIniReader::ReadBoolean(const STR8 szSection, const STR8 szKey, bool defaultValue, bool bolDisplayError)
|
|
{
|
|
#ifndef USE_VFS
|
|
char szResult[255];
|
|
char szDefault[255];
|
|
sprintf(szDefault, "%s", defaultValue? "TRUE" : "FALSE");
|
|
GetPrivateProfileString(szSection, szKey, szDefault, szResult, 255, m_szFileName);
|
|
for (int idx=0; (szResult[idx] != 0) && (idx < 255); ++idx)
|
|
szResult[idx] = toupper(szResult[idx]);
|
|
if (strcmp(szResult, "TRUE") == 0)
|
|
return TRUE;
|
|
else if (strcmp(szResult, "FALSE") == 0)
|
|
return FALSE;
|
|
#else
|
|
vfs::String str = m_oProps.getStringProperty(szSection, szKey, L"");
|
|
if( vfs::StrCmp::Equal(str, L"true") )
|
|
{
|
|
return TRUE;
|
|
}
|
|
else if( vfs::StrCmp::Equal(str, L"false") )
|
|
{
|
|
return FALSE;
|
|
}
|
|
std::string szResult = str.utf8();
|
|
char szDefault[255];
|
|
sprintf(szDefault, "%s", defaultValue? "TRUE" : "FALSE");
|
|
#endif
|
|
if(bolDisplayError){
|
|
std::stringstream errMessage;
|
|
errMessage << "The value [" << szSection << "][" << szKey << "] = \"" << szResult << "\" "
|
|
<< "in file [" << this->m_szFileName << "] is neither TRUE nor FALSE. The value " << szDefault << " will be used.";
|
|
iniErrorMessages.push(errMessage.str());
|
|
}
|
|
return defaultValue;
|
|
}
|
|
|
|
// ary-05/15/2009 : snippet on how to use CIniReader::ReadString
|
|
// const STR8 test_ini_string = new char[255];
|
|
// memset(test_ini_string, 0x00, 255);
|
|
// iniReader.ReadString("JA2 Game Settings" , "TEST_STRING" , "default string" , test_ini_string , 255 );
|
|
|
|
void CIniReader::ReadString(const STR8 szSection, const STR8 szKey, const STR8 szDefaultValue, STR8 input_buffer, size_t buffer_size)
|
|
{
|
|
#ifndef USE_VFS
|
|
GetPrivateProfileString(szSection, szKey, szDefaultValue, input_buffer, buffer_size, m_szFileName);
|
|
#else
|
|
std::string s = m_oProps.getStringProperty(szSection, szKey, szDefaultValue).utf8();
|
|
int len = std::min<unsigned int>(s.length(),buffer_size-1);
|
|
strncpy(input_buffer, s.c_str(), len);
|
|
input_buffer[len] = 0;
|
|
#endif
|
|
}
|
|
|
|
// WANNE - MP: Old version, currently used by Multiplayer
|
|
STR8 CIniReader::ReadString(const STR8 szSection, const STR8 szKey, const STR8 szDefaultValue)
|
|
{
|
|
// >>>>> Memory Leak <<<<<
|
|
STR8 szResult = new char[255];
|
|
memset(szResult, 0x00, 255);
|
|
#ifndef USE_VFS
|
|
GetPrivateProfileString(szSection, szKey, szDefaultValue, szResult, 255, m_szFileName);
|
|
#else
|
|
std::string s = m_oProps.getStringProperty(szSection, szKey, szDefaultValue).utf8();
|
|
strncpy(szResult, s.c_str(), std::min<int>(s.length(),254));
|
|
#endif
|
|
return szResult;
|
|
}
|
|
|
|
UINT8 CIniReader::ReadUINT8(const STR8 szSection, const STR8 szKey, UINT8 defaultValue, UINT8 minValue, UINT8 maxValue)
|
|
{
|
|
UINT8 iniValueReadFromFile;
|
|
|
|
|
|
iniValueReadFromFile = (UINT8) this->ReadUINT( szSection, szKey, (UINT32) defaultValue, (UINT32) minValue, (UINT32) maxValue);
|
|
|
|
return iniValueReadFromFile;
|
|
|
|
}
|
|
|
|
UINT16 CIniReader::ReadUINT16(const STR8 szSection, const STR8 szKey, UINT16 defaultValue, UINT16 minValue, UINT16 maxValue)
|
|
{
|
|
UINT16 iniValueReadFromFile;
|
|
|
|
iniValueReadFromFile = (UINT16) this->ReadUINT( szSection, szKey, (UINT32) defaultValue, (UINT32) minValue, (UINT32) maxValue);
|
|
|
|
return iniValueReadFromFile;
|
|
|
|
}
|
|
|
|
UINT32 CIniReader::ReadUINT32(const STR8 szSection, const STR8 szKey, UINT32 defaultValue, UINT32 minValue, UINT32 maxValue)
|
|
{
|
|
UINT32 iniValueReadFromFile;
|
|
|
|
iniValueReadFromFile = (UINT32) this->ReadUINT( szSection, szKey, (UINT32) defaultValue, (UINT32) minValue, (UINT32) maxValue);
|
|
|
|
return iniValueReadFromFile;
|
|
|
|
}
|
|
|
|
UINT32 CIniReader::ReadUINT(const STR8 szSection, const STR8 szKey, UINT32 defaultValue, UINT32 minValue, UINT32 maxValue )
|
|
{
|
|
UINT32 iniValueReadFromFile;
|
|
#ifndef USE_VFS
|
|
STR8 szResult = new char[255];
|
|
STR8 szDefault = new char[255];
|
|
|
|
memset(szResult, 0x00, 255);
|
|
memset(szDefault, 0x00, 255);
|
|
|
|
sprintf(szDefault, "%u", defaultValue);
|
|
|
|
this->ReadString (szSection , szKey , szDefault, szResult, (size_t) 255 );
|
|
iniValueReadFromFile = (UINT32) strtoul(szResult,NULL,0);
|
|
#else
|
|
iniValueReadFromFile = (UINT32) m_oProps.getUIntProperty(szSection, szKey, defaultValue);
|
|
#endif
|
|
//AssertGE(iniValueReadFromFile, minValue);
|
|
//AssertLE(iniValueReadFromFile, maxValue);
|
|
|
|
if (iniValueReadFromFile < minValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey, iniValueReadFromFile, minValue, minValue, maxValue);
|
|
iniValueReadFromFile = minValue;
|
|
}
|
|
else if (iniValueReadFromFile > maxValue)
|
|
{
|
|
PushErrorMessage(this->m_szFileName, szSection, szKey, iniValueReadFromFile, maxValue, minValue, maxValue);
|
|
iniValueReadFromFile = maxValue;
|
|
}
|
|
|
|
#ifndef USE_VFS
|
|
delete [] szResult ;
|
|
delete [] szDefault ;
|
|
#endif
|
|
return iniValueReadFromFile;
|
|
|
|
}
|