diff options
| -rw-r--r-- | backends/PalmOS/Src/palm.h | 2 | ||||
| -rw-r--r-- | backends/dc/dc.h | 2 | ||||
| -rw-r--r-- | backends/fs/fs.h | 9 | ||||
| -rw-r--r-- | backends/gp32/gp32.h | 2 | ||||
| -rw-r--r-- | backends/morphos/morphos.cpp | 2 | ||||
| -rw-r--r-- | backends/morphos/morphos.h | 2 | ||||
| -rw-r--r-- | backends/null/null.cpp | 2 | ||||
| -rw-r--r-- | backends/sdl/sdl-common.h | 2 | ||||
| -rw-r--r-- | backends/x11/x11.cpp | 2 |
9 files changed, 9 insertions, 16 deletions
diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h index 5c203ddfcf..8b93aa1b46 100644 --- a/backends/PalmOS/Src/palm.h +++ b/backends/PalmOS/Src/palm.h @@ -76,7 +76,7 @@ public: // Set the bitmap that's used when drawing the cursor. - void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255); + void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor); // Shaking is used in SCUMM. Set current shake position. void set_shake_pos(int shake_pos); diff --git a/backends/dc/dc.h b/backends/dc/dc.h index 286cb99bb3..490a97ffea 100644 --- a/backends/dc/dc.h +++ b/backends/dc/dc.h @@ -85,7 +85,7 @@ class OSystem_Dreamcast : public OSystem { void warpMouse(int x, int y); // Set the bitmap that's used when drawing the cursor. - void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255); + void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor); // Shaking is used in SCUMM. Set current shake position. void set_shake_pos(int shake_pos); diff --git a/backends/fs/fs.h b/backends/fs/fs.h index ba9cb6dd4c..15bd05c78f 100644 --- a/backends/fs/fs.h +++ b/backends/fs/fs.h @@ -44,7 +44,7 @@ * * Secondly, with this abstraction layer, we still avoid a lot of complications based on * differences in FS roots, different path separators, or even systems with no real - * paths (Mac OS 9, which doesn't even have the notion of a "current director"). + * paths (MacOS 9 doesn't even have the notion of a "current directory"). * And if we ever want to support devices with no FS in the classical sense (Palm...), * we can build upon this. */ @@ -180,13 +180,6 @@ public: _size++; } - const FilesystemNode& operator [](int idx) const { - assert(idx >= 0 && idx < _size); - return *_data[idx]; - } - - int size() const { return _size; } - const_iterator begin() const { return const_iterator(_data); } diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h index af5834e0f0..80b3160673 100644 --- a/backends/gp32/gp32.h +++ b/backends/gp32/gp32.h @@ -62,7 +62,7 @@ public: void set_mouse_pos(int x, int y); // Set the bitmap that's used when drawing the cursor. - void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, int keycolor = 255); + void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor); // Shaking is used in SCUMM. Set current shake position. void set_shake_pos(int shake_pos); diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp index d7f3f9e345..aea11d251b 100644 --- a/backends/morphos/morphos.cpp +++ b/backends/morphos/morphos.cpp @@ -1424,7 +1424,7 @@ void OSystem_MorphOS::set_mouse_pos(int x, int y) } } -void OSystem_MorphOS::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255) +void OSystem_MorphOS::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor) { MouseWidth = w; MouseHeight = h; diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h index 5b14f5bfa8..7294f855ca 100644 --- a/backends/morphos/morphos.h +++ b/backends/morphos/morphos.h @@ -64,7 +64,7 @@ class OSystem_MorphOS : public OSystem virtual void set_mouse_pos(int x, int y); // Set the bitmap that's used when drawing the cursor. - virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255); + virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor); // Shaking is used in SCUMM. Set current shake position. virtual void set_shake_pos(int shake_pos); diff --git a/backends/null/null.cpp b/backends/null/null.cpp index 6fed878e9c..fa5b634868 100644 --- a/backends/null/null.cpp +++ b/backends/null/null.cpp @@ -36,7 +36,7 @@ public: void updateScreen() {} bool showMouse(bool visible) { return false; } void set_mouse_pos(int x, int y) {} - void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255) {} + void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor) {} void set_shake_pos(int shake_pos) {} uint32 get_msecs(); void delay_msecs(uint msecs); diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h index 276f021b9b..2f7b219779 100644 --- a/backends/sdl/sdl-common.h +++ b/backends/sdl/sdl-common.h @@ -64,7 +64,7 @@ public: void warpMouse(int x, int y); // Set the bitmap that's used when drawing the cursor. - void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255); + void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor); // Shaking is used in SCUMM. Set current shake position. void set_shake_pos(int shake_pos); diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp index af8695d685..3f8d2ddb8f 100644 --- a/backends/x11/x11.cpp +++ b/backends/x11/x11.cpp @@ -107,7 +107,7 @@ public: void warpMouse(int x, int y); // Set the bitmap that's used when drawing the cursor. - void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor = 255); + void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor); // Shaking is used in SCUMM. Set current shake position. void set_shake_pos(int shake_pos); |