| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
We don't use underscores in the filenames generally, and let's be
consistent on that matter.
|
|
In an attempt to make the GUI code a little more structured, basic
widgets are now put in gui/widgets. Many includes were also cleaned up.
|
|
|
|
eAthena NPC handler has been implemented and is being used for NPC
interraction.
|
|
Now that messages can be sent without requiring a pointer to the
Network instance, a lot of cleanup was possible.
|
|
Now the instance doesn't need to be passed into the MessageOut class
anymore. Expect a lot of cleanup in the next commit.
|
|
Conflicts:
A lot of files.
|
|
Conflicts:
Many files.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
aesthetically pleasing.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
their guis are similarly laid out.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
that position. This makes it so that when resolutions are changed, the
default locations stay relative to the window's position, and not the
800x600 screen resolution.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Use the last location the user gave instead. Also, do the same for the
inventory dialog.
|
|
|
|
Conflicts:
data/graphics/images/login_wallpaper.png
src/being.cpp
src/beingmanager.cpp
src/engine.cpp
src/game.cpp
src/gui/buysell.cpp
src/gui/buysell.h
src/gui/gui.h
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npclistdialog.h
src/gui/npcstringdialog.cpp
src/gui/sell.cpp
src/gui/shop.cpp
src/gui/table.cpp
src/net/beinghandler.cpp
src/net/npchandler.cpp
src/net/playerhandler.cpp
src/npc.cpp
src/npc.h
src/shopitem.cpp
src/shopitem.h
src/utils/stringutils.cpp
src/utils/stringutils.h
src/utils/trim.h
|
|
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The Being ID is used instead, as that is all that was ever really
needed.
|
|
text dialog.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
through the list requires the use of the mouse wheel at the moment),
fixed wrapping behavior for wrapping around lists to actually wrap
around lists properly, and placed a few checks for current_npc where
they were assumed before which could cause the client to hang or crash
in case the NPC is no longer around.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Basically ensures that the NPC text dialog is visible before making NPC
input dialogs visible
|
|
It's not that useful to make variables that are passed by value const.
In the declaration it is even completely ignored.
|
|
|
|
|
|
|
|
And keep the text dialog open for the whole transaction, logging user
input and keep a full record of text from the NPC (for the current
transaction only).
|
|
When not passing any parameters to constructors, there is no reason for
using parenthesis.
|
|
Please do remember that member variables are prefixes with 'm', so that
they are easily distinguishable.
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
to the input fields. Now the only NPC dialog which isn't completely
navigatable by the keyboard alone is the NPC list dialog (seems to
have regressed slightly recently).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This dates back to the old days of TMW, but the usage instructions of
GPLv2 don't mention this being necessary. Since it doesn't add anything,
avoid the branding in these sections.
|
|
again.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
NPC String class. The Integer input field was rather horribly broken to
the point where it could send invalid data, the increment and decrement
buttons didn't work, and overall it was tripping over itself. As for the
NPC String, "The Mana World" as a string is not needed to set the field
to that length, but instead fills the text field with that text for
starting. This is completely inappropriate for a text entry field, and a
more sensible default would be to leave it empty, so that people can
type in what they want without having to delete it.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
