~ubuntu-branches/ubuntu/vivid/manaplus/vivid

« back to all changes in this revision

Viewing changes to src/net/ea/network.cpp

Committer: Package Import Robot
Author(s): Patrick Matthäi
Date: 2014-09-30 18:10:18 UTC
mfrom: (1.1.35)
Revision ID: package-import@ubuntu.com-20140930181018-pb73a0ogw29tjv8k

Tags: 1.4.9.27-1

* New upstream release.
* Bump Standards-Version to 3.9.6 (no changes required).

files added:
data/themes/golden-delicious/skillpopup.xml

data/themes/jewelry/skillpopup.xml

src/being/homunculusinfo.h

src/being/mercenaryinfo.h

src/being/petinfo.h

src/gui/widgets/selldialog.cpp

src/gui/widgets/selldialog.h

src/gui/windows/eggselectiondialog.cpp

src/gui/windows/eggselectiondialog.h

src/gui/windows/npcselldialog.cpp

src/gui/windows/npcselldialog.h

src/gui/windows/shopselldialog.cpp

src/gui/windows/shopselldialog.h

src/net/auctionhandler.h

src/net/bankhandler.h

src/net/buyingstorehandler.h

src/net/cashshophandler.h

src/net/eathena/auctionhandler.cpp

src/net/eathena/auctionhandler.h

src/net/eathena/bankhandler.cpp

src/net/eathena/bankhandler.h

src/net/eathena/buyingstorehandler.cpp

src/net/eathena/buyingstorehandler.h

src/net/eathena/cashshophandler.cpp

src/net/eathena/cashshophandler.h

src/net/eathena/familyhandler.cpp

src/net/eathena/familyhandler.h

src/net/eathena/homunculushandler.cpp

src/net/eathena/homunculushandler.h

src/net/eathena/menu.cpp

src/net/eathena/menu.h

src/net/eathena/menutype.h

src/net/eathena/mercenaryhandler.cpp

src/net/eathena/mercenaryhandler.h

src/net/familyhandler.h

src/net/homunculushandler.h

src/net/mercenaryhandler.h

src/net/questhandler.h

src/net/tmwa/auctionhandler.cpp

src/net/tmwa/auctionhandler.h

src/net/tmwa/bankhandler.cpp

src/net/tmwa/bankhandler.h

src/net/tmwa/buyingstorehandler.cpp

src/net/tmwa/buyingstorehandler.h

src/net/tmwa/cashshophandler.cpp

src/net/tmwa/cashshophandler.h

src/net/tmwa/familyhandler.cpp

src/net/tmwa/familyhandler.h

src/net/tmwa/homunculushandler.cpp

src/net/tmwa/homunculushandler.h

src/net/tmwa/mercenaryhandler.cpp

src/net/tmwa/mercenaryhandler.h

src/resources/chatobject.h

src/resources/db/homunculusdb.cpp

src/resources/db/homunculusdb.h

src/resources/db/mercenarydb.cpp

src/resources/db/mercenarydb.h

src/resources/skillowner.h

files removed:
src/gui/windows/selldialog.cpp

src/gui/windows/selldialog.h

files modified:
CMakeLists.txt

ChangeLog

PKGBUILD

README

configure

configure.ac

data/graphics/gui/colors.xml

data/themes/blacknblack/colors.xml

data/themes/blackwood/colors.xml

data/themes/enchilado/colors.xml

data/themes/golden-delicious/CMakeLists.txt

data/themes/golden-delicious/Makefile.am

data/themes/golden-delicious/Makefile.in

data/themes/golden-delicious/colors.xml

data/themes/jewelry/CMakeLists.txt

data/themes/jewelry/Makefile.am

data/themes/jewelry/Makefile.in

data/themes/jewelry/colors.xml

data/themes/mana/colors.xml

data/themes/pink/colors.xml

data/themes/unity/colors.xml

data/themes/wood/colors.xml

debian/changelog

debian/control

manaplus.spec

po/POTFILES.in

po/ar.po

po/bg.po

po/ca.po

po/cs.gmo

po/cs.po

po/da.po

po/de.gmo

po/de.po

po/el.po

po/en_GB.po

po/eo.po

po/es.gmo

po/es.po

po/et.po

po/fa.po

po/fi.gmo

po/fi.po

po/fr.gmo

po/fr.po

po/he.po

po/hr.po

po/hu.po

po/id.gmo

po/id.po

po/it.gmo

po/it.po

po/ja.gmo

po/ja.po

po/ka.po

po/manaplus.pot

po/nb.po

po/nl.po

po/nl_BE.gmo

po/nl_BE.po

po/pl.gmo

po/pl.po

po/pt.gmo

po/pt.po

po/pt_BR.gmo

po/pt_BR.po

po/ru.gmo

po/ru.po

po/sk.po

po/sq.po

po/sv.po

po/sv_SE.gmo

po/sv_SE.po

po/te.po

po/th.po

po/tr.gmo

po/tr.po

po/vls.po

po/zh_CN.gmo

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/CMakeLists.txt

src/Makefile.am

src/Makefile.in

src/actions/actions.cpp

src/actions/actions.h

src/actions/chat.cpp

src/actions/commands.cpp

src/actions/commands.h

src/actions/move.cpp

src/actions/target.cpp

src/actions/target.h

src/actormanager.cpp

src/auctionmanager.cpp

src/being/actortype.h

src/being/being.cpp

src/being/being.h

src/being/localplayer.cpp

src/being/playerinfo.cpp

src/being/playerinfo.h

src/beingequipbackend.cpp

src/client.cpp

src/defaults.cpp

src/flooritem.cpp

src/game.cpp

src/gamemodifiers.cpp

src/gui/dialogsmanager.cpp

src/gui/models/shopitems.h

src/gui/models/typelistmodel.h

src/gui/popups/itempopup.cpp

src/gui/popups/popupmenu.cpp

src/gui/popups/popupmenu.h

src/gui/popups/skillpopup.cpp

src/gui/theme.cpp

src/gui/theme.h

src/gui/viewport.cpp

src/gui/widgets/itemcontainer.cpp

src/gui/widgets/skillinfo.cpp

src/gui/widgets/skillinfo.h

src/gui/widgets/skilllistbox.h

src/gui/widgets/tabs/chattab.cpp

src/gui/widgets/tabs/setup_other.cpp

src/gui/widgets/tabs/socialguildtab.h

src/gui/widgets/tabs/socialpartytab.h

src/gui/widgets/tabs/whispertab.cpp

src/gui/windows/buydialog.cpp

src/gui/windows/buyselldialog.cpp

src/gui/windows/changeemaildialog.cpp

src/gui/windows/changepassworddialog.cpp

src/gui/windows/charcreatedialog.cpp

src/gui/windows/charselectdialog.cpp

src/gui/windows/charselectdialog.h

src/gui/windows/chatwindow.cpp

src/gui/windows/editserverdialog.cpp

src/gui/windows/inventorywindow.cpp

src/gui/windows/itemamountwindow.cpp

src/gui/windows/logindialog.cpp

src/gui/windows/minimap.cpp

src/gui/windows/ministatuswindow.cpp

src/gui/windows/npcdialog.cpp

src/gui/windows/npcpostdialog.cpp

src/gui/windows/quitdialog.cpp

src/gui/windows/registerdialog.cpp

src/gui/windows/serverdialog.cpp

src/gui/windows/shopwindow.cpp

src/gui/windows/skilldialog.cpp

src/gui/windows/skilldialog.h

src/gui/windows/socialwindow.cpp

src/gui/windows/statuswindow.cpp

src/gui/windows/tradewindow.cpp

src/gui/windows/unregisterdialog.cpp

src/gui/windows/whoisonline.cpp

src/gui/windows/whoisonline.h

src/gui/windows/worldselectdialog.cpp

src/guildmanager.cpp

src/input/inputaction.h

src/input/inputactionmap.h

src/input/inputmanager.cpp

src/input/pages/basic.cpp

src/input/pages/other.cpp

src/inventory.cpp

src/item.cpp

src/listeners/pincodelistener.cpp

src/listeners/playerdeathlistener.h

src/listeners/requesttradelistener.h

src/logger.h

src/main.h

src/net/adminhandler.h

src/net/beinghandler.h

src/net/buysellhandler.h

src/net/charserverhandler.h

src/net/chathandler.h

src/net/ea/adminhandler.cpp

src/net/ea/beinghandler.cpp

src/net/ea/beinghandler.h

src/net/ea/buysellhandler.cpp

src/net/ea/charserverhandler.cpp

src/net/ea/charserverhandler.h

src/net/ea/chathandler.cpp

src/net/ea/gui/guildtab.cpp

src/net/ea/gui/partytab.cpp

src/net/ea/inventoryhandler.cpp

src/net/ea/itemhandler.cpp

src/net/ea/network.cpp

src/net/ea/skillhandler.cpp

src/net/ea/skillhandler.h

src/net/eathena/adminhandler.cpp

src/net/eathena/adminhandler.h

src/net/eathena/beinghandler.cpp

src/net/eathena/beinghandler.h

src/net/eathena/charserverhandler.cpp

src/net/eathena/charserverhandler.h

src/net/eathena/chathandler.cpp

src/net/eathena/chathandler.h

src/net/eathena/gamehandler.cpp

src/net/eathena/generalhandler.cpp

src/net/eathena/generalhandler.h

src/net/eathena/guildhandler.cpp

src/net/eathena/inventoryhandler.cpp

src/net/eathena/inventoryhandler.h

src/net/eathena/loginhandler.cpp

src/net/eathena/loginhandler.h

src/net/eathena/mailhandler.cpp

src/net/eathena/mailhandler.h

src/net/eathena/messagehandler.h

src/net/eathena/messagein.cpp

src/net/eathena/messagein.h

src/net/eathena/messageout.cpp

src/net/eathena/messageout.h

src/net/eathena/network.cpp

src/net/eathena/npchandler.cpp

src/net/eathena/packets.h

src/net/eathena/partyhandler.cpp

src/net/eathena/partyhandler.h

src/net/eathena/pethandler.cpp

src/net/eathena/pethandler.h

src/net/eathena/playerhandler.cpp

src/net/eathena/playerhandler.h

src/net/eathena/protocol.h

src/net/eathena/questhandler.cpp

src/net/eathena/questhandler.h

src/net/eathena/serverfeatures.cpp

src/net/eathena/serverfeatures.h

src/net/eathena/skillhandler.cpp

src/net/eathena/skillhandler.h

src/net/eathena/tradehandler.cpp

src/net/gamehandler.h

src/net/generalhandler.h

src/net/guildhandler.h

src/net/inventoryhandler.h

src/net/loginhandler.h

src/net/mailhandler.h

src/net/messagein.cpp

src/net/messagein.h

src/net/messageout.cpp

src/net/messageout.h

src/net/net.cpp

src/net/net.h

src/net/netconsts.h

src/net/npchandler.h

src/net/packetlimiter.cpp

src/net/partyhandler.h

src/net/pethandler.h

src/net/playerhandler.h

src/net/serverfeatures.h

src/net/serverinfo.h

src/net/skillhandler.h

src/net/tmwa/adminhandler.cpp

src/net/tmwa/adminhandler.h

src/net/tmwa/beinghandler.cpp

src/net/tmwa/beinghandler.h

src/net/tmwa/buysellhandler.cpp

src/net/tmwa/charserverhandler.cpp

src/net/tmwa/charserverhandler.h

src/net/tmwa/chathandler.cpp

src/net/tmwa/chathandler.h

src/net/tmwa/gamehandler.cpp

src/net/tmwa/generalhandler.cpp

src/net/tmwa/generalhandler.h

src/net/tmwa/guildhandler.cpp

src/net/tmwa/inventoryhandler.cpp

src/net/tmwa/inventoryhandler.h

src/net/tmwa/loginhandler.cpp

src/net/tmwa/mailhandler.cpp

src/net/tmwa/mailhandler.h

src/net/tmwa/messagehandler.h

src/net/tmwa/messagein.cpp

src/net/tmwa/messagein.h

src/net/tmwa/messageout.cpp

src/net/tmwa/messageout.h

src/net/tmwa/npchandler.cpp

src/net/tmwa/partyhandler.cpp

src/net/tmwa/partyhandler.h

src/net/tmwa/pethandler.cpp

src/net/tmwa/pethandler.h

src/net/tmwa/playerhandler.cpp

src/net/tmwa/playerhandler.h

src/net/tmwa/protocol.h

src/net/tmwa/questhandler.cpp

src/net/tmwa/questhandler.h

src/net/tmwa/serverfeatures.cpp

src/net/tmwa/serverfeatures.h

src/net/tmwa/skillhandler.cpp

src/net/tmwa/skillhandler.h

src/net/tmwa/tradehandler.cpp

src/net/tradehandler.h

src/notifymanager.cpp

src/particle/textparticle.cpp

src/resources/beingcommon.cpp

src/resources/beingcommon.h

src/resources/db/colordb.cpp

src/resources/db/itemdb.cpp

src/resources/db/monsterdb.cpp

src/resources/notifications.h

src/resources/notifytypes.h

src/resources/spritedef.cpp

src/settings.h

src/shopitem.cpp

src/shopitem.h

src/spellmanager.cpp

src/utils/chatutils.cpp

src/utils/stringutils.h

Show diffs side-by-side

added added

removed removed

src/net/ea/network.cpp

153

154

SDL_mutexP(mMutexOut);

155

const int ret = TcpNet::send(mSocket, mOutBuffer, mOutSize);

156

DEBUGLOG(std::string("Send ").append(toString(mOutSize)).append(" bytes"));

156

157

if (logger)

158

{

159

logger->dlog(std::string("Send ").append(

160

toString(mOutSize)).append(" bytes"));

161

}

162

157

163

if (ret < static_cast<int>(mOutSize))

158

164

{

159

165

SDL_mutexV(mMutexOut);

Older »