diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-02 22:17:30 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-02 22:17:30 +0200 |
| commit | 3f7f013168e62693601ab57108d329ffaa924439 (patch) | |
| tree | 97c55730d6ffb96dccfde35a01308fa4f2c8f6ef /src/common | |
| parent | ba3dce3aed8ade76901dc0cbf228b5cb81d8c2a5 (diff) | |
| parent | 4b7ca3f26254f6692d1b17eb0df151382bb3b851 (diff) | |
| download | colobot-3f7f013168e62693601ab57108d329ffaa924439.tar.gz colobot-3f7f013168e62693601ab57108d329ffaa924439.tar.bz2 colobot-3f7f013168e62693601ab57108d329ffaa924439.zip | |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/profile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/profile.h b/src/common/profile.h index ed948ff..facb414 100644 --- a/src/common/profile.h +++ b/src/common/profile.h @@ -107,6 +107,6 @@ class CProfile : public CSingleton<CProfile> }; //! Global function to get profile instance -inline CProfile* GetProfile() { - return CProfile::GetInstancePointer(); +inline CProfile & GetProfile() { + return *CProfile::GetInstancePointer(); } |