Fixed last merge broken stuff and re-factored
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 6 May 2010 10:57:08 +0000 (13:57 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 6 May 2010 10:57:08 +0000 (13:57 +0300)
commit8fb91ac4b41799e2c37528fd2fe93d74a8a15397
treed7d5c790b947faf78b1d1fbdd312d374828d4053
parent3f2ca614141c4deb7e2d8d31e9107924c35c23d8
Fixed last merge broken stuff and re-factored
src/engine/engine.cpp
src/map/frienditemshandler.cpp
src/map/frienditemshandler.h
src/map/mapengine.cpp
src/map/mapengine.h
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h