diff options
author | Max Horn | 2004-10-16 22:28:29 +0000 |
---|---|---|
committer | Max Horn | 2004-10-16 22:28:29 +0000 |
commit | b41902f4079793236a20ebc380481fd598401c1d (patch) | |
tree | a880c59aa57fbbeda66b0f455b0e9023058c02ed /kyra/kyra.h | |
parent | f0a7f8f0fbe1869b8ada4df161c8e4fb38ff8699 (diff) | |
download | scummvm-rg350-b41902f4079793236a20ebc380481fd598401c1d.tar.gz scummvm-rg350-b41902f4079793236a20ebc380481fd598401c1d.tar.bz2 scummvm-rg350-b41902f4079793236a20ebc380481fd598401c1d.zip |
Fix whitespace / code formatting to match out guidelines
svn-id: r15576
Diffstat (limited to 'kyra/kyra.h')
-rw-r--r-- | kyra/kyra.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kyra/kyra.h b/kyra/kyra.h index 14a5c7855e..2a6b5b1556 100644 --- a/kyra/kyra.h +++ b/kyra/kyra.h @@ -8,7 +8,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * You should have received a copy of the GNU General Public License @@ -48,23 +48,23 @@ public: void errorString( const char *buf_input, char *buf_output); void updateScreen(void); - void setCurrentPalette(Palette* pal, bool delNextTime = true); + void setCurrentPalette(Palette* pal, bool delNextTime = true); - Resourcemanager* resManager(void) { return _resMgr; } -// MidiDriver* midiDriver(void) { return _midiDriver; } + Resourcemanager* resManager(void) { return _resMgr; } +// MidiDriver* midiDriver(void) { return _midiDriver; } protected: void go(); void shutdown(); - Resourcemanager* _resMgr; + Resourcemanager* _resMgr; uint8 *_screen; - Font* _font; - CPSImage* _mouse; - CPSImage* _items; + Font* _font; + CPSImage* _mouse; + CPSImage* _items; - VMContext* _currentScript; // our current script - VMContext* _npcScript; // script from NPCs + VMContext* _currentScript; // our current script + VMContext* _npcScript; // script from NPCs }; } // End of namespace Kyra |