diff options
| -rw-r--r-- | ChangeLog | 40 | ||||
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | data/graphics/gui/attack_target.png | bin | 359 -> 0 bytes | |||
| -rw-r--r-- | src/game.cpp | 3 | ||||
| -rw-r--r-- | src/gui/chat.cpp | 23 | ||||
| -rw-r--r-- | src/gui/scrollarea.cpp | 4 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 1 | ||||
| -rw-r--r-- | src/openglgraphics.cpp | 2 | ||||
| -rw-r--r-- | tools/tmxcopy/Makefile | 18 | ||||
| -rw-r--r-- | tools/tmxcopy/zlibutils.cpp | 1 |
12 files changed, 77 insertions, 19 deletions
@@ -1,7 +1,7 @@ 2008-04-19 Yohann Ferreira <bertram@cegetel.net> - * src/gui/char_select.cpp: Made the client clean characters information - to avoid a freeze at relogin with another account. + * src/gui/char_select.cpp: Made the client clean characters + information to avoid a freeze at relogin with another account. 2008-04-19 Dennis Friis <peavey@placid.dk> @@ -168,11 +168,25 @@ * data/test.lua: Removed the +100 offset of NPC IDs (relict from eAthena) +2008-03-30 Dennis Friis <peavey@placid.dk> + + * configure.ac: Updated for tmwdata split. + 2008-03-28 David Athay <ko2fan@gmail.com> * tmw.cbp, src/gui/guildwindow.cpp, src/gui/shop.cpp: Updated project file and added some headers to help compiling on gcc 4.3. +2008-03-27 Dennis Friis <peavey@placid.dk> + + * src/gui/progressbar.cpp, src/gui/scrollarea.cpp: Revert progress bar + changes and initialize mWalkTime. + +2008-03-26 Dennis Friis <peavey@placid.dk> + + * src/gui/progressbar.cpp, src/localplayer.cpp: Initialized some + uninitialized variables. + 2008-03-24 Bjørn Lindeijer <bjorn@lindeijer.nl> * src/main.h: Updated default account server name. @@ -211,6 +225,15 @@ src/net/chatserver.cpp, src/net/chatserver.h: Added ability to quit guilds. +2008-03-11 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am: + Removed unused image here too. + +2008-03-11 Eugenio Favalli <elvenprogrammer@themanaworld.org> + + * data/graphics/gui/attack_target.png: Removed unused image. + 2008-03-09 Philipp Sehmisch <tmw@crushnet.org> * src/particle.cpp, src/particle.h, src/particleemitter.cpp, @@ -230,10 +253,17 @@ data/graphics/sprites/scorpion.xml: Gave the tail attack of the scorpion a custom animation and a particle effect. +2008-03-09 Dennis Friis <peavey@placid.dk> + + * src/game.cpp: Pressing escape in the quit dialog closes the dialog. + * src/gui/chat.cpp, src/gui/chat.h: Fixed a bug with chat messages + without a sender which include semicolons. + * src/chat.cpp: Added "/clear" command to clear chat window. + 2008-03-08 Philipp Sehmisch <tmw@crushnet.org> * tools/tmxcopy/main.cpp, tools/tmxcopy/main.map.cpp, - tools/tmxcopy/plibutils.cpp: Fixed some width/height mixups in + tools/tmxcopy/zlibutils.cpp: Fixed some width/height mixups in TMXCopy. 2008-03-07 Bjørn Lindeijer <bjorn@lindeijer.nl> @@ -1004,7 +1034,7 @@ * src/gui/textfield.cpp: Fixed a windows compilation problem caused by a define macro of the Windows API that conflicts - with a guichan identifier. + with a guichan identifier. 2007-10-27 Guillaume Melquiond <guillaume.melquiond@gmail.com> @@ -2289,7 +2319,7 @@ 2007-03-16 Philipp Sehmisch <tmw@crushnet.org> * src/gui/char_select.cpp, src/net/accountserver/account.cpp, - src/net/accountserver/account.hpp: Implemented 7 atribute system + src/net/accountserver/account.hpp: Implemented 7 attribute system in character creation. 2007-03-14 Bjørn Lindeijer <bjorn@lindeijer.nl> diff --git a/configure.ac b/configure.ac index 1ee6dfb7..506ef0f7 100755 --- a/configure.ac +++ b/configure.ac @@ -113,8 +113,6 @@ data/Makefile data/graphics/Makefile data/graphics/gui/Makefile data/graphics/images/Makefile -data/graphics/images/ambient/Makefile -data/graphics/tiles/Makefile data/help/Makefile data/icons/Makefile docs/Makefile diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 252348e5..4a5ea7e5 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -1,5 +1,4 @@ SET (FILES - attack_target.png bg_quad_dis.png browserfont.png button_disabled.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 7287d717..724631fe 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -2,7 +2,6 @@ guidir = $(pkgdatadir)/data/graphics/gui gui_DATA = \ - attack_target.png \ bg_quad_dis.png \ browserfont.png \ button.png \ diff --git a/data/graphics/gui/attack_target.png b/data/graphics/gui/attack_target.png Binary files differdeleted file mode 100644 index b1306f97..00000000 --- a/data/graphics/gui/attack_target.png +++ /dev/null diff --git a/src/game.cpp b/src/game.cpp index fcbc5aba..039a1916 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -540,10 +540,11 @@ void Game::handleInput() if (!quitDialog) { quitDialog = new QuitDialog(&done, &quitDialog); + quitDialog->requestMoveToTop(); } else { - quitDialog->requestMoveToTop(); + quitDialog->action(gcn::ActionEvent(NULL, "cancel")); } break; diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index d490853c..a9f3b931 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -120,9 +120,13 @@ ChatWindow::logic() void ChatWindow::chatLog(std::string line, int own, const std::string &channelName) { + // Trim whitespace + trim(line); + CHATLOG tmp; tmp.own = own; tmp.nick = ""; + tmp.text = line; BrowserBox *output = mChannelOutput[channelName]; ScrollArea *scroll = mChannelScroll[channelName]; @@ -136,12 +140,9 @@ ChatWindow::chatLog(std::string line, int own, const std::string &channelName) std::string::size_type pos = line.find(" : "); if (pos != std::string::npos) { tmp.nick = line.substr(0, pos); - line.erase(0, pos + 3); + tmp.text = line.substr(pos + 3); } - // Trim whitespace - trim(line); - std::string lineColor = "##0"; // Equiv. to BrowserBox::BLACK switch (own) { case BY_GM: @@ -157,10 +158,13 @@ ChatWindow::chatLog(std::string line, int own, const std::string &channelName) lineColor = "##0"; // Equiv. to BrowserBox::BLACK break; case BY_SERVER: - tmp.nick += "Server: "; + tmp.nick = "Server: "; + tmp.text = line; lineColor = "##7"; // Equiv. to BrowserBox::PINK break; case BY_LOGGER: + tmp.nick = ""; + tmp.text = line; lineColor = "##8"; // Equiv. to BrowserBox::GREY break; } @@ -179,7 +183,7 @@ ChatWindow::chatLog(std::string line, int own, const std::string &channelName) << (int)((t / 60) % 60) << "] "; - line = lineColor + timeStr.str() + tmp.nick + line; + line = lineColor + timeStr.str() + tmp.nick + tmp.text; // We look if the Vertical Scroll Bar is set at the max before // adding a row, otherwise the max will always be a row higher @@ -314,6 +318,7 @@ void ChatWindow::chatSend(std::string const &nick, std::string const &msg, chatLog("/join > Join an already registered channel", BY_SERVER, channelName); chatLog("/quit > Leave a channel", BY_SERVER, channelName); chatLog("/admin > Send a command to the server (GM only)", BY_SERVER, channelName); + chatLog("/clear > Clears this window", BY_SERVER); } else if (command == "where") { @@ -365,6 +370,12 @@ void ChatWindow::chatSend(std::string const &nick, std::string const &msg, { Net::GameServer::Player::say("/" + arg); } + else if (command == "clear") + { + BrowserBox *output = mChannelOutput[channelName]; + if (output) + output->clearRows(); + } else { chatLog("Unknown command", BY_SERVER, channelName); diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index 97384fa3..9c88f8e3 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -86,8 +86,8 @@ void ScrollArea::init() // Load the background skin ResourceManager *resman = ResourceManager::getInstance(); Image *textbox = resman->getImage("graphics/gui/deepbox.png"); - int bggridx[4] = {0, 3, 28, 31}; - int bggridy[4] = {0, 3, 28, 31}; + const int bggridx[4] = {0, 3, 28, 31}; + const int bggridy[4] = {0, 3, 28, 31}; int a = 0, x, y; for (y = 0; y < 3; y++) { diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index a8fd452c..819cb761 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -57,6 +57,7 @@ Viewport::Viewport(): mViewY(0.0f), mShowDebugPath(false), mPlayerFollowMouse(false), + mWalkTime(0), mLocalWalkTime(-1) { setOpaque(false); diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 92ce2fe9..76efe380 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -354,7 +354,7 @@ void OpenGLGraphics::setTexturingAndBlending(bool enable) void OpenGLGraphics::drawRectangle(const gcn::Rectangle& rect, bool filled) { - float offset = filled ? 0 : 0.5f; + const float offset = filled ? 0 : 0.5f; setTexturingAndBlending(false); diff --git a/tools/tmxcopy/Makefile b/tools/tmxcopy/Makefile new file mode 100644 index 00000000..732dec36 --- /dev/null +++ b/tools/tmxcopy/Makefile @@ -0,0 +1,18 @@ +CC=g++
+CFLAGS=-c `pkg-config --cflags libxml-2.0`
+LDFLAGS=`pkg-config --libs libxml-2.0`
+SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+EXECUTABLE=tmxcopy
+
+all: $(SOURCES) $(EXECUTABLE)
+ make clean
+
+$(EXECUTABLE): $(OBJECTS)
+ $(CC) $(LDFLAGS) $(OBJECTS) -o $@
+
+.cpp.o:
+ $(CC) $(CFLAGS) $< -o $@
+
+clean:
+ rm -f *.o
diff --git a/tools/tmxcopy/zlibutils.cpp b/tools/tmxcopy/zlibutils.cpp index 9145f459..39c19aee 100644 --- a/tools/tmxcopy/zlibutils.cpp +++ b/tools/tmxcopy/zlibutils.cpp @@ -119,3 +119,4 @@ compressMemory(unsigned char *in, unsigned int inLength, assert (ret == Z_OK); } +*/ |
