diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
| commit | af3057df7eb41973349b407539846f17d9094c21 (patch) | |
| tree | 0940a188a0cfc43a99505f55513516866a57d145 /src/common/profile.h | |
| parent | f95df35dc58e01b99ffddfc4ad394feaa4460b09 (diff) | |
| download | colobot-af3057df7eb41973349b407539846f17d9094c21.tar.gz colobot-af3057df7eb41973349b407539846f17d9094c21.tar.bz2 colobot-af3057df7eb41973349b407539846f17d9094c21.zip | |
Merged changes from dev
Resolved conflicts & added fixes.
Diffstat (limited to 'src/common/profile.h')
| -rw-r--r-- | src/common/profile.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/profile.h b/src/common/profile.h index 1a36050..2c76a0b 100644 --- a/src/common/profile.h +++ b/src/common/profile.h @@ -20,11 +20,11 @@ extern bool InitCurrentDirectory(); -extern bool SetProfileString(char* section, char* key, char* string); -extern bool GetProfileString(char* section, char* key, char* buffer, int max); -extern bool SetProfileInt(char* section, char* key, int value); -extern bool GetProfileInt(char* section, char* key, int &value); -extern bool SetProfileFloat(char* section, char* key, float value); -extern bool GetProfileFloat(char* section, char* key, float &value); +extern bool SetLocalProfileString(char* section, char* key, char* string); +extern bool GetLocalProfileString(char* section, char* key, char* buffer, int max); +extern bool SetLocalProfileInt(char* section, char* key, int value); +extern bool GetLocalProfileInt(char* section, char* key, int &value); +extern bool SetLocalProfileFloat(char* section, char* key, float value); +extern bool GetLocalProfileFloat(char* section, char* key, float &value); |