From 6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 4 May 2009 23:26:22 +0200 Subject: Replaced emote window with a new emote popup The popup is meant to be temporary, showing the emote instantly when you click on it. It adapts nicely to show any number of emotes. I still need to add a better way of assigning emote shortcuts, since currently you can only change which emote is assigned to which shortcut by actually using it. --- src/resources/emotedb.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/resources/emotedb.cpp') diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index 3ee40f0e..857cd591 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -90,7 +90,8 @@ void EmoteDB::load() } } mEmoteInfos[id] = currentInfo; - if (id > mLastEmote) mLastEmote = id; + if (id > mLastEmote) + mLastEmote = id; } mLoaded = true; @@ -98,9 +99,9 @@ void EmoteDB::load() void EmoteDB::unload() { - for ( EmoteInfosIterator i = mEmoteInfos.begin(); - i != mEmoteInfos.end(); - i++) + for (EmoteInfos::const_iterator i = mEmoteInfos.begin(); + i != mEmoteInfos.end(); + i++) { while (!i->second->sprites.empty()) { @@ -125,7 +126,7 @@ void EmoteDB::unload() const EmoteInfo *EmoteDB::get(int id) { - EmoteInfosIterator i = mEmoteInfos.find(id); + EmoteInfos::const_iterator i = mEmoteInfos.find(id); if (i == mEmoteInfos.end()) { -- cgit v1.2.3-70-g09d2