[Scummvm-cvs-logs] scummvm master -> dd0ad3cba4534cb9b36dc0b6c8b412a0f1b10cf2
lordhoto
lordhoto at gmail.com
Thu Aug 18 23:23:05 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5491d9306f COMMON: Slight formatting fix.
dd0ad3cba4 SDL: Fix typo.
Commit: 5491d9306f12c91bf18b5a8b7c3a5f1ddacbcd4a
https://github.com/scummvm/scummvm/commit/5491d9306f12c91bf18b5a8b7c3a5f1ddacbcd4a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-18T14:15:38-07:00
Commit Message:
COMMON: Slight formatting fix.
Changed paths:
common/keyboard.h
diff --git a/common/keyboard.h b/common/keyboard.h
index 74b8775..bdd0a2d 100644
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -291,7 +291,7 @@ struct KeyState {
return f == (flags & ~(KBD_NUM|KBD_CAPS|KBD_SCRL));
}
- bool operator ==(const KeyState &x) const {
+ bool operator==(const KeyState &x) const {
return keycode == x.keycode && ascii == x.ascii && flags == x.flags;
}
};
Commit: dd0ad3cba4534cb9b36dc0b6c8b412a0f1b10cf2
https://github.com/scummvm/scummvm/commit/dd0ad3cba4534cb9b36dc0b6c8b412a0f1b10cf2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-18T14:18:20-07:00
Commit Message:
SDL: Fix typo.
Changed paths:
backends/graphics/sdl/sdl-graphics.h
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index b42eafd..ea9149f 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -32,7 +32,7 @@ class SdlEventSource;
*
* It features a few extra a few extra features required by SdlEventSource.
* FIXME/HACK:
- * Note it does not inherit from GraphicsManager to avoid a diamon inheritance
+ * Note it does not inherit from GraphicsManager to avoid a diamond inheritance
* in the current OpenGLSdlGraphicsManager.
*/
class SdlGraphicsManager {
More information about the Scummvm-git-logs
mailing list