aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2009-12-11 17:14:55 +0000
committerTorbjörn Andersson2009-12-11 17:14:55 +0000
commit22ca0c1e9249d68099db1135abe63a76b11394b8 (patch)
tree8cae366fbdde3c49e6b3aad7d29a4f923a941b03
parent724d698a05bfda015e428ffa3ac4094ecbc1b4c0 (diff)
downloadscummvm-rg350-22ca0c1e9249d68099db1135abe63a76b11394b8.tar.gz
scummvm-rg350-22ca0c1e9249d68099db1135abe63a76b11394b8.tar.bz2
scummvm-rg350-22ca0c1e9249d68099db1135abe63a76b11394b8.zip
Renamed line() to drawLine() to silence warning about function parameters in
dialogs.cpp shadowing it. Actually, the function doesn't seem to be used anywhere at the moment, but perhaps someone has future plans for it? svn-id: r46331
-rw-r--r--engines/m4/graphics.cpp2
-rw-r--r--engines/m4/graphics.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/m4/graphics.cpp b/engines/m4/graphics.cpp
index b3c1a8cf04..5a6f598731 100644
--- a/engines/m4/graphics.cpp
+++ b/engines/m4/graphics.cpp
@@ -155,7 +155,7 @@ void M4Surface::hLineXor(int x1, int x2, int y) {
}
-void M4Surface::line(int x1, int y1, int x2, int y2, byte color) {
+void M4Surface::drawLine(int x1, int y1, int x2, int y2, byte color) {
Graphics::Surface::drawLine(x1, y1, x2, y2, color);
}
diff --git a/engines/m4/graphics.h b/engines/m4/graphics.h
index ca33f6150b..a6c5973a18 100644
--- a/engines/m4/graphics.h
+++ b/engines/m4/graphics.h
@@ -118,7 +118,7 @@ public:
void hLine(int x1, int x2, int y);
void vLineXor(int x, int y1, int y2);
void hLineXor(int x1, int x2, int y);
- void line(int x1, int y1, int x2, int y2, byte color);
+ void drawLine(int x1, int y1, int x2, int y2, byte color);
void frameRect(int x1, int y1, int x2, int y2);
void fillRect(int x1, int y1, int x2, int y2);