summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/being.h2
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp5
-rw-r--r--src/gui/widgets/scrollarea.cpp2
-rw-r--r--src/log.cpp12
-rw-r--r--src/log.mm36
-rw-r--r--src/main.h2
-rw-r--r--src/net/download.cpp8
-rw-r--r--src/net/manaserv/connection.h1
-rw-r--r--src/net/tmwa/beinghandler.cpp5
-rw-r--r--src/playerrelations.cpp3
-rw-r--r--src/resources/emotedb.cpp6
-rw-r--r--src/resources/emotedb.h4
-rw-r--r--src/winver.h4
13 files changed, 58 insertions, 32 deletions
diff --git a/src/being.h b/src/being.h
index 84c159b7..0287dc6e 100644
--- a/src/being.h
+++ b/src/being.h
@@ -31,11 +31,9 @@
#include <guichan/color.hpp>
#include <map>
-#include <set>
#include <string>
#include <vector>
-#define FIRST_IGNORE_EMOTE 14
#define STATUS_EFFECTS 32
#define SPEECH_TIME 500
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 1230e47a..3105a762 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -60,7 +60,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
mEmoteImg.push_back(EmoteDB::get(i)->sprite);
}
- mMaxItems = EmoteDB::getLast() < MAX_ITEMS ? EmoteDB::getLast() : MAX_ITEMS;
+ mMaxItems = std::min(EmoteDB::getLast(), MAX_ITEMS);
mBoxHeight = mBackgroundImg->getHeight();
mBoxWidth = mBackgroundImg->getWidth();
@@ -97,11 +97,10 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
int emoteId = emoteShortcut->getEmote(i);
- if (emoteId > 0 && emoteId <= EmoteDB::getLast())
+ if (emoteId > 0 && emoteId <= EmoteDB::getLast() + 1)
{
mEmoteImg[emoteId - 1]->draw(g, emoteX + 2, emoteY + 10);
}
-
}
if (mEmoteMoved)
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 716dc7bc..d5e824e1 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -212,7 +212,7 @@ void ScrollArea::logic()
void ScrollArea::updateAlpha()
{
- float alpha = std::max(config.getFloatValue("guialpha"),
+ float alpha = std::max(config.getFloatValue("guialpha"),
Theme::instance()->getMinimumOpacity());
if (alpha != mAlpha)
diff --git a/src/log.cpp b/src/log.cpp
index fc36ea75..eae0a82b 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -24,7 +24,7 @@
#ifdef _WIN32
#include <windows.h>
#elif __APPLE__
-#include <Carbon/Carbon.h>
+void MacDialogBox(const std::string &error);
#endif
#include <sys/time.h>
@@ -109,15 +109,7 @@ void Logger::error(const std::string &error_text)
#ifdef _WIN32
MessageBox(NULL, error_text.c_str(), "Error", MB_ICONERROR | MB_OK);
#elif defined __APPLE__
- Str255 msg;
- CFStringRef error;
- error = CFStringCreateWithCString(NULL,
- error_text.c_str(),
- kCFStringEncodingMacRoman);
- CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman);
- StandardAlert(kAlertStopAlert,
- "\pError",
- (ConstStr255Param) msg, NULL, NULL);
+ MacDialogBox(error_text);
#elif defined __linux__ || __linux
std::cerr << "Error: " << error_text << std::endl;
std::string msg="xmessage \"" + error_text + "\"";
diff --git a/src/log.mm b/src/log.mm
new file mode 100644
index 00000000..ae241c59
--- /dev/null
+++ b/src/log.mm
@@ -0,0 +1,36 @@
+/*
+ * The Mana Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2012 The Mana Developers
+ *
+ * This file is part of The Mana Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#import <AppKit/AppKit.h>
+#include <string>
+
+void MacDialogBox(const std::string &error)
+{
+ NSString *errorMessage = [NSString stringWithCString:error.c_str()
+ encoding:[NSString defaultCStringEncoding]];
+ NSAlert *alert = [NSAlert alertWithMessageText:errorMessage
+ defaultButton:@"OK"
+ alternateButton:nil
+ otherButton:nil
+ informativeTextWithFormat:@""];
+
+ [alert runModal];
+}
diff --git a/src/main.h b/src/main.h
index 8be57657..5a663646 100644
--- a/src/main.h
+++ b/src/main.h
@@ -55,7 +55,7 @@
#elif defined _WIN32
#include "winver.h"
#elif defined __APPLE__
-#define PACKAGE_VERSION "0.5.3"
+#define PACKAGE_VERSION "0.6.1"
#endif
#ifdef PACKAGE_VERSION
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 988cc662..bccba7a3 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -220,9 +220,11 @@ int Download::downloadThread(void *ptr)
curl_easy_setopt(d->mCurl, CURLOPT_WRITEDATA, file);
}
- curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT,
- strprintf(PACKAGE_EXTENDED_VERSION,
- branding.getStringValue("appShort").c_str()).c_str());
+ const std::string appShort = branding.getStringValue("appShort");
+ const std::string userAgent =
+ strprintf(PACKAGE_EXTENDED_VERSION, appShort.c_str());
+
+ curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT, userAgent.c_str());
curl_easy_setopt(d->mCurl, CURLOPT_ERRORBUFFER, d->mError);
curl_easy_setopt(d->mCurl, CURLOPT_URL, d->mUrl.c_str());
curl_easy_setopt(d->mCurl, CURLOPT_NOPROGRESS, 0);
diff --git a/src/net/manaserv/connection.h b/src/net/manaserv/connection.h
index 954849de..42932c47 100644
--- a/src/net/manaserv/connection.h
+++ b/src/net/manaserv/connection.h
@@ -23,6 +23,7 @@
#define NET_MANASERV_CONNECTION_H
#include <enet/enet.h>
+#include "net/manaserv/network.h"
#include <iosfwd>
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index c94e08df..b7d84685 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -427,9 +427,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
if (player_relations.hasPermission(dstBeing, PlayerRelation::EMOTE))
{
- const int fx = EmoteDB::get(msg.readInt8())->effect;
- //TODO: figure out why the -1 is needed
- effectManager->trigger(fx - 1, dstBeing);
+ const int fx = EmoteDB::get(msg.readInt8() - 1)->effect;
+ effectManager->trigger(fx, dstBeing);
}
break;
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 89cd7250..47bc1913 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -31,8 +31,7 @@
#include "utils/gettext.h"
#define PLAYER_IGNORE_STRATEGY_NOP "nop"
-#define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0"
-#define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_EMOTE0
+#define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_NOP
#define NAME "name" // constant for xml serialisation
#define RELATION "relation" // constant for xml serialisation
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 6a001078..00721ac4 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -45,7 +45,7 @@ void EmoteDB::load()
unload();
mUnknown.name = "unknown";
- mUnknown.effect = 0;
+ mUnknown.effect = -1;
mUnknown.sprite = new ImageSprite(
ResourceManager::getInstance()->getImage("graphics/sprites/error.png"));
@@ -91,7 +91,7 @@ void EmoteDB::load()
const int width = XML::getProperty(emoteNode, "width", 0);
const int height = XML::getProperty(emoteNode, "height", 0);
- if (imageName.empty() || !(width > 0) || !(height > 0))
+ if (imageName.empty() || width <= 0 || height <= 0)
{
logger->log("Emote Database: Warning: Emote with bad imageset values");
delete currentEmote;
@@ -150,7 +150,7 @@ const Emote *EmoteDB::get(int id)
}
}
-const int &EmoteDB::getLast()
+int EmoteDB::getLast()
{
return mLastEmote;
}
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 1324fb7e..a1e991ec 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -48,9 +48,9 @@ namespace EmoteDB
const Emote *get(int id);
- const int &getLast();
+ int getLast();
typedef Emotes::iterator EmotesIterator;
}
-#endif
+#endif // EMOTE_DB_H
diff --git a/src/winver.h b/src/winver.h
index ce6f23ee..4c33fe29 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -21,6 +21,6 @@
/* VERSION DEFINITIONS */
#define VER_MAJOR 0
#define VER_MINOR 6
-#define VER_RELEASE 0
+#define VER_RELEASE 1
#define VER_BUILD 0
-#define PACKAGE_VERSION "0.6.0.0"
+#define PACKAGE_VERSION "0.6.1.0"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-03 22:51:36 +0000