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

Send dealer player id with each hand start message.

Browse Source
This commit is contained in:
lotodore
2013-09-24 23:40:10 +02:00
parent 14bf950471
commit a304903883
5 changed files with 151 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth.proto
+1
View File
@@ -451,6 +451,7 @@ message HandStartMessage {
optional bytes encryptedCards = 3;
required uint32 smallBlind = 4;
repeated NetPlayerState seatStates = 5;
optional uint32 dealerPlayerId = 6;
}
message PlayersTurnMessage {
src/net/common/servergamestate.cpp
+1
View File
@@ -438,6 +438,7 @@ AbstractServerGameStateReceiving::CreateNetPacketHandStart(const ServerGame &ser
}
netHandStart->set_smallblind(curGame.getCurrentHand()->getSmallBlind());
netHandStart->set_dealerplayerid(curGame.getCurrentHand()->getDealerPosition());
return notifyCards;
}
src/third_party/protobuf/pokerth.pb.cc
Vendored
+35
View File
@@ -12596,6 +12596,7 @@ const int HandStartMessage::kPlainCardsFieldNumber;
const int HandStartMessage::kEncryptedCardsFieldNumber;
const int HandStartMessage::kSmallBlindFieldNumber;
const int HandStartMessage::kSeatStatesFieldNumber;
const int HandStartMessage::kDealerPlayerIdFieldNumber;
#endif // !_MSC_VER
HandStartMessage::HandStartMessage()
@@ -12624,6 +12625,7 @@ void HandStartMessage::SharedCtor() {
plaincards_ = NULL;
encryptedcards_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
smallblind_ = 0u;
dealerplayerid_ = 0u;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -12676,6 +12678,7 @@ void HandStartMessage::Clear() {
}
}
smallblind_ = 0u;
dealerplayerid_ = 0u;
}
seatstates_.Clear();
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -12769,6 +12772,22 @@ bool HandStartMessage::MergePartialFromCodedStream(
goto handle_uninterpreted;
}
if (input->ExpectTag(40)) goto parse_seatStates;
if (input->ExpectTag(48)) goto parse_dealerPlayerId;
break;
}
// optional uint32 dealerPlayerId = 6;
case 6: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
parse_dealerPlayerId:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
input, &dealerplayerid_)));
set_has_dealerplayerid();
} else {
goto handle_uninterpreted;
}
if (input->ExpectAtEnd()) return true;
break;
}
@@ -12818,6 +12837,11 @@ void HandStartMessage::SerializeWithCachedSizes(
5, this->seatstates(i), output);
}
// optional uint32 dealerPlayerId = 6;
if (has_dealerplayerid()) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->dealerplayerid(), output);
}
}
int HandStartMessage::ByteSize() const {
@@ -12852,6 +12876,13 @@ int HandStartMessage::ByteSize() const {
this->smallblind());
}
// optional uint32 dealerPlayerId = 6;
if (has_dealerplayerid()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::UInt32Size(
this->dealerplayerid());
}
}
// repeated .NetPlayerState seatStates = 5;
{
@@ -12890,6 +12921,9 @@ void HandStartMessage::MergeFrom(const HandStartMessage& from) {
if (from.has_smallblind()) {
set_smallblind(from.smallblind());
}
if (from.has_dealerplayerid()) {
set_dealerplayerid(from.dealerplayerid());
}
}
}
@@ -12915,6 +12949,7 @@ void HandStartMessage::Swap(HandStartMessage* other) {
std::swap(encryptedcards_, other->encryptedcards_);
std::swap(smallblind_, other->smallblind_);
seatstates_.Swap(&other->seatstates_);
std::swap(dealerplayerid_, other->dealerplayerid_);
std::swap(_has_bits_[0], other->_has_bits_[0]);
std::swap(_cached_size_, other->_cached_size_);
}
src/third_party/protobuf/pokerth.pb.h
Vendored
+33 -1
View File
@@ -6028,6 +6028,13 @@ class HandStartMessage : public ::google::protobuf::MessageLite {
inline const ::google::protobuf::RepeatedField<int>& seatstates() const;
inline ::google::protobuf::RepeatedField<int>* mutable_seatstates();
// optional uint32 dealerPlayerId = 6;
inline bool has_dealerplayerid() const;
inline void clear_dealerplayerid();
static const int kDealerPlayerIdFieldNumber = 6;
inline ::google::protobuf::uint32 dealerplayerid() const;
inline void set_dealerplayerid(::google::protobuf::uint32 value);
// @@protoc_insertion_point(class_scope:HandStartMessage)
private:
inline void set_has_gameid();
@@ -6038,15 +6045,18 @@ class HandStartMessage : public ::google::protobuf::MessageLite {
inline void clear_has_encryptedcards();
inline void set_has_smallblind();
inline void clear_has_smallblind();
inline void set_has_dealerplayerid();
inline void clear_has_dealerplayerid();
::HandStartMessage_PlainCards* plaincards_;
::google::protobuf::uint32 gameid_;
::google::protobuf::uint32 smallblind_;
::std::string* encryptedcards_;
::google::protobuf::RepeatedField<int> seatstates_;
::google::protobuf::uint32 dealerplayerid_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
friend void protobuf_AddDesc_pokerth_2eproto_impl();
@@ -15865,6 +15875,28 @@ HandStartMessage::mutable_seatstates() {
return &seatstates_;
}
// optional uint32 dealerPlayerId = 6;
inline bool HandStartMessage::has_dealerplayerid() const {
return (_has_bits_[0] & 0x00000020u) != 0;
}
inline void HandStartMessage::set_has_dealerplayerid() {
_has_bits_[0] |= 0x00000020u;
}
inline void HandStartMessage::clear_has_dealerplayerid() {
_has_bits_[0] &= ~0x00000020u;
}
inline void HandStartMessage::clear_dealerplayerid() {
dealerplayerid_ = 0u;
clear_has_dealerplayerid();
}
inline ::google::protobuf::uint32 HandStartMessage::dealerplayerid() const {
return dealerplayerid_;
}
inline void HandStartMessage::set_dealerplayerid(::google::protobuf::uint32 value) {
set_has_dealerplayerid();
dealerplayerid_ = value;
}
// -------------------------------------------------------------------
// PlayersTurnMessage
tests/src/de/pokerth/protocol/ProtoBuf.java
+81
View File
@@ -27845,6 +27845,16 @@ public final class ProtoBuf {
* <code>repeated .NetPlayerState seatStates = 5;</code>
*/
de.pokerth.protocol.ProtoBuf.NetPlayerState getSeatStates(int index);
// optional uint32 dealerPlayerId = 6;
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
boolean hasDealerPlayerId();
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
int getDealerPlayerId();
}
/**
* Protobuf type {@code HandStartMessage}
@@ -27946,6 +27956,11 @@ public final class ProtoBuf {
input.popLimit(oldLimit);
break;
}
case 48: {
bitField0_ |= 0x00000010;
dealerPlayerId_ = input.readUInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -28492,12 +28507,29 @@ public final class ProtoBuf {
return seatStates_.get(index);
}
// optional uint32 dealerPlayerId = 6;
public static final int DEALERPLAYERID_FIELD_NUMBER = 6;
private int dealerPlayerId_;
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
public boolean hasDealerPlayerId() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
public int getDealerPlayerId() {
return dealerPlayerId_;
}
private void initFields() {
gameId_ = 0;
plainCards_ = de.pokerth.protocol.ProtoBuf.HandStartMessage.PlainCards.getDefaultInstance();
encryptedCards_ = com.google.protobuf.ByteString.EMPTY;
smallBlind_ = 0;
seatStates_ = java.util.Collections.emptyList();
dealerPlayerId_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -28540,6 +28572,9 @@ public final class ProtoBuf {
for (int i = 0; i < seatStates_.size(); i++) {
output.writeEnum(5, seatStates_.get(i).getNumber());
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeUInt32(6, dealerPlayerId_);
}
}
private int memoizedSerializedSize = -1;
@@ -28573,6 +28608,10 @@ public final class ProtoBuf {
size += dataSize;
size += 1 * seatStates_.size();
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, dealerPlayerId_);
}
memoizedSerializedSize = size;
return size;
}
@@ -28674,6 +28713,8 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000008);
seatStates_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010);
dealerPlayerId_ = 0;
bitField0_ = (bitField0_ & ~0x00000020);
return this;
}
@@ -28718,6 +28759,10 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000010);
}
result.seatStates_ = seatStates_;
if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
to_bitField0_ |= 0x00000010;
}
result.dealerPlayerId_ = dealerPlayerId_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -28746,6 +28791,9 @@ public final class ProtoBuf {
}
}
if (other.hasDealerPlayerId()) {
setDealerPlayerId(other.getDealerPlayerId());
}
return this;
}
@@ -29021,6 +29069,39 @@ public final class ProtoBuf {
return this;
}
// optional uint32 dealerPlayerId = 6;
private int dealerPlayerId_ ;
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
public boolean hasDealerPlayerId() {
return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
public int getDealerPlayerId() {
return dealerPlayerId_;
}
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
public Builder setDealerPlayerId(int value) {
bitField0_ |= 0x00000020;
dealerPlayerId_ = value;
return this;
}
/**
* <code>optional uint32 dealerPlayerId = 6;</code>
*/
public Builder clearDealerPlayerId() {
bitField0_ = (bitField0_ & ~0x00000020);
dealerPlayerId_ = 0;
return this;
}
// @@protoc_insertion_point(builder_scope:HandStartMessage)
}