From 8a595e7771aa89d06876e13d7ab6751e26da8982 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Fri, 29 Jan 2016 13:13:40 +0100 Subject: AGI: graphics rewrite + cleanup - graphics code fully rewritten - Apple IIgs font support - Amiga Topaz support - Word parser rewritten - menu code rewritten - removed forced 2 second delay on all room changes replaced with heuristic to detect situations, where it's required - lots of naming cleanup - new console commands show_map, screenobj, vmvars and vmflags - all sorts of hacks/workarounds removed - added SCI wait mouse cursor - added Apple IIgs mouse cursor - added Atari ST mouse cursor - added Amiga/Apple IIgs transition - added Atari ST transition - user can select another render mode and use Apple IIgs palette + transition for PC versions - inventory screen rewritten - SetSimple command now properly implemented - PreAGI Mickey: Sierra logo now shown - saved games: now saving controller key mapping also saving automatic save data (SetSimple command) - fixed invalid memory access when saving games (31 bytes were saved using Common::String c_ptr() Special Thanks to: - fuzzie for helping out with the Apple IIgs font + valgrind - eriktorbjorn for helping out with valgrind - LordHoto for figuring out the code, that caused invalid memory access in the original code, when saving a game - sev for help out with reversing the Amiga transition currently missing: - mouse support for menu - mouse support for system dialogs - predictive dialog support --- engines/agi/words.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 engines/agi/words.h (limited to 'engines/agi/words.h') diff --git a/engines/agi/words.h b/engines/agi/words.h new file mode 100644 index 0000000000..c7bf4829c3 --- /dev/null +++ b/engines/agi/words.h @@ -0,0 +1,69 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef AGI_WORDS_H +#define AGI_WORDS_H + +namespace Agi { + +#define DICTIONARY_RESULT_UNKNOWN -1 +#define DICTIONARY_RESULT_IGNORE 0 + +struct WordEntry { + uint16 id; + Common::String word; +}; + +class Words { +public: + Words(AgiEngine *vm); + ~Words(); + +private: + AgiEngine *_vm; + + // Dictionary + Common::Array _dictionaryWords[26]; + + WordEntry _egoWords[MAX_WORDS]; + uint16 _egoWordCount; + +public: + uint16 getEgoWordCount(); + const char *getEgoWord(int16 wordNr); + uint16 getEgoWordId(int16 wordNr); + + int loadDictionary_v1(Common::File &f); + int loadDictionary(const char *fname); + void unloadDictionary(); + + void clearEgoWords(); + void parseUsingDictionary(char *rawUserInput); + +private: + void cleanUpInput(const char *userInput, Common::String &cleanInput); + int16 findWordInDictionary(const Common::String &userInput, uint16 userInputLen, uint16 userInputPos, uint16 &foundWordLen); +}; + +} // End of namespace Agi + +#endif /* AGI_WORDS_H */ -- cgit v1.2.3