Skip to content

Y
ygopro-2pick
Commit aadf5a01 authored by nanahira's avatar nanahira
Browse files
Options

fixtp

parent 80b99317
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
gframe/single_duel.cpp
View file @ aadf5a01
...@@ -457,8 +457,8 @@ void SingleDuel::StartDuel(DuelPlayer* dp) { ...@@ -457,8 +457,8 @@ void SingleDuel::StartDuel(DuelPlayer* dp) {
players[0]->state = CTOS_HAND_RESULT; players[0]->state = CTOS_HAND_RESULT;
players[1]->state = CTOS_HAND_RESULT; players[1]->state = CTOS_HAND_RESULT;
//2pick //2pick
pick_deck[0] = 0; pick_deck[0] = NULL;
pick_deck[1] = 0; pick_deck[1] = NULL;
} }
void SingleDuel::HandResult(DuelPlayer* dp, unsigned char res) { void SingleDuel::HandResult(DuelPlayer* dp, unsigned char res) {
if(res > 3) if(res > 3)
...@@ -520,7 +520,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) { ...@@ -520,7 +520,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
SwapPickDeck(); SwapPickDeck();
swapped = true; swapped = true;
} }
if(pick_deck[0] && pick_deck[1]) { if(pick_deck[0] != NULL && pick_deck[1] != NULL) {
pdeck[0] = pick_deck[0]; pdeck[0] = pick_deck[0];
pdeck[1] = pick_deck[1]; pdeck[1] = pick_deck[1];
} }
...@@ -1967,7 +1967,7 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) { ...@@ -1967,7 +1967,7 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) {
} }
} }
void SingleDuel::SwapPickDeck() { void SingleDuel::SwapPickDeck() {
if(pick_deck[0] && pick_deck[0]) { if(pick_deck[0] != NULL && pick_deck[1] != NULL) {
Deck d = pick_deck[0]; Deck d = pick_deck[0];
pick_deck[0] = pick_deck[1]; pick_deck[0] = pick_deck[1];
pick_deck[1] = d; pick_deck[1] = d;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment