pkgs/games/kobodeluxe/glibc29.patch

   1 --- a/enemies.h
   2 +++ b/enemies.h
   3 @@ -70,9 +70,9 @@
   4  extern const enemy_kind bomb2;
   5  extern const enemy_kind bombdeto;
   6  extern const enemy_kind cannon;
   7 -extern const enemy_kind pipe1;
   8 +extern const enemy_kind pipeone;
   9  extern const enemy_kind core;
  10 -extern const enemy_kind pipe2;
  11 +extern const enemy_kind pipetwo;
  12  extern const enemy_kind rock;
  13  extern const enemy_kind ring;
  14  extern const enemy_kind enemy_m1;
  15 @@ -430,7 +430,7 @@
  16
  17  inline int _enemy::is_pipe()
  18  {
  19 -       return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
  20 +       return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo)));
  21  }
  22
  23
  24 --- a/enemy.cpp
  25 +++ b/enemy.cpp
  26 @@ -713,7 +713,7 @@
  27
  28  void _enemy::kill_cannon()
  29  {
  30 -       enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
  31 +       enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y));
  32         sound.g_base_node_explo(x, y);
  33         release();
  34  }
  35 @@ -755,10 +755,10 @@
  36
  37  void _enemy::kill_core()
  38  {
  39 -       enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
  40 -       enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
  41 -       enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
  42 -       enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
  43 +       enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
  44 +       enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
  45 +       enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
  46 +       enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
  47         enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
  48         sound.g_base_core_explo(x, y);
  49         release();
  50 @@ -851,7 +851,7 @@
  51                 screen.set_map(x1, y1, m ^ a);
  52         release();
  53  }
  54 -const enemy_kind pipe1 = {
  55 +const enemy_kind pipeone = {
  56         0,
  57         &_enemy::make_pipe1,
  58         &_enemy::move_pipe1,
  59 @@ -978,19 +978,19 @@
  60         }
  61         p ^= a;
  62         if(p & U_MASK)
  63 -               enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
  64 +               enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
  65         if(p & R_MASK)
  66 -               enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
  67 +               enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
  68         if(p & D_MASK)
  69 -               enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
  70 +               enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
  71         if(p & L_MASK)
  72 -               enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
  73 +               enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
  74         manage.add_score(10);
  75         release();
  76  }
  77
  78
  79 -const enemy_kind pipe2 = {
  80 +const enemy_kind pipetwo = {
  81         0,
  82         &_enemy::make_pipe2,
  83         &_enemy::move_pipe2,