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
39,095 Commits 45 Branches 139 Tags
052d2ab6f17e6ec239f368ee802a659be46098cc
Commit Graph
298 Commits
Author SHA1 Message Date
Martin Kiewitz 42dfdea5df SCI: added resetting of SoundCommandParser, so that error()s before that one got initialized wont crash 
svn-id: r50619
 2010-07-03 06:55:10 +00:00
Filippos Karapetis bff3e89e48 SCI: Removed the FreeSCI music code 
svn-id: r50532
 2010-06-30 13:49:05 +00:00
Filippos Karapetis 9f1320d5cc SCI: Made the SoundCommandParser a member of the SciEngine class and removed it from the EngineState, since it's static throughout the course of a game 
svn-id: r50484
 2010-06-29 09:00:08 +00:00
Filippos Karapetis 58732b9df1 SCI: More changes to the code for loading from the launcher 
- Added support for the LSL2 menu bar object
- We no longer need a reference to the init() selector - it's always the first method of the menu bar object

svn-id: r50462
 2010-06-28 22:01:26 +00:00
Filippos Karapetis 0b33cc0dab Fixed loading of saved games from the launcher 
svn-id: r50460
 2010-06-28 20:58:32 +00:00
Filippos Karapetis 52ddc711d0 SCI: separated the graphics initialization code a bit 
- Moved all of the graphics initialization code on startup inside initGraphics()
- Moved all of the screen initialization (resolution, upscaled graphics etc) code inside GfxScreen()

svn-id: r50412
 2010-06-28 08:18:55 +00:00
Filippos Karapetis 048ceb73d3 SCI: Removed the hack for loading games from the launcher from run_vm(). This is now done on startup. This should fix loading from the launcher for LSL6 
svn-id: r50406
 2010-06-27 23:20:08 +00:00
Filippos Karapetis 4a60ff4090 Made the script initialization/uninitialization methods part of the segment manager 
svn-id: r50402
 2010-06-27 21:18:19 +00:00
Max Horn 6ee82a2027 SCI: Introduce SciGameId enum 
svn-id: r50273
 2010-06-25 16:16:29 +00:00
Max Horn 23d384e6b8 SCI: Remove SciEngine::getFlags() 
svn-id: r50272
 2010-06-25 16:12:38 +00:00
Martin Kiewitz c6b0a5e896 SCI: detect, if SCI1.1 game is merging or copying palette instead of using gameIds. Also prints method used, when using debug command "version" 
svn-id: r50261
 2010-06-25 10:04:31 +00:00
Filippos Karapetis 9c1ec81d76 Strict mode: Turned several severe errors (almost all detection related) into errors, instead of warnings 
svn-id: r49972
 2010-06-17 23:45:38 +00:00
Max Horn 359be0c066 SCI: Change SciEngine's 'char *getGameID()' to 'Common::String getGameId()' 
svn-id: r49968
 2010-06-17 23:14:34 +00:00
Max Horn cfcbdf8656 SCI: Remove selector_name function, some cleanup 
svn-id: r49966
 2010-06-17 23:13:30 +00:00
Max Horn 337711d321 SCI: Get rid of duplicate _system member in SciEngine 
svn-id: r49965
 2010-06-17 23:12:59 +00:00
Max Horn fabba55e6d SCI: cleanup 
svn-id: r49961
 2010-06-17 23:11:34 +00:00
Filippos Karapetis a7b76c04d9 Added handling of VMD video files in kResCheck, fixes video playing in GK2 
svn-id: r49913
 2010-06-17 00:07:03 +00:00
Filippos Karapetis 18dc295a33 Hooked the VMD player in kPlayVMD. The VMD videos in the demo of Phantasmagoria 1 are shown now (e.g. the intro and the chapter beginning) 
svn-id: r49912
 2010-06-16 23:30:22 +00:00
Martin Kiewitz b25aba1d1e SCI: SciGui/SciGui32 gone for good... 
svn-id: r49860
 2010-06-15 15:44:24 +00:00
Martin Kiewitz ddb5a769a2 SCI: reset _gfxText16 for sci32, fixes gk1 
svn-id: r49856
 2010-06-15 13:52:06 +00:00
Martin Kiewitz ba2de6dfa4 SCI: putting SciGui::init into SciEngine, removing it from SciGui(32) 
svn-id: r49854
 2010-06-15 13:34:40 +00:00
Max Horn 824dd44ddf SCI: Revise how ResourceManager is instantiated. 
This should allow for better error handling. Also, it
means that g_sci->getResMan() returns a valid value much sooner,
allowing me to simplify some code.

Also added a note about potentially replacing Common::FSList usage
by Common::Archive (and FSNode by Archive/ArchiveMember ?). This
might be a way to unify the addAppropriateSources variants again.

svn-id: r49825
 2010-06-15 12:15:52 +00:00
Filippos Karapetis 60d8cc5180 Removed the now unused EngineState parameter of script_adjust_opcode_formats(), as well as an obsolete TODO 
svn-id: r49684
 2010-06-15 07:21:52 +00:00
Filippos Karapetis cfdbfaa28e SCI: Limit the screen refresh rate to 60fps 
svn-id: r49647
 2010-06-14 08:36:52 +00:00
Filippos Karapetis 711f679b7f camelCase changes 
svn-id: r49570
 2010-06-10 11:43:20 +00:00
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 abc5f97608 Fixed compilation with the old music code 
svn-id: r49560
 2010-06-10 07:41:48 +00:00
Filippos Karapetis 9b8e4e8359 Moved all of the game init/run/exit logic inside the SciEngine class 
svn-id: r49559
 2010-06-10 07:32:05 +00:00
Filippos Karapetis 14437e6394 The segment manager is now initialized before the graphics subsystem. Fixes the detection of the fastCast object on startup, and hence fixes LSL1VGA 
svn-id: r49553
 2010-06-09 21:41:20 +00:00
Filippos Karapetis c486b77bb7 Fixed crash in SCI2.1 games 
svn-id: r49546
 2010-06-09 18:42:21 +00:00
Filippos Karapetis a542ce174b Proper fix for kernel name loading (regression from commit #49537) 
svn-id: r49544
 2010-06-09 15:28:14 +00:00
Filippos Karapetis 3c9ab81a07 Fixed regression from commit #49537 
svn-id: r49543
 2010-06-09 15:21:10 +00:00
Filippos Karapetis 2c629a04dd Merged script_init_engine() and game_init() and cleaned up SciEngine::run() a bit 
svn-id: r49537
 2010-06-09 10:45:54 +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
Martin Kiewitz dc8b826f5e SCI: set default palette after initializing music driver, fixes palette getting messed up when using mt32 emulation 
svn-id: r49523
 2010-06-08 22:00:59 +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 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
Martin Kiewitz 58a7dbe721 SCI: forgot one rename in r49202 - MSVC, why? 
svn-id: r49203
 2010-05-24 21:51:45 +00:00
Martin Kiewitz 830d17ed31 SCI: renaming MacIconBar to GfxMacIconBar 
svn-id: r49202
 2010-05-24 21:47:06 +00:00
Matthew Hoops f5ec3a3f74 Oops, forgot to delete the icon bar. 
svn-id: r49199
 2010-05-24 17:55:23 +00:00
Matthew Hoops d49fb8f42d Add support for showing the icon bar in SCI1.1 Mac. 
svn-id: r49196
 2010-05-24 17:21:11 +00:00
Filippos Karapetis c874ff15a8 Cleaned up the game ID code: 
- The game ID is now obtained from ScummVM ID directly, not by converting Sierra's internal ID
- Moved the code which reads the internal Sierra ID inside the resource manager
- Moved the code which converts the internal Sierra ID to ScummVM's IDs together with the rest of the detection code

svn-id: r49152
 2010-05-23 10:28:03 +00:00
Filippos Karapetis 46af5a5162 - Moved kernel_lookup_text inside the Kernel class 
- Added a pointer to the segment manager from within the Kernel class, thus simplifying the calls to it

svn-id: r49076
 2010-05-18 12:16:48 +00:00
Filippos Karapetis 75f4791a4a - Moved determine_reg_type() and kernel_matches_signature() inside the Kernel class, where they belong 
- Moved the kernel signature defines inside kernel.h
- Removed some unused references to EngineState

svn-id: r49075
 2010-05-18 11:23:13 +00:00
Martin Kiewitz f3b2627179 SCI: adding special 640x440 upscaling mode for kq6, finally hires portraits are drawn at the right position 
svn-id: r49041
 2010-05-15 15:16:32 +00:00
Martin Kiewitz eb2b3f352e SCI: adding upscaled hires mode 640x480 for kq6 and gk1, fixing valgrind error in GfxPortrait class, not using priority anymore when drawing hires cels (shouldnt be needed for kq6) 
svn-id: r49040
 2010-05-15 14:17:50 +00:00