libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 18:31:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,680 Commits 5 Branches 5 Tags 1.8 GiB
4a4aab83d0
Commit Graph

472 Commits

Author SHA1 Message Date
Kari Salminen
06a45c49c7 Added a preliminary saving routine for Operation Stealth (Disabled by default, needs more work still. WIP!). 
Added backgrounds' name saving (8 names in Operation Stealth instead of just 1 like in Future Wars).
Added 256 color palette saving and restoring (One of the palettes isn't properly handled yet though).

svn-id: r33349
 2008-07-27 22:50:36 +00:00
Kari Salminen
cedbb6b2b2 Clear the confusing usage of NUM_MAX_VAR (It's 255 actually, not 256). 
svn-id: r33339
 2008-07-27 14:36:53 +00:00
Kari Salminen
955d0700f5 Cut savegame loading into smaller functional parts (resetEngine, loadPlainSave etc). 
svn-id: r33338
 2008-07-27 14:33:37 +00:00
Kari Salminen
55bf215ba4 Renamed opcodes 0x49 and 0x68: 
- Opcode 0x49: setDefaultMenuColor2 -> setDefaultMenuBgColor
- Opcode 0x68: setDefaultMenuColor  -> setPlayerCommandPosY

svn-id: r33240
 2008-07-23 14:19:31 +00:00
Max Horn
c92f154b90 Fix warnings in CINE 
svn-id: r33202
 2008-07-22 14:38:54 +00:00
Kari Salminen
a38234d6e6 Fix CineSaveGameFormat enumeration's include order (Caused problems at least with GCC). 
svn-id: r33196
 2008-07-22 12:17:44 +00:00
Kari Salminen
2a90435e5d Fix for bug #2019355 (FW: broken compatibility with 0.11.1 saves): 
- Changed savegame loading related functions to use SeekableReadStream
  rather than InSaveFile so MemoryReadStream can be used transparently.
- Fixed loadResourcesFromSave to load multiframe animations correctly
  and to load 0.11.0/0.11.1 Future Wars savegames which used a slightly
  different format.
- Added a savegame format detector that tries to detect between the old
  Future Wars savegame format, the new one and a broken revision of the
  new one.
- Changed makeLoad to first load the savegame fully into memory and only
  then handle it (If the savegame's packed then it's unpacked first). If
  the packed savegame can't tell its unpacked size (i.e. it's using zlib
  format) then we'll try to load up to 256kB of the savegame data.
Thanks to wjp for his help with nailing this release critical bug.

svn-id: r33192
 2008-07-22 10:15:58 +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
Kari Salminen
8757326b5f Added savefile position comments to savegame loading routine (Helpful for debugging the formats). 
svn-id: r33096
 2008-07-18 14:01:53 +00:00
Kari Salminen
67bef188d3 Patch #2019455: Patch for reducing the BSS size of Cine engine. 
svn-id: r33087
 2008-07-17 07:13:41 +00:00
Kari Salminen
60357650e0 Fix for bug #2016647 (FW: crash with italian amiga version). 
- Consists of a workaround for a script bug that used local
  variable 251 when it should've used global variable 251.
- Also added a fix for a crash when failing copy protection
  in Amiga or Atari ST versions of Future Wars.
NOTE: That any of the Amiga or Atari ST versions of Future Wars
haven't crashed right in the beginning before seems like plain
luck because accessing local variable 251 is out of bounds!

svn-id: r33068
 2008-07-14 23:10:51 +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
Christopher Page
1fd613afa6 Changed CINE to RTL when copy protection fails instead of Quit 
svn-id: r32985
 2008-07-10 05:25:52 +00:00
Christopher Page
30b1a62e81 Removed unnecessary #inlcudes 
svn-id: r32984
 2008-07-10 05:15:19 +00:00
Christopher Page
e808cdf7a0 Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM 
svn-id: r32971
 2008-07-09 02:27:05 +00:00
Christopher Page
41938b7644 CINE works with the new GMM implementation 
svn-id: r32954
 2008-07-07 23:47:39 +00:00
Kari Salminen
e74d01a59a Fix for bathroom door opening crash in Operation Stealth's start. 
svn-id: r32951
 2008-07-07 22:02:01 +00:00
Kari Salminen
18559708c6 Fully implemented processSeqListElement 
- Added parts that were missing and fixed a couple of errors
-- One test was backwards and a global variable was written to when it shouldn't have been
Added global variable inputVar0 that's used in processSeqListElement
NOTE: inputVar0 isn't updated anywhere yet, so that's a TODO

svn-id: r32874
 2008-07-02 04:31:50 +00:00
Max Horn
bd296a45fa Fixed unitialized variables 
svn-id: r32865
 2008-07-01 10:33:25 +00:00
Kari Salminen
e415a97fe5 Removed TODO from checkCollision: Updating zoneQuery each time checkCollision is called seems to be fine. 
svn-id: r32852
 2008-06-30 18:15:34 +00:00
Kari Salminen
2ecf8fdbb5 Fixed addAni (A test before using resetGfxEntityEntry was incorrect). Also added comments and checked that most 8-bit values used in this function are used as signed integers. 
svn-id: r32850
 2008-06-30 17:24:23 +00:00
Kari Salminen
ecbf8d54ad Implemented resetGfxEntityEntry and made it used where appropriate (The function wasn't very easy to reverse engineer so it may have flaws still, but let's hope it doesn't ;-)). 
svn-id: r32848
 2008-06-30 03:33:08 +00:00
Kari Salminen
8cd03780f6 Implemented Operation Stealth's version of addOverlay(objectIndex, overlayType). 
svn-id: r32816
 2008-06-26 23:30:45 +00:00
Kari Salminen
971f27beb2 Fixed opcode: 
- 0x83: o2_isSeqRunning (Should it be named o2_isSeqNotRunning?)
-- Added previously missing test part
-- Negated the result (It was backwards before!)

svn-id: r32804
 2008-06-26 17:29:21 +00:00
Kari Salminen
d7051a8ef7 Comments update. 
svn-id: r32802
 2008-06-26 15:44:26 +00:00
Kari Salminen
68c598a3f3 Comments update. 
svn-id: r32801
 2008-06-26 15:16:15 +00:00
Kari Salminen
1d71ab7e1f Fix for GCC warning (Warned about testing x >= 0 when x is unsigned and therefore the test is always true). 
svn-id: r32791
 2008-06-25 22:13:18 +00:00
Kari Salminen
1339a55389 Implemented support for zoneQuery (Operation Stealth specific). 
Fixed opcodes (related to zoneQuery):
- 0x08: o1_checkCollision
- 0x9A: o2_wasZoneChecked
NOTE: Savegame support for the zoneQuery data is broken

svn-id: r32790
 2008-06-25 21:57:08 +00:00
Kari Salminen
dee147eebf Added FIXME about the broken implementation of opcode 0x9A (o2_wasZoneChecked). 
svn-id: r32789
 2008-06-25 18:51:44 +00:00
Kari Salminen
d5d09208b4 Implemented opcode: 
- 0x82: o2_modifySeqListElement (Was o2_op82)
Seeks a matching element from the seqList and modifies its values.

svn-id: r32786
 2008-06-25 17:14:44 +00:00
Kari Salminen
a2e6f35310 Implemented opcode: 
- 0x8D: o2_op8D (Didn't come up with a descriptive name yet)
Compares ranges of x, y and mask parameters between two objects.
Possibly some kind of an intersection testing function?

svn-id: r32785
 2008-06-25 15:09:24 +00:00
Christopher Page
c14804e22f Added main menu dialog files. Gob is now using the new _quit flag 
svn-id: r32771
 2008-06-24 23:19:23 +00:00
Christopher Page
f878820bbe Created Global Main Menu Dialog. Made a uniform _quit flag for engines. So far agi, agos, and cine are now using the new _quit flag. 
svn-id: r32770
 2008-06-24 21:15:30 +00:00
Kari Salminen
f1cacafc46 Fixed opcodes: 
- 0xA0: o2_addGfxElementType20 (Was o2_addGfxElementA0)
Implemented opcodes:
- 0xA1: o2_removeGfxElementType20 (Was o2_removeGfxElementA0)
- 0xA2: o2_addGfxElementType21 (Was o2_opA2)
- 0xA3: o2_removeGfxElementType21 (Was o2_opA3)
NOTE: Drawing of type 21 overlay elements isn't coded yet.

svn-id: r32769
 2008-06-24 20:44:37 +00:00
Christopher Page
8ce5dcc8e8 Merged revisions 31992,32088,32094,32129,32203,32208,32219,32236,32329,32332-32333,32357,32504,32519,32525,32566,32578,32641-32642,32673,32675,32677,32679-32680,32718-32719,32721,32739 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2008-rtl

........
  r31992 | cpage88 | 2008-05-10 18:44:46 -0500 (Sat, 10 May 2008) | 1 line
  
  Modified game loop to return to launcher, codeblocks layouts update 1.5->1.6
........
  r32088 | cpage88 | 2008-05-13 11:09:57 -0500 (Tue, 13 May 2008) | 1 line
  
  used memmove() instead of memcpy() to fix memory overlap error
........
  r32094 | cpage88 | 2008-05-13 17:59:19 -0500 (Tue, 13 May 2008) | 1 line
  
  Fixed memory leak by deallocating memory used by window->iconPtr
........
  r32129 | cpage88 | 2008-05-14 18:26:32 -0500 (Wed, 14 May 2008) | 1 line
  
  Fixed memory leak when returning to launcher in AGOS engine by properly creating and deleting midi driver pointer
........
  r32203 | cpage88 | 2008-05-20 16:40:53 -0500 (Tue, 20 May 2008) | 1 line
  
  AGOS Engine: Began implementation for a new quit event which will cleanly return to the launcher.  This replaces the old shutdown() method within delay()
........
  r32208 | cpage88 | 2008-05-21 13:52:27 -0500 (Wed, 21 May 2008) | 1 line
  
  AGOS: Fixed two memory leaks when returning to the launcher (_mouseData and _zoneBuffers)
........
  r32219 | cpage88 | 2008-05-22 18:40:36 -0500 (Thu, 22 May 2008) | 1 line
  
  AGOS: Fixed a memory leak from earlier in a better way
........
  r32236 | cpage88 | 2008-05-23 19:08:13 -0500 (Fri, 23 May 2008) | 1 line
  
  AGI: Fixed two memory leaks when returning to launcher from AGI Engine
........
  r32329 | cpage88 | 2008-05-27 15:15:36 -0500 (Tue, 27 May 2008) | 1 line
  
  AGI: Modified AGI Engine to shutdown without using system->quit
........
  r32332 | cpage88 | 2008-05-27 18:26:48 -0500 (Tue, 27 May 2008) | 1 line
  
  CINE: Fixed two memory leaks when shutting down the CINE engine
........
  r32333 | cpage88 | 2008-05-27 19:52:45 -0500 (Tue, 27 May 2008) | 1 line
  
  CINE: Initialize exitEngine to 0 in mainLoop() to allow replay after returning to the launcher
........
  r32357 | cpage88 | 2008-05-28 18:28:11 -0500 (Wed, 28 May 2008) | 1 line
  
  LURE: Fixed some memory leaks when returning to the launcher from the LURE engine
........
  r32504 | cpage88 | 2008-06-02 16:08:49 -0500 (Mon, 02 Jun 2008) | 1 line
  
  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.
........
  r32519 | cpage88 | 2008-06-03 13:24:54 -0500 (Tue, 03 Jun 2008) | 1 line
  
  PARA: Fixed some memory leaks
........
  r32525 | cpage88 | 2008-06-04 00:21:47 -0500 (Wed, 04 Jun 2008) | 1 line
  
  QUEEN: Modified engine to use a quit flag instead of system->quit() in order to return to the launcher
........
  r32566 | cpage88 | 2008-06-05 19:34:47 -0500 (Thu, 05 Jun 2008) | 1 line
  
  TOUCHE: Fixed a memory leak
........
  r32578 | cpage88 | 2008-06-06 11:40:39 -0500 (Fri, 06 Jun 2008) | 1 line
  
  SKY: Fixed a memory leak in SKY engine
........
  r32641 | cpage88 | 2008-06-09 17:26:05 -0500 (Mon, 09 Jun 2008) | 1 line
  
  TOUCHE: Reverted some comments that were used for testing purposes
........
  r32642 | cpage88 | 2008-06-09 18:15:17 -0500 (Mon, 09 Jun 2008) | 1 line
  
  Implemented popAllCursors() in CursorManager to ensure that all unnecessary cursors are removed from the cursor stack when returning to the launcher
........
  r32673 | cpage88 | 2008-06-12 11:58:02 -0500 (Thu, 12 Jun 2008) | 1 line
  
  SAGA: Fixed memory leaks in the SAGA engine
........
  r32675 | cpage88 | 2008-06-12 13:11:09 -0500 (Thu, 12 Jun 2008) | 1 line
  
  LURE: Fixed memory leaks in the LURE engine
........
  r32677 | cpage88 | 2008-06-12 13:52:43 -0500 (Thu, 12 Jun 2008) | 1 line
  
  CINE: Fixed memory leaks in the CINE engine
........
  r32679 | cpage88 | 2008-06-12 14:34:32 -0500 (Thu, 12 Jun 2008) | 1 line
  
  AGOS: Fixed a memory leak in the AGOS engine
........
  r32680 | cpage88 | 2008-06-12 14:43:54 -0500 (Thu, 12 Jun 2008) | 1 line
  
  SCUMM: Fixed a memory leak in the SCUMM engine
........
  r32718 | cpage88 | 2008-06-16 12:34:58 -0500 (Mon, 16 Jun 2008) | 1 line
  
  AGOS: Found a system->quit(), changed to _quit=true
........
  r32719 | cpage88 | 2008-06-16 13:47:32 -0500 (Mon, 16 Jun 2008) | 1 line
  
  Fixed a problem where the function that I previously implemented, popAllCursors(), was causing the mouse cursor to disapear
........
  r32721 | cpage88 | 2008-06-16 14:55:59 -0500 (Mon, 16 Jun 2008) | 1 line
  
  Cleaned up some unnecessary comments
........
  r32739 | cpage88 | 2008-06-20 14:38:38 -0500 (Fri, 20 Jun 2008) | 1 line
  
  Reverting changes to codeblocks layouts made in revision 31992
........

svn-id: r32742
 2008-06-20 20:20:46 +00:00
Christopher Page
65abece4c6 Merged revisions 32727-32728,32730-32733,32737-32738 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32740
 2008-06-20 19:42:29 +00:00
Kari Salminen
9b910eedba Fixed a small discrepancy in Delphine unpacker's command 00b's documentation (Parameter range is 1..8, not 1..9). 
svn-id: r32730
 2008-06-18 03:31:13 +00:00
Christopher Page
37a7a572cf Merged revisions 32668-32669,32676,32687-32689,32693,32695,32698-32701,32705 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32720
 2008-06-16 19:06:48 +00:00
Kari Salminen
2b94f21744 Small cleanup (uint16 -> uint where still applicable). 
svn-id: r32689
 2008-06-13 08:37:03 +00:00
Kari Salminen
1a6841c92f More documentation for CineUnpacker-class (Practically done documenting now). Also changed parameter and return value types to a more uniform style (uint16 -> uint, int -> uint where applicable etc). 
svn-id: r32688
 2008-06-13 08:28:14 +00:00
Kari Salminen
d7d9348243 Made CineUnpacker::unpack more robust & secure. It shouldn't crash now with any input (Before making reading or writing operations they are checked to be in bounds). Also updated some comments and added some error message(s). 
svn-id: r32687
 2008-06-13 05:57:07 +00:00
Christopher Page
101105315e CINE: Fixed memory leaks in the CINE engine 
svn-id: r32677
 2008-06-12 18:52:43 +00:00
Christopher Page
e86a422e25 Merged revisions 32564-32565,32567-32575,32577,32579-32594,32596-32603,32605-32639,32644-32646,32648-32666 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32667
 2008-06-11 17:36:21 +00:00
Kari Salminen
7186c3bd1b Documented CineUnpacker class. 
svn-id: r32665
 2008-06-11 11:06:07 +00:00
Max Horn
fefad79249 No need to specify CaseSensitiveString_Hash explicitly anymore 
svn-id: r32663
 2008-06-11 06:00:56 +00:00
Kari Salminen
efc4fd7ae0 A little Delphine unpacker documentation addition and variable renaming. 
svn-id: r32660
 2008-06-10 22:37:55 +00:00
Kari Salminen
009e26f813 Changed unpackHelper1(numBits, addCount) to unpackBytes(numBytes). 
svn-id: r32655
 2008-06-10 21:44:59 +00:00
Kari Salminen
420d29932b unpackerHelper2(numBits) -> copyRelocatesBytes(offset, numBytes) and some revising of the unpacking routine. 
svn-id: r32653
 2008-06-10 21:34:26 +00:00
Kari Salminen
fdf3f36bc6 Properly renamed some of the functions in the Delphine unpacker after understanding what they really do. 
svn-id: r32649
 2008-06-10 20:57:22 +00:00
Kari Salminen
3823a23b70 Objectified the Delphine decompression routine (i.e. delphineUnpack). 
svn-id: r32646
 2008-06-10 19:08:53 +00:00
Torbjörn Andersson
339874f6c0 Fixed warnings. (Mainly, GCC 4.3 doesn't want you to use "char" as an array 
index. Probably because it's undefined whether or not it's signed.)

svn-id: r32637
 2008-06-09 17:50:52 +00:00
Kari Salminen
e2e4c90bb3 Fixed readVolCnf() filename length detection and converted fixVolCnfFileName-function to something easier to understand. 
svn-id: r32618
 2008-06-08 15:22:04 +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
Kari Salminen
b6b1b864be Checked that opcodes 0x71-0x73 really do nothing else but read the parameters in PC versions of Future Wars and Operation Stealth. Maybe they're used in the Amiga versions? 
svn-id: r32396
 2008-05-30 11:12:14 +00:00
Kari Salminen
94d1e7effb Implemented opcodes 0x04 (o1_mulObjectParam) and 0x05 (o1_divObjectParam). 
svn-id: r32393
 2008-05-30 10:43:21 +00:00
Kari Salminen
b7deac38b3 Added check in modifyObjectParam's start (Verified with FW & OS PC versions' disassemblies). Also removed superfluous default-case, hopefully no compiler will complain about this :). 
svn-id: r32371
 2008-05-29 22:07:25 +00:00
Filippos Karapetis
7ced1215d4 Fixed a crash that occurs when OS starts 
svn-id: r32366
 2008-05-29 17:58:56 +00:00
Kari Salminen
3f91c579fc Verified most parts of opcode 0x01 (o1_modifyObjectParam) against Future Wars's and Operation Stealth's disassembly (Only part of switch case 3 still left to do). 
svn-id: r32360
 2008-05-29 12:22:14 +00:00
Kari Salminen
5779261c16 Tiny comment update (Echec in French means failure). 
svn-id: r32358
 2008-05-29 10:15:39 +00:00
Christopher Page
8297ead267 Merged revisions 32124,32126-32128,32131,32133,32135-32144,32146-32153,32155-32163,32165-32168,32170-32173,32175-32179,32181-32191,32193-32202,32204-32205,32209-32214,32216,32218,32220-32235,32237-32266,32269-32271,32273-32290,32292-32295,32297-32317,32319-32323,32325-32328,32330-32331,32334-32338,32343-32347 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32350
 2008-05-28 20:30:20 +00:00
Kari Salminen
51e4e487b1 Implemented opcode 0x9A (o2_wasZoneChecked). 
svn-id: r32336
 2008-05-28 13:00:27 +00:00
Kari Salminen
f0195a01f6 Fix Operation Stealth's opcode 0x82's parameter list (Verified with DOS version's disassembly). 
svn-id: r32335
 2008-05-28 12:05:40 +00:00
Christopher Page
3c0e72bb25 CINE: Initialize exitEngine to 0 in mainLoop() to allow replay after returning to the launcher 
svn-id: r32333
 2008-05-28 00:52:45 +00:00
Christopher Page
17b0144402 CINE: Fixed two memory leaks when shutting down the CINE engine 
svn-id: r32332
 2008-05-27 23:26:48 +00:00
Kari Salminen
c0f1b7fe66 Added a few more comments about Operation Stealth's opcodes (Redundancies, Future Wars's opcodes' end point). 
svn-id: r32328
 2008-05-27 19:36:39 +00:00
Kari Salminen
17fd16a38e Went through Operation Stealth's opcode list and added TODOs for naming all unknown functions properly and some notes about opcode redundancies. 
svn-id: r32327
 2008-05-27 19:25:04 +00:00
Eugene Sandulenko
f2d72d9473 Patch #1969189: "CinE renderer rewrite" 
svn-id: r32257
 2008-05-24 22:11:41 +00:00
Eugene Sandulenko
51352c71c5 Proper fix for savestates. Thanks to next_ghost 
svn-id: r32073
 2008-05-12 21:03:26 +00:00
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time 
svn-id: r31888
 2008-05-06 03:00:26 +00:00
Kari Salminen
9ba0aa01fa Cleanup & typo. 
- Use sizeof(_name) instead of magic number 10 with memset
- 'usually' instead of 'ussually'
- 'delete[]' instead of 'delete []'
- Fixed parameter name discrepancy between loadResource's definition and declaration

svn-id: r31701
 2008-04-24 20:04:53 +00:00
Filippos Karapetis
5cf618937f Fixed regression: CINE games crashed when a message box appeared (patch by next_ghost) 
svn-id: r31696
 2008-04-24 17:32:24 +00:00
Eugene Sandulenko
57a9ef3a8f Patch #1941066: "CinE sprite overlay rewrite" courtsey of next_ghost 
svn-id: r31651
 2008-04-21 20:51:17 +00:00
Johannes Schickel
b586235fb8 Fixed warnings for msvc9. 
svn-id: r31460
 2008-04-09 15:16:50 +00:00
Eugene Sandulenko
e4ddd5d5f1 Ignore pointers on save 
svn-id: r31453
 2008-04-08 18:12:32 +00:00
Sven Hesse
9f94a2fa8c Fix compilation on my 64-bit system... 
svn-id: r31450
 2008-04-08 09:59:41 +00:00
Eugene Sandulenko
732774fd8d Patch #1913862: "CinE Script system" 
svn-id: r31444
 2008-04-07 20:24:40 +00:00
Max Horn
29f1e6de38 Advanced detector: replaced kADFlagAugmentPreferredTarget by its inverse, kADFlagDontAugmentPreferredTarget (since all AdvDetector engines except Kyra used kADFlagAugmentPreferredTarget, it seems reasonable to assume that as default) 
svn-id: r31413
 2008-04-05 22:29:08 +00:00
Filippos Karapetis
1e58257791 Oops 
svn-id: r31297
 2008-03-28 17:46:18 +00:00
Filippos Karapetis
70e4503274 Fixed 2 off-by-one errors (thanks next_ghost for spotting them) 
svn-id: r31296
 2008-03-28 17:38:45 +00:00
Max Horn
6547ef6e12 Started to get rid of Common::EncapsulatedADGameDesc (using plain Common::ADGameDescription instead) 
svn-id: r31121
 2008-03-14 17:31:04 +00:00
Max Horn
8a9a14002e Advanced Detector: Changed fallback detector from a callback function pointer to an overrideable method of AdvancedMetaEngine 
svn-id: r31119
 2008-03-14 13:59:31 +00:00
Max Horn
88bb567e18 Merged lots of _mixer->isReady() warnings into a single one in Engine constructor 
svn-id: r30871
 2008-02-15 17:01:35 +00:00
Jordi Vilalta Prat
c103290e2b Initial support for plugin types 
svn-id: r30825
 2008-02-08 00:02:23 +00:00
Max Horn
8a73356a2d Revised Engine plugin API to only provide a single func which returns a MetaEngine instance. Used this to simplify the rest of the plugin system 
svn-id: r30780
 2008-02-03 18:56:47 +00:00
Torbjörn Andersson
e51bf80218 Changed "COMPATIBLITY" to "COMPATIBILITY". 
svn-id: r30754
 2008-02-03 10:15:36 +00:00
Max Horn
34b35348be Moved AdvancedMetaEngine to namespace Common 
svn-id: r30736
 2008-02-02 11:52:04 +00:00
Jordi Vilalta Prat
5165ff448d Converted the remaining engines to use MetaEngine 
svn-id: r30728
 2008-02-02 02:35:13 +00:00
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs. 
svn-id: r30667
 2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Eugene Sandulenko
7aadf6c191 Slightly modified patch #1848173: "ScriptVars class implementation for CinE" 
svn-id: r30125
 2008-01-01 16:57:03 +00:00
Eugene Sandulenko
6b722c2f1c _Properly_ fix lock-up introduced introduced in revision 29860. A typical 
c/p error.

svn-id: r29982
 2007-12-24 19:49:28 +00:00
Eugene Sandulenko
fd22ebb269 Fix regressions (crashes) introduced in commit 29860 
svn-id: r29981
 2007-12-24 19:13:32 +00:00
Filippos Karapetis
50cf084a6b Cleanup 
svn-id: r29973
 2007-12-24 10:11:41 +00:00
Filippos Karapetis
8b0ae7983c Change 3 remaining free() to delete, which were not changed with commit #29841 (part of patch #1848173) 
svn-id: r29972
 2007-12-24 10:10:21 +00:00
Filippos Karapetis
46ee7e6791 Slight cleanup 
svn-id: r29934
 2007-12-21 02:43:21 +00:00
Gregory Montoir
bb30d560b2 renamed several structures, variables and functions 
svn-id: r29860
 2007-12-14 19:21:19 +00:00
Filippos Karapetis
57460c21b3 Added a note, switched to CLIP template for clipping, some cleanup 
svn-id: r29859
 2007-12-14 13:55:18 +00:00
Filippos Karapetis
729c843091 Cleanup 
svn-id: r29858
 2007-12-14 13:51:41 +00:00
Gregory Montoir
e1b73e47f8 use CLIP template for clipping, made an array static const and renamed MAX_OBJECTDATA to MAX_VAR 
svn-id: r29853
 2007-12-13 19:07:10 +00:00
Filippos Karapetis
ee56120fcf Added a proper fix for bug #1733238 - "FW: crash in copier room", taken from next_ghost's patch #1848173 - "ScriptVars class implementation for CinE" 
svn-id: r29852
 2007-12-13 17:53:31 +00:00
Filippos Karapetis
3240d0636a Fixed a regression from the latest cleanups 
svn-id: r29851
 2007-12-13 17:47:54 +00:00
Filippos Karapetis
280d634455 Fixed an incorrect copy/paste 
svn-id: r29850
 2007-12-13 17:03:14 +00:00
Filippos Karapetis
30be440557 Fixed regression introduced by the latest cleanups 
svn-id: r29849
 2007-12-13 15:10:52 +00:00
Filippos Karapetis
dd14a43cac Fixed one more regression from the latest cleanup 
svn-id: r29848
 2007-12-13 14:04:36 +00:00
Filippos Karapetis
2cb9ea3c10 Fixed a regression from the latest cleanup 
svn-id: r29847
 2007-12-13 13:51:04 +00:00
Sven Hesse
1d338096f0 Muting the compiler :P 
svn-id: r29846
 2007-12-13 13:26:49 +00:00
Filippos Karapetis
2991b03cc4 Cleanup and simplification 
svn-id: r29845
 2007-12-13 13:17:45 +00:00
Filippos Karapetis
8b7f3fae35 Cleanup 
svn-id: r29844
 2007-12-13 12:33:31 +00:00
Filippos Karapetis
2f7539e865 Cleanup 
svn-id: r29843
 2007-12-13 11:11:38 +00:00
Filippos Karapetis
a9e1f39a16 Cleanup and simplification 
svn-id: r29842
 2007-12-13 10:47:14 +00:00
Filippos Karapetis
8968f7e616 Changed the C style malloc/free to the C++ style new/delete 
svn-id: r29841
 2007-12-13 10:06:53 +00:00
Torbjörn Andersson
6589dba7f5 Fixed warning about casting away constness. 
svn-id: r29839
 2007-12-12 21:56:22 +00:00
Filippos Karapetis
dcf4755dc1 Cleanup, removed duplicate code 
svn-id: r29838
 2007-12-12 21:39:00 +00:00
Filippos Karapetis
99453537f1 Cleanup 
svn-id: r29830
 2007-12-11 23:16:15 +00:00
Gregory Montoir
a94fada0ae - minor screen fix for OS 
- added new debug channel for sound
- updated 2 opcodes comments

svn-id: r29790
 2007-12-09 13:41:59 +00:00
Gregory Montoir
6ef7e37488 reverted parts of commits #29447 and #29446 (caused regressions in ADL music playback) and properly (I hope) fixed the sound issues described in tracker item #1763053. 
svn-id: r29766
 2007-12-08 15:24:42 +00:00
Gregory Montoir
aae704f6cd amiga demo version of OS has a VOL.CNF file so I assume full versions of the game also use it ; enabled readVolCnf for all versions of OS. 
svn-id: r29760
 2007-12-08 09:51:24 +00:00
Gregory Montoir
c271093fbb simplified gfxConvertSpriteToRaw, some renaming 
svn-id: r29758
 2007-12-08 09:10:08 +00:00
Gregory Montoir
6b68c156ae made timing closer to the original interpreter and simplified manageEvents function (no need to recurse) 
svn-id: r29757
 2007-12-08 08:49:22 +00:00
Gregory Montoir
e82c2b3fb9 reverted part of commit #29749, inplace unpacking doesn't work with .ani data 
svn-id: r29756
 2007-12-08 08:48:31 +00:00
Filippos Karapetis
e905723b1e Cleanup and simplification 
svn-id: r29755
 2007-12-08 02:38:04 +00:00
Filippos Karapetis
c488384f19 Cleanup and simplification 
svn-id: r29754
 2007-12-08 02:24:12 +00:00
Gregory Montoir
126f55fd0e backported some changes for OS 
- added parsing of VOL.CNF to get the (filename,bundle) mapping (should be more efficient than testing every bundle file)
- delphineUnpack allows "inplace unpacking", use this instead of allocating temporary buffers
- relation script run count should be set in _localVars[0]
- added comments for some "special" script variables

svn-id: r29749
 2007-12-07 20:45:51 +00:00
Eugene Sandulenko
cc4311f10f One more fix from Patch #1773489 
svn-id: r29447
 2007-11-07 22:29:20 +00:00
Eugene Sandulenko
604be3107e Patches #1773489: "FW: Fixes for German Amiga Version" 
svn-id: r29446
 2007-11-07 22:28:01 +00:00
Torbjörn Andersson
c1760e2aae Mark the end of the Cine namespace. 
svn-id: r29413
 2007-11-04 18:03:18 +00:00
Gregory Montoir
7cf5a57827 fix buffer overflow (globalVars is int16 -> index/=2) 
svn-id: r29402
 2007-11-04 03:16:56 +00:00
Eugene Sandulenko
c640d1c604 Patch #1825276: "DETECTION: advanced detector engine simplification" 
svn-id: r29386
 2007-11-03 21:06:58 +00:00
Eugene Sandulenko
77eea722af Modified patch #1738058: "Action recorder". 
svn-id: r28968
 2007-09-19 13:55:05 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00
Neil Millstone
c43f68e554 Fix bug where an object was accessed after it was deleted in cine engine 
svn-id: r27870
 2007-07-02 22:42:35 +00:00
Max Horn
2fa0a5c457 Cleaning up after myself (I blame it on, err, uhh... the Vogons?) 
svn-id: r27625
 2007-06-22 21:16:07 +00:00
Max Horn
54d668ac13 Changed more code to use Common::KEYCODE_ enum 
svn-id: r27624
 2007-06-22 21:10:57 +00:00
Torbjörn Andersson
8e2fd2ee73 Fixed freeing of invalid pointer, which would cause Operation Stealth to crash. 
I don't know if the loadSet() / loadSetAbs() functions are every used in Future
Wars. If so, we should commit this to the branch as well.

svn-id: r27590
 2007-06-21 17:24:27 +00:00
Filippos Karapetis
5dc568e7a7 Fix for #1733238 - FW: crash in copier room 
svn-id: r27376
 2007-06-12 12:49:07 +00:00
Eugene Sandulenko
6e5b70f5e9 Patch #1733764: "Fallback detection patch". GSoC student. 
svn-id: r27375
 2007-06-12 12:22:25 +00:00
Torbjörn Andersson
059ba7326c Fixed some Valgrind warnings (overlapping source and destination in strcpy()). 
svn-id: r27207
 2007-06-08 19:29:48 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Gregory Montoir
45b721d3cc cleanup, don't rely on assert() to ensure a gamefile/savefile is opened. Also removed the use of Common::File global objects. 
svn-id: r27021
 2007-05-30 18:43:28 +00:00
Max Horn
0de170c980 Removing useless common/fs.h includes 
svn-id: r27018
 2007-05-30 17:44:52 +00:00
Gregory Montoir
137140b7e9 removed some resource related memory leaks 
svn-id: r27007
 2007-05-29 21:06:07 +00:00
Gregory Montoir
73210b4aa3 added code for freePartRange, freePartEntry and freeOverlay (also renamed some functions and variables). 
svn-id: r27006
 2007-05-29 20:22:20 +00:00
Gregory Montoir
659e7ed76e sync resource unpacking code of cruise with cine 
svn-id: r26933
 2007-05-24 21:19:52 +00:00
Gregory Montoir
e0159324cc some fixes for the music in Amiga OS Demo 
svn-id: r26886
 2007-05-20 11:50:06 +00:00
Gregory Montoir
b37c83448a made the resource loading function case insensitive to the filename and removed a NULL dereference if a file is not found 
svn-id: r26885
 2007-05-20 11:48:53 +00:00
Gregory Montoir
4aa3ec63de when reading a string from a script, skip the '\0' trailing char (less opcode '0' executions...) 
svn-id: r26880
 2007-05-19 21:16:31 +00:00
Gregory Montoir
3afd0d9557 removed 4 unused offscreen buffers ; also changed several 64k buffers to be dynamically allocated. 
svn-id: r26879
 2007-05-19 21:12:10 +00:00
Max Horn
a165d96fd3 Fix preprocessor error caused by undefined symbol DEBUG_SPRITE_MASK 
svn-id: r26874
 2007-05-19 20:06:50 +00:00
Gregory Montoir
bde5404a4e added basic support for Amiga music playback 
svn-id: r26870
 2007-05-19 12:08:41 +00:00
Gregory Montoir
93e41222b5 added debug code to display sprite masks 
svn-id: r26865
 2007-05-18 09:19:35 +00:00
Gregory Montoir
e16e11fdf2 added missing MIN() calls 
svn-id: r26864
 2007-05-18 09:14:27 +00:00
Gregory Montoir
1b3458e429 moved gfx related functions from various.cpp/.h to gfx.cpp/.h and fixed indentation of previous commit 
svn-id: r26863
 2007-05-17 22:26:05 +00:00
Gregory Montoir
3ab295a0ee removed unneeded if blocks 
svn-id: r26862
 2007-05-17 22:18:51 +00:00
Gregory Montoir
e9827d0884 added code for gfxSpriteFunc1 and gfxSpriteFunc2, which are used for sprite masking (see also bug #1624797) 
svn-id: r26861
 2007-05-17 22:13:31 +00:00
Gregory Montoir
97e6e4aea8 this should fix script label offsets computation for OS 
svn-id: r26841
 2007-05-14 21:52:06 +00:00
Gregory Montoir
b5aa521a75 added basic support for sounds playback in Amiga versions (only tested with the demos) 
svn-id: r26837
 2007-05-13 16:11:19 +00:00
Gregory Montoir
e6ef2348a4 removed duplicated code (BASESON datafiles can be loaded with the existing bundle related functions) 
svn-id: r26836
 2007-05-13 16:07:33 +00:00
Gregory Montoir
a05d455ae8 minor fixes to the adlib sound code, this should help bug #1599270 
svn-id: r26820
 2007-05-13 02:11:38 +00:00
Max Horn
eb6318e9fa Added FIXME comment to CINE regarding an odd warning in processSeqListElement 
svn-id: r26248
 2007-03-19 22:30:28 +00:00
Max Horn
f1497d5aa9 CINE: Make use of EventManager::getMousePos 
svn-id: r26222
 2007-03-18 18:34:16 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again 
svn-id: r26180
 2007-03-17 19:02:05 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent 
svn-id: r26156
 2007-03-17 00:53:21 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me 
svn-id: r25752
 2007-02-20 18:50:17 +00:00
Chris Apers
227d83ea6e Bad hack to make this engine works on PalmOS (compiler still seems to hate some global objects) 
svn-id: r25684
 2007-02-18 12:21:25 +00:00
Max Horn
7572d2b4f2 Changed detectBestMatchingGame to return a pointer to a ADGameDescription (or a subclass of it); added a (currently fake) fallback callback entry in ADParams 
svn-id: r25574
 2007-02-13 23:37:44 +00:00
Max Horn
4968e912ce AdvancedDetector changes: 
* Renamed genGameList to gameIDList to make it match the corresponding
  plugin API function name
* removed the detectFunc param from detectGameForEngineCreation,
  as it *always* pointed to a straight wrapper around AdvancedDetector::detectAllGames
* as a consequence, removed the various GAME_detectGames functions from the
  engines, and removed the detectFunc param from ADVANCED_DETECTOR_DEFINE_PLUGIN

svn-id: r25547
 2007-02-13 14:55:11 +00:00
Eugene Sandulenko
da7d8c9f35 Rename Common::GF_XXX to Common::ADGF_XXX 
svn-id: r25545
 2007-02-13 13:42:28 +00:00
Max Horn
2afe07992f Renamed kADFlagComplexID to kADFlagAugmentPreferredTarget, document it, and add it for AGOS, too 
svn-id: r25543
 2007-02-13 13:17:46 +00:00
Max Horn
55adc889e7 (re)added flags field to ADGameDescription, with currently only one value (GF_DEMO) -- this flag value is not yet used by anything (also, GF_DEMO hasn't been correctly set for AGI games yet) 
svn-id: r25539
 2007-02-13 01:28:18 +00:00
Torbjörn Andersson
3bc0661065 Merged the "palette manager" into the cursor manager. It was only used to 
manage *cursor* palettes, so the name was misleading.

svn-id: r25500
 2007-02-12 00:04:56 +00:00
Eugene Sandulenko
7b6bdd231d AdvancedDetector now has built-in fallback detection based on file lists. 
Currently only gob engine benefits from it.

svn-id: r25374
 2007-02-04 03:10:27 +00:00
Torbjörn Andersson
0a18259d78 Used Fingolfin's workaround for a bogus (?) warning produced by some versions 
of GCC. (Not the one he's using, though, which is why I'm doing this instead.)

svn-id: r25327
 2007-02-01 20:16:32 +00:00
Eugene Sandulenko
adcfd2cc5f Now AdvancedDetector could use single ID per engine. Also it can suggest 
more complex game IDs with platform and language specified.

AGI engine benefits most from that.
Also turned Cine, Parallaction and SAGA to single ID, autoupgrading old ID.

svn-id: r25269
 2007-01-29 23:25:51 +00:00
Eugene Sandulenko
93687d376b Add more paramteres to AdvancedDetector. Not used yet. 
svn-id: r25241
 2007-01-28 07:31:26 +00:00
Max Horn
d70c83bd4b Lots of cleanup in the AdvancedDetector 
svn-id: r25194
 2007-01-25 21:16:57 +00:00
Eugene Sandulenko
bb3cc79bc6 Reduce #include dependencies 
svn-id: r25178
 2007-01-25 01:05:25 +00:00
Eugene Sandulenko
318210ad96 Add optional size parameter to ADGameFileDescription. Not used now. 
svn-id: r25164
 2007-01-24 22:42:44 +00:00
Eugene Sandulenko
edd2422a55 Hide all AdvacedDetector parameters into a structure for easier maintenance 
and extensibility

svn-id: r25163
 2007-01-24 22:24:52 +00:00
Eugene Sandulenko
d3b0ff8ade Reduce dependency from common/advancedDetector.h 
svn-id: r25156
 2007-01-21 20:24:38 +00:00
Max Horn
fef501c205 openForSaving can fail, so it should be handled gracefully -- but better to assert out in a controlled manner than o invoke methods on a NULL pointer, right? :-) 
svn-id: r25151
 2007-01-21 15:19:30 +00:00
Eugene Sandulenko
cd8a5f3a98 First phase of detection-related plugins interface improvements. Now plugins 
return StringMap instead of fixed list of parameters. This adds great
flexibility.

Current patch should not alter any functionality, i.e. if there are regressions,
submit a report. Phase 2 will benefit from these changes and will come later.

svn-id: r25134
 2007-01-20 21:27:57 +00:00
Torbjörn Andersson
48061b3392 Fixed warning. 
svn-id: r25092
 2007-01-15 19:56:27 +00:00
Eugene Sandulenko
c01839bbe9 Make ADGameFileDescription is built in directly into ADGameDescription. 
svn-id: r24947
 2006-12-29 00:03:03 +00:00
Max Horn
559f2b62eb Renamed real_ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION to ADVANCED_DETECTOR_DETECT_GAMES_FUNCTION, and real_ADVANCED_DETECTOR_DETECT_INIT_GAME to ADVANCED_DETECTOR_DETECT_INIT_GAME 
svn-id: r24896
 2006-12-19 23:57:04 +00:00
Max Horn
d82d2c4513 Fix warning about a const cast 
svn-id: r24886
 2006-12-19 12:24:41 +00:00
Eugene Sandulenko
457ebfea3c Get rif od ARRAYSIZE in ADGameDescription 
svn-id: r24882
 2006-12-19 04:35:08 +00:00
Eugene Sandulenko
18ce381060 Got rid of ARRAYSIZE in advanceDetector calls 
svn-id: r24881
 2006-12-19 03:52:04 +00:00
Eugene Sandulenko
6eb8b98adc Remove unneeded #include 
svn-id: r24813
 2006-12-07 00:32:32 +00:00
Torbjörn Andersson
f36beed55d Changed CINE_*_H_ to CINE_*_H for consistency with other engines. (Oh, who am I 
kidding, I'm still testing the SVN change.)

svn-id: r24806
 2006-12-03 18:29:58 +00:00
Torbjörn Andersson
2564d954de Fixed indentation. (Oh, ok, I actually just wanted to test the new SVN access 
path.)

svn-id: r24805
 2006-12-03 17:08:37 +00:00
Eugene Sandulenko
8fddc12581 Support loading saves from command line. 
svn-id: r24787
 2006-11-25 09:28:00 +00:00
Eugene Sandulenko
c89dcb6e79 Let F10 work in all expected cases. 
svn-id: r24785
 2006-11-24 20:25:55 +00:00
Eugene Sandulenko
a2b240c0e2 Fix regression in OS Amiga demo. 
svn-id: r24771
 2006-11-23 06:57:06 +00:00
Eugene Sandulenko
45c645159f Add missing dump script cases. 
svn-id: r24770
 2006-11-23 06:52:03 +00:00
Eugene Sandulenko
8476b767f9 Fix crashes on unimplemented music/sfx in Amiga/Atari versions. 
svn-id: r24769
 2006-11-23 06:50:44 +00:00
Eugene Sandulenko
57ba5fc233 Fix Amiga/Atari-specific copy protection. 
svn-id: r24768
 2006-11-23 06:49:23 +00:00
Eugene Sandulenko
51a621fe98 Dump global scripts too. 
svn-id: r24767
 2006-11-23 06:47:41 +00:00
Eugene Sandulenko
207ef00754 et up cursor palette. This fixes Amiga/Atari versions and makes cursor more 
visible in most cases.

svn-id: r24766
 2006-11-23 06:45:21 +00:00
Eugene Sandulenko
e09eaa074e Fix bug #1599267: "FW: Ungraceful exit from copy protection screen" 
svn-id: r24765
 2006-11-23 06:43:18 +00:00
Eugene Sandulenko
cfb29dcb51 Fix MSVC2005 warnings. Please, review the changes. 
svn-id: r24760
 2006-11-22 15:50:30 +00:00