diff options
| author | Max Horn | 2003-10-03 18:33:57 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-03 18:33:57 +0000 |
| commit | d7660a2662be298dad3cf9b320137dac8744d456 (patch) | |
| tree | c80ddb2c4fb1917660db0010bb0b3d6ed8d57b24 /scumm/dialogs.cpp | |
| parent | eabeb62e20a8ed2117e19ca3bf04bb1d33637b79 (diff) | |
| download | scummvm-rg350-d7660a2662be298dad3cf9b320137dac8744d456.tar.gz scummvm-rg350-d7660a2662be298dad3cf9b320137dac8744d456.tar.bz2 scummvm-rg350-d7660a2662be298dad3cf9b320137dac8744d456.zip | |
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
svn-id: r10571
Diffstat (limited to 'scumm/dialogs.cpp')
| -rw-r--r-- | scumm/dialogs.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index 8f022b2526..51ee68aadb 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -19,17 +19,17 @@ */ #include "stdafx.h" -#include "dialogs.h" -#include "sound.h" -#include "scumm.h" -#include "imuse.h" -#include "player_v2.h" -#include "verbs.h" +#include "scumm/dialogs.h" +#include "scumm/sound.h" +#include "scumm/scumm.h" +#include "scumm/imuse.h" +#include "scumm/player_v2.h" +#include "scumm/verbs.h" #include "sound/mididrv.h" #include "sound/mixer.h" #ifndef DISABLE_HELP -#include "help.h" +#include "scumm/help.h" #endif #include "gui/newgui.h" @@ -44,6 +44,8 @@ extern void save_key_mapping(); extern void load_key_mapping(); #endif +namespace Scumm { + struct ResString { int num; char string[80]; @@ -803,3 +805,5 @@ _GRELEASEPTR(GBVARS_STRINGMAPTABLEV5_INDEX, GBVARS_SCUMM) _GEND #endif + +} // End of namespace Scumm |