Make functions const where possible.

diff --git a/src/CConfig.cpp b/src/CConfig.cpp
index ce87a06ce358c35fdefe27b89b5c29712b48d7d1..ef997bd7741234e8c74293228db87bc9ff10a84e 100644 (file)
--- a/src/CConfig.cpp
+++ b/src/CConfig.cpp
@@ -43,7 +43,7 @@ void Config::populate(int *data)
        command[CONTROL::PAUSE] = 0;
 }
 
-bool Config::isControl(CONTROL::TYPE type)
+bool Config::isControl(CONTROL::TYPE type) const
 {
        return command[type];
 }

diff --git a/src/CConfig.h b/src/CConfig.h
index 6a6f5f70221646be516b305e613fbf700f9eb2b4..e1460ed8ad1d84709d8fb88b6c2d30c50a7bc602 100755 (executable)
--- a/src/CConfig.h
+++ b/src/CConfig.h
@@ -17,7 +17,7 @@ class Config
        void populate();
        void populate(int *data);
        
-       bool isControl(CONTROL::TYPE type);
+       bool isControl(CONTROL::TYPE type) const;
        void resetControl(CONTROL::TYPE type);
        
        void doPause();

diff --git a/src/CEngine.cpp b/src/CEngine.cpp
index 9ab25813c1cf10cb8ec2127b2bb5ab2d799bf531..10bdf60c38fc5eee014a2f30f4156bfa98d6cdc0 100644 (file)
--- a/src/CEngine.cpp
+++ b/src/CEngine.cpp
@@ -274,12 +274,12 @@ void Engine::getInput()
        }
 }
 
-int Engine::getMouseX()
+int Engine::getMouseX() const
 {
        return mouseX;
 }
 
-int Engine::getMouseY()
+int Engine::getMouseY() const
 {
        return mouseY;
 }
@@ -458,7 +458,7 @@ void Engine::setPlayerPosition(int x, int y, int limitLeft, int limitRight, int
        Math::limitInt(&playerPosY, limitUp, limitDown);
 }
 
-int Engine::getFrameLoop()
+int Engine::getFrameLoop() const
 {
        return frameLoop;
 }
@@ -475,7 +475,7 @@ void Engine::doTimeDifference()
        time2 = SDL_GetTicks();
 }
 
-float Engine::getTimeDifference()
+float Engine::getTimeDifference() const
 {
        return timeDifference;
 }

diff --git a/src/CEngine.h b/src/CEngine.h
index d054bb879f6c1d4b6cec6b2b26d2283c72e157e3..4fe6876023070152d28862c021587354ee6bf325 100755 (executable)
--- a/src/CEngine.h
+++ b/src/CEngine.h
@@ -97,8 +97,8 @@ class Engine {
        Engine();
        void destroy();
        void getInput();
-       int getMouseX();
-       int getMouseY();
+       int getMouseX() const;
+       int getMouseY() const;
 
        void setMouse(int x, int y);
        bool userAccepts();
@@ -114,10 +114,10 @@ class Engine {
        bool loadData(const char *filename);
        void reportFontFailure();
        void setPlayerPosition(int x, int y, int limitLeft, int limitRight, int limitUp, int limitDown);
-       int getFrameLoop();
+       int getFrameLoop() const;
        void doFrameLoop();
        void doTimeDifference();
-       float getTimeDifference();
+       float getTimeDifference() const;
        void resetTimeDifference();
        void setInfoMessage(const char *message, int priority, int type);
        void deleteWidgets();

diff --git a/src/CGame.cpp b/src/CGame.cpp
index b75820da037c620dd94def504354d7da7e99679e..c371ad9ee6340fe8bf25499f33ba9944fca192da 100644 (file)
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -117,7 +117,7 @@ void Game::setCheckPoint(float x, float y)
        checkPointY = (int)y;
 }
 
-void Game::getCheckPoint(float *x, float *y)
+void Game::getCheckPoint(float *x, float *y) const
 {
        *x = checkPointX;
        *y = checkPointY;
@@ -159,7 +159,7 @@ int Game::getWeaponAccuracy(int weapon)
        return 0;
 }
 
-int Game::getTotalBulletsFired()
+int Game::getTotalBulletsFired() const
 {
        return bulletsFired[0] + bulletsFired[1] + bulletsFired[2] + bulletsFired[3] + bulletsFired[4];
 }

diff --git a/src/CGame.h b/src/CGame.h
index 7e6052b4027549f1d7b79649340ab89fee10d1df..ac443703502d2e02b7513d5fd19f11e78b27fcab 100755 (executable)
--- a/src/CGame.h
+++ b/src/CGame.h
@@ -63,14 +63,14 @@ class Game {
                void destroy();
                void incrementMissionTime();
                void setCheckPoint(float x, float y);
-               void getCheckPoint(float *x, float *y);
+               void getCheckPoint(float *x, float *y) const;
                void setObjectiveCheckPoint();
                void useObjectiveCheckPoint();
                void doCombo();
                void incBulletsFired();
                void incBulletsHit();
                int getWeaponAccuracy(int weapon);
-               int getTotalBulletsFired();
+               int getTotalBulletsFired() const;
                int getTotalAccuracy();
                int getMostUsedWeapon();
                void totalUpStats();

diff --git a/src/CGraphics.cpp b/src/CGraphics.cpp
index 6dde3df167f10191bccce5397e3f1db6a6d40e1b..8e21f97e0d56acef2bdcb9e9f1c9d65394c54350 100644 (file)
--- a/src/CGraphics.cpp
+++ b/src/CGraphics.cpp
@@ -159,7 +159,7 @@ void Graphics::setTransparent(SDL_Surface *sprite)
        SDL_SetColorKey(sprite, (SDL_SRCCOLORKEY|SDL_RLEACCEL), SDL_MapRGB(sprite->format, 0, 0, 0));
 }
 
-bool Graphics::canShowMedalMessage()
+bool Graphics::canShowMedalMessage() const
 {
        return (medalMessageTimer <= 0);
 }
@@ -662,17 +662,17 @@ void Graphics::animateSprites()
        }
 }
 
-int Graphics::getWaterAnim()
+int Graphics::getWaterAnim() const
 {
        return waterAnim;
 }
 
-int Graphics::getSlimeAnim()
+int Graphics::getSlimeAnim() const
 {
        return slimeAnim;
 }
 
-int Graphics::getLavaAnim()
+int Graphics::getLavaAnim() const
 {
        return lavaAnim;
 }

diff --git a/src/CGraphics.h b/src/CGraphics.h
index 3ad2c5213d439cad412fe134ed3f7168f51c6de4..325d17f762a73db0d31a73afb3e59b1e8a7e75b7 100755 (executable)
--- a/src/CGraphics.h
+++ b/src/CGraphics.h
@@ -75,7 +75,7 @@ class Graphics {
        Sprite *getSpriteHead();
        void setTransparent(SDL_Surface *sprite);
        void updateScreen();
-       bool canShowMedalMessage();
+       bool canShowMedalMessage() const;
        void delay(int time);
        void RGBtoHSV(float r, float g, float b, float *h, float *s, float *v);
        void HSVtoRGB(float *r, float *g, float *b, float h, float s, float v);
@@ -89,9 +89,9 @@ class Graphics {
        Sprite *addSprite(const char *name);
        Sprite *getSprite(const char *name, bool required);
        void animateSprites();
-       int getWaterAnim();
-       int getSlimeAnim();
-       int getLavaAnim();
+       int getWaterAnim() const;
+       int getSlimeAnim() const;
+       int getLavaAnim() const;
        int getLavaAnim(int current);
        void loadBackground(const char *filename);
        void putPixel(int x, int y, Uint32 pixel, SDL_Surface *dest);

diff --git a/src/CPak.cpp b/src/CPak.cpp
index a6811d33f1300ce000ecf7f8549f0dfbd29a92b1..5698fa0176c4704d0c96619b491bf8133d269a1b 100644 (file)
--- a/src/CPak.cpp
+++ b/src/CPak.cpp
@@ -181,7 +181,7 @@ bool Pak::fileExists(const char *filename)
        return false;
 }
 
-unsigned int Pak::getUncompressedSize()
+unsigned int Pak::getUncompressedSize() const
 {
        return (unsigned int)currentFile->fSize;
 }

diff --git a/src/CPak.h b/src/CPak.h
index 7c8c54736276ae445b8ef1373ee1af379957d189..b996087e5ed28984e75a26a045c26ed516e1739c 100755 (executable)
--- a/src/CPak.h
+++ b/src/CPak.h
@@ -42,6 +42,6 @@ class Pak {
        void setPakFile(const char *pakFilename);
        bool unpack(const char *filename, unsigned char **buffer);
        bool fileExists(const char *filename);
-       unsigned int getUncompressedSize();
+       unsigned int getUncompressedSize() const;
 
 };

diff --git a/src/CWeapon.cpp b/src/CWeapon.cpp
index 53d962bfbbced144ca460b07827e09fad2292b27..9fd8adad1a198cbf60dbe07268b01890639c76af 100644 (file)
--- a/src/CWeapon.cpp
+++ b/src/CWeapon.cpp
@@ -37,7 +37,7 @@ void Weapon::setName(const char *name)
        strlcpy(this->name, name, sizeof this->name);
 }
 
-int Weapon::getSpeed(int face)
+int Weapon::getSpeed(int face) const
 {
        return (dx - ((dx * 2) * face));
 }

diff --git a/src/CWeapon.h b/src/CWeapon.h
index 2f0c0804b0009ade514f5803822cd4e8fb0b4e56..366735b8204a3f4e31771a0bbfd81332c0876826 100755 (executable)
--- a/src/CWeapon.h
+++ b/src/CWeapon.h
@@ -30,6 +30,6 @@ class Weapon {
 
        Weapon();
        void setName(const char *name);
-       int getSpeed(int face);
+       int getSpeed(int face) const;
 
 };