ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,290 Commits 45 Branches 139 Tags
dcecdc7b94de30f8859cadf7ecf24529e4c711c7
Commit Graph
69 Commits
Author SHA1 Message Date
Filippos Karapetis 3490819a66 - Removed debug_mode from the engine state 
- Turned all SCIkwarn and SCIkdebug functions to ScummVM's debugC function
- Placed some debug code in appropriate defines: DEBUG_PARSER, DEBUG_AVOIDPATH and DEBUG_SOUND
- Removed the "debuglog" command and the "script_checkloads_flag" and "sci_debug_flags" variables

svn-id: r41033
 2009-05-30 15:40:49 +00:00
Walter van Niftrik fd191a4920 SCI: Changed signatures of StrLen and StrCpy to allow NULL pointers. This is 
needed for a game bug in KQ6CD.

svn-id: r40930
 2009-05-26 23:34:57 +00:00
Max Horn 7fbbaff990 SCI: Turned the global 'static MessageState state' variable into a member of EngineState 
svn-id: r40910
 2009-05-26 11:33:18 +00:00
Max Horn 7d5f3e1714 Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines) 
svn-id: r40908
 2009-05-26 11:30:21 +00:00
Filippos Karapetis 4799cbf1c3 Removed the PREG, PSTK, IS_NULL_REG and REG_EQ defines 
svn-id: r40767
 2009-05-21 17:18:46 +00:00
Walter van Niftrik df3357159c SCI: Added some stubs for LSL6CD (lores). 
svn-id: r40719
 2009-05-19 02:10:58 +00:00
Max Horn e0366f00bc SCI: Removed SCI_SIMPLE_SAID_CODE and the associated heavily bitrotted code 
svn-id: r40691
 2009-05-18 15:07:51 +00:00
Johannes Schickel 220fe60424 Fix some error/warning calls. (might need some review, from someone familiar with SCI) 
svn-id: r40680
 2009-05-18 11:53:04 +00:00
Filippos Karapetis 1e547f320c Removed the unused file and line parameters from the list and list node lookup functions, and removed the LOOKUP_LIST and LOOKUP_NODE defines. Also, disabled the unused LOOKUP_SPECIES define 
svn-id: r40676
 2009-05-18 08:28:04 +00:00
Filippos Karapetis 1239949ef2 Changed errors to be fatal, as most of them are fatal conditions. Some of them have been changed to warnings for now, as they occur in certain games (e.g. SQ4 floppy, SQ4 CD and KQ5 CD) 
svn-id: r40675
 2009-05-18 07:55:13 +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
Max Horn 9c44705f05 SCI: Got rid of SEG_ID/SCRIPT_ID 
svn-id: r40599
 2009-05-15 09:28:31 +00:00
Max Horn 75c0d719c9 SCI: Turned several script related SegManager methods into Script methods 
svn-id: r40597
 2009-05-15 09:27:07 +00:00
Max Horn a3efc5611c Fixed various GCC 4.2 warnings, among them an actual longstanding bug (3 years :) in the quicktime midi code 
svn-id: r40577
 2009-05-14 23:09:04 +00:00
Walter van Niftrik f64df361e0 SCI: Message: fix K_MESSAGE_SIZE 
svn-id: r40556
 2009-05-14 11:27:54 +00:00
Walter van Niftrik e35b77e0a7 SCI: Message: Added a few more subfunctions; cleanup. 
svn-id: r40529
 2009-05-13 19:03:12 +00:00
Max Horn 0255cd0213 SCI: Removed sci_memory.h/.cpp 
svn-id: r40514
 2009-05-12 23:30:10 +00:00
Walter van Niftrik c299dbeb26 SCI: Merged Message() and GetMessage(). Set SCI1.1 to use SCI1 kernel table (for now). 
svn-id: r40481
 2009-05-12 12:31:09 +00:00
Walter van Niftrik 7f587a9d6b SCI: Message: Added resource-internal recursion (currently untested). 
svn-id: r40478
 2009-05-12 11:28:15 +00:00
Walter van Niftrik 4d55f8b8d7 SCI: Minor changes to Message(). Some of the text in KQ6 floppy should now be visible. 
svn-id: r40441
 2009-05-10 22:25:43 +00:00
Filippos Karapetis 7cd07d9581 Cleanup 
svn-id: r40423
 2009-05-10 14:57:27 +00:00
Filippos Karapetis 53f24f3e43 Applied patch by waltervn to remove the length parameter from getText() and fixed a silly bug in getLength() 
svn-id: r40421
 2009-05-10 13:47:38 +00:00
Filippos Karapetis 3592801a57 Objectified and cleaned up the MessageState class 
svn-id: r40419
 2009-05-10 13:15:14 +00:00
Filippos Karapetis acd5a87922 Moved the code which retrieves the current room number in a separate function and merged _sci1_alloc_system_colors inside _reset_graphics_input 
svn-id: r40412
 2009-05-10 10:27:45 +00:00
Walter van Niftrik be7acea217 SCI: Set signature for GetMessage. 
svn-id: r40396
 2009-05-08 23:10:25 +00:00
Walter van Niftrik 4f4bef88b1 SCI: Fix return value of GetMessage. 
svn-id: r40394
 2009-05-08 22:44:26 +00:00
Max Horn 82f2672008 SCI: Changed SegManager to store the heap pointers in a Common::Arrray 
svn-id: r40293
 2009-05-03 22:46:11 +00:00
Max Horn 50c8821072 SCI: Renamed MemObject::type and ::segmgr_id to _type resp. _segmgrId, and added accessor methods getType() and getSegMgrId() 
svn-id: r40271
 2009-05-03 09:30:33 +00:00
Filippos Karapetis beee12a520 Long messages in Eco Quest 1 are now shown correctly 
svn-id: r40127
 2009-04-24 20:09:52 +00:00
Max Horn 486f10edaf SCI: Store parse_tree_branch_t in a Common::Arraay 
svn-id: r40100
 2009-04-24 10:42:53 +00:00
Filippos Karapetis efc28c1be6 Fixed the GetMessage kernel opcode. Eco Quest 1 text is showing up correctly now 
svn-id: r40093
 2009-04-23 18:46:41 +00:00
Filippos Karapetis bd2c2b0e50 WIP code for kGetMessage (tested with Eco Quest 1). Currently, it doesn't always work for some reason... 
svn-id: r40092
 2009-04-23 18:17:35 +00:00
Filippos Karapetis fe1584c140 Fixed an issue with the password screen in LSL5 and kStrAt(). The game password, saved in file memory.drv (which can either exist in the game directory, or is created in the saves folder by ScummVM) is now working correctly, and the game can be started. Note that it's NOT currently possible not to set a password (you'll get the password screen anyway the next time, and it won't work). 
svn-id: r39876
 2009-04-06 17:13:07 +00:00
Filippos Karapetis c4e054848e Changed some references from "FreeSCI" to "SCI" or "ScummVM" 
svn-id: r39807
 2009-04-03 08:10:58 +00:00
Joost Peters 67201f6a71 revert yesterday's change -- apparently this different behavior was intentional. 
svn-id: r39683
 2009-03-25 10:04:45 +00:00
Joost Peters fc9e5b6beb Fix smaller error introduced in r39671 refactoring (this check used to be "res == 0"). 
Thanks to syke for spotting it.

svn-id: r39673
 2009-03-24 19:56:41 +00:00
Max Horn 1e94b9cd3c SCI: Rewrote vocabulary code to use a Common::HashMap<String,ResultWord> 
svn-id: r39671
 2009-03-24 17:42:12 +00:00
Max Horn 65b96f6a1b SCI: Changed vocab_tokenize_string to not 'return' the list it generates, but rather pass a reference to an existing list to it (this is a bit more efficient, and allows us to return an error value) 
svn-id: r39670
 2009-03-24 17:41:46 +00:00
Max Horn d38590e6d4 SCI: Turned synonyms list into a Common::List 
svn-id: r39669
 2009-03-24 17:41:26 +00:00
Max Horn 364ce5874d SCI: cleanup 
svn-id: r39371
 2009-03-13 16:31:38 +00:00
Filippos Karapetis 7854a01f14 Changed the parameter passed to isprint() to be unsigned, according to MSDN (thanks wjp) 
svn-id: r39370
 2009-03-13 10:36:57 +00:00
Filippos Karapetis 0916523763 Added an explanatory comment for commit #39368 
svn-id: r39369
 2009-03-13 07:56:06 +00:00
Filippos Karapetis f4eb159eb8 LSL5 no longer throws an assertion after the intro 
svn-id: r39368
 2009-03-13 01:36:07 +00:00
Max Horn 6c93249715 SCI: result_word_t -> ResultWord; switched to Common::List for storing lists of ResultWords 
svn-id: r39278
 2009-03-09 22:25:33 +00:00
Max Horn efa5493b2d SCI: Changed suffix list to be stored as a Common::List; also fixed spelling: suffices -> suffixes 
svn-id: r39214
 2009-03-08 08:17:43 +00:00
Filippos Karapetis 1e29983d8e Replaced getInt16, getUInt16 and putInt16 
svn-id: r39189
 2009-03-07 16:14:20 +00:00
Jordi Vilalta Prat 82872a7033 SCI: Start converting MessageState into a class 
svn-id: r38989
 2009-03-01 00:18:30 +00:00
Jordi Vilalta Prat 7050c7b03f SCI: Use the ResourceType enum instead of integers where it makes sense 
svn-id: r38988
 2009-02-28 23:46:50 +00:00
Greg Frieger 61ab59138a resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed 
svn-id: r38982
 2009-02-28 21:59:49 +00:00
Greg Frieger 4dd1b7dad5 Turned ResourceManager into a class, along with all related functions 
svn-id: r38978
 2009-02-28 20:45:36 +00:00