Filippos Karapetis
93f33c7dab
Resolved a FIXME with getSciLanguage(), by creating a separate setter. Also, some camelCase changes
...
svn-id: r49568
2010-06-10 11:18:10 +00:00
Filippos Karapetis
eb4ec596cd
Use the SELECTOR() macro for readability
...
svn-id: r49563
2010-06-10 09:18:57 +00:00
Filippos Karapetis
0ab7c908bb
Removed the pointer to the game object from the EngineState class
...
svn-id: r49562
2010-06-10 08:11:38 +00:00
Filippos Karapetis
536b2614e8
Globals from script 0 are now initialized in script_init_engine(), and are accessed from the relevant variables pointer. Removed direct reference to script 0 from the engine state
...
svn-id: r49536
2010-06-09 09:17:48 +00:00
Filippos Karapetis
5cb311ee2c
Renamed the SciEvent class to EventManager, to separate it from the sciEvent structure, and removed it from the engine state
...
svn-id: r49534
2010-06-09 07:59:42 +00:00
Filippos Karapetis
10aeb33a42
Merged restAdjust and restAdjustCur, as we don't save the restAdjust modifier inside saved games (rightfully so). Also, the segment manager is now reset inside the main loop, when the game is restarted, not in game_exit()
...
svn-id: r49533
2010-06-09 07:32:17 +00:00
Filippos Karapetis
eafc63e572
Cleanup
...
svn-id: r49521
2010-06-08 21:21:19 +00:00
Filippos Karapetis
9304b5fbeb
Merged the restarting_flags, script_abort_flag, and restoring members of the EngineState class into one variable, abortScriptProcessing. The flag kept to signify a game restart has been placed in a boolean, gameWasRestarted
...
svn-id: r49518
2010-06-08 21:05:46 +00:00
Filippos Karapetis
3c82b6578f
Now that EngineState is not deleted when loading games, we can move some more state-related variables to it, and remove several FIXME's about non-const global variables. Also, the entries in the data stack are now deleted when loading (fixes a memory leak - thanks to digitall for this).
...
svn-id: r49465
2010-06-06 23:00:33 +00:00
Filippos Karapetis
65f3cfcbd8
Stop reconstructing the engine state when restoring, but reset it instead
...
svn-id: r49376
2010-06-01 15:48:17 +00:00
Filippos Karapetis
9c92bd1b81
The parser vocabulary remains static throughout the game, thus it has been removed from the engine state
...
svn-id: r49373
2010-06-01 15:11:20 +00:00
Filippos Karapetis
e083c20da1
The system strings segment is a fixed segment of the segment manager, which doesn't change during the game, thus move all the system strings code and variables inside the segment manager
...
svn-id: r49372
2010-06-01 14:41:48 +00:00
Filippos Karapetis
67de5b1bd3
Mass renaming of selector-related functions, and removed some defines which were just cloaking functions with a different name
...
- GET_SEL32 -> readSelector
- GET_SEL32V -> readSelectorValue
- PUT_SEL32 -> writeSelector
- PUT_SEL32V -> writeSelectorValue
Also, changed some selector-related function names and variables to CamelCase
svn-id: r49317
2010-05-29 23:37:15 +00:00
Filippos Karapetis
9be4f6250c
Made shrink_execution_stack() a member of EngineState
...
svn-id: r49159
2010-05-23 16:44:36 +00:00
Filippos Karapetis
852cb16c49
Moved the breakpoint information inside the DebugState struct
...
svn-id: r49092
2010-05-19 07:25:06 +00:00
Walter van Niftrik
fa846bfebc
SCI: For Japanese system-font strings, convert half-width characters to
...
full-width characters.
svn-id: r48707
2010-04-19 00:13:01 +00:00
Walter van Niftrik
c0c351c766
SCI: Don't add subtitles for monolingual strings.
...
svn-id: r48697
2010-04-18 00:56:04 +00:00
Martin Kiewitz
01852cbf93
SCI: dont switch to english on kanji text, also cut off text w/o spaces inside GetLongest() so that kanji raw chars will appear in windows
...
svn-id: r48673
2010-04-16 13:27:30 +00:00
Max Horn
2e68de1e5a
SCI: Turn kernel_sleep() into SciEvent::sleep()
...
svn-id: r48119
2010-02-23 22:47:53 +00:00
Max Horn
02201e937a
SCI: Move SciGui::wait to EngineState::wait
...
svn-id: r48118
2010-02-23 22:44:46 +00:00
Filippos Karapetis
07e405588d
Moved the reference to AudioPlayer inside SciEngine (as it doesn't have a state, per se, and is static)
...
svn-id: r48059
2010-02-14 12:23:22 +00:00
Max Horn
b9a11ddb0b
SCI: Move language related code from EngineState to SciEngine
...
svn-id: r48052
2010-02-13 17:46:44 +00:00
Max Horn
e45f0f309a
SCI: Remove EngineState::_kernel, use SciEngine::_kernel instead
...
svn-id: r48050
2010-02-13 17:45:40 +00:00
Max Horn
9575cc08a2
SCI: Move GameFeatures from EngineState to SciEngine
...
svn-id: r48049
2010-02-13 17:44:58 +00:00
Max Horn
a82939c9be
SCI: Get rid of EngineState::resMan
...
svn-id: r48048
2010-02-13 17:44:19 +00:00
Max Horn
721a57a661
SCI: Move Gui/Gfx related permanent objects from EngineState to SciEngine
...
svn-id: r48047
2010-02-13 17:43:31 +00:00
Max Horn
f86618f92b
SCI: Add a 'SELECTOR' macro
...
svn-id: r47918
2010-02-05 22:55:18 +00:00
Filippos Karapetis
2fb37063a4
Placed all the game feature detection code in a separate class
...
svn-id: r47850
2010-02-03 11:02:43 +00:00
Max Horn
bb5e34a014
SCI: Get rid of EngineState::stack_segment
...
svn-id: r47833
2010-02-03 01:32:59 +00:00
Max Horn
4b19acf255
SCI: Use Common::List and Common::String to simplify breakpoint handling (untested)
...
svn-id: r47824
2010-02-02 22:52:41 +00:00
Martin Kiewitz
097b45db21
SCI: fix getLanguage - fixes gk1 german (day number blood writing at the start), thx to waltervn
...
svn-id: r47795
2010-02-01 13:27:20 +00:00
Matthew Hoops
12d983eaf4
Make EngineState::getLanguage() check from the resource manager as to what language it has loaded before checking from what ScummVM has set and make kDoAudio use EngineState::getLanguage()
...
svn-id: r47782
2010-01-31 22:14:35 +00:00
Walter van Niftrik
a92bb6193b
SCI: Implement kMemorySegment().
...
svn-id: r47776
2010-01-31 19:47:54 +00:00
Max Horn
4ffec28103
SCI: Move selector stuff to new header; reorder k_argc & k_argp param of invoke_selector
...
svn-id: r47665
2010-01-29 11:03:54 +00:00
Matthew Hoops
d883b6215f
Detect whether to use the modified SCI2 or SCI2.1 kernel table based on the kDoSound call used in Sound::play(), which fixes at least my version of KQ7 - probably others. The kernel table initialization now occurs after the script signatures are adjusted as we need it adjusted before checking through Sound::play for the kDoSound call.
...
svn-id: r47645
2010-01-28 18:57:31 +00:00
Filippos Karapetis
75ae56b0d4
Improved kSetCursor() semantics detection
...
svn-id: r47624
2010-01-28 02:15:15 +00:00
Filippos Karapetis
dfafec6486
Fixed kSetCursor semantics detection for KQ5 Amiga, by making a hack for KQ5 CD specific to that version only
...
svn-id: r47557
2010-01-25 17:30:59 +00:00
Johannes Schickel
aed02365ec
Strip trailing spaces/tabs.
...
svn-id: r47541
2010-01-25 01:39:44 +00:00
Filippos Karapetis
722233fd0d
- Moved all of the parser-related variables inside the Vocabulary class
...
- Moved the kSetSynonyms() function inside kscripts (as it's for script synonyms, not parser word synonyms)
- The parser vocabulary is now only initialized for SCI0 and SCI01 games, which had a parser
svn-id: r47483
2010-01-23 19:10:56 +00:00
Filippos Karapetis
f007435b82
sfx_init_flags is not used in the new sound code
...
svn-id: r47464
2010-01-23 12:10:31 +00:00
Martin Kiewitz
3e44180e47
SCI: speed throttler changed, now gets triggered by kAnimate, removed initial no-delay, i'm still getting animation now in iceman and sq3, slow palette animation in longbow fixed
...
svn-id: r47343
2010-01-17 18:41:28 +00:00
Filippos Karapetis
a637f50862
Silenced warnings ("this" isn't defined on object instantiation, and commented out some unused variables)
...
svn-id: r47237
2010-01-10 21:13:38 +00:00
Matthew Hoops
e87cc86665
Fix walking in SCI32. Gabriel now will walk and DrMcCoy can now hear his precious 'Gabriel is a lout' line :P
...
svn-id: r47011
2010-01-05 01:51:09 +00:00
Filippos Karapetis
f66d5a7f53
SCI: Removed the old graphics code
...
svn-id: r47005
2010-01-05 00:54:53 +00:00
Filippos Karapetis
c0aad0508c
Renamed SCI_VERSION_AUTODETECT to SCI_VERSION_NONE to signify its actual purpose
...
svn-id: r46959
2010-01-03 22:50:39 +00:00
Filippos Karapetis
2f23eb99ee
The "room" command can now set the current room number, too (more straightforward than changing global var 13)
...
svn-id: r46925
2010-01-03 15:08:26 +00:00
Filippos Karapetis
21c6bbc588
Fixed graphics functions detection in an old version of SQ3 - my initial thought to rely on the presence of the shiftParser selector was wrong
...
svn-id: r46580
2009-12-26 13:35:17 +00:00
Filippos Karapetis
113c0941ae
- Introduced a new version in the sound version detection routine, as SCI0 early games had different sound than SCI0 late ones
...
- Changed sound-related debug output from printf's into debugC calls
svn-id: r46560
2009-12-25 18:15:16 +00:00
Max Horn
5df86e4ccc
SCI: Paranoia tweak for EngineState::autoDetectFeature
...
svn-id: r46306
2009-12-09 12:32:47 +00:00
Filippos Karapetis
09f7df09e6
Added a sanity check to the setCursor detection
...
svn-id: r46087
2009-11-22 15:22:23 +00:00