diff --git a/pokerth.pro b/pokerth.pro index e68e05e4..508a638a 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -267,9 +267,9 @@ win32{ } unix{ - LIBS += -lboost_thread-mt_static -lcrypto -lSDL_mixer + LIBS += -lboost_thread -lcrypto -lSDL_mixer ## My release static libs - #LIBS += -lboost_thread-mt_static -lcrypto -lSDL_mixer -lmikmod -lSDL + #LIBS += -lboost_thread -lcrypto -lSDL_mixer -lSDL -lmikmod # -lmikmod -lSDL -laa -lgpm -lncurses } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 7558808e..9a78949e 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -57,7 +57,7 @@ using namespace std; mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) - : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(1), breakAfterActualHand(FALSE) + : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(0), breakAfterActualHand(FALSE) { int i; diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc index 1e751cab..de99b9be 100755 --- a/src/gui/qt/resources.qrc +++ b/src/gui/qt/resources.qrc @@ -29,9 +29,12 @@ resources/avatar/goethe.png resources/avatar/linus.png resources/avatar/marc.png - resources/avatar/florian.png resources/avatar/Kapitan.png resources/avatar/benedikt.png + resources/avatar/lotodore.png + resources/avatar/viktoria.png + resources/avatar/felix.png + resources/avatar/florian.png resources/graphics/cards/0.png diff --git a/src/gui/qt/resources/avatar/felix.png b/src/gui/qt/resources/avatar/felix.png new file mode 100644 index 00000000..7048caf0 Binary files /dev/null and b/src/gui/qt/resources/avatar/felix.png differ diff --git a/src/gui/qt/resources/avatar/lotodore.png b/src/gui/qt/resources/avatar/lotodore.png new file mode 100644 index 00000000..852c046a Binary files /dev/null and b/src/gui/qt/resources/avatar/lotodore.png differ diff --git a/src/gui/qt/resources/avatar/viktoria.png b/src/gui/qt/resources/avatar/viktoria.png new file mode 100644 index 00000000..15db27a3 Binary files /dev/null and b/src/gui/qt/resources/avatar/viktoria.png differ diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp index 07ad6e16..0c657395 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp @@ -71,9 +71,12 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c) avatarList << ":avatar/resources/avatar/goethe.png"; avatarList << ":avatar/resources/avatar/linus.png"; avatarList << ":avatar/resources/avatar/marc.png"; - avatarList << ":avatar/resources/avatar/florian.png"; + avatarList << ":avatar/resources/avatar/viktoria.png"; avatarList << ":avatar/resources/avatar/benedikt.png"; avatarList << ":avatar/resources/avatar/Kapitan.png"; + avatarList << ":avatar/resources/avatar/florian.png"; + avatarList << ":avatar/resources/avatar/felix.png"; + avatarList << ":avatar/resources/avatar/lotodore.png"; avatarList << ":avatar/resources/avatar/clipart1.png"; int i;