← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty

~ubuntu-branches/ubuntu/trusty/manaplus/trusty

« back to all changes in this revision

Viewing changes to src/gui/windows/tradewindow.cpp

Committer: Package Import Robot
Author(s): Patrick Matthäi
Date: 2013-11-18 15:19:44 UTC
mfrom: (1.1.14)
Revision ID: package-import@ubuntu.com-20131118151944-iyd93ut2rmxzp8gg

Tags: 1.3.11.10-1

New upstream release.

files added:
data/themes/jewelry/edit.xml

src/dyetool

src/dyetool/dyemain.cpp

src/net/netconsts.h

src/sdl2gfx/SDL2_framerate.c

src/sdl2gfx/SDL2_framerate.h

src/sdl2gfx/SDL2_rotozoom.c

src/sdl2gfx/SDL2_rotozoom.h

src/utils/files_unittest.cc

src/utils/timer.cpp

src/utils/timer.h

files removed:
src/sdl2gfx/SDL_framerate.c

src/sdl2gfx/SDL_framerate.h

src/sdl2gfx/SDL_rotozoom.c

src/sdl2gfx/SDL_rotozoom.h

files modified:
ChangeLog

PKGBUILD

README

config.h.in

configure

configure.ac

data/themes/jewelry/CMakeLists.txt

data/themes/jewelry/Makefile.am

data/themes/jewelry/Makefile.in

debian/changelog

manaplus.cbp

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.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/actionmanager.cpp

src/actionmanager.h

src/actormanager.cpp

src/being/actorsprite.cpp

src/being/being.cpp

src/being/compoundsprite.cpp

src/being/localplayer.cpp

src/client.cpp

src/client.h

src/commands.cpp

src/configuration.cpp

src/configuration.h

src/debug.h

src/defaults.cpp

src/eventsmanager.cpp

src/eventsmanager.h

src/flooritem.cpp

src/game.cpp

src/graphicsmanager.cpp

src/gui/gui.cpp

src/gui/palette.cpp

src/gui/palette.h

src/gui/popups/itempopup.cpp

src/gui/popups/popupmenu.cpp

src/gui/sdlfont.cpp

src/gui/setupactiondata.h

src/gui/theme.cpp

src/gui/viewport.cpp

src/gui/widgets/avatarlistbox.cpp

src/gui/widgets/browserbox.cpp

src/gui/widgets/button.cpp

src/gui/widgets/emotepage.cpp

src/gui/widgets/popup.cpp

src/gui/widgets/progressbar.cpp

src/gui/widgets/scrollarea.cpp

src/gui/widgets/shortcutcontainer.cpp

src/gui/widgets/slider.cpp

src/gui/widgets/slider.h

src/gui/widgets/tabs/guildchattab.cpp

src/gui/widgets/tabs/tab.cpp

src/gui/widgets/tabs/whispertab.cpp

src/gui/widgets/textfield.cpp

src/gui/widgets/window.cpp

src/gui/windowmenu.cpp

src/gui/windows/botcheckerwindow.cpp

src/gui/windows/charselectdialog.cpp

src/gui/windows/chatwindow.cpp

src/gui/windows/debugwindow.cpp

src/gui/windows/editdialog.cpp

src/gui/windows/equipmentwindow.cpp

src/gui/windows/minimap.cpp

src/gui/windows/npcdialog.cpp

src/gui/windows/outfitwindow.cpp

src/gui/windows/tradewindow.cpp

src/gui/windows/whoisonline.cpp

src/guichan/include/guichan/widgets/slider.hpp

src/guichan/widgets/slider.cpp

src/guildmanager.cpp

src/input/inputmanager.cpp

src/input/joystick.cpp

src/input/keyboarddata.h

src/input/keydata.h

src/logger.cpp

src/logger.h

src/main.cpp

src/main.h

src/map.cpp

src/map.h

src/maplayer.cpp

src/maplayer.h

src/net/chathandler.h

src/net/download.cpp

src/net/ea/beinghandler.cpp

src/net/ea/buysellhandler.cpp

src/net/ea/chathandler.cpp

src/net/ea/chathandler.h

src/net/ea/gui/guildtab.cpp

src/net/ea/gui/partytab.cpp

src/net/ea/inventoryhandler.cpp

src/net/ea/inventoryhandler.h

src/net/ea/network.h

src/net/eathena/beinghandler.cpp

src/net/inventoryhandler.h

src/net/tmwa/beinghandler.cpp

src/net/tmwa/network.cpp

src/net/tmwa/network.h

src/net/tmwa/playerhandler.cpp

src/net/tmwa/playerhandler.h

src/net/tmwa/protocol.h

src/render/graphics.cpp

src/render/renderers.h

src/render/rendererslistsdl.h

src/render/rendererslistsdl2.h

src/resources/ambientlayer.cpp

src/resources/ambientlayer.h

src/resources/db/colordb.cpp

src/resources/db/itemdb.cpp

src/resources/image.cpp

src/resources/image.h

src/resources/imagehelper.cpp

src/resources/imagewriter.cpp

src/resources/mapreader.cpp

src/resources/resourcemanager.cpp

src/resources/sdl2imagehelper.cpp

src/resources/sdl2softwareimagehelper.cpp

src/resources/sdlimagehelper.cpp

src/resources/surfaceimagehelper.cpp

src/shopitem.cpp

src/soundmanager.cpp

src/touchmanager.cpp

src/utils/files.cpp

src/utils/files.h

src/utils/gettext.h

src/utils/mkdir.cpp

src/utils/paths.cpp

src/utils/paths.h

src/utils/physfstools.cpp

src/utils/physfstools.h

src/utils/sdlcheckutils.cpp

src/utils/sdlcheckutils.h

src/utils/xml.cpp

Show diffs side-by-side

added added

removed removed

src/gui/windows/tradewindow.cpp

444

444

Item *const item = inv->findItem(mAutoAddItem->getId(),

445

445

mAutoAddItem->getColor());

446

446

if (item)

447

tradeItem(item, mAutoAddItem->getQuantity());

447

tradeItem(item, mAutoAddAmount);

448

448

}

449

449

}

450

450

if (mAutoMoney)

Older »