diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 22:30:00 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 22:31:11 +0100 |
commit | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (patch) | |
tree | b55b8c0d04a1544ace42f00642adfde4ad045d94 /src/resources | |
parent | 6c29cfa167820635ea602b5cc31dcfeb7b04478c (diff) | |
download | mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.gz mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.bz2 mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.xz mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.zip |
Mostly whitespace fixes
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/buddylist.cpp | 4 | ||||
-rw-r--r-- | src/resources/colordb.cpp | 4 | ||||
-rw-r--r-- | src/resources/colordb.h | 2 | ||||
-rw-r--r-- | src/resources/emotedb.cpp | 2 | ||||
-rw-r--r-- | src/resources/emotedb.h | 2 | ||||
-rw-r--r-- | src/resources/monsterinfo.h | 8 | ||||
-rw-r--r-- | src/resources/resourcemanager.h | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index 541acabe..719ecab1 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -55,9 +55,9 @@ void BuddyList::loadFile() char *buddy = new char[LEN_MAX_USERNAME]; inputStream.getline(buddy, LEN_MAX_USERNAME); // Ugly ? - if(strcmp(buddy,"")) mBuddylist.push_back(buddy); + if (strcmp(buddy, "")) mBuddylist.push_back(buddy); delete [] buddy; - } while(!inputStream.eof()); + } while (!inputStream.eof()); // Read buddy and close file inputStream.close(); diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index f80ca6b3..34c48496 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -103,7 +103,7 @@ void ColorDB::unload() std::string& ColorDB::get(int id) { - if(!mLoaded) + if (!mLoaded) load(); ColorIterator i = mColors.find(id); diff --git a/src/resources/colordb.h b/src/resources/colordb.h index 65b7f759..892411f8 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index 2f43822d..bbc6b634 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h index 0962edad..2b9dbbc2 100644 --- a/src/resources/emotedb.h +++ b/src/resources/emotedb.h @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index 75464035..359791fd 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -67,13 +67,13 @@ class MonsterInfo void addParticleEffect(std::string filename); - const std::string& getName() const + const std::string& getName() const { return mName; } - const std::list<std::string>& getSprites() const + const std::list<std::string>& getSprites() const { return mSprites; } - Being::TargetCursorSize getTargetCursorSize() const + Being::TargetCursorSize getTargetCursorSize() const { return mTargetCursorSize; } std::string getSound(MonsterSoundEvent event) const; @@ -83,7 +83,7 @@ class MonsterInfo void addAttackParticleEffect(const std::string &particleEffect) { mAttackParticle = particleEffect; } - const std::list<std::string>& getParticleEffects() const + const std::list<std::string>& getParticleEffects() const { return mParticleEffects; } private: diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 73f55fd3..c3c68d88 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -100,7 +100,7 @@ class ResourceManager /** * Returns the real path to a file. Note that this method will always * return a path, it does not check whether the file exists. - * + * * @param file The file to get the real path to. * @return The real path. */ |