summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/browserbox.h1
-rw-r--r--src/gui/chat.cpp81
-rw-r--r--src/gui/chat.h9
-rw-r--r--src/gui/gui.cpp7
-rw-r--r--src/gui/setup_video.cpp1
-rw-r--r--src/gui/updatewindow.cpp2
6 files changed, 42 insertions, 59 deletions
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 95b181ad..a2c9dd9b 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -31,6 +31,7 @@
#include <guichan/mouselistener.hpp>
#include "../guichanfwd.h"
+#include "../main.h"
class LinkHandler;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 133e5e3a..592439fc 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -35,18 +35,16 @@
#include "../game.h"
#include "../localplayer.h"
-#include "../log.h"
#include "../net/messageout.h"
#include "../net/protocol.h"
-ChatWindow::ChatWindow(const std::string &logfile, Network *network):
+ChatWindow::ChatWindow(Network *network):
Window(""),
mNetwork(network),
mTmpVisible(false)
{
setWindowName("Chat");
- mChatlogFile.open(logfile.c_str(), std::ios::out | std::ios::app);
mItems = 0;
mItemsKeep = 20;
@@ -76,12 +74,6 @@ ChatWindow::ChatWindow(const std::string &logfile, Network *network):
mCurHist = mHistory.end();
}
-ChatWindow::~ChatWindow()
-{
- mChatlogFile.flush();
- mChatlogFile.close();
-}
-
void
ChatWindow::logic()
{
@@ -251,44 +243,12 @@ ChatWindow::isFocused()
void
ChatWindow::chatSend(const std::string &nick, std::string msg)
{
- // Prepare command
- if (msg.substr(0, 1) == "/")
- {
- /* Some messages are managed client side, while others
- * require server handling by proper packet. Probably
- * those if elses should be replaced by protocol calls */
- if (msg.substr(0, IS_ANNOUNCE_LENGTH) == IS_ANNOUNCE)
- {
- msg.erase(0, IS_ANNOUNCE_LENGTH);
- MessageOut outMsg;
- outMsg.writeShort(0x0099);
- outMsg.writeShort(msg.length() + 4);
- outMsg.writeString(msg, msg.length());
- }
- else if (msg.substr(0, IS_HELP_LENGTH) == IS_HELP)
- {
- chatLog("-- Help --", BY_SERVER);
- chatLog("/help : Display this help.", BY_SERVER);
- chatLog("/announce : Global announcement (GM only)", BY_SERVER);
- chatLog("/where : Display map name", BY_SERVER);
- chatLog("/who : Display number of online users", BY_SERVER);
- }
- else if (msg.substr(0, IS_WHERE_LENGTH) == IS_WHERE)
- {
- chatLog(map_path, BY_SERVER);
- }
- else if (msg.substr(0, IS_WHO_LENGTH) == IS_WHO)
- {
- MessageOut outMsg;
- outMsg.writeShort(0x00c1);
- }
- else
- {
- chatLog("Unknown command", BY_SERVER);
- }
- }
+ /* Some messages are managed client side, while others
+ * require server handling by proper packet. Probably
+ * those if elses should be replaced by protocol calls */
+
// Prepare ordinary message
- else {
+ if (msg.substr(0, 1) != "/") {
msg = nick + " : " + msg;
MessageOut outMsg;
@@ -296,6 +256,35 @@ ChatWindow::chatSend(const std::string &nick, std::string msg)
outMsg.writeShort(msg.length() + 4);
outMsg.writeString(msg, msg.length());
}
+ else if (msg.substr(0, IS_ANNOUNCE_LENGTH) == IS_ANNOUNCE)
+ {
+ msg.erase(0, IS_ANNOUNCE_LENGTH);
+ MessageOut outMsg;
+ outMsg.writeShort(0x0099);
+ outMsg.writeShort(msg.length() + 4);
+ outMsg.writeString(msg, msg.length());
+ }
+ else if (msg.substr(0, IS_HELP_LENGTH) == IS_HELP)
+ {
+ chatLog("-- Help --", BY_SERVER);
+ chatLog("/help : Display this help.", BY_SERVER);
+ chatLog("/announce : Global announcement (GM only)", BY_SERVER);
+ chatLog("/where : Display map name", BY_SERVER);
+ chatLog("/who : Display number of online users", BY_SERVER);
+ }
+ else if (msg.substr(0, IS_WHERE_LENGTH) == IS_WHERE)
+ {
+ chatLog(map_path, BY_SERVER);
+ }
+ else if (msg.substr(0, IS_WHO_LENGTH) == IS_WHO)
+ {
+ MessageOut outMsg;
+ outMsg.writeShort(0x00c1);
+ }
+ else
+ {
+ chatLog("Unknown command", BY_SERVER);
+ }
}
std::string
diff --git a/src/gui/chat.h b/src/gui/chat.h
index addfb6b5..20841873 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -24,7 +24,6 @@
#ifndef _TMW_CHAT_H
#define _TMW_CHAT_H
-#include <fstream>
#include <list>
#include <string>
@@ -117,12 +116,7 @@ class ChatWindow : public Window, public gcn::ActionListener,
/**
* Constructor.
*/
- ChatWindow(const std::string &logfile, Network *network);
-
- /**
- * Destructor.
- */
- ~ChatWindow();
+ ChatWindow(Network *network);
/**
* Logic (updates components' size)
@@ -195,7 +189,6 @@ class ChatWindow : public Window, public gcn::ActionListener,
private:
Network *mNetwork;
- std::ofstream mChatlogFile;
bool mTmpVisible;
/** One item in the chat log */
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 88998f7a..026f24bd 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -32,10 +32,6 @@
// constant as well as guichan does
#include <guichan/sdl/sdlinput.hpp>
-#ifdef USE_OPENGL
-#include "../resources/openglsdlimageloader.h"
-#endif
-
#include "focushandler.h"
#include "popupmenu.h"
#include "window.h"
@@ -57,6 +53,9 @@
#include "../resources/image.h"
#include "../resources/resourcemanager.h"
#include "../resources/sdlimageloader.h"
+#ifdef USE_OPENGL
+#include "../resources/openglsdlimageloader.h"
+#endif
// Guichan stuff
Gui *gui;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 9eb94520..7ac226d3 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -42,6 +42,7 @@
#include "../configuration.h"
#include "../graphics.h"
#include "../log.h"
+#include "../main.h"
#include "../utils/tostring.h"
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 9188b6de..8c69d3ef 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -300,7 +300,7 @@ int UpdaterWindow::downloadThread(void *ptr)
// Any existing file with this name is deleted first, otherwise the
// rename will fail on Windows.
::remove(newName.c_str());
- rename(outFilename.c_str(), newName.c_str());
+ ::rename(outFilename.c_str(), newName.c_str());
}
}
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-08-02 07:09:16 +0000