xbill-c++.patch

   1 diff -Nur xbill-2.0.orig/Cable.h xbill-2.0/Cable.h
   2 --- xbill-2.0.orig/Cable.h      Thu Jan 23 17:22:49 1997
   3 +++ xbill-2.0/Cable.h   Fri Jan  5 20:02:21 2001
   4 @@ -13,7 +13,7 @@
   5         void setup();
   6         void draw();
   7         void update();
   8 -       onspark (int locx, int locy);
   9 +       int onspark (int locx, int locy);
  10
  11  };
  12
  13 --- xbill-2.0/UI.cc.orig        1997-01-23 17:22:51.000000000 +0100
  14 +++ xbill-2.0/UI.cc     2006-10-16 23:07:56.461712750 +0200
  15 @@ -125,10 +125,10 @@
  16  void UI::popup_dialog (int dialog) {
  17         Widget w;
  18         switch (dialog) {
  19 -               case game.ENTERNAME: w = enternamebox; break;
  20 -               case game.HIGHSCORE: w = highscorebox; break;
  21 -               case game.SCORE: w = scorebox; break;
  22 -               case game.ENDGAME: w = endgamebox; break;
  23 +               case Game::ENTERNAME: w = enternamebox; break;
  24 +               case Game::HIGHSCORE: w = highscorebox; break;
  25 +               case Game::SCORE: w = scorebox; break;
  26 +               case Game::ENDGAME: w = endgamebox; break;
  27         }
  28         popup (NULL, &w, NULL);
  29  }
  30 @@ -139,11 +139,11 @@
  31
  32  void UI::set_cursor(int cursor) {
  33         switch (cursor) {
  34 -       case game.BUCKETC:
  35 +       case Game::BUCKETC:
  36                 XDefineCursor(display, window, bucket.cursor.cursor); break;
  37 -       case game.DOWNC:
  38 +       case Game::DOWNC:
  39                 XDefineCursor(display, window, downcursor.cursor); break;
  40 -       case game.DEFAULTC:
  41 +       case Game::DEFAULTC:
  42                 XDefineCursor(display, window, defaultcursor.cursor); break;
  43         default:
  44                 XDefineCursor(display, window, OS.cursor[cursor].cursor);