aboutsummaryrefslogtreecommitdiff
path: root/sword2/driver
diff options
context:
space:
mode:
Diffstat (limited to 'sword2/driver')
-rw-r--r--sword2/driver/animation.h2
-rw-r--r--sword2/driver/d_sound.cpp2
-rw-r--r--sword2/driver/menu.cpp6
-rw-r--r--sword2/driver/render.cpp2
-rw-r--r--sword2/driver/sprite.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h
index 5958d03692..99138ffd79 100644
--- a/sword2/driver/animation.h
+++ b/sword2/driver/animation.h
@@ -69,7 +69,7 @@ struct MovieInfo {
uint frames;
bool seamless;
};
-
+
class MoviePlayer {
private:
Sword2Engine *_vm;
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index d936a43941..f24646a9af 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -247,7 +247,7 @@ MusicInputStream::MusicInputStream(int cd, SoundFileHandle *fh, uint32 musicId,
_bufferEnd = _buffer + BUFFER_SIZE;
_remove = false;
_fading = 0;
-
+
_decoder = getAudioStream(_fh, "music", _cd, _musicId, &_numSamples);
if (_decoder) {
_samplesLeft = _numSamples;
diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp
index 065b2cf99b..e344d70fd5 100644
--- a/sword2/driver/menu.cpp
+++ b/sword2/driver/menu.cpp
@@ -142,7 +142,7 @@ void Mouse::processMenu() {
// each frame we need to clear the icon area.
clearIconArea(menu, i, &r1);
-
+
if (_pocketStatus[menu][i] == MAXMENUANIMS) {
xoff = (RDMENU_ICONWIDE / 2);
r2.left = curx - xoff;
@@ -183,7 +183,7 @@ void Mouse::processMenu() {
}
/**
- * This function brings a specified menu into view.
+ * This function brings a specified menu into view.
* @param menu RDMENU_TOP or RDMENU_BOTTOM, depending on which menu to show
* @return RD_OK, or an error code
*/
@@ -261,7 +261,7 @@ int32 Mouse::setMenuIcon(uint8 menu, uint8 pocket, byte *icon) {
// Check for invalid menu parameter.
if (menu > RDMENU_BOTTOM)
return RDERR_INVALIDMENU;
-
+
// Check for invalid pocket parameter
if (pocket >= RDMENU_MAXPOCKETS)
return RDERR_INVALIDPOCKET;
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index 1b41f58f13..94b8fa305f 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -328,7 +328,7 @@ void Screen::startRenderCycle() {
/**
* This function should be called at the end of the render cycle.
- * @return true if the render cycle is to be terminated,
+ * @return true if the render cycle is to be terminated,
* or false if it should continue
*/
diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index a52faef3b9..8a0b3407f7 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -196,7 +196,7 @@ int32 Screen::decompressRLE16(byte *dst, byte *src, int32 decompSize, byte *colT
src++;
// if we've decompressed all of the data
- if (dst == endDest) {
+ if (dst == endDest) {
rv = 0; // return "OK"
break;
}