sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trying to fix game info validation.

Browse Source
This commit is contained in:
lotodore
2013-01-01 00:27:49 +01:00
parent fb620625b6
commit d4c1d64eda
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/netpacketvalidator.cpp
+2 -3
View File
@@ -1145,7 +1145,7 @@ NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
bool bool
NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
{ {
/* bool retVal = false; bool retVal = false;
if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
&& VALIDATE_INT_RANGE(gameInfo.maxnumplayers(), 2, 10) && VALIDATE_INT_RANGE(gameInfo.maxnumplayers(), 2, 10)
&& (!gameInfo.has_raiseeveryhands() || VALIDATE_INT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) && (!gameInfo.has_raiseeveryhands() || VALIDATE_INT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
@@ -1161,7 +1161,6 @@ NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
retVal = true; retVal = true;
} }
return retVal;*/ return retVal;
return true;
} }
tests/src/de/pokerth/test/TestBase.java
+15 -15
View File
@@ -320,15 +320,8 @@ public abstract class TestBase {
public NetGameInfo createGameInfo(NetGameInfo.NetGameType gameType, int playerActionTimeout, int proposedGuiSpeed, int delayBetweenHands, NetGameInfo.EndRaiseMode endMode, int endRaiseValue, int sb, public NetGameInfo createGameInfo(NetGameInfo.NetGameType gameType, int playerActionTimeout, int proposedGuiSpeed, int delayBetweenHands, NetGameInfo.EndRaiseMode endMode, int endRaiseValue, int sb,
String gameName, Collection<Integer> manualBlinds, int maxNumPlayers, int raiseEveryMinutes, int raiseEveryHands, int startMoney) { String gameName, Collection<Integer> manualBlinds, int maxNumPlayers, int raiseEveryMinutes, int raiseEveryHands, int startMoney) {
NetGameInfo.RaiseIntervalMode raiseInterval; NetGameInfo.Builder infoBuilder = NetGameInfo.newBuilder();
if (raiseEveryMinutes > 0) { infoBuilder
raiseInterval = NetGameInfo.RaiseIntervalMode.raiseOnMinutes;
}
else {
raiseInterval = NetGameInfo.RaiseIntervalMode.raiseOnHandNum;
}
NetGameInfo gameInfo = NetGameInfo.newBuilder()
.setNetGameType(gameType) .setNetGameType(gameType)
.setPlayerActionTimeout(playerActionTimeout) .setPlayerActionTimeout(playerActionTimeout)
.setProposedGuiSpeed(proposedGuiSpeed) .setProposedGuiSpeed(proposedGuiSpeed)
@@ -339,13 +332,20 @@ public abstract class TestBase {
.setGameName(gameName) .setGameName(gameName)
.setMaxNumPlayers(maxNumPlayers) .setMaxNumPlayers(maxNumPlayers)
.addAllManualBlinds(manualBlinds) .addAllManualBlinds(manualBlinds)
.setRaiseIntervalMode(raiseInterval) .setStartMoney(startMoney);
.setRaiseEveryMinutes(raiseEveryMinutes)
.setRaiseEveryHands(raiseEveryHands)
.setStartMoney(startMoney)
.build();
return gameInfo; if (raiseEveryMinutes > 0) {
infoBuilder
.setRaiseIntervalMode(NetGameInfo.RaiseIntervalMode.raiseOnMinutes)
.setRaiseEveryMinutes(raiseEveryMinutes);
}
else {
infoBuilder
.setRaiseIntervalMode(NetGameInfo.RaiseIntervalMode.raiseOnHandNum)
.setRaiseEveryHands(raiseEveryHands);
}
return infoBuilder.build();
} }
void failOnErrorMessage(PokerTHMessage msg) { void failOnErrorMessage(PokerTHMessage msg) {