diff options
| author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
| commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
| tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /engines/agi | |
| parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
| parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
| download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip | |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'engines/agi')
| -rw-r--r-- | engines/agi/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/agi/preagi_mickey.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index f526c51a27..cd6942f9c0 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -2148,7 +2148,7 @@ bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common: } const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const FSList *fslist) const { - typedef Common::HashMap<Common::String, int32, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> IntMap; + typedef Common::HashMap<Common::String, int32> IntMap; IntMap allFiles; bool matchedUsingFilenames = false; bool matchedUsingWag = false; diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 6944eee9f2..08f8969ca3 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -238,7 +238,7 @@ bool Mickey::checkMenu() { memcpy(buffer, &menu, sizeof(MSA_MENU)); getMenuSel(buffer, &iSel0, &iSel1); - delete [] buffer; + delete[] buffer; return parse(menu.cmd[iSel0].data[iSel1], menu.arg[iSel0].data[iSel1]); } @@ -645,7 +645,7 @@ void Mickey::playSound(ENUM_MSA_SOUND iSound) { case Common::EVENT_LBUTTONUP: case Common::EVENT_RBUTTONUP: case Common::EVENT_KEYDOWN: - delete [] buffer; + delete[] buffer; return; default: break; @@ -657,7 +657,7 @@ void Mickey::playSound(ENUM_MSA_SOUND iSound) { break; } - delete [] buffer; + delete[] buffer; } // Graphics @@ -893,7 +893,7 @@ void Mickey::drawLogo() { _vm->_picture->showPic(10, 10, w, h); - delete [] buffer; + delete[] buffer; } void Mickey::animate() { |