Commit Graph

333 Commits

Author SHA1 Message Date
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
Martin Kiewitz
f7692e724f SCI: some progress on REing robot files (99% comments only)
svn-id: r47647
2010-01-28 19:28:56 +00:00
Filippos Karapetis
858eb1a283 Don't attempt to pause/resume sounds when the debug console opens if the sound subsystem hasn't been initialized yet
svn-id: r47639
2010-01-28 10:31:37 +00:00
Filippos Karapetis
1e6123ce89 Improved the diskdump command so that it also writes the resource header, if it exists (e.g. in SOL audio files)
svn-id: r47630
2010-01-28 08:17:46 +00:00
Filippos Karapetis
da7d221d40 Introduced a new console command, diskdump, which is able to dump files from resource files to disk
svn-id: r47623
2010-01-28 01:45:20 +00:00
Martin Kiewitz
00413a0b04 SCI: also change exit to quit in help
svn-id: r47608
2010-01-27 20:06:07 +00:00
Martin Kiewitz
f376572ed8 SCI: renamed exit console command to quit, so that systemwide "exit" works (exits console instead of quitting game)
svn-id: r47607
2010-01-27 20:03:45 +00:00
Martin Kiewitz
e0d05a482c SCI: changed flags (uint16) to force (bool) for set/merge palette methods
svn-id: r47578
2010-01-26 22:45:52 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Filippos Karapetis
bab94d58ba Added missing documentation for the new music related commands introduced in rev. 47475
svn-id: r47497
2010-01-24 11:54:55 +00:00
Filippos Karapetis
df149e1509 Separated the parser code
svn-id: r47480
2010-01-23 17:55:54 +00:00
Filippos Karapetis
d6e0276119 Added song manipulation debug commands: songinfo, startsound, togglesound and stopallsounds. is_sample now works with the new sound code
svn-id: r47475
2010-01-23 14:39:03 +00:00
Filippos Karapetis
93a8b469c0 - Fixed pausing of all sounds in the playlist
- Sounds are now paused correctly when opening/closing the debug console
- Some cleanup

svn-id: r47422
2010-01-21 21:28:32 +00:00
Walter van Niftrik
208dbf1d9a SCI: Renamed softseq/ to drivers/
svn-id: r47418
2010-01-21 16:27:29 +00:00
Max Horn
8559f0c3eb SCI: Use prefix increment instead of postfix on iterators (more efficient); also correct code formatting issues
svn-id: r47295
2010-01-13 23:58:25 +00:00
Martin Kiewitz
a815d0e12a SCI: added new debug command "picture_visualize", which enables visualization of the drawing process of EGA pictures
svn-id: r47201
2010-01-09 14:09:45 +00:00
Eugene Sandulenko
413b4291b4 Fix warnings.
svn-id: r47101
2010-01-06 22:24:52 +00:00
Martin Kiewitz
1bea3e3873 SCI: added a new class for robot resources
svn-id: r47099
2010-01-06 21:56:31 +00:00
Martin Kiewitz
d183420c86 SCI: implemented debug command "set_palette"
svn-id: r47047
2010-01-05 21:25:59 +00:00
Martin Kiewitz
be9507fcb1 SCI: implemented new debug command "draw_cel"
svn-id: r47043
2010-01-05 21:03:33 +00:00
Martin Kiewitz
d183fb3c81 SCI: fix debug command draw_pic to accept higher resourceIds
svn-id: r47039
2010-01-05 20:39:21 +00:00
Filippos Karapetis
d99aa0f126 More renaming
svn-id: r47009
2010-01-05 01:37:57 +00:00
Filippos Karapetis
84cd8d2dc7 Renamed /gui to /graphics and /sfx to /sound, to better illustrate their purpose
svn-id: r47007
2010-01-05 01:22:16 +00:00
Filippos Karapetis
f66d5a7f53 SCI: Removed the old graphics code
svn-id: r47005
2010-01-05 00:54:53 +00:00
Filippos Karapetis
eeb3502fa4 Made the "version" command more verbose, listing all the automatically detected game features, along with the detected SCI version
svn-id: r46943
2010-01-03 20:18:36 +00:00
Filippos Karapetis
6a25bd2b8a The backtrace command now outputs to the graphical console
svn-id: r46934
2010-01-03 16:50:27 +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
Martin Kiewitz
1084b90fbb SCI: listsaves is now "list_saves", also included entry in help
svn-id: r46884
2010-01-02 14:11:38 +00:00
Martin Kiewitz
d4738631d5 SCI: implemented new console command "listsaves"
svn-id: r46883
2010-01-02 14:08:26 +00:00
Martin Kiewitz
0c9b828db1 SCI: console behaviour changed for vmvars command, now allows entering decimal values, also accepts hexadecimal values (use e.g. 12h). hexadecimal addresses are still accepted as well
svn-id: r46878
2010-01-02 09:39:17 +00:00
Filippos Karapetis
bcc33871c1 The wrapper for the VMD decoder is only used in the SCI engine for SCI32 games, so moved it inside the engine, instead of common code. Added support for VMD video playing from the "play_video" console command
svn-id: r46737
2009-12-30 10:09:48 +00:00
Filippos Karapetis
5cb5fe22ea SCI/new sound code:
- Made the SciMusic class private, and added wrapper functions for invoking specific methods of SciMusic from outside the SoundCommandParser class
- Many SCI games keep creating and destroying sound effects constantly (i.e. many times per second). Therefore, another scheme has been devised, which replaces the mutex that was in place. Whenever a sound command is run which operates on a specific object in the play list, we disallow onTimer() from kicking in. This isn't ideal, but it does stop random deadlocks because of locked mutexes without any noticeable side effects

svn-id: r46681
2009-12-28 20:10:15 +00:00
Filippos Karapetis
62c1c2633d SCI/new music code: Implemented the "songlib" debug command
svn-id: r46670
2009-12-28 11:23:20 +00:00
Martin Kiewitz
78d268b21a SCI/newgui: Added support for draw_pic command
svn-id: r46599
2009-12-26 18:07:36 +00:00
Max Horn
fd5e548bb2 SCI: Fix some warnings
svn-id: r46476
2009-12-22 00:16:09 +00:00
Filippos Karapetis
980b8bb899 Moved all of the sound iterator code in its own directory, and added a slight hack to the SoundCommandParser constructor
svn-id: r46430
2009-12-20 13:38:13 +00:00
Filippos Karapetis
0c1b646c7f - Started wrapping the current sound code around appropriate defines
- Introduced a new resource type, SoundResource, used in the new music code

svn-id: r46421
2009-12-19 16:19:53 +00:00
Filippos Karapetis
2e6013947d Moved the interface class for the the custom SCI MIDI drivers together with the actual driver implementation code
svn-id: r46414
2009-12-18 18:32:09 +00:00
Martin Kiewitz
a5f1808c83 SCI: SciEvent created, kernel_sleep() created
svn-id: r46252
2009-12-04 17:38:24 +00:00
Filippos Karapetis
f755311114 priority_first and priority_last are not used by the new drawing code, thus the new code didn't handle priority changes by kGraph()
svn-id: r45658
2009-11-04 11:52:11 +00:00
Filippos Karapetis
57266a7cba - Removed status_bar_foreground and status_bar_background variables from the engine state
- Implemented clearMenuBar() in the new graphics code
- Removed the "status_bar" command, which was used to set custom colors for the status bar

svn-id: r45538
2009-10-30 14:39:26 +00:00
Filippos Karapetis
ff284c9f5b Remove unused includes when INCLUDE_OLDGFX is not set. Implemented the full screen updates that the current menu code is doing using new graphics functions (still unfinished). Some cleanup.
svn-id: r45536
2009-10-30 12:33:05 +00:00
Filippos Karapetis
394fc76719 Rewrote kBaseSetter() to use new graphics functions and behave like the original, and fixed a bug in the process (the previous code ignored z when calculating the height)
svn-id: r45463
2009-10-28 14:23:23 +00:00
Filippos Karapetis
04ab6bc9fc Enclose all of the old graphics code within the INCLUDE_OLDGFX safeguard (defined in sci.h)
svn-id: r45459
2009-10-28 13:20:30 +00:00
Filippos Karapetis
b5feeb60b6 Moved the cel count calculation to the new graphics code
svn-id: r45379
2009-10-25 22:33:08 +00:00
Willem Jan Palenstijn
4a3ebce699 SCI: Restore accumulator after executing send from debugger
svn-id: r45360
2009-10-24 13:26:12 +00:00
Filippos Karapetis
1f4ad52c61 Moved the view loop counting code in the new GUI
svn-id: r45322
2009-10-22 05:41:50 +00:00
Max Horn
f3ab3051d8 SCI: Make the implicit segMan param to GET_SEL32(V) and PUT_SEL32(V) explicit
svn-id: r45234
2009-10-18 19:42:56 +00:00
Matthew Hoops
c8853f0cc0 Move the SeqDecoder to the Sci namespace, it makes more sense than Graphics because it's only used in Sci.
svn-id: r45230
2009-10-18 18:47:53 +00:00
Filippos Karapetis
cc31846eb5 Added a new console command, "play_video", which can play a SEQ or AVI file
svn-id: r45178
2009-10-17 10:42:00 +00:00
Willem Jan Palenstijn
4ce77c77fa SCI: Make send varselector reads more verbose. Add notes.
svn-id: r45131
2009-10-15 20:13:19 +00:00
Willem Jan Palenstijn
e3aa37dde0 SCI: Fix send debugger command
svn-id: r45128
2009-10-15 19:24:50 +00:00
Willem Jan Palenstijn
e6d3bb80b4 SCI: Improve cmdSend slightly. It's still broken, though
svn-id: r45097
2009-10-14 22:41:03 +00:00
Filippos Karapetis
4e0046dd1f Merged the rest of the cursor code
svn-id: r45029
2009-10-13 17:09:32 +00:00
Filippos Karapetis
5aa1415397 Merged the cursor manipulation code - cursor views are still not done
svn-id: r45028
2009-10-13 16:22:07 +00:00
Filippos Karapetis
1d3118cf42 Implemented some advanced savegame functionality - loading and deleting savegames from the GMM is now possible, and new saved games will also have thumbnails. Saving from the GMM creates corrupted saved games, so it has been disabled for now
svn-id: r44930
2009-10-11 15:51:43 +00:00
Filippos Karapetis
d6f5d93dbf Started rewriting the Object struct into a class
svn-id: r44878
2009-10-10 15:58:51 +00:00
Max Horn
0988e273ec SCI: Turn lookup_node & lookup_list into SegManager::lookupNode & SegManager::lookupList
svn-id: r44769
2009-10-07 23:34:24 +00:00
Max Horn
8498d769be SCI: Reduce header interdepencies once again. Rule of thumb: Never include a header file from another header file unless you absolutely *must* do it; if possible, try to use class forwards instead, and include the headers from source files only
svn-id: r44767
2009-10-07 23:04:13 +00:00
Martin Kiewitz
a61076a645 SCI: debug command undither implemented
svn-id: r44761
2009-10-07 21:47:34 +00:00
Filippos Karapetis
1562add631 - Cleaned up the cursor code
- Renamed gui -> _gui in EngineState, for consistency
- Added a reference to SciGuiCursor in EngineState, to be used by current code
- Renamed setCursorHide -> hideCursor, setCursorShow -> showCursor
- Moved the cursor zone limiting code inside SciGuiCursor. This code is currently not functioning, as we need to call refreshPosition() before each updateScreen() call to limit the cursor position.

svn-id: r44760
2009-10-07 21:29:47 +00:00
Martin Kiewitz
cb31d302b9 SCI/newgui: implemented debug command show_map
svn-id: r44735
2009-10-07 15:53:34 +00:00
Max Horn
6ad5840181 SCI: Rename EngineState::segMan to _segMan
svn-id: r44629
2009-10-04 18:38:18 +00:00
Max Horn
0da9ad5ff5 SCI: Add SegManager::findObjectByName() method, make parse_reg_t() local to console.cpp, and switch other code using it to use findObjectByName() instead.
svn-id: r44628
2009-10-04 18:36:58 +00:00
Willem Jan Palenstijn
f61bf4f97a SCI: Fix parse error in parse_reg_t
svn-id: r44578
2009-10-03 22:44:16 +00:00
Willem Jan Palenstijn
95959a88ef SCI: Fix typo
svn-id: r44561
2009-10-03 20:25:27 +00:00
Max Horn
bfec2debe6 SCI: Fix parse_reg_t, it no longer modified the const string passed to it
svn-id: r44545
2009-10-02 20:20:45 +00:00
Max Horn
908e13fa73 SCI: Remove PRINT_STK macro; cleanup
svn-id: r44533
2009-10-02 12:53:04 +00:00
Willem Jan Palenstijn
7d6848dfa3 SCI: Add some fixmes noted by salty-horse.
svn-id: r44513
2009-10-01 11:06:38 +00:00
Filippos Karapetis
7d40dde96f - Removed the toggle for "weak" validations, as there are cases where they fail (e.g. in Longbow), so there is no point in having strict validations
- Removed the invalid toggle from kernel signatures - we now never error out on invalid object references, but throw a warning instead
- Simplified determine_reg_type()

svn-id: r44511
2009-10-01 10:57:59 +00:00
Willem Jan Palenstijn
168257df24 SCI: Remove outdated debugging hack.
In the past, a negative selector value was used to identify a callk
stack frame. Currently a type of EXEC_STACK_TYPE_KERNEL already does that.

svn-id: r44510
2009-10-01 08:53:10 +00:00
Max Horn
27026f6565 SCI: Replace magic '-42' by an enum
svn-id: r44492
2009-09-30 16:00:44 +00:00
Filippos Karapetis
fd21bb2611 - Moved the list of synonyms and parser nodes inside the vocabulary class
- Added a convenience member inside the EngineState struct to access the instance of the Vocabulary class

svn-id: r44481
2009-09-30 12:17:38 +00:00
Filippos Karapetis
180b3f1247 Create a define for the special "signal" offset used throughout the engine, and fixed the arbitrary 0 values from commit #44294, set when some math functions do invalid calculations
svn-id: r44359
2009-09-25 16:15:57 +00:00
Max Horn
2fe6b32968 SCI: Remove EngineState::game_version, it was only used for saving anyway. Also remove syncCStr()
svn-id: r44358
2009-09-25 13:02:11 +00:00
Filippos Karapetis
13ad217cdd - Moved the SCI version in a global variable
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269
2009-09-23 10:55:35 +00:00
Max Horn
5f5ab54810 SCI: Add new type SegmentRef which ultimately will allow us to distinguish between raw and 'reg_t' memory blocks in client code
svn-id: r44244
2009-09-22 00:36:24 +00:00
Max Horn
5fc2428c99 SCI: SegmentObj's now set their type in constructor; replace central SegmentObj::createSegmentObj call in SegManager::allocSegment by several explicit 'new' statements; some extra cleanup
svn-id: r44242
2009-09-22 00:35:46 +00:00
Max Horn
d2a6713a8e SCI: Replace IntMapper Script::_objIndices and Common::Array Script::_objects by a HashMap -- goodbye, class IntMapper
svn-id: r44240
2009-09-21 21:38:43 +00:00
Max Horn
57dfb9bafd SCI: Rename Object::flags and pos to _flags and _pos; tweak scriptObjInit0 and scriptObjInit11 to be more similar
svn-id: r44234
2009-09-21 21:35:43 +00:00
Max Horn
5f440854b7 SCI: Add EngineState::_kernel member for convenience
svn-id: r44173
2009-09-17 17:00:36 +00:00
Max Horn
eb77efda78 SCI: Add a global getSciVersion() function and make use of it
svn-id: r44170
2009-09-17 16:50:53 +00:00
Max Horn
364640cfd5 SCI: Rename selector_map_t -> SelectorCache and _selectorMap -> _selectorCache
svn-id: r44152
2009-09-17 13:21:42 +00:00
Max Horn
b2c386ed00 SCI: Move parts of struct ScriptState into a new struct DebugState
svn-id: r44151
2009-09-17 13:21:19 +00:00
Filippos Karapetis
f890a69428 Changed the way object selectors are accessed, by removing the relevant defines and adding appropriate methods to the Object structure
svn-id: r44138
2009-09-17 08:51:38 +00:00
Max Horn
10f898c90e SCI: Rename MemObject -> SegmentObj
svn-id: r44130
2009-09-17 00:45:12 +00:00
Max Horn
a277123f54 SCI: Rename Script class members, change Script from struct to class
svn-id: r44126
2009-09-16 23:32:27 +00:00
Max Horn
bfe1538715 SCI: Misc cleanup
svn-id: r44093
2009-09-14 22:34:53 +00:00
Filippos Karapetis
90ae20c3ea - Made obj_get and obj_get_name methods of SegManager (getObject and getObjectName, respectively)
- Renamed alloc_List -> allocateList, alloc_Node->allocateNode, alloc_hunk_entry->allocateHunkEntry, free_hunk_entry->freeHunkEntry, for consistency

svn-id: r44039
2009-09-12 00:10:07 +00:00
Max Horn
44b60d2750 SCI: Replace GET_SEGMENT_ANY and GET_OBJECT_SEGMENT macros by new segman methods
svn-id: r43999
2009-09-07 06:07:18 +00:00
Max Horn
a550e2ea10 SCI: Replace "IntMapper *id_seg_map" in SegManager with a Common::HashMap<int,int>
This simplifies the code considerably. Also changed the savegame format
accordingly, which required me to bump the format version to 10. Old
saves should still load fine.

svn-id: r43986
2009-09-06 13:00:30 +00:00
Max Horn
b51e9988e6 SCI: cleanup
svn-id: r43982
2009-09-06 12:58:43 +00:00
Max Horn
fdbb167ea3 SCI: Cleanup for some SegManager internals
- rename segGet and getSegment to getScriptSegment; the two can be
  distinguished by the parameter count.
- rename type SCRIPT_GET to ScriptLoadType to conform with our code
  formatting conventions
- rename get_class_address to getClassAddress
- some cleanup

svn-id: r43981
2009-09-06 12:58:16 +00:00
Max Horn
d04b5d2c9b SCI: Rename resManager -> resMan; segManager -> segMan
svn-id: r43980
2009-09-06 12:57:42 +00:00
Filippos Karapetis
9381362277 Removed the bilinear and trilinear FreeSCI scalers, and only left the unfiltered scaler in (to be replaced by ScummVM's scaler code). We really don't need bilinear and trilinear filtered scaling in the engine, as ScummVM's filters already perform bilinear and trilinear filtered scaling, if requested
svn-id: r43938
2009-09-04 09:44:06 +00:00
Filippos Karapetis
1bbab8f191 Some renaming:
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan

svn-id: r43908
2009-09-02 12:02:37 +00:00
Filippos Karapetis
28e2f0457e Re-enabled custom graphics options, and read the cursor, view, pic and text filtering algorithm options from the ScummVM ini file (options "cursor_filter", "view_filter", "pic_filter" and "text_filter", 0 - unfiltered, 1 - bilinear filtering, 2 - trilinear filtering)
svn-id: r43894
2009-09-01 20:28:44 +00:00
Filippos Karapetis
186267a302 Some adjustments to the output of the "selector" and "selectors" console commands
svn-id: r43858
2009-08-31 20:09:36 +00:00
Walter van Niftrik
fff023794f SCI: Cleanup
svn-id: r43811
2009-08-30 01:37:27 +00:00
Filippos Karapetis
faa3c64d1b Stop loading opcodes from vocab.998. They are the same in all SCI games and are hardcoded anyway (plus, vocab.998 is unreliable in some games, e.g. QFG3, or completely missing in others). Also hardcoded the opcode names for the script debugger, the only place they're actually used. The only place where vocab.998 is loaded on demand is when using the "opcodes" console command (for debug/verification purposes)
svn-id: r43775
2009-08-27 23:39:59 +00:00
Filippos Karapetis
ac025f4294 - Replaced more cases of EngineState parameters
- Made some version comparisons for old SCI0 versions easier to read
- Removed the GET_SEL32SV macro

svn-id: r43729
2009-08-25 15:14:29 +00:00
Filippos Karapetis
ed66cad677 - Simplified the parameters of some functions
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722
2009-08-25 08:38:14 +00:00
Filippos Karapetis
c38f58598b - Simplified some functions to accept only the parts of the EngineState they need as parameters, instead of the whole EngineState
- Moved the class table in the Segment manager - it's the only class using it directly
- Removed the sci11 flag from save games (we already know this, we don't need to store it)
- Moved script_get_segment() and get_class_address() inside the segment manager class
- Removed the script_locate_by_segment wrapper
- Simplified script_lookup_export() a lot by removing some paranoia checks
- Added some WIP code for automatically determining the game id in the fallback detector (still not working)
- General cleanup

svn-id: r43458
2009-08-17 05:55:21 +00:00
Walter van Niftrik
f99932b72a SCI: Added enum for map and volume versions. Removed res_version setting from
detection.cpp (should be detectable). Cleanup.

svn-id: r43390
2009-08-15 00:28:59 +00:00
Walter van Niftrik
eaed412152 SCI: Added several debug command aliases.
svn-id: r43229
2009-08-10 21:30:16 +00:00
Walter van Niftrik
7dfa30d3fe SCI: Fix vmvars debug command.
svn-id: r43219
2009-08-10 18:59:59 +00:00
Willem Jan Palenstijn
57504cb699 SCI: Fix disasm_addr option parsing
svn-id: r42598
2009-07-18 22:19:07 +00:00
Willem Jan Palenstijn
d9c2544a4c SCI: don't leave debugger after bt
svn-id: r42589
2009-07-18 13:05:39 +00:00
Willem Jan Palenstijn
a1bb715611 SCI: Fix stepping in debugger
svn-id: r42587
2009-07-18 12:51:12 +00:00
Filippos Karapetis
31a0c80905 Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game)
svn-id: r42398
2009-07-11 23:45:54 +00:00
Filippos Karapetis
763c6c8ca1 Fixed regression in the script parser from commit 42260
svn-id: r42371
2009-07-11 06:19:29 +00:00
Filippos Karapetis
5ca94c5cce - Moved printObject inside the Console class
- Enabled the parts where disassemble() is called

svn-id: r42263
2009-07-08 13:08:51 +00:00
Filippos Karapetis
62499054a0 Some cleanup for the script debugger code:
- Renamed struct DebugState to ScriptState and r_amp_rest to restAdjust inside EngineState. Changed restAdjust to be a uint16 (actually it is a uint16, but it was being casted back and forth from an unsigned integer, so this clears up its type and size)
- Moved the script state variables from inside the run_vm() into the ScriptState struct, so that they can be accessed by the console commands and the script debugger all the time, and removed the weird isValid code

svn-id: r42260
2009-07-08 10:25:37 +00:00
Filippos Karapetis
74670cc834 Removed the superfluous sci_version_types array (it's essentially the same as the versionNames array)
svn-id: r42216
2009-07-07 12:29:55 +00:00
Filippos Karapetis
2e3419c8cb Prevent a crash when the engine errors out before the game state is initialized
svn-id: r42201
2009-07-07 06:53:53 +00:00
Filippos Karapetis
522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls
svn-id: r42167
2009-07-06 10:39:22 +00:00
Filippos Karapetis
6cb5106a0b Removed validity check for atoi, which prevented console commands from interacting with resources with id 0
svn-id: r42117
2009-07-05 10:34:43 +00:00
Filippos Karapetis
49ef8ae5a4 Added a new console command, "selector", which attempts to find a selector by name
svn-id: r42093
2009-07-04 15:22:42 +00:00
Filippos Karapetis
6fa8541aed - Pushed debugstate into debug.h
- When an error occurs, manipulate the execution stack before error() opens the console inside getDebugger(), like FreeSCI did. Added another method for obtaining the SCI console for use by the engine itself.

svn-id: r42062
2009-07-03 14:22:50 +00:00
Filippos Karapetis
c3403ac739 Moved some more debug state related variables in the DebugState struct
svn-id: r42044
2009-07-02 23:58:05 +00:00
Filippos Karapetis
80cb18e87f Moved all the debug state variables in a separate struct and re-enabled several places where they're used
svn-id: r42043
2009-07-02 23:16:40 +00:00
Filippos Karapetis
245a2764fc Cleanup
svn-id: r41727
2009-06-21 13:06:08 +00:00
Filippos Karapetis
0e6a23ab3b Added aliases for the script/breakpoint related commands and added the debugflag related commands to the help screen
svn-id: r41538
2009-06-15 08:44:35 +00:00
Filippos Karapetis
95d32180df Moved some more debug commands to ScummVM's console
svn-id: r41364
2009-06-08 08:38:10 +00:00
Max Horn
0dcb1fa84f SCI: Got rid of g_EngineState
svn-id: r41359
2009-06-07 23:04:34 +00:00
Walter van Niftrik
a6ed05740f SCI: Moved resource36 handling into resource manager.
svn-id: r41349
2009-06-07 19:15:55 +00:00
Max Horn
21d948ec05 SCI: Simplified SongLibrary code a bit
svn-id: r41345
2009-06-07 17:07:25 +00:00
Max Horn
f2ca788004 SCI: Renamed various song/songlib related structs and members
svn-id: r41342
2009-06-07 17:06:32 +00:00
Filippos Karapetis
744323ca33 Replaced/removed KP_UINT, KP_SINT, SKPV and UKPV as well as the VIEW_PRIORITY and PRIORITY_BAND_FIRST wrappers
svn-id: r41338
2009-06-07 15:53:30 +00:00
Filippos Karapetis
7375039158 Moved some more debug commands to ScummVM's coneole
svn-id: r41302
2009-06-06 20:29:37 +00:00
Filippos Karapetis
e572811aed Moved some more debug commands to ScummVM's coneole
svn-id: r41227
2009-06-06 16:43:13 +00:00
Filippos Karapetis
8033a39128 Objectified the graphics driver
svn-id: r41214
2009-06-06 10:21:48 +00:00
Filippos Karapetis
7c84cca81d Moved some more debug commands to ScummVM's coneole and removed some unused code
svn-id: r41198
2009-06-05 19:04:14 +00:00
Max Horn
ae3c6c3053 SCI: cleanup
svn-id: r41173
2009-06-04 20:51:09 +00:00
Max Horn
382ebea3fa SCI: Renamed various debug related global variables to have a g_ prefix; and moved any 'extern' decls of them into a new header file
svn-id: r41163
2009-06-04 11:28:05 +00:00
Filippos Karapetis
634e023485 Turned debug_weak_validations on by default again, as apparently some games like SQ3 fail in some validations (e.g. when loading). Also, fixed a potential out of bounds access when copying the value of __FILE__ into a buffer (as its value can be quite long in some cases).
svn-id: r41154
2009-06-04 08:25:48 +00:00
Johannes Schickel
5206ef16a6 Silence unused variable warning.
svn-id: r41144
2009-06-03 16:29:02 +00:00
Filippos Karapetis
9673beb082 Moved some more console commands to ScummVM's console
svn-id: r41141
2009-06-03 14:47:32 +00:00
Filippos Karapetis
317da8756e - Moved the engine state and the console to be private members of SciEngine
- Implemented pauseEngineIntern()
- Music now stops and resumes when entering/leaving the debugger

svn-id: r41139
2009-06-03 14:09:25 +00:00
Filippos Karapetis
cb0aed3303 Moved some more console commands to ScummVM's console
svn-id: r41137
2009-06-03 11:38:12 +00:00
Filippos Karapetis
3c7b434b04 - Sorted the console commands a bit more
- Removed the commands which manipulated variables and turned them into debug variables instead 
- Rewrote help so that it's more organized and easier to read
- Unified the debug variable names

svn-id: r41136
2009-06-03 09:45:16 +00:00
Filippos Karapetis
2ce6cca98b Moved some more console commands to ScummVM's debug console
svn-id: r41129
2009-06-02 23:29:58 +00:00
Johannes Schickel
d94f920d50 Fix warning.
svn-id: r41128
2009-06-02 23:20:14 +00:00
Filippos Karapetis
ac544e73e9 Moved some more console commands to ScummVM's debug console
svn-id: r41127
2009-06-02 21:07:34 +00:00
Filippos Karapetis
780926991e Moved some more console commands to ScummVM's debug console
svn-id: r41126
2009-06-02 19:03:43 +00:00
Filippos Karapetis
98f64cfa2f Removed the gfxw_new_visual and gfxw_new_port wrappers, moved _kfuncTable inside the Kernel class and moved gfxw_find_port inside the GfxVisual struct
svn-id: r41125
2009-06-02 14:16:59 +00:00
Filippos Karapetis
99c6874630 Split the kernel functions away from the vocabulary functions (WIP, saving/loading is broken)
svn-id: r41101
2009-06-01 14:12:43 +00:00
Max Horn
cf68dc1a7b SCI: Renamed some Vocabulary methods for clarity; also renamed decypherSaidBlock -> decipherSaidBlock; some cleanup in Console::cmdSentenceFragments
svn-id: r41072
2009-05-31 15:08:47 +00:00
Filippos Karapetis
4441ca4b3e - Further objectification of the SCI vocabulary functions
- Rewrote the sci_opcodes enum so that it's easier to read
- Made the engine error out if data is sent to an invalid selector (which is a fatal condition)

svn-id: r41069
2009-05-31 14:55:32 +00:00
Filippos Karapetis
e317012cce Further objectification of the SCI vocabulary functions. Removed the "kernel_words" console command, as it's exactly the same as "parser_words"
svn-id: r41065
2009-05-31 12:05:49 +00:00
Filippos Karapetis
a4d13cef8c More objectification of the Vocabulary functions
svn-id: r41057
2009-05-31 02:37:24 +00:00
Filippos Karapetis
76406c35ec Started objectifying the vocabulary functions (WIP)
svn-id: r41051
2009-05-30 22:15:00 +00:00
Filippos Karapetis
dcecdc7b94 Moved the "songlib" command to console.cpp and removed the non-working "set_vismap" command - we can view the different maps with "show_map", but it doesn't make much sense to redirect the game's graphics output to another screen map on demand
svn-id: r41048
2009-05-30 20:45:57 +00:00
Filippos Karapetis
329b93acc8 Moved 4 mode commands to console.cpp: "sentence_fragments", "parser_nodes", "status_bar" and "track_mouse"
svn-id: r41043
2009-05-30 20:01:43 +00:00
Filippos Karapetis
4ab05f0b38 - Moved 3 more commands to console.cpp: "draw_pic", "draw_rect" and "fill_screen"
- Removed some FreeSCI-specific variables for checking of the on-screen console
- Removed the Control-1 key combo - the console command "visual_state" can be used for the same reason

svn-id: r41040
2009-05-30 18:22:55 +00:00
Filippos Karapetis
ecfb2e5b5d - Moved the print_port, segment_info and segment_kill console commands to console.cpp
- Removed the unused gfx driver debug flags

svn-id: r41036
2009-05-30 16:36:37 +00:00
Filippos Karapetis
69582f0179 Moved 3 more debug commands to console.cpp ("simkey", "segment_table" and "show_map") and removed the GFXWC macro. Some cleanup
svn-id: r41032
2009-05-30 14:30:39 +00:00
Filippos Karapetis
a21f34cf91 Moved more script debug commands to console.cpp: "visual_state", "dynamic_views", "dropped_views", "gc" and "gc_objects". Removed the "gfx_free_widgets" and "sleep" commands (they weren't really useful)
svn-id: r41030
2009-05-30 13:36:51 +00:00
Filippos Karapetis
4dcfaead8d Moved some script debug commands to console.cpp: "clear_screen", "redraw_screen", "save_game", "restore_game", "restart_game", "class_table", "parser_words", "current_port" and "parse_grammar"
svn-id: r41029
2009-05-30 13:04:09 +00:00
Filippos Karapetis
56c0a41b71 SCI: Moved the rest of the console code out of sciconsole.cpp and into console.cpp. "list" and "hexgrep" have been added to the console commands. parse_reg_t() has been moved to kmovement.cpp (as it's the only code using it). Note that the debug commands in scriptdebug.cpp have not been converted yet, so they don't work at the moment
svn-id: r41024
2009-05-30 10:22:53 +00:00
Filippos Karapetis
b1997801da - Moved some debug code into console.cpp, adding 3 console commands: resource_types, sci0_palette and exit
- Removed the "man" command
- Removed the commands which set the SCI01 priority table flags and the crossblit alpha threshold (they're too specific, and not really useful anymore)
- Removed some leftover debug code from gfxop_clear_box()

svn-id: r41010
2009-05-29 17:19:39 +00:00
Filippos Karapetis
b042cab3a9 Fixed a bug with the "size" console command
svn-id: r40995
2009-05-29 13:19:18 +00:00
Filippos Karapetis
c95e5fceee Moved the "size" console debugger command to console.cpp and silenced a warning
svn-id: r40978
2009-05-29 08:59:13 +00:00
Filippos Karapetis
c75bdbc8e9 - SQ5 floppy starts now
- Added a new console command, "room", which shows the current room

svn-id: r40943
2009-05-27 16:45:42 +00:00
Max Horn
099a29b6bf SCI: Added 'opcodes' command to the debugger; fixed output wrapping in the selectors & kernelnames debugger commands
svn-id: r40919
2009-05-26 15:06:21 +00:00
Max Horn
c96cf97ea7 SCI: Merged vocab_debug.cpp into vocabulary.cpp; cleanup
svn-id: r40915
2009-05-26 14:44:14 +00:00
Filippos Karapetis
8dd601d35e Moved the "dump" and "dissectscript" commands to console.cpp and renamed them to "hexdump" and "dissect_script" respectively
svn-id: r40818
2009-05-23 19:59:42 +00:00
Filippos Karapetis
87e8f94fde - Moved all the files out of /sci/scicore and into /sci
- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp

svn-id: r40608
2009-05-15 14:07:45 +00:00
Filippos Karapetis
565cfa074d Simplified SCI versions to be SCI version generations, and fixed some game entries in the process. Also, added a sanity check for invalid game entries
svn-id: r40596
2009-05-15 09:04:21 +00:00
Filippos Karapetis
f75c950457 - Replaced SCI_VERSION_FTU_LOFS_ABSOLUTE with the GF_SCI1_LOFSABSOLUTE game flag
- Moved the version defines outside of versions.h

svn-id: r40559
2009-05-14 12:38:50 +00:00
Filippos Karapetis
999d46b241 Started using game-specific flags and removed/replaced some SCI version checks with flags.
- The SCI0 new script header and the angles check have been replaced by the GF_SCI0_OLD flag
- The SCI0 new drawpic parameter and the new priority check have been replaced by the GF_SCI0_OLDGFXFUNCS flag
- Removed the code which retries to use the newer script header in SCI0 games if the detected one is wrong, as that case should be covered by the GF_SCI0_OLD flag
- Removed the leftover min_version and max_version variables from gamestate
- Cleaned up kGetTime() a bit

svn-id: r40552
2009-05-14 09:12:27 +00:00
Filippos Karapetis
a5a1aa5542 - Slight cleanup of c_sfx_01_header()
- "words" -> "kernelwords"

svn-id: r40474
2009-05-12 08:22:20 +00:00
Filippos Karapetis
63fe11702c Moved the "suffixes" and "words" console commands to ScummVM's debug console
svn-id: r40473
2009-05-12 08:14:24 +00:00
Max Horn
d09037fa6c SCI: Hacked stuff up so that debugger commands also print on the GUI console
svn-id: r40460
2009-05-11 18:18:43 +00:00
Max Horn
5481806635 SCI: Hook FreeSCI console commands into the ScummVM console (incomplete as of now, because printf output is not yet redirect to the GUI console)
svn-id: r40459
2009-05-11 18:02:48 +00:00
Filippos Karapetis
e3e3fbd7d1 Moved the "selectors" and "syscalls" console commands to ScummVM's debug console (as commands "selectors" and "kernelnames", respectively)
svn-id: r40457
2009-05-11 17:10:36 +00:00
Max Horn
d7b06b7d42 SCI: Renamed ResourceManager::sci_version to _sciVersion, to avoid var shadowing warnings; some other tweaks
svn-id: r38984
2009-02-28 22:19:22 +00:00
Max Horn
170916201c SCI: Moved almost all files from include/ to other dirs; only include/engine.h remains
svn-id: r38920
2009-02-27 02:23:00 +00:00
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup
svn-id: r38783
2009-02-22 13:11:43 +00:00
Filippos Karapetis
fcf5e87de6 - Made ResourceManager accessible from _vm
- Replaced c_version by its corresponding ScummVM equivalent command

svn-id: r38775
2009-02-22 01:33:16 +00:00
Paweł Kołodziejski
03769a6d56 formating
svn-id: r38700
2009-02-21 15:30:47 +00:00
Sven Hesse
a69ec56869 Fixing compilation for me
svn-id: r38627
2009-02-20 21:47:51 +00:00
Filippos Karapetis
9582e48574 Some initial code for a debug console (still non-working)
svn-id: r38623
2009-02-20 21:26:31 +00:00