Path: blob/main/games/CaribbeanStud/files/patch-Seat.cpp
16461 views
--- ./Seat.cpp.orig 2013-10-29 15:12:13.000000000 -02001+++ ./Seat.cpp 2013-10-29 15:12:13.000000000 -02002@@ -151,10 +151,10 @@3gcv.font = XLoadFont(_dpy, "10x20");4gcflags = GCForeground | GCBackground | GCGraphicsExposures;5_redgc = XCreateGC(_dpy, RootWindow(_dpy, _screen), gcflags, &gcv);6+ // allocate drawing area background color, set areas7+ XAllocNamedColor(_dpy, cmap, "Forest Green", &color, &color);89}10- // allocate drawing area background color, set areas11- XAllocNamedColor(_dpy, cmap, "Forest Green", &color, &color);12i = 0;13XtSetArg(args[i], XmNbackground, color.pixel); i++;14XtSetArg(args[i], XmNforeground, whitepixel); i++;15@@ -255,25 +255,25 @@ void Seat::MakeCardMaps()16for (int i = 0; i< 13; i++) {17s_map[i] = XCreateBitmapFromData(_dpy,18RootWindow(_dpy, _screen),19- s_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);20+ reinterpret_cast<const char *>(s_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);2122h_map[i] = XCreateBitmapFromData(_dpy,23RootWindow(_dpy, _screen),24- h_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);25+ reinterpret_cast<const char *>(h_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);2627c_map[i] = XCreateBitmapFromData(_dpy,28RootWindow(_dpy, _screen),29- c_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);30+ reinterpret_cast<const char *>(c_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);3132d_map[i] = XCreateBitmapFromData(_dpy,33RootWindow(_dpy, _screen),34- d_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);35+ reinterpret_cast<const char *>(d_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);3637}3839back_map = XCreateBitmapFromData(_dpy,40RootWindow(_dpy, _screen),41- back_bits, CARD_MAP_WIDTH, CARD_MAP_HEIGHT);42+ reinterpret_cast<const char *>(back_bits), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);4344}4546@@ -342,7 +342,8 @@47Card ** cards = hands->Cards();48if( hands->NumOfCards() )49{50- for(int i=0; i< hands->NumOfCards() -1; i++)51+ int i;52+ for(i=0; i< hands->NumOfCards() -1; i++)53DrawCardBack(GetWindow(), cards[i], PositionCardX(cards[i],i),54PositionCardY(cards[i],i));55DrawCard(GetWindow(), cards[i], PositionCardX(cards[i],i),565758