| 1 | --- src/gui/callbacks.cpp.orig 2006-01-01 21:47:53.000000000 -0600 |
| 2 | +++ src/gui/callbacks.cpp 2011-03-07 02:55:35.000000000 -0600 |
| 3 | @@ -104,13 +104,13 @@ |
| 4 | on_pcard_clicked (GtkButton *button, |
| 5 | gpointer user_data) |
| 6 | { |
| 7 | - LOG("enter on_pcard_clicked with %d\n", (int) user_data); |
| 8 | + LOG("enter on_pcard_clicked with %d\n", (intptr_t) user_data); |
| 9 | HumanGuiPlayer* p = (HumanGuiPlayer*) theGame->getPlayer(Common::SOUTH); |
| 10 | if (p == NULL) { |
| 11 | return; |
| 12 | } |
| 13 | |
| 14 | - p->setSelectedCard((int) user_data); |
| 15 | + p->setSelectedCard((intptr_t) user_data); |
| 16 | theGame->addEvent(Game::PAUSE_END); |
| 17 | theGame->run(); |
| 18 | } |
| 19 | @@ -142,7 +142,7 @@ |
| 20 | gpointer user_data) |
| 21 | { |
| 22 | Player* p = theGame->getPlayer(Common::SOUTH); |
| 23 | - p->assignBid((Common::Bid) ((int) user_data)); |
| 24 | + p->assignBid((Common::Bid) ((intptr_t) user_data)); |
| 25 | |
| 26 | theGame->addEvent(Game::AUCTION_CONT); |
| 27 | theGame->run(); |
| 28 | @@ -202,9 +202,9 @@ |
| 29 | Player* p = theGame->getPlayer(Common::SOUTH); |
| 30 | |
| 31 | if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t))) { |
| 32 | - p->assignBid(Common::LONER, (Card::Suit) (int) user_data); |
| 33 | + p->assignBid(Common::LONER, (Card::Suit) (intptr_t) user_data); |
| 34 | } else { |
| 35 | - p->assignBid(Common::PICKITUP, (Card::Suit) (int) user_data); |
| 36 | + p->assignBid(Common::PICKITUP, (Card::Suit) (intptr_t) user_data); |
| 37 | } |
| 38 | |
| 39 | theGame->addEvent(Game::AUCTION_CONT); |
| 40 | --- src/lib/Game.cpp.orig 2006-01-14 19:58:31.000000000 -0600 |
| 41 | +++ src/lib/Game.cpp 2011-03-07 02:55:48.000000000 -0600 |
| 42 | @@ -59,7 +59,7 @@ |
| 43 | while (g_slist_length(itsEventList) != 0) { |
| 44 | /* gcc doesn't like conversion from void* to Event so hack around |
| 45 | it */ |
| 46 | - Event ev = (Event) (unsigned int) g_slist_nth_data(itsEventList, 0); |
| 47 | + Event ev = (Event) (uintptr_t) g_slist_nth_data(itsEventList, 0); |
| 48 | itsEventList = g_slist_remove(itsEventList, (gpointer) ev); |
| 49 | |
| 50 | processEvent(ev); |