summaryrefslogtreecommitdiff
path: root/src/net
AgeCommit message (Collapse)AuthorFilesLines
2010-12-16Made the client handle the number of slots given by the server.Yohann Ferreira3-4/+23
I turned the CharacterEntries into a vector. As for now, it's basically working but I discovered bugs about slots handling mainly for Manaserv that were already present before that patch. Hence, there are three remaining issues: - Under ManaServ, the character's slots numbers aren't handled when loading the characters but used when sending selection or deletion attempts. For instance, if you delete the character at slot 1, you won't be able to select or delete characters at slots 2 and 3, since the server believes that the characters are now in slots 1 and 2, even thought the client still displays them at the former slots. - Also under manaserv, you won't be able to create a character at slot 1 and 3, the server will automatically add the new one to the next slot, which is not corresponding to where you clicked to the 'Create' button. I propose to make Manaserv send again the character slots numbers and store them in database since we used them in creation, selection, and deletion attempts. It would make more sense IMHO. - The last remaining issue found is that when switching between different servers, the loginData don't get cleaned up, make the characterSelect dialog look crazy when the number of slots is different between two servers. If this one is accepted, my next patch will make the logindata be cleaned up between each login attempts (as for the slot number, and maybe other sensible data) and the next ones will readd character slot handling server and client side. Reviewed-by: Jaxad0127.
2010-12-15Unlock the char select dialog even if we've got an error.Yohann Ferreira1-1/+1
This permit not to be stuck at character deletion when something goes wrong. Trivial fix.
2010-12-06Removed superfluous #includes taken from checkheaders list.Yohann Ferreira5-9/+0
Resolves: Mana-Mantis #265. Trivial fix.
2010-11-12Change NPC handling in the net codeChuck Miller5-104/+212
Instead of using events to invoke netcode, invoke netcode directly and have it send events Reviewed-by: Freeyorp
2010-11-11Replace Event names with enums instead of stringsChuck Miller12-57/+58
2010-11-11Have the event system channels use enums instead of stringsChuck Miller18-55/+55
Reviewed-by: Freeyorp
2010-11-09Fix client successful unregister behaviour for manaserv.Yohann Ferreira1-1/+1
Resolves: Mana-Mantis #250. Reviewed-by: Freeyorp, thorbjorn.
2010-11-07Convert the emote system to use particlesChuck Miller1-5/+4
Reviewed-by: Jared Adams
2010-11-02Re-Enable the support of manaserv servers.Yohann Ferreira1-5/+0
Reviewed-by: CodyMartin.
2010-11-01Merge branch '0.5' of gitorious.org:mana/manaYohann Ferreira9-7/+30
Conflicts: src/being.cpp src/client.cpp src/commandhandler.cpp src/gui/setup_video.cpp src/gui/socialwindow.cpp src/gui/viewport.cpp src/gui/widgets/browserbox.cpp src/gui/widgets/itemcontainer.cpp src/imageparticle.cpp src/localplayer.cpp src/localplayer.h src/map.cpp src/net/tmwa/beinghandler.cpp src/particle.cpp src/particle.h src/player.cpp src/player.h
2010-10-31Fix memory leak of localplayer classes in the charserverhandlerChuck Miller2-2/+2
They are initialized else where in the code Reviewed-by: Jared Adams
2010-10-19Heavy GUI fixes related to stats for Manaserv.Yohann Ferreira3-21/+114
Also tested to be compatible with tA. Now the Status window is much more nicer when using Manaserv. HP, max hp, ... are now working fine along with corrections made in the attributes.xml file (in next commit.) Reviewed-by: Thorbjorn.
2010-10-17Removed unnecessary condition in net::readCoordinates.Yohann Ferreira1-6/+2
It is used only by tmwa handlers. Trivial fix.
2010-10-17Fixing missing translation of direction for tA-serverStefan Dombrowski1-0/+7
Reviewed-by: Bertram
2010-10-13Adding theme colors for party tabsStefan Dombrowski1-1/+1
Following Rotonen's advise to "make anything and everything you can think of recolorable", a theme can now define colors for PARTY_CHAT_TAB and PARTY_SOCIAL_TAB. This was badly needed, because the requirements for a color of a chat tab and of a player name are quite different. TODO: When guild support gets enabled, then have a look at the colors for guilds. Reviewed-by: 4144
2010-10-13Hiding Manaserv from the player on TMW-Athena only releaseStefan Dombrowski1-0/+4
With the preprocessor definition MANASERV_SUPPORT the manaserv support is avaible as before. * Removing server type from server dialog GUI. * Ignoring Manaserv entries in serverlist.xml. * In order not to lose Manaserv CustomServers from the config.xml, they get stored in mManaservServers. * The entries in mManaservServers are saved in config.xml again. But they are now behind the TMWA-Athena servers. * For custom server the GUI sets 6901 as default value for port. * If the server type is unknown, then we use TMW-Athena. This is relevant, if the client is started with command line options for server. Reviewed-by: Bertram
2010-10-11Implementing show IP for game mastersStefan Dombrowski3-2/+12
As an upcoming feature the TMW-Athena server sends IP addresses or IP hashes to game masters. The current client freezes if it receives such a packet, therefor the game masters need to use a new client before the server can use it. Normal players are not affected, because they do not get this packet. Showing the IP is optional and can be enable with the chat command "/showip 1". The IP is then shown behind the players name. Reviewed-by: Bertram
2010-10-08Remove the following systemStefan Dombrowski1-21/+0
Removed due to unresolved social issues. In master it had been already removed by Kage in commit 89f192b9039f9c000515f0a12f4bb9fb55c4691c.
2010-10-07Disable guilds netcode.Andrei Karas1-0/+2
Reviewed-by: Jaxad0127
2010-10-04Remove the following systemChuck Miller1-20/+0
The implamentation is poor, and this is something that would be better handled by the addon engine later down the road. Reviewed-By: Freeyorp < Freeyorp101@hotmail.com >
2010-09-29Fixing segfault when switching serverStefan Dombrowski1-0/+3
Reviewed-by: Thorbjorn
2010-09-25Merge branch '1.0'Thorbjørn Lindeijer10-15/+65
Conflicts: src/actorspritemanager.h src/beingmanager.cpp src/game.cpp src/gui/beingpopup.cpp src/gui/chat.cpp src/gui/chat.h src/gui/inventorywindow.h src/gui/itempopup.cpp src/gui/socialwindow.cpp src/gui/statuswindow.cpp src/gui/widgets/chattab.cpp src/gui/widgets/chattab.h src/net/tmwa/inventoryhandler.cpp src/net/tmwa/partyhandler.cpp src/party.cpp src/sound.cpp src/utils/stringutils.cpp src/utils/stringutils.h
2010-09-18Fixed attribute built-ins display at character's creation.Yohann Ferreira1-10/+21
Reviewed-by: Thorbjorn. Resolves: Mana-Mantis #229.
2010-09-19Fix a typo.Freeyorp1-1/+1
Trivial fix.
2010-09-15Avoid log message for unhandled SMSG_BEING_SPAWNStefan Dombrowski1-0/+8
This log message shows up in mana.log: "Unhandled packet: 7c". Later, the client will have to actually take care of it, though. Reviewed-by: Bertram, jaxad0127.
2010-09-13Fix loading of manaserv's attributes fileJared Adams1-6/+9
Reviewed-by: Bertram
2010-09-11Fixing misspelling in Setup_Video and removing empty lines from logStefan Dombrowski3-4/+4
Reviewed-by: Jaxad0127
2010-09-11Making sure the inventory window shows the correct number of used slotsStefan Dombrowski1-2/+10
The SlotsBar is updated, if InventoryWindow::slotsChanged() is called. This did not happen when an item disappeared from the inventory, because of using it. Then the item quantity was just set to 0, but the SlotBar was not notified. Reviewed-by: Jaxad0127
2010-09-08Adding missing updates for buttons in InventoryWindowStefan Dombrowski2-0/+12
Reviewed-by: Thorbjorn
2010-09-08Adding missing update for attributes in StatusWindowStefan Dombrowski1-0/+4
Reviewed-by: Thorbjorn
2010-09-06Changed CREATE_ATTRIBUTES_EQUAL_TO_ZERO to OUT_OF_RANGEYohann Ferreira2-3/+6
to fit manaserv latest changes. Reviwed-by: Freeyorp, Thorbjorn.
2010-09-05Fixing ghost characters in charselectdialogStefan Dombrowski1-0/+3
How to reproduce the bug: Switch the login to an account with fewer characters. Then those character slots are not empty, but show characters from the previous account. Reviewed-by: thorbjorn
2010-09-05Fixing segmentation fault if server is given on command lineStefan Dombrowski2-2/+12
If server and port was given on the command line, then the server type was unknown. The command line options do work now, but only if standard ports 6901 and 9601 are used. This resolves http://bugs.manasource.org/view.php?id=177 TODO: Query the server about itself and choose the server type based on that. Reviewed-by: Jaxad0127
2010-08-28Fixing omitted items in equipment windowStefan Dombrowski1-2/+1
Bug description: If a player has equipable items only, then the equipment backend gets not initialized. As a consequence the equipment window remains empty. This is particularly a problem for new characters. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-27Changing findBeingByName so that it searches case insensitiveStefan Dombrowski1-1/+1
Adding error message when trying to create a party with to long name. Removing non-existing files from C::B project. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-26Fixing segmentation fault when creating a new accountStefan Dombrowski1-0/+2
This resolves http://bugs.manasource.org/view.php?id=171 Reviewed-by: Bertram.
2010-08-26Fixing segmentation fault when creating a new accountStefan Dombrowski1-0/+2
This resolves http://bugs.manasource.org/view.php?id=171 Reviewed-by: Bertram.
2010-08-26Merged testing branch into master.Yohann Ferreira13-333/+477
2010-08-24Giving functionality to invite in socialwindow and allow enter key in textdialogStefan Dombrowski1-5/+11
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-23Fixing segmentation fault in partyhandlerStefan Dombrowski1-1/+1
Segmentation fault happens if a player leaves your party while he is out of sight. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-16Move more to the event systemJared Adams6-197/+165
Most of Net::InventoryHandler is now done through events. The ActorSpriteManager was also replaced by events. A few odds and ends were taken care of too. Reviewed-by: Bertram
2010-08-15Merge branch '1.0'Chuck Miller5-13/+33
Conflicts: mana.cbp mana.files src/CMakeLists.txt src/Makefile.am src/utils/xml.cpp
2010-08-13Add code to change gameservers to manaserv netcodeJared Adams2-6/+21
Reviewed-by: Freeyorp
2010-08-13Add missing setAttribute for moneyStefan Dombrowski1-0/+1
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-12Simplify working with the event systemJared Adams17-44/+44
EventManager has been merged into Event, with some new convinience methods added. Reviewed-by: Chuck Miller
2010-08-12Replace most of Net::NpcHandler with eventsJared Adams5-142/+99
Reviewed-by: Chuck Miller
2010-08-10Remove NpcDialog references from netcodeJared Adams6-175/+126
Reviewed-by: Chuck Miller
2010-08-09Fix enet version check *again*Jared Adams3-2/+8
Reviewed-by: Chuck Miller
2010-08-08Do proper checks on the ENet versionThorbjørn Lindeijer2-2/+2
The previous check broke compilation against ENet 1.2.2, which does define the version macros but does not have the API changes.
2010-08-05Have Being manage speech creation and add permissions to eventsJared Adams2-19/+28
The Being and Player Chat events now have the precomuted permissions for SPEECH_LOG and SPEECH_FLOAT. The Being class now acts on those events to show speech (if SPEECH_FLOAT is present). ChatWindow now checks for the SPEECH_LOG permission. Reviewed-by: Freeyorp