+74 −69

client.cpp

src/client.cpp

+2 −1

client.h

src/client.h

+13 −9

connection.cpp

src/connection.cpp

+1 −1

content_cao.cpp

src/content_cao.cpp

+2 −1

emerge.cpp

src/emerge.cpp

+101 −104

game.cpp

src/game.cpp

+3 −2

guiEngine.cpp

src/guiEngine.cpp

+151 −94

guiFormSpecMenu.cpp

src/guiFormSpecMenu.cpp

+14 −5

guiFormSpecMenu.h

src/guiFormSpecMenu.h

+2 −1

httpfetch.cpp

src/httpfetch.cpp

+16 −15

localplayer.cpp

src/localplayer.cpp

+4 −3

main.cpp

src/main.cpp

+22 −22

porting.cpp

src/porting.cpp

+33 −13

porting.h

src/porting.h

+2 −0

server.cpp

src/server.cpp

+2 −1

settings.h

src/settings.h

+14 −3

tile.cpp

src/tile.cpp