libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-27 12:16:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,436 Commits 5 Branches 5 Tags 1.8 GiB
4198ee9623
Commit Graph

70 Commits

Author SHA1 Message Date
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
 2008-08-04 22:34:07 +00:00
Nicola Mettifogo
591973c827 Changed Gfx::_backgroundInfo to be a pointer. This temporarily kills all z-buffering. 
svn-id: r33468
 2008-07-31 12:26:12 +00:00
Nicola Mettifogo
3dbeeaf8a1 * Unified implementation of flow control opcodes in NS and BRA 
* Simplified script execution loop and context

svn-id: r33437
 2008-07-30 07:58:25 +00:00
Nicola Mettifogo
f46ee2b70c * Implemented pause/resume of command execution 
* Implemented command opcode MOVE (not the script instruction).

svn-id: r33408
 2008-07-29 12:59:55 +00:00
Nicola Mettifogo
c8400e9725 * Fixed positioning of balloons and faces in BRA (dos, at least). 
* Adapted loading of faces.

svn-id: r33392
 2008-07-29 03:14:35 +00:00
Nicola Mettifogo
7baf727790 Enforcing use of nullZonePtr only for nulling out pointers, as it is useless for comparisons. 
svn-id: r33384
 2008-07-28 23:21:03 +00:00
Nicola Mettifogo
30d943fe2f Moved validation step from revision 33363, so that it is executed for all animations. 
svn-id: r33376
 2008-07-28 14:22:44 +00:00
Nicola Mettifogo
c6cbf1f144 Added a post processing step to runScripts, so that Animation can be validated after buggy scripts have been executed. 
svn-id: r33363
 2008-07-28 08:56:37 +00:00
Nicola Mettifogo
8d59006bd7 Some instrumentation for script debugging. 
svn-id: r33359
 2008-07-28 08:25:06 +00:00
Nicola Mettifogo
791d2b3ba2 Changed comment display code so that input polling is integrated into the main loop, instead of being performed in a blocking way from a separate routine. 
svn-id: r33188
 2008-07-22 09:00:39 +00:00
Christopher Page
09f4fd946e Merged revisions 33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33183
 2008-07-21 22:46:39 +00:00
Christopher Page
0cae5552db Improved GMM sound setting config for Parallaction 
svn-id: r33181
 2008-07-21 21:11:28 +00:00
Nicola Mettifogo
361bed0a95 Massive refactoring of dialogue code, which is now implemented as a finite state machine. Related code in other files has been updated has well. 
svn-id: r33162
 2008-07-21 06:08:30 +00:00
Christopher Page
d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
 2008-07-14 00:10:09 +00:00
Nicola Mettifogo
2a80bd0678 Cleanup and improved debugging output for CommandExec::run() 
svn-id: r33022
 2008-07-13 03:39:42 +00:00
Nicola Mettifogo
9c2d96530b Properly implemented the OFF command. The new rendering order for graphics let this mistake finally surface. 
svn-id: r33021
 2008-07-13 03:30:14 +00:00
Nicola Mettifogo
8ba56e98cf Cleanup. 
svn-id: r33006
 2008-07-11 13:36:22 +00:00
Nicola Mettifogo
8ed023142a Moved program and command execution code out of the engine, into their own brand new 
classes.

svn-id: r33003
 2008-07-11 13:06:28 +00:00
Christopher Page
8d23846eaf Parallaction works with the new GMM implementation 
svn-id: r32997
 2008-07-10 23:03:34 +00:00
Nicola Mettifogo
d387d1af0e - Moved dialogue balloon management code from Gfx to its own class 
- Added a class to draw balloons in BRA (still without text and with wrong placement)

svn-id: r32902
 2008-07-04 00:29:21 +00:00
Christopher Page
e37b0745d3 Parallaction now uses the new _quit flag 
svn-id: r32773
 2008-06-25 01:41:40 +00:00
Christopher Page
0cbfc3a9d1 Merged revisions 32348-32349,32351-32356,32358-32411,32413-32441,32443-32445,32449,32453-32454,32456-32457,32459-32462,32464-32465,32467-32492,32494-32503 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32505
 2008-06-02 21:36:45 +00:00
Christopher Page
a338d5fdb2 PARA: Got rid of calls to system->quit() so that the Parallaction engine can return to the launcher. Also fixed a couple of memory leaks. 
svn-id: r32504
 2008-06-02 21:08:49 +00:00
Nicola Mettifogo
22d63345e3 Got rid of the static arrays for initialization of parsers and exec opcodes, to make returning to launcher easier. The code has been borrowed by Kyra, after suggestion by LordHoto. 
svn-id: r32465
 2008-06-01 14:05:39 +00:00
Nicola Mettifogo
40ff1537a9 - Moved input code to its own class. 
- Slightly simplified inventory highlight code thanks to changes in input code.

svn-id: r32115
 2008-05-14 14:34:01 +00:00
Nicola Mettifogo
6979458e26 Extracted script parsing code to its own class. 
svn-id: r31972
 2008-05-10 11:11:03 +00:00
Nicola Mettifogo
c7c8bb99ee Tiny cleanup to ease extraction of the program parser code. 
svn-id: r31959
 2008-05-09 01:42:25 +00:00
Nicola Mettifogo
1d025957ca Moved location parsing out of the engines, to LocationParser_ns and LocationParser_br. 
svn-id: r31958
 2008-05-09 01:35:43 +00:00
Nicola Mettifogo
1ddd54b50d - Moved some members from the engine class to Location, since they belong there. 
- Cleaned up usage of location flags by using accessor functions.

svn-id: r31872
 2008-05-05 11:02:40 +00:00
Nicola Mettifogo
d4c8d4e18f Fixed usage of SharedPtr, so that reference counting is proper and there are no more objects that need constructors at global level (helps PalmOS). 
svn-id: r31533
 2008-04-17 09:32:57 +00:00
Nicola Mettifogo
3d1a2e2049 Replaced custom ManagedList with Common::SharedPtr. 
svn-id: r31415
 2008-04-06 05:40:02 +00:00
Nicola Mettifogo
435c437f6d More refactoring for command parsing/execution. 
svn-id: r30841
 2008-02-09 23:26:45 +00:00
Nicola Mettifogo
cf724e889c Added new debug command to dump scripts execution status. 
svn-id: r30840
 2008-02-09 22:07:51 +00:00
Nicola Mettifogo
85171eadaa Programs are now handled in their own list, instead of being accessed via the referring Animation. 
svn-id: r30768
 2008-02-03 14:58:16 +00:00
Nicola Mettifogo
d8349d66ff Subtitles are now displayed in the intro for BRA, though in wrong color (and I don't know why). 
svn-id: r30747
 2008-02-02 21:22:05 +00:00
Nicola Mettifogo
ed09766acc BRA now loads and displays location backgrounds (at least in the intro). 
svn-id: r30740
 2008-02-02 13:57:29 +00:00
Nicola Mettifogo
015ad5e469 Some more integration of background code into BackgroundInfo. 
svn-id: r30731
 2008-02-02 09:48:07 +00:00
Filippos Karapetis
289d18ed07 Fix shadowing warning 
svn-id: r30710
 2008-01-30 23:09:18 +00:00
Nicola Mettifogo
d6f45b451b Fixed regression when displaying animation: the issue could only be noticed when characters appeared out of their sketches in the intro. 
svn-id: r30696
 2008-01-29 09:58:21 +00:00
Nicola Mettifogo
68fc3f1dee Removed usage of kBitFront and kBitBack. Only the old kBit2 buffer is kept to store the background picture. 
svn-id: r30687
 2008-01-28 19:56:29 +00:00
Nicola Mettifogo
3c2c16c705 Fixed animation sorting: everything should be drawn like before revision 30673 now. Character may still disappear when changing location because of wrong resource management, though. 
svn-id: r30680
 2008-01-28 16:52:41 +00:00
Nicola Mettifogo
cce8e25960 Removed all job routines. Stubs have been left for future reference in the code for BRA. 
svn-id: r30675
 2008-01-28 13:10:49 +00:00
Nicola Mettifogo
be2c5d3c87 All interactive objects are now drawn in the framebuffer instead of using the old kBitBack/kBitFront buffers. Animation are not sorted yet, so they can overlap in an inconsistent fashion for the time being. 
svn-id: r30673
 2008-01-28 12:20:53 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs. 
svn-id: r30667
 2008-01-28 00:14:17 +00:00
Nicola Mettifogo
7d635a4b9c Added function to encapsulate/protect manipulation of background. 
svn-id: r30441
 2008-01-12 10:46:51 +00:00
Nicola Mettifogo
1b80eedaa1 Added a proper _name member to Zone, instead of using the label text. 
svn-id: r30343
 2008-01-08 20:32:29 +00:00
Torbjörn Andersson
eeb212c7e0 Indent with tabs instead of spaces. 
svn-id: r30312
 2008-01-06 20:42:28 +00:00
Nicola Mettifogo
db51514dd3 Moved balloons management into Gfx, which is now responsible for positioning and drawing. All balloons are now drawn on a different layer than the game graphics, thus simplifying screen management. Dialogue code has undergone a major revision, and the superior implementation of answer selection in the Amiga version is now used in place of the poor PC one. Other bits (where some changes had already been introduced) have been updated, too. 
svn-id: r30311
 2008-01-06 19:29:41 +00:00
Nicola Mettifogo
7bef63537d Going back to uncached mode for graphics resources of Examine zones. This prevents engine to crash when trying to cache a resource out of the currently selected archive. 
svn-id: r29798
 2007-12-09 17:29:41 +00:00
Nicola Mettifogo
919c0a2833 * added adapter from Graphics::Surface to Frames 
* changed all Disk routines to return Frames* instead of Graphics::Surface*
* changed displayItemComment to use new gfx routines
* merged code for Examine zones into displayComment

svn-id: r29615
 2007-11-22 21:51:33 +00:00