diff options
| author | Ira Rice <irarice@gmail.com> | 2008-10-23 11:46:21 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-10-23 11:46:21 +0000 |
| commit | 7a88c394584cb02cec8d1d7eb70ac2020e033d41 (patch) | |
| tree | d19c75ea94072c9b54abb0c679a9bf6984b485c4 /src/resources/colordb.cpp | |
| parent | e57f4ec64f53091dd254c2ee2db9592d30a5af0b (diff) | |
| download | mana-7a88c394584cb02cec8d1d7eb70ac2020e033d41.tar.gz mana-7a88c394584cb02cec8d1d7eb70ac2020e033d41.tar.bz2 mana-7a88c394584cb02cec8d1d7eb70ac2020e033d41.tar.xz mana-7a88c394584cb02cec8d1d7eb70ac2020e033d41.zip | |
Cleaned up ColorDB code so that it loads with all other databases, as
well as fixed color cycling.
Diffstat (limited to 'src/resources/colordb.cpp')
| -rw-r--r-- | src/resources/colordb.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index f738b471..caa1fbda 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -98,7 +98,8 @@ void ColorDB::unload() std::string& ColorDB::get(int id) { - assert(mLoaded); + if(!mLoaded) + load(); ColorIterator i = mColors.find(id); |