src/engine/enginefactory.h

@@ -36,7 +36,7 @@ public:
 		
 	virtual HandInterface* createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC) =0;
 	virtual BoardInterface* createBoard() =0;
-	virtual PlayerInterface* createPlayer(BoardInterface *b, int id, std::string name, int sC, bool aS, int mB) =0;
+	virtual PlayerInterface* createPlayer(BoardInterface *b, int id, std::string name, std::string avatar, int sC, bool aS, int mB) =0;
 	virtual PreflopInterface* createPreflop(HandInterface* hi, int id, int aP, int dP, int sB) =0;
 	virtual FlopInterface* createFlop(HandInterface* hi, int id, int aP, int dP, int sB) =0;
 	virtual TurnInterface* createTurn(HandInterface* hi, int id, int aP, int dP, int sB) =0;

src/engine/local_engine/localenginefactory.cpp

@@ -35,7 +35,7 @@ HandInterface* LocalEngineFactory::createHand(EngineFactory *f, GuiInterface *g,
 
 BoardInterface* LocalEngineFactory::createBoard() { return new LocalBoard; }
 
-PlayerInterface* LocalEngineFactory::createPlayer(BoardInterface *b, int id, std::string name, int sC, bool aS, int mB) { return new LocalPlayer(b, id, name, sC, aS, mB); }
+PlayerInterface* LocalEngineFactory::createPlayer(BoardInterface *b, int id, std::string name, std::string avatar, int sC, bool aS, int mB) { return new LocalPlayer(b, id, name, avatar, sC, aS, mB); }
 
 PreflopInterface* LocalEngineFactory::createPreflop(HandInterface* hi, int id, int aP, int dP, int sB) { return new LocalPreflop(hi, id, aP, dP, sB); }
 

src/engine/local_engine/localenginefactory.h

@@ -39,7 +39,7 @@ public:
 
 	HandInterface* createHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, int dP, int sB,int sC);
 	BoardInterface* createBoard();
-	PlayerInterface* createPlayer(BoardInterface *b, int id, std::string name, int sC, bool aS, int mB);
+	PlayerInterface* createPlayer(BoardInterface *b, int id, std::string name, std::string avatar, int sC, bool aS, int mB);
 	PreflopInterface* createPreflop(HandInterface* hi, int id, int aP, int dP, int sB);
 	FlopInterface* createFlop(HandInterface* hi, int id, int aP, int dP, int sB);
 	TurnInterface* createTurn(HandInterface* hi, int id, int aP, int dP, int sB);

src/engine/local_engine/localplayer.cpp

@@ -23,7 +23,7 @@
 
 using namespace std;
 
-LocalPlayer::LocalPlayer(BoardInterface *b, int id, std::string name, int sC, bool aS, int mB) : PlayerInterface(), actualHand(0), actualBoard(b), myCardsValue(0), myID(id), myName(name), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myAction(0), myButton(mB), myActiveStatus(aS), myTurn(0), myRoundStartCash(0)
+LocalPlayer::LocalPlayer(BoardInterface *b, int id, std::string name, std::string avatar, int sC, bool aS, int mB) : PlayerInterface(), actualHand(0), actualBoard(b), myCardsValue(0), myID(id), myName(name), myAvatar(avatar), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myAction(0), myButton(mB), myActiveStatus(aS), myTurn(0), myRoundStartCash(0)
 {
 	// myBestHandPosition mit -1 initialisieren
 	int i;

src/engine/local_engine/localplayer.h

@@ -36,7 +36,7 @@ class BoardInterface;
 
 class LocalPlayer : public PlayerInterface{
 public:
-    LocalPlayer(BoardInterface*, int, std::string, int, bool, int);
+    LocalPlayer(BoardInterface*, int, std::string, std::string, int, bool, int);
 
     ~LocalPlayer();
 
@@ -51,6 +51,9 @@ public:
 	void setMyName(const std::string& theValue) { myName = theValue; }
 	std::string getMyName() const { return myName; }
 
+	void setMyAvatar(const std::string& theValue) { myAvatar = theValue; }
+	std::string getMyAvatar() const { return myAvatar; }
+
 	void setMyCash(const int& theValue) { myCash = theValue; }
 	int getMyCash() const { return myCash; }
 
@@ -132,6 +135,7 @@ private:
 	// Konstanten
 	int myID;
 	std::string myName;
+	std::string myAvatar;
 	int myDude;
 	int myDude4;
 

src/engine/playerinterface.h

@@ -38,6 +38,9 @@ public:
 	virtual void setMyName(const std::string& theValue) =0;
 	virtual std::string getMyName() const =0;
 
+	virtual void setMyAvatar(const std::string& theValue) =0;
+	virtual std::string getMyAvatar() const =0;
+
 	virtual void setMyCash(const int& theValue) =0;
 	virtual int getMyCash() const =0;
 

src/game.cpp

@@ -60,13 +60,16 @@ Game::Game(ConfigFile* c, GuiInterface* g, int qP, int sC, int sB, int gId) : my
 	PlayerInterface *tempPlayer;
 	for(i=0; i<myGui->getMaxQuantityPlayers(); i++) {
 
-		//Namen abfragen 
+		//Namen und Avatarpfad abfragen 
 		ostringstream myName;
 		if (i==0) { myName << "MyName";	}
 		else { myName << "Opponent" << i << "Name"; }
+		ostringstream myAvatar;
+		if (i==0) { myAvatar << "MyAvatar";	}
+		else { myAvatar << "Opponent" << i << "Avatar"; }
 
 		//PlayerObjekte erzeugen
-		tempPlayer = myFactory->createPlayer(actualBoard, i, myConfig->readConfigString(myName.str()), startCash, startQuantityPlayers > i, 0);
+		tempPlayer = myFactory->createPlayer(actualBoard, i, myConfig->readConfigString(myName.str()), myConfig->readConfigString(myAvatar.str()), startCash, startQuantityPlayers > i, 0);
 		playerArray[i] = tempPlayer;
 	}
 	actualBoard->setPlayer(playerArray);

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -799,21 +799,19 @@ void mainWindowImpl::refreshPlayerAvatar() {
 		if(actualHand->getPlayerArray()[i]->getMyActiveStatus()) { 
 
 			if(!i) {
-				if(myConfig->readConfigString("MyAvatar") == "") {
+				if(actualHand->getPlayerArray()[0]->getMyAvatar() == "") {
 					playerAvatarLabelArray[0]->setPixmap(QPixmap(":/guiv2/resources/guiv2/genereticAvatar.png"));
 				}
 				else {
-					playerAvatarLabelArray[0]->setPixmap(QPixmap(QString::fromStdString(myConfig->readConfigString("MyAvatar"))));
+					playerAvatarLabelArray[0]->setPixmap(QString::fromStdString(actualHand->getPlayerArray()[0]->getMyAvatar()));
 				}
 			}
-			else {
-				QString tmp("Opponent"+QString::number(i,10)+"Avatar");
-				
-				if(myConfig->readConfigString(tmp.toStdString()) == "") {
+			else {				
+				if(actualHand->getPlayerArray()[i]->getMyAvatar() == "") {
 					playerAvatarLabelArray[i]->setPixmap(QPixmap(":/guiv2/resources/guiv2/genereticAvatar.png"));
 				}
 				else {
-					playerAvatarLabelArray[i]->setPixmap(QPixmap(QString::fromStdString(myConfig->readConfigString(tmp.toStdString()))));
+					playerAvatarLabelArray[i]->setPixmap(QString::fromStdString(actualHand->getPlayerArray()[i]->getMyAvatar()));
 				}
 			}
 		}	
@@ -947,10 +945,11 @@ void mainWindowImpl::refreshAll() {
 
 void mainWindowImpl::refreshChangePlayer() {
 
-	refreshSet();
-	refreshButton();
-	refreshAction();
-	refreshCash();
+	refreshSet(); // alter
+	refreshButton(); // wech
+	refreshAction(); // alter
+	refreshCash(); // alter
+	//<refreshGroupbox(int 1, int 2)
 }
 
 void mainWindowImpl::refreshPot() {