diff --git a/src/engine/local_engine/localbero.cpp b/src/engine/local_engine/localbero.cpp
index 423e1704..770f25e4 100644
--- a/src/engine/local_engine/localbero.cpp
+++ b/src/engine/local_engine/localbero.cpp
@@ -242,6 +242,33 @@ void LocalBeRo::run()
 				//Gegner sind dran
 				myHand->getGuiInterface()->beRoAnimation2(myBeRoID);
 			}
+
+                        // logging action
+                        PlayerActionLog myActionLog = LOG_ACTION_NONE;
+                        switch((*currentPlayersTurnIt)->getMyAction()) {
+                                case PLAYER_ACTION_FOLD: {
+                                        myActionLog = LOG_ACTION_FOLD;
+                                } break;
+                                case PLAYER_ACTION_CHECK: {
+                                        myActionLog = LOG_ACTION_CHECK;
+                                } break;
+                                case PLAYER_ACTION_CALL: {
+                                        myActionLog = LOG_ACTION_CALL;
+                                } break;
+                                case PLAYER_ACTION_BET:
+                                case PLAYER_ACTION_RAISE: {
+                                        myActionLog = LOG_ACTION_BET;
+                                } break;
+                                case PLAYER_ACTION_ALLIN: {
+                                        myActionLog = LOG_ACTION_ALL_IN;
+                                } break;
+                                default: {
+                                }
+                        }
+                        if(myActionLog) {
+//                                myHand->getLog()->logPlayerAction(myBeRoID+1,(*currentPlayersTurnIt)->getMyID()+1,myActionLog);
+                        }
+
 		}
 	}
 }
diff --git a/src/engine/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp
index 025fd594..59007ad6 100755
--- a/src/engine/local_engine/localplayer.cpp
+++ b/src/engine/local_engine/localplayer.cpp
@@ -847,7 +847,7 @@ static const RoundData FlopValues[] = {
 
 LocalPlayer::LocalPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB)
 	: PlayerInterface(), myConfig(c), currentHand(0), myID(id), myUniqueID(uniqueId), myType(type), myName(name), myAvatar(avatar),
-	  myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myLastRelativeSet(0), myAction(0),
+          myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myLastRelativeSet(0), myAction(PLAYER_ACTION_NONE),
 	  myButton(mB), myActiveStatus(aS), myStayOnTableStatus(1), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0),
 	  sBluff(0), sBluffStatus(0), myWinnerState(false), m_actionTimeoutCounter(0), m_isConnected(false)
 {
@@ -1222,16 +1222,16 @@ void LocalPlayer::preflopEngine()
 			// all in
 			if(myOdds >= myNiveau[2] + 8) {
 				raise = myCash;
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			}
 			// nur call
 			else {
 				// all in bei knappem call
 				if(myCash-currentHand->getCurrentBeRo()->getHighestSet() <= (myCash*1)/5) {
 					raise = myCash;
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				} else {
-					myAction = 3;
+                                        myAction = PLAYER_ACTION_CALL;
 				}
 			}
 
@@ -1247,51 +1247,51 @@ void LocalPlayer::preflopEngine()
 			if(myCash/(2*currentHand->getSmallBlind()) <= 6 || raise >= (myCash*4)/5) {
 				raise = myCash;
 			}
-			myAction = 5;
+                        myAction = PLAYER_ACTION_RAISE;
 		}
 
 		// auf cBluff testen --> call (bzw check) statt raise
 		if(cBluff > 90) {
-			myAction = 3;
+                        myAction = PLAYER_ACTION_CALL;
 			// bigBlind --> check
-			if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = 2;
+                        if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = PLAYER_ACTION_CHECK;
 		}
 		if(cBluff > 80 && myOdds >= myNiveau[2] + 4) {
-			myAction = 3;
+                        myAction = PLAYER_ACTION_CALL;
 			// bigBlind --> check
-			if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = 2;
+                        if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = PLAYER_ACTION_CHECK;
 		}
 		if(cBluff > 70 && myOdds >= myNiveau[2] + 8) {
-			myAction = 3;
+                        myAction = PLAYER_ACTION_CALL;
 			// bigBlind --> check
-			if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = 2;
+                        if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = PLAYER_ACTION_CHECK;
 		}
 		if(cBluff > 60 && myOdds >= myNiveau[2] + 12) {
-			myAction = 3;
+                        myAction = PLAYER_ACTION_CALL;
 			// bigBlind --> check
-			if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = 2;
+                        if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = PLAYER_ACTION_CHECK;
 		}
 
 	} else {
 		// call
 		if(myOdds >= myNiveau[0] || (mySet >= currentHand->getCurrentBeRo()->getHighestSet()/2 && myOdds >= myNiveau[0]-8)) {
 			// bigBlind --> check
-			if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = 2;
+                        if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = PLAYER_ACTION_CHECK;
 			else {
 				// all in bei knappem call
 				if(myCash-currentHand->getCurrentBeRo()->getHighestSet() <= (myCash*1)/5) {
 					raise = myCash;
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				} else {
-					myAction = 3;
+                                        myAction = PLAYER_ACTION_CALL;
 				}
 			}
 		}
 		// fold
 		else {
 			// bigBlind -> check
-			if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = 2;
-			else myAction = 1;
+                        if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = PLAYER_ACTION_CHECK;
+                        else myAction = PLAYER_ACTION_FOLD;
 		}
 	}
 
@@ -1308,11 +1308,11 @@ void LocalPlayer::preflopEngine()
 			// all in bei knappem call
 			if(myCash-currentHand->getCurrentBeRo()->getHighestSet() <= (myCash*1)/6) {
 				raise = myCash;
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			} else {
-				myAction = 3;
+                                myAction = PLAYER_ACTION_CALL;
 				// bigBlind --> check
-				if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = 2;
+                                if(myButton == 3 && mySet == currentHand->getCurrentBeRo()->getHighestSet()) myAction = PLAYER_ACTION_CHECK;
 			}
 		}
 		// Standard-Raise-Routine
@@ -1327,12 +1327,12 @@ void LocalPlayer::preflopEngine()
 			if(myCash/(2*currentHand->getSmallBlind()) <= 6 || raise >= (myCash*4)/5) {
 				raise = myCash;
 			}
-			myAction = 5;
+                        myAction = PLAYER_ACTION_RAISE;
 		}
 
 		// extrem hoher set der gegner -> bluff beenden
 		if((currentHand->getCurrentBeRo()->getHighestSet() >= 12*currentHand->getSmallBlind() && myOdds < myNiveau[0]) || (currentHand->getCurrentBeRo()->getHighestSet() >= 20*currentHand->getSmallBlind() && myOdds < myNiveau[2])) {
-			myAction = 1;
+                        myAction = PLAYER_ACTION_FOLD;
 		}
 
 
@@ -1590,16 +1590,16 @@ void LocalPlayer::flopEngine()
 				// all in
 				if(myOdds >= myNiveau[2] + 15) {
 					raise = myCash;
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				}
 				// nur call
 				else {
 					// all in bei knappem call
 					if(myCash-currentHand->getCurrentBeRo()->getHighestSet() <= (myCash*1)/5) {
 						raise = myCash;
-						myAction = 5;
+                                                myAction = PLAYER_ACTION_RAISE;
 					} else {
-						myAction = 3;
+                                                myAction = PLAYER_ACTION_CALL;
 					}
 				}
 
@@ -1615,14 +1615,14 @@ void LocalPlayer::flopEngine()
 				if(myCash/(2*currentHand->getSmallBlind()) <= 6 || raise >= (myCash*4.0)/5.0) {
 					raise = myCash;
 				}
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			}
 
 			// auf cBluff testen --> call statt raise
-			if(cBluff > 90) myAction = 3;
-			if(cBluff > 80 && myOdds >= myNiveau[2] + 4) myAction = 3;
-			if(cBluff > 70 && myOdds >= myNiveau[2] + 8) myAction = 3;
-			if(cBluff > 60 && myOdds >= myNiveau[2] + 12) myAction = 3;
+                        if(cBluff > 90) myAction = PLAYER_ACTION_CALL;
+                        if(cBluff > 80 && myOdds >= myNiveau[2] + 4) myAction = PLAYER_ACTION_CALL;
+                        if(cBluff > 70 && myOdds >= myNiveau[2] + 8) myAction = PLAYER_ACTION_CALL;
+                        if(cBluff > 60 && myOdds >= myNiveau[2] + 12) myAction = PLAYER_ACTION_CALL;
 
 		} else {
 			// call -> über niveau0, schon einiges gesetzt im flop, schon einiges insgesamt gesetzt
@@ -1630,12 +1630,12 @@ void LocalPlayer::flopEngine()
 				// all in bei knappem call
 				if(currentHand->getCurrentBeRo()->getHighestSet() > (myCash*3.0)/4.0) {
 					raise = myCash;
-					myAction = 5;
-				} else myAction = 3;
+                                        myAction = PLAYER_ACTION_RAISE;
+                                } else myAction = PLAYER_ACTION_CALL;
 			}
 			// fold
 			else {
-				myAction = 1;
+                                myAction = PLAYER_ACTION_FOLD;
 			}
 		}
 	} else {
@@ -1654,17 +1654,17 @@ void LocalPlayer::flopEngine()
 			if(bet > (myCash*4.0)/5.0) {
 				bet = myCash;
 			}
-			myAction = 4;
+                        myAction = PLAYER_ACTION_BET;
 
 			// auf cBluff testen --> check statt bet
-			if(cBluff > 80) myAction = 2;
-			if(cBluff > 70 && myOdds >= myNiveau[1] + 4) myAction = 2;
-			if(cBluff > 60 && myOdds >= myNiveau[1] + 8) myAction = 2;
-			if(cBluff > 50 && myOdds >= myNiveau[1] + 12) myAction = 2;
+                        if(cBluff > 80) myAction = PLAYER_ACTION_CHECK;
+                        if(cBluff > 70 && myOdds >= myNiveau[1] + 4) myAction = PLAYER_ACTION_CHECK;
+                        if(cBluff > 60 && myOdds >= myNiveau[1] + 8) myAction = PLAYER_ACTION_CHECK;
+                        if(cBluff > 50 && myOdds >= myNiveau[1] + 12) myAction = PLAYER_ACTION_CHECK;
 		}
 		// check
 		else {
-			myAction = 2;
+                        myAction = PLAYER_ACTION_CHECK;
 			// Position
 			if(myButton == 1) {
 				// Position-Bluff generieren
@@ -1683,7 +1683,7 @@ void LocalPlayer::flopEngine()
 					if(bet > (myCash*4.0)/5.0) {
 						bet = myCash;
 					}
-					myAction = 4;
+                                        myAction = PLAYER_ACTION_BET;
 				}
 			}
 		}
@@ -1701,7 +1701,7 @@ void LocalPlayer::flopEngine()
 
 			// Gegner setzen -> call
 			if(currentHand->getCurrentBeRo()->getHighestSet() >= 4*currentHand->getSmallBlind()) {
-				myAction = 3;
+                                myAction = PLAYER_ACTION_CALL;
 			}
 			// Standard-Raise-Routine
 			else {
@@ -1716,12 +1716,12 @@ void LocalPlayer::flopEngine()
 				if(myCash/(2*currentHand->getSmallBlind()) <= 6 || raise >= (myCash*4)/5) {
 					raise = myCash;
 				}
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			}
 
 			// extrem hoher set der gegner -> bluff beenden
 			if(currentHand->getCurrentBeRo()->getHighestSet() >= 10*currentHand->getSmallBlind()) {
-				myAction = 1;
+                                myAction = PLAYER_ACTION_FOLD;
 			}
 		}
 	} else {
@@ -1743,7 +1743,7 @@ void LocalPlayer::flopEngine()
 			if(bet > (myCash*4.0)/5.0) {
 				bet = myCash;
 			}
-			myAction = 4;
+                        myAction = PLAYER_ACTION_BET;
 		}
 
 	}
@@ -1974,11 +1974,11 @@ void LocalPlayer::flopEngine()
 	// 				case 4: {
 	// 					Tools::getRandNumber(0,100,1,&cBluff,0);
 	// 					if(cBluff < 35) {
-	// 						myAction = 2;
+        // 						myAction = PLAYER_ACTION_CHECK;
 	// 					}
 	// 					else {
 	// 						if(myCash/(2*currentHand->getSmallBlind()) <= 8) {
-	// 							myAction = 6;
+        // 							myAction = PLAYER_ACTION_ALLIN;
 	// 						} else {
 	// 							if(cBluff < 60) {
 	// 								bet = (7-myDude4)*2*currentHand->getSmallBlind();
@@ -1986,7 +1986,7 @@ void LocalPlayer::flopEngine()
 	// 								bet = (((100-cBluff)/20)+2)*currentHand->getSmallBlind();
 	// 							}
 	// 							if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 							myAction = 4;
+        // 							myAction = PLAYER_ACTION_BET;
 	// 						}
 	// 					}
 	// 				}
@@ -1996,11 +1996,11 @@ void LocalPlayer::flopEngine()
 	// 						case 2: {
 	// 							Tools::getRandNumber(0,100,1,&cBluff,0);
 	// 							if(cBluff < 35) {
-	// 								myAction = 2;
+        // 								myAction = PLAYER_ACTION_CHECK;
 	// 							}
 	// 							else {
 	// 								if(myCash/(2*currentHand->getSmallBlind()) <= 8) {
-	// 									myAction = 6;
+        // 									myAction = PLAYER_ACTION_ALLIN;
 	// 								} else {
 	// 									if(cBluff < 60) {
 	// 										bet = (5-myDude4)*2*currentHand->getSmallBlind();
@@ -2008,7 +2008,7 @@ void LocalPlayer::flopEngine()
 	// 										bet = (((100-cBluff)/20)+2)*currentHand->getSmallBlind();
 	// 									}
 	// 									if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 									myAction = 4;
+        // 									myAction = PLAYER_ACTION_BET;
 	// 								}
 	// 							}
 	// 						}
@@ -2016,11 +2016,11 @@ void LocalPlayer::flopEngine()
 	// 						case 1: {
 	// 							Tools::getRandNumber(0,100,1,&cBluff,0);
 	// 							if(cBluff < 40) {
-	// 								myAction = 2;
+        // 								myAction = PLAYER_ACTION_CHECK;
 	// 							}
 	// 							else {
 	// 								if(myCash/(2*currentHand->getSmallBlind()) <= 6) {
-	// 									myAction = 6;
+        // 									myAction = PLAYER_ACTION_ALLIN;
 	// 								} else {
 	// 									if(cBluff < 60) {
 	// 										bet = (3-myDude4)*2*currentHand->getSmallBlind();
@@ -2028,7 +2028,7 @@ void LocalPlayer::flopEngine()
 	// 										bet = (((100-cBluff)/20)+2)*currentHand->getSmallBlind();
 	// 									}
 	// 									if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 									myAction = 4;
+        // 									myAction = PLAYER_ACTION_BET;
 	// 								}
 	// 							}
 	// 						}
@@ -2038,10 +2038,10 @@ void LocalPlayer::flopEngine()
 	// 							if(info[1] >= 10 && sBluff <= 40) {
 	// 								bet = (sBluff/10)*2*currentHand->getSmallBlind();
 	// 								if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 								myAction = 4;
+        // 								myAction = PLAYER_ACTION_BET;
 	// 							}
 	// 							else {
-	// 								myAction = 2;
+        // 								myAction = PLAYER_ACTION_CHECK;
 	// 							}
 	// 						}
 	// 					}
@@ -2052,15 +2052,15 @@ void LocalPlayer::flopEngine()
 	// 						case 2: {
 	// 							Tools::getRandNumber(0,100,1,&cBluff,0);
 	// 							if(cBluff > 80) {
-	// 								myAction = 2;
+        // 								myAction = PLAYER_ACTION_CHECK;
 	// 							}
 	// 							else {
 	// 								if(myCash/(2*currentHand->getSmallBlind()) <= 6) {
-	// 									myAction = 6;
+        // 									myAction = PLAYER_ACTION_ALLIN;
 	// 								} else {
 	// 									bet = (cBluff/20)*2*currentHand->getSmallBlind();
 	// 									if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 									myAction = 4;
+        // 									myAction = PLAYER_ACTION_BET;
 	// 								}
 	// 							}
 	// 						}
@@ -2068,15 +2068,15 @@ void LocalPlayer::flopEngine()
 	// 						default: {
 	// 							Tools::getRandNumber(0,100,1,&cBluff,0);
 	// 							if(cBluff > 90) {
-	// 								myAction = 2;
+        // 								myAction = PLAYER_ACTION_CHECK;
 	// 							}
 	// 							else {
 	// 								if(myCash/(2*currentHand->getSmallBlind()) <= 5) {
-	// 									myAction = 6;
+        // 									myAction = PLAYER_ACTION_ALLIN;
 	// 								} else {
 	// 									bet = (cBluff/30)*2*currentHand->getSmallBlind();
 	// 									if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 									myAction = 4;
+        // 									myAction = PLAYER_ACTION_BET;
 	// 								}
 	// 							}
 	// 						}
@@ -2092,7 +2092,7 @@ void LocalPlayer::flopEngine()
 	// 							if(currentHand->getActivePlayerList().size() == 2) {
 	// 								bet = (1-myDude4)*2*currentHand->getSmallBlind();
 	// 								if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 								myAction = 4;
+        // 								myAction = PLAYER_ACTION_BET;
 	//
 	// 							}
 	// 							else {
@@ -2100,40 +2100,40 @@ void LocalPlayer::flopEngine()
 	// 									case 3: {
 	// 										if(sBluff <= 10) {
 	// 											bet = (sBluff/5 + 2)*currentHand->getSmallBlind();
-	// 											myAction = 4;
+        // 											myAction = PLAYER_ACTION_BET;
 	// 										}
 	// 										else {
-	// 											myAction = 2;
+        // 											myAction = PLAYER_ACTION_CHECK;
 	// 										}
 	// 									}
 	// 									break;
 	// 									case 2: {
 	// 										if(sBluff <= 15) {
 	// 											bet = (sBluff/5 + 2)*currentHand->getSmallBlind();
-	// 											myAction = 4;
+        // 											myAction = PLAYER_ACTION_BET;
 	// 										}
 	// 										else {
-	// 											myAction = 2;
+        // 											myAction = PLAYER_ACTION_CHECK;
 	// 										}
 	// 									}
 	// 									break;
 	// 									case 1: {
 	// 										if(sBluff <= 50) {
 	// 											bet = (sBluff/15 + 2)*currentHand->getSmallBlind();
-	// 											myAction = 4;
+        // 											myAction = PLAYER_ACTION_BET;
 	// 										}
 	// 										else {
-	// 											myAction = 2;
+        // 											myAction = PLAYER_ACTION_CHECK;
 	// 										}
 	// 									}
 	// 									break;
 	// 									default: {
 	// 										if(myCash/(2*currentHand->getSmallBlind()) <= 5) {
-	// 											myAction = 6;
+        // 											myAction = PLAYER_ACTION_ALLIN;
 	// 										} else {
 	// 											bet = (sBluff/15)*2*currentHand->getSmallBlind();
 	// 											if(bet < 2*currentHand->getSmallBlind()) bet = 2*currentHand->getSmallBlind();
-	// 											myAction = 4;
+        // 											myAction = PLAYER_ACTION_BET;
 	// 										}
 	// 									}
 	// 									break;
@@ -2292,16 +2292,16 @@ void LocalPlayer::turnEngine()
 				// all in
 				if(myOdds >= myNiveau[2] + 15) {
 					raise = myCash;
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				}
 				// nur call
 				else {
 					// all in bei knappem call
 					if(myCash-currentHand->getCurrentBeRo()->getHighestSet() <= (myCash*1)/5) {
 						raise = myCash;
-						myAction = 5;
+                                                myAction = PLAYER_ACTION_RAISE;
 					} else {
-						myAction = 3;
+                                                myAction = PLAYER_ACTION_CALL;
 					}
 				}
 
@@ -2317,25 +2317,25 @@ void LocalPlayer::turnEngine()
 				if(myCash/(2*currentHand->getSmallBlind()) <= 6 || raise >= (myCash*4.0)/5.0) {
 					raise = myCash;
 				}
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			}
 			// auf cBluff testen --> call statt raise
-			if(cBluff > 90) myAction = 3;
-			if(cBluff > 80 && myOdds >= myNiveau[2] + 5) myAction = 3;
-			if(cBluff > 70 && myOdds >= myNiveau[2] + 10) myAction = 3;
-			if(cBluff > 60 && myOdds >= myNiveau[2] + 15) myAction = 3;
+                        if(cBluff > 90) myAction = PLAYER_ACTION_CALL;
+                        if(cBluff > 80 && myOdds >= myNiveau[2] + 5) myAction = PLAYER_ACTION_CALL;
+                        if(cBluff > 70 && myOdds >= myNiveau[2] + 10) myAction = PLAYER_ACTION_CALL;
+                        if(cBluff > 60 && myOdds >= myNiveau[2] + 15) myAction = PLAYER_ACTION_CALL;
 		} else {
 			// call -> über niveau0, schon einiges gesetzt im flop, schon einiges insgesamt gesetzt
 			if(myOdds >= myNiveau[0] || (mySet >= currentHand->getCurrentBeRo()->getHighestSet()/2 && myOdds >= myNiveau[0]-5) || (myRoundStartCash-myCash > individualHighestSet && myNiveau[0]-3)) {
 				// all in bei knappem call
 				if(currentHand->getCurrentBeRo()->getHighestSet() > (myCash*3.0)/4.0) {
 					raise = myCash;
-					myAction = 5;
-				} else myAction = 3;
+                                        myAction = PLAYER_ACTION_RAISE;
+                                } else myAction = PLAYER_ACTION_CALL;
 			}
 			// fold
 			else {
-				myAction = 1;
+                                myAction = PLAYER_ACTION_FOLD;
 			}
 		}
 	}
@@ -2355,17 +2355,17 @@ void LocalPlayer::turnEngine()
 			if(bet > (myCash*4.0)/5.0) {
 				bet = myCash;
 			}
-			myAction = 4;
+                        myAction = PLAYER_ACTION_BET;
 
 			// auf cBluff testen --> call statt raise
-			if(cBluff > 90) myAction = 2;
-			if(cBluff > 80 && myOdds >= myNiveau[2] + 5) myAction = 2;
-			if(cBluff > 70 && myOdds >= myNiveau[2] + 10) myAction = 2;
-			if(cBluff > 60 && myOdds >= myNiveau[2] + 15) myAction = 2;
+                        if(cBluff > 90) myAction = PLAYER_ACTION_CHECK;
+                        if(cBluff > 80 && myOdds >= myNiveau[2] + 5) myAction = PLAYER_ACTION_CHECK;
+                        if(cBluff > 70 && myOdds >= myNiveau[2] + 10) myAction = PLAYER_ACTION_CHECK;
+                        if(cBluff > 60 && myOdds >= myNiveau[2] + 15) myAction = PLAYER_ACTION_CHECK;
 		}
 		// check
 		else {
-			myAction = 2;
+                        myAction = PLAYER_ACTION_CHECK;
 			// Position
 			if(myButton == 1) {
 				// Position-Bluff generieren
@@ -2384,7 +2384,7 @@ void LocalPlayer::turnEngine()
 					if(bet > (myCash*4.0)/5.0) {
 						bet = myCash;
 					}
-					myAction = 4;
+                                        myAction = PLAYER_ACTION_BET;
 				}
 			}
 		}
@@ -2401,7 +2401,7 @@ void LocalPlayer::turnEngine()
 
 			// Gegner setzen -> call
 			if(currentHand->getCurrentBeRo()->getHighestSet() >= 4*currentHand->getSmallBlind()) {
-				myAction = 3;
+                                myAction = PLAYER_ACTION_CALL;
 			}
 			// Standard-Raise-Routine
 			else {
@@ -2416,12 +2416,12 @@ void LocalPlayer::turnEngine()
 				if(myCash/(2*currentHand->getSmallBlind()) <= 6 || raise >= (myCash*4)/5) {
 					raise = myCash;
 				}
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			}
 
 			// extrem hoher set der gegner -> bluff beenden
 			if(currentHand->getCurrentBeRo()->getHighestSet() >= 10*currentHand->getSmallBlind()) {
-				myAction = 1;
+                                myAction = PLAYER_ACTION_FOLD;
 			}
 		}
 	} else {
@@ -2443,7 +2443,7 @@ void LocalPlayer::turnEngine()
 			if(bet > (myCash*4.0)/5.0) {
 				bet = myCash;
 			}
-			myAction = 4;
+                        myAction = PLAYER_ACTION_BET;
 		}
 
 	}
@@ -2813,16 +2813,16 @@ void LocalPlayer::riverEngine()
 				// all in
 				if(myOdds >= myNiveau[2] + 15) {
 					raise = myCash;
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				}
 				// nur call
 				else {
 					// all in bei knappem call
 					if(myCash-currentHand->getCurrentBeRo()->getHighestSet() <= (myCash*1)/5) {
 						raise = myCash;
-						myAction = 5;
+                                                myAction = PLAYER_ACTION_RAISE;
 					} else {
-						myAction = 3;
+                                                myAction = PLAYER_ACTION_CALL;
 					}
 				}
 			}
@@ -2838,7 +2838,7 @@ void LocalPlayer::riverEngine()
 				if(myCash/(2*currentHand->getSmallBlind()) <= 8) {
 					raise = myCash;
 				}
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			}
 		} else {
 			// call -> über niveau0, schon einiges gesetzt im flop, schon einiges insgesamt gesetzt
@@ -2846,12 +2846,12 @@ void LocalPlayer::riverEngine()
 				// all in bei knappem call
 				if(myCash-currentHand->getCurrentBeRo()->getHighestSet() <= (myCash*1)/4) {
 					raise = myCash;
-					myAction = 5;
-				} else myAction = 3;
+                                        myAction = PLAYER_ACTION_RAISE;
+                                } else myAction = PLAYER_ACTION_CALL;
 			}
 			// fold
 			else {
-				myAction = 1;
+                                myAction = PLAYER_ACTION_FOLD;
 			}
 		}
 	} else {
@@ -2869,11 +2869,11 @@ void LocalPlayer::riverEngine()
 			if(bet > (myCash*4.0)/5.0) {
 				bet = myCash;
 			}
-			myAction = 4;
+                        myAction = PLAYER_ACTION_BET;
 		}
 		// check
 		else {
-			myAction = 2;
+                        myAction = PLAYER_ACTION_CHECK;
 			// Position
 			if(myButton == 1) {
 				// Position-Bluff generieren
@@ -2892,7 +2892,7 @@ void LocalPlayer::riverEngine()
 					if(bet > (myCash*4.0)/5.0) {
 						bet = myCash;
 					}
-					myAction = 4;
+                                        myAction = PLAYER_ACTION_BET;
 				}
 			}
 		}
@@ -2913,7 +2913,7 @@ void LocalPlayer::riverEngine()
 
 			// Gegner setzen -> call
 			if(currentHand->getCurrentBeRo()->getHighestSet() >= 4*currentHand->getSmallBlind()) {
-				myAction = 3;
+                                myAction = PLAYER_ACTION_CALL;
 			}
 			// Standard-Raise-Routine
 			else {
@@ -2928,12 +2928,12 @@ void LocalPlayer::riverEngine()
 				if(myCash/(2*currentHand->getSmallBlind()) <= 6 || raise >= (myCash*4)/5) {
 					raise = myCash;
 				}
-				myAction = 5;
+                                myAction = PLAYER_ACTION_RAISE;
 			}
 
 			// extrem hoher set der gegner -> bluff beenden
 			if(currentHand->getCurrentBeRo()->getHighestSet() >= 10*currentHand->getSmallBlind()) {
-				myAction = 1;
+                                myAction = PLAYER_ACTION_FOLD;
 			}
 		}
 	} else {
@@ -2955,7 +2955,7 @@ void LocalPlayer::riverEngine()
 			if(bet > (myCash*4.0)/5.0) {
 				bet = myCash;
 			}
-			myAction = 4;
+                        myAction = PLAYER_ACTION_BET;
 		}
 
 	}
@@ -3237,7 +3237,7 @@ void LocalPlayer::evaluation(int bet, int raise)
 		if(highestSet >= myCash + mySet) {
 			mySet += myCash;
 			myCash = 0;
-			myAction = 6;
+                        myAction = PLAYER_ACTION_ALLIN;
 			currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,myID+1,LOG_ACTION_ALL_IN,mySet);
 			// 				cout << "evaluation(call) - mySet: " << mySet << endl;
 		}
@@ -3260,7 +3260,7 @@ void LocalPlayer::evaluation(int bet, int raise)
 			currentHand->getCurrentBeRo()->setMinimumRaise(myCash);
 			mySet = myCash;
 			myCash = 0;
-			myAction = 6;
+                        myAction = PLAYER_ACTION_ALLIN;
 			highestSet = mySet;
 			currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,myID+1,LOG_ACTION_ALL_IN,mySet);
 		}
@@ -3284,14 +3284,14 @@ void LocalPlayer::evaluation(int bet, int raise)
 			if(highestSet >= myCash + mySet) {
 				mySet += myCash;
 				myCash = 0;
-				myAction = 6;
+                                myAction = PLAYER_ACTION_ALLIN;
 				currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,myID+1,LOG_ACTION_ALL_IN,mySet);
 			}
 			// sonst
 			else {
 				myCash = myCash - highestSet + mySet;
 				mySet = highestSet;
-				myAction = 3;
+                                myAction = PLAYER_ACTION_CALL;
 				currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,myID+1,LOG_ACTION_CALL,mySet);
 			}
 		} else {
@@ -3306,7 +3306,7 @@ void LocalPlayer::evaluation(int bet, int raise)
 						// only call all-in
 						mySet += myCash;
 						myCash = 0;
-						myAction = 6;
+                                                myAction = PLAYER_ACTION_ALLIN;
 					} else {
 						// raise, but not enough --> full bet rule
 						currentHand->getCurrentBeRo()->setFullBetRule(true);
@@ -3316,7 +3316,7 @@ void LocalPlayer::evaluation(int bet, int raise)
 						mySet += myCash;
 						currentHand->getCurrentBeRo()->setMinimumRaise(mySet-highestSet);
 						myCash = 0;
-						myAction = 6;
+                                                myAction = PLAYER_ACTION_ALLIN;
 						highestSet = mySet;
 					}
 				} else {
@@ -3326,7 +3326,7 @@ void LocalPlayer::evaluation(int bet, int raise)
 					mySet += myCash;
 					currentHand->getCurrentBeRo()->setMinimumRaise(mySet-highestSet);
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 					highestSet = mySet;
 				}
 				currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,myID+1,LOG_ACTION_ALL_IN,mySet);
@@ -4470,7 +4470,7 @@ void LocalPlayer::preflopEngine3()
 
 	// FOLD --> wenn Potential negativ oder HighestSet zu hoch
 	if( (potential*setToHighest<0 || (setToHighest > tempFold * currentHand->getSmallBlind() &&  potential<1) || (setToHighest > 2 * tempFold * currentHand->getSmallBlind() &&  potential<2) || (setToHighest > 4 * tempFold * currentHand->getSmallBlind() &&  potential<3) || (setToHighest > 10 * tempFold * currentHand->getSmallBlind() &&  potential<4))  && CardsValue::holeCardsClass(myCards[0], myCards[1]) < 9 && bluff > 15) {
-		myAction=1;
+                myAction = PLAYER_ACTION_FOLD;
 	} else {
 		// RAISE --> wenn hohes Potential
 		if((potential >= 4 && 6 * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet()) || bluff <= 6) {
@@ -4489,14 +4489,14 @@ void LocalPlayer::preflopEngine3()
 
 							mySet += myCash;
 							myCash = 0;
-							myAction = 6;
+                                                        myAction = PLAYER_ACTION_ALLIN;
 
 						}
 						// sonst
 						else {
 							myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 							mySet = currentHand->getCurrentBeRo()->getHighestSet();
-							myAction = 3;
+                                                        myAction = PLAYER_ACTION_CALL;
 						}
 					} else {
 						// doch nich raisen, sondern nur checken, weil highestSets bereits sehr hoch !!!
@@ -4507,14 +4507,14 @@ void LocalPlayer::preflopEngine3()
 
 								mySet += myCash;
 								myCash = 0;
-								myAction = 6;
+                                                                myAction = PLAYER_ACTION_ALLIN;
 
 							}
 							// sonst
 							else {
 								myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 								mySet = currentHand->getCurrentBeRo()->getHighestSet();
-								myAction = 3;
+                                                                myAction = PLAYER_ACTION_CALL;
 							}
 
 						} else raise = (potential - 4 ) * 2 * currentHand->getCurrentBeRo()->getHighestSet();
@@ -4535,14 +4535,14 @@ void LocalPlayer::preflopEngine3()
 
 							mySet += myCash;
 							myCash = 0;
-							myAction = 6;
+                                                        myAction = PLAYER_ACTION_ALLIN;
 
 						}
 						// sonst
 						else {
 							myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 							mySet = currentHand->getCurrentBeRo()->getHighestSet();
-							myAction = 3;
+                                                        myAction = PLAYER_ACTION_CALL;
 						}
 					} else {
 						// doch nich raisen, sondern nur checken, weil highestSets bereits sehr hoch !!!
@@ -4553,14 +4553,14 @@ void LocalPlayer::preflopEngine3()
 
 								mySet += myCash;
 								myCash = 0;
-								myAction = 6;
+                                                                myAction = PLAYER_ACTION_ALLIN;
 
 							}
 							// sonst
 							else {
 								myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 								mySet = currentHand->getCurrentBeRo()->getHighestSet();
-								myAction = 3;
+                                                                myAction = PLAYER_ACTION_CALL;
 							}
 						} else raise = (potential - 3 ) * currentHand->getCurrentBeRo()->getHighestSet();
 					}
@@ -4573,7 +4573,7 @@ void LocalPlayer::preflopEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 					if(mySet > currentHand->getCurrentBeRo()->getHighestSet()) currentHand->getCurrentBeRo()->setHighestSet(mySet);
 
 				}
@@ -4583,7 +4583,7 @@ void LocalPlayer::preflopEngine3()
 					myCash = myCash + mySet - currentHand->getCurrentBeRo()->getHighestSet() - raise;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet() + raise;
 					currentHand->getCurrentBeRo()->setHighestSet(mySet);
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				}
 			}
 		}
@@ -4591,7 +4591,7 @@ void LocalPlayer::preflopEngine3()
 		else {
 			// CHECK --> wenn alle Sets glieich bei BigBlind und nich zu hohem Potential
 			if(mySet == currentHand->getCurrentBeRo()->getHighestSet()) {
-				myAction = 2;
+                                myAction = PLAYER_ACTION_CHECK;
 			}
 			// CALL --> bei normalen Potential
 			else {
@@ -4600,14 +4600,14 @@ void LocalPlayer::preflopEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 
 				}
 				// sonst
 				else {
 					myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet();
-					myAction = 3;
+                                        myAction = PLAYER_ACTION_CALL;
 				}
 			}
 		}
@@ -4697,14 +4697,14 @@ void LocalPlayer::flopEngine3()
 
 	// FOLD --> wenn potential negativ oder HighestSet zu hoch
 	if(( potential*setToHighest<0 || (setToHighest > tempFold * currentHand->getSmallBlind() &&  potential<1) || (setToHighest > 3 * tempFold * currentHand->getSmallBlind() &&  potential<2) || (setToHighest > 9 * tempFold * currentHand->getSmallBlind() &&  potential<3) || (setToHighest > 20*tempFold * currentHand->getSmallBlind() &&  potential<4) || (setToHighest > 40 *tempFold * currentHand->getSmallBlind() &&  potential<5)) && percent < 0.90 && bluff > 18) {
-		myAction=1;
+                myAction = PLAYER_ACTION_FOLD;
 	} else {
 		// CHECK und BET --> wenn noch keiner was gesetzt hat
 		if(currentHand->getCurrentBeRo()->getHighestSet() == 0) {
 			// CHECK --> wenn Potential klein oder check-bluff sonst bet oder bet-bluff
 			if((potential<3 || bluff >= 80) && bluff > 15) {
 				// check
-				myAction = 2;
+                                myAction = PLAYER_ACTION_CHECK;
 			}
 			// BET --> wenn Potential hoch
 			else {
@@ -4719,13 +4719,13 @@ void LocalPlayer::flopEngine3()
 				if(mySet >= myCash) {
 					mySet = myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 
 				}
 				// sonst
 				else {
 					myCash -= mySet;
-					myAction = 4;
+                                        myAction = PLAYER_ACTION_BET;
 				}
 				currentHand->getCurrentBeRo()->setHighestSet(mySet);
 			}
@@ -4748,7 +4748,7 @@ void LocalPlayer::flopEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 					if(mySet > currentHand->getCurrentBeRo()->getHighestSet()) currentHand->getCurrentBeRo()->setHighestSet(mySet);
 
 				}
@@ -4758,7 +4758,7 @@ void LocalPlayer::flopEngine3()
 					myCash = myCash + mySet - currentHand->getCurrentBeRo()->getHighestSet() - raise;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet() + raise;
 					currentHand->getCurrentBeRo()->setHighestSet(mySet);
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				}
 			}
 			// CALL --> bei normalen Potential
@@ -4769,14 +4769,14 @@ void LocalPlayer::flopEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 
 				}
 				// sonst
 				else {
 					myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet();
-					myAction = 3;
+                                        myAction = PLAYER_ACTION_CALL;
 				}
 			}
 		}
@@ -4864,14 +4864,14 @@ void LocalPlayer::turnEngine3()
 	// FOLD
 	// --> wenn potential negativ oder HighestSet zu hoch
 	if( (potential*setToHighest<0 || (setToHighest > tempFold * currentHand->getSmallBlind() &&  potential<1) || (setToHighest > 3 * tempFold * currentHand->getSmallBlind() &&  potential<2) || (setToHighest > 9 * tempFold * currentHand->getSmallBlind() &&  potential<3) || (setToHighest > 20*tempFold * currentHand->getSmallBlind() &&  potential<4) || (setToHighest > 40 *tempFold * currentHand->getSmallBlind() &&  potential<5)) && percent < 0.90 && bluff > 15) {
-		myAction=1;
+                myAction = PLAYER_ACTION_FOLD;
 	} else {
 		// CHECK und BET --> wenn noch keiner was gesetzt hat
 		if(currentHand->getCurrentBeRo()->getHighestSet() == 0) {
 			// CHECK --> wenn Potential klein
 			if((potential<2 || bluff >= 80) && bluff > 10) {
 				// check
-				myAction = 2;
+                                myAction = PLAYER_ACTION_CHECK;
 			}
 			// BET --> wenn Potential hoch
 			else {
@@ -4887,13 +4887,13 @@ void LocalPlayer::turnEngine3()
 				if(mySet >= myCash) {
 					mySet = myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 
 				}
 				// sonst
 				else {
 					myCash -= mySet;
-					myAction = 4;
+                                        myAction = PLAYER_ACTION_BET;
 				}
 				currentHand->getCurrentBeRo()->setHighestSet(mySet);
 			}
@@ -4916,7 +4916,7 @@ void LocalPlayer::turnEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 					if(mySet > currentHand->getCurrentBeRo()->getHighestSet()) currentHand->getCurrentBeRo()->setHighestSet(mySet);
 
 				}
@@ -4926,7 +4926,7 @@ void LocalPlayer::turnEngine3()
 					myCash = myCash + mySet - currentHand->getCurrentBeRo()->getHighestSet() - raise;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet() + raise;
 					currentHand->getCurrentBeRo()->setHighestSet(mySet);
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				}
 			}
 			// CALL --> bei normalen Potential
@@ -4936,14 +4936,14 @@ void LocalPlayer::turnEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 
 				}
 				// sonst
 				else {
 					myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet();
-					myAction = 3;
+                                        myAction = PLAYER_ACTION_CALL;
 				}
 			}
 		}
@@ -5026,14 +5026,14 @@ void LocalPlayer::riverEngine3()
 	// FOLD
 	// --> wenn potential negativ oder HighestSet zu hoch
 	if( (potential*setToHighest<0 || (setToHighest > tempFold * currentHand->getSmallBlind() &&  potential<1) || (setToHighest > 3 * tempFold * currentHand->getSmallBlind() &&  potential<2) || (setToHighest > 9 * tempFold * currentHand->getSmallBlind() &&  potential<3) || (setToHighest > 20*tempFold * currentHand->getSmallBlind() &&  potential<4) || (setToHighest > 40 *tempFold * currentHand->getSmallBlind() &&  potential<5)) && percent < 0.90 && bluff > 15) {
-		myAction=1;
+                myAction = PLAYER_ACTION_FOLD;
 	} else {
 		// CHECK und BET --> wenn noch keiner was gesetzt hat
 		if(currentHand->getCurrentBeRo()->getHighestSet() == 0) {
 			// CHECK --> wenn Potential klein
 			if((potential<2 || bluff >= 92) && bluff > 15) {
 				// check
-				myAction = 2;
+                                myAction = PLAYER_ACTION_CHECK;
 			}
 			// BET --> wenn Potential hoch
 			else {
@@ -5049,13 +5049,13 @@ void LocalPlayer::riverEngine3()
 				if(mySet >= myCash) {
 					mySet = myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 
 				}
 				// sonst
 				else {
 					myCash -= mySet;
-					myAction = 4;
+                                        myAction = PLAYER_ACTION_BET;
 				}
 				currentHand->getCurrentBeRo()->setHighestSet(mySet);
 			}
@@ -5078,7 +5078,7 @@ void LocalPlayer::riverEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 					if(mySet > currentHand->getCurrentBeRo()->getHighestSet()) currentHand->getCurrentBeRo()->setHighestSet(mySet);
 
 				}
@@ -5088,7 +5088,7 @@ void LocalPlayer::riverEngine3()
 					myCash = myCash + mySet - currentHand->getCurrentBeRo()->getHighestSet() - raise;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet() + raise;
 					currentHand->getCurrentBeRo()->setHighestSet(mySet);
-					myAction = 5;
+                                        myAction = PLAYER_ACTION_RAISE;
 				}
 			}
 			// CALL --> bei normalen Potential
@@ -5098,14 +5098,14 @@ void LocalPlayer::riverEngine3()
 
 					mySet += myCash;
 					myCash = 0;
-					myAction = 6;
+                                        myAction = PLAYER_ACTION_ALLIN;
 
 				}
 				// sonst
 				else {
 					myCash = myCash - currentHand->getCurrentBeRo()->getHighestSet() + mySet;
 					mySet = currentHand->getCurrentBeRo()->getHighestSet();
-					myAction = 3;
+                                        myAction = PLAYER_ACTION_CALL;
 				}
 			}
 		}
diff --git a/src/engine/local_engine/localplayer.h b/src/engine/local_engine/localplayer.h
index 682f0728..f8a3c0cf 100755
--- a/src/engine/local_engine/localplayer.h
+++ b/src/engine/local_engine/localplayer.h
@@ -113,12 +113,12 @@ public:
 		return myLastRelativeSet;
 	}
 
-	void setMyAction(int theValue, bool blind = 0) {
+        void setMyAction(PlayerAction theValue, bool blind = 0) {
 		myAction = theValue;
 		// logging for human player
 		if(myAction && !blind) currentHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, mySet);
 	}
-	int getMyAction() const	{
+        PlayerAction getMyAction() const	{
 		return myAction;
 	}
 
@@ -166,15 +166,12 @@ public:
 			switch(state) {
 			case 1:
 				currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt);
-//				currentHand->getLog()->logHoleCardsHandName(myID+1,myCards,myCardsValueInt,currentHand->getActivePlayerList());
 				break;
 			case 2:
 				currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1]);
-//				currentHand->getLog()->logHoleCards(currentHand->getCurrentRound()+1,myID+1,myCards);
 				break;
 			case 3:
 				currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt, "has");
-//				currentHand->getLog()->logHandName(myID+1,myCardsValueInt,currentHand->getActivePlayerList());
 				break;
 			default:
 				;
@@ -320,7 +317,7 @@ private:
 	int myCash;
 	int mySet;
 	int myLastRelativeSet;
-	int myAction; // 0 = none, 1 = fold, 2 = check, 3 = call, 4 = bet, 5 = raise, 6 = allin
+        PlayerAction myAction;
 	int myButton; // 0 = none, 1 = dealer, 2 =small, 3 = big
 	bool myActiveStatus; // 0 = inactive, 1 = active
 	bool myStayOnTableStatus; // 0 = left, 1 = stay
diff --git a/src/engine/log.cpp b/src/engine/log.cpp
index d96386a7..5073ada5 100644
--- a/src/engine/log.cpp
+++ b/src/engine/log.cpp
@@ -227,7 +227,26 @@ void Log::logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, uns
                                         exec_transaction(&sql);
                                 }
 
-				logPlayerAction(0,dealerPosition,LOG_ACTION_DEALER);
+                                // !! TODO !! Hack, weil Button-Regel noch falsch und dealerPosition noch teilweise falsche ID enthält (HeadsUp: dealerPosition=bigBlindPosition <-- falsch)
+                                bool dealerButtonOnTable = false;
+                                int countActivePlayer = 0;
+                                for(it_c = seatsList->begin(); it_c!=seatsList->end(); it_c++) {
+                                        if((*it_c)->getMyActiveStatus()) {
+                                                countActivePlayer++;
+                                                if((*it_c)->getMyButton()==BUTTON_DEALER && (*it_c)->getMyActiveStatus()) {
+                                                        dealerButtonOnTable = true;
+                                                }
+                                        }
+                                }
+                                if(countActivePlayer==2) {
+                                        logPlayerAction(0,smallBlindPosition,LOG_ACTION_DEALER);
+                                }
+                                else {
+                                        if(dealerButtonOnTable) {
+                                                logPlayerAction(0,dealerPosition,LOG_ACTION_DEALER);
+                                        }
+                                }
+                                // !! TODO !! Hack
 			}
 		}
 	}
@@ -434,24 +453,6 @@ void Log::exec_transaction(string *sql)
 
 //}
 
-
-
-// ACTION-Code
-// 0    starts as dealer
-// 1    posts small blind
-// 2    posts big blind
-// 3    folds
-// 4    checks
-// 5    calls
-// 6    bets
-// 7    is all in with
-// 8    shows
-// 9    has
-// 10   wins
-// 11   wins (side pot)
-// 11   sits out
-// 12   wins game
-
 // Bero-Code
 // 0	Pre-Preflop
 // 1	Preflop
diff --git a/src/engine/network_engine/clientplayer.cpp b/src/engine/network_engine/clientplayer.cpp
index f2e8760e..4030c889 100644
--- a/src/engine/network_engine/clientplayer.cpp
+++ b/src/engine/network_engine/clientplayer.cpp
@@ -25,7 +25,7 @@ using namespace std;
 ClientPlayer::ClientPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB)
 	: PlayerInterface(), myConfig(c), currentHand(0), myID(id), myUniqueID(uniqueId), myType(type),
 	  myName(name), myAvatar(avatar), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myLastRelativeSet(0),
-	  myAction(0), myButton(mB), myActiveStatus(aS), myStayOnTableStatus(true), myTurn(false), myCardsFlip(false), myRoundStartCash(0),
+          myAction(PLAYER_ACTION_NONE), myButton(mB), myActiveStatus(aS), myStayOnTableStatus(true), myTurn(false), myCardsFlip(false), myRoundStartCash(0),
 	  lastMoneyWon(0), sBluff(0), sBluffStatus(false), myWinnerState(false), m_isConnected(false)
 {
 	myBestHandPosition[0] = myBestHandPosition[1] = myBestHandPosition[2] = myBestHandPosition[3] = myBestHandPosition[4] = 0;
@@ -195,13 +195,13 @@ ClientPlayer::getMyLastRelativeSet() const
 }
 
 void
-ClientPlayer::setMyAction(int theValue, bool /*blind*/)
+ClientPlayer::setMyAction(PlayerAction theValue, bool /*blind*/)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
 	myAction = theValue;
 }
 
-int
+PlayerAction
 ClientPlayer::getMyAction() const
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
diff --git a/src/engine/network_engine/clientplayer.h b/src/engine/network_engine/clientplayer.h
index ecc52193..9d935c9a 100644
--- a/src/engine/network_engine/clientplayer.h
+++ b/src/engine/network_engine/clientplayer.h
@@ -64,8 +64,8 @@ public:
 	int getMySet() const;
 	int getMyLastRelativeSet() const;
 
-	void setMyAction(int theValue, bool blind);
-	int getMyAction() const;
+        void setMyAction(PlayerAction theValue, bool blind);
+        PlayerAction getMyAction() const;
 
 	void setMyButton(int theValue);
 	int getMyButton() const;
@@ -172,7 +172,7 @@ private:
 	int myCash;
 	int mySet;
 	int myLastRelativeSet;
-	int myAction; // 0 = none, 1 = fold, 2 = check, 3 = call, 4 = bet, 5 = raise, 6 = allin
+        PlayerAction myAction;
 	int myButton; // 0 = none, 1 = dealer, 2 =small, 3 = big
 	bool myActiveStatus; // 0 = inactive, 1 = active
 	bool myStayOnTableStatus; // 0 = left, 1 = stay
diff --git a/src/engine/playerinterface.h b/src/engine/playerinterface.h
index bd875f44..e27cf034 100644
--- a/src/engine/playerinterface.h
+++ b/src/engine/playerinterface.h
@@ -62,8 +62,8 @@ public:
 	virtual int getMySet() const =0;
 	virtual int getMyLastRelativeSet() const =0;
 
-	virtual void setMyAction(int theValue, bool blind=0) =0;
-	virtual int getMyAction() const	=0;
+        virtual void setMyAction(PlayerAction theValue, bool blind=0) =0;
+        virtual PlayerAction getMyAction() const	=0;
 
 	virtual void setMyButton(int theValue) =0;
 	virtual int getMyButton() const	=0;
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index bdaaa3e7..aee962bc 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -1823,8 +1823,8 @@ void gameTableImpl::myFold()
 
 		boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand();
 		boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
-		humanPlayer->setMyAction(1);
-		currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_FOLD);
+                humanPlayer->setMyAction(PLAYER_ACTION_FOLD);
+                currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_FOLD);
 		humanPlayer->setMyTurn(0);
 
 		//set that i was the last active player. need this for unhighlighting groupbox
@@ -1844,7 +1844,7 @@ void gameTableImpl::myCheck()
 	boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
 	humanPlayer->setMyTurn(0);
 	currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_CHECK);
-	humanPlayer->setMyAction(2);
+        humanPlayer->setMyAction(PLAYER_ACTION_CHECK);
 
 	//set that i was the last active player. need this for unhighlighting groupbox
 	currentHand->setLastPlayersTurn(0);
@@ -1911,11 +1911,11 @@ void gameTableImpl::myCall()
 		humanPlayer->setMySet(humanPlayer->getMyCash());
 		humanPlayer->setMyCash(0);
 		currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_ALL_IN,humanPlayer->getMySet());
-		humanPlayer->setMyAction(6);
+                humanPlayer->setMyAction(PLAYER_ACTION_ALLIN);
 	} else {
 		humanPlayer->setMySet(tempHighestSet - humanPlayer->getMySet());
 		currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_CALL,humanPlayer->getMySet());
-		humanPlayer->setMyAction(3);
+                humanPlayer->setMyAction(PLAYER_ACTION_CALL);
 	}
 	humanPlayer->setMyTurn(0);
 
@@ -1948,7 +1948,7 @@ void gameTableImpl::mySet()
 
 			humanPlayer->setMySet(humanPlayer->getMyCash());
 			humanPlayer->setMyCash(0);
-			humanPlayer->setMyAction(6);
+                        humanPlayer->setMyAction(PLAYER_ACTION_ALLIN);
 			currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_ALL_IN,humanPlayer->getMySet());
 
 			// full bet rule
@@ -1960,7 +1960,7 @@ void gameTableImpl::mySet()
 		if(myActionIsRaise) {
 			//do not if allIn
 			if(humanPlayer->getMyAction() != 6) {
-				humanPlayer->setMyAction(5);
+                                humanPlayer->setMyAction(PLAYER_ACTION_RAISE);
 				currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_BET,humanPlayer->getMySet());
 			}
 			myActionIsRaise = 0;
@@ -1971,7 +1971,7 @@ void gameTableImpl::mySet()
 		if(myActionIsBet) {
 			//do not if allIn
 			if(humanPlayer->getMyAction() != 6) {
-				humanPlayer->setMyAction(4);
+                                humanPlayer->setMyAction(PLAYER_ACTION_BET);
 				currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_BET,humanPlayer->getMySet());
 			}
 			myActionIsBet = 0;
@@ -2009,7 +2009,7 @@ void gameTableImpl::myAllIn()
 
 		humanPlayer->setMySet(humanPlayer->getMyCash());
 		humanPlayer->setMyCash(0);
-		humanPlayer->setMyAction(6);
+                humanPlayer->setMyAction(PLAYER_ACTION_ALLIN);
 		currentHand->getLog()->logPlayerAction(currentHand->getCurrentRound()+1,1,LOG_ACTION_ALL_IN,humanPlayer->getMySet());
 
 		// full bet rule
diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
index 1f52e7f1..7ba0a0ac 100644
--- a/src/net/common/clientstate.cpp
+++ b/src/net/common/clientstate.cpp
@@ -1756,7 +1756,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
 			curGame->getCurrentHand()->setLastPlayersTurn(tmpPlayer->getMyID());
 		}
 
-		tmpPlayer->setMyAction(netActionDone->playerAction);
+                tmpPlayer->setMyAction(PlayerAction(netActionDone->playerAction));
 		tmpPlayer->setMySetAbsolute(netActionDone->totalPlayerBet);
 		tmpPlayer->setMyCash(netActionDone->playerMoney);
 		curGame->getCurrentHand()->getCurrentBeRo()->setHighestSet(netActionDone->highestSet);
@@ -1992,7 +1992,7 @@ ClientStateRunHand::ResetPlayerActions(Game &curGame)
 	while (i != end) {
 		int action = (*i)->getMyAction();
 		if (action != 1 && action != 6)
-			(*i)->setMyAction(0);
+                        (*i)->setMyAction(PLAYER_ACTION_NONE);
 		(*i)->setMySetNull();
 		++i;
 	}