diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2002-10-26 14:05:11 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2002-10-26 14:05:11 +0000 |
commit | f8f04af8cae40a244ede4a3db744dee28c32a02a (patch) | |
tree | d7972e07690f0808e673c29177a612a5d2f62b58 /games/znibbles/files/patch-src::Movable.C | |
parent | Correct RUN_DEPENDS. (diff) |
Makes games/znibbles compiling again with gcc 3.2.1.
The patch has become somebody bigger than I was hoping for. And
the original author is MIA...
Approved by: Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw> (maintainer)
Notes
Notes:
svn path=/head/; revision=68869
Diffstat (limited to 'games/znibbles/files/patch-src::Movable.C')
-rw-r--r-- | games/znibbles/files/patch-src::Movable.C | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/games/znibbles/files/patch-src::Movable.C b/games/znibbles/files/patch-src::Movable.C new file mode 100644 index 000000000000..7c59d6bfe455 --- /dev/null +++ b/games/znibbles/files/patch-src::Movable.C @@ -0,0 +1,71 @@ +--- src/Movable.C Tue May 11 12:15:20 1999 ++++ src/Movable.C Sat Oct 26 00:40:14 2002 +@@ -51,7 +51,7 @@ + void Movable::read_description(Trame& t) + { + if (t.get_char() != NEW_MOVABLE) { +- cerr << "Movable::read_description(): ohhh le bordel!\n"; ++ std::cerr << "Movable::read_description(): ohhh le bordel!\n"; + exit(1); + } + +@@ -91,19 +91,19 @@ + // for debug purposes + void Movable::display() + { +- cout << " ID:"<< id; ++ std::cout << " ID:"<< id; + printf(" %04x", classtype); +- cout <<" Movable " << pos.x << "x" << pos.y << " sp=" << speed ++ std::cout <<" Movable " << pos.x << "x" << pos.y << " sp=" << speed + << " dir=" << direction << " len=" << length + << " full=" << full_length << " pid=" << player_id + << " paused=" << paused << " q=[ " ; + + Pix pix = queue.first(); + for (int i = length - 1; i > 0; i--) { +- cout << queue(pix) << " "; ++ std::cout << queue(pix) << " "; + queue.next(pix); + } +- cout << "]" << endl; ++ std::cout << "]" << std::endl; + } + + +@@ -282,7 +282,7 @@ + && !update_pos(p = pos, D_RIGHT)) + newdir = D_RIGHT; + // else +-// cout << "Movable::auto_dir(): couldn't find a way to go!" << endl; ++// std::cout << "Movable::auto_dir(): couldn't find a way to go!" << std::endl; + + if (direction != newdir) { + direction = newdir; +@@ -401,7 +401,7 @@ + _Position pos2 = pos; + + if (length == 1) { +- cerr << "getcut too short" << endl; ++ std::cerr << "getcut too short" << std::endl; + return; + } + +@@ -415,7 +415,7 @@ + + // should never happen. (should be an assertion) + if (!p) { +- cerr << "Movable::cut(): reached end of queue!" << endl; ++ std::cerr << "Movable::cut(): reached end of queue!" << std::endl; + return; + } + +@@ -447,7 +447,7 @@ + //evidemment ca bug! world.add_object(worm); + } + //else +- // cerr << "petard de pas de p" << endl; ++ // std::cerr << "petard de pas de p" << std::endl; + } + + |