36794 Commits

Author SHA1 Message Date
Martin Kiewitz
9d1dc48a6e SCI: removed oldMenuId check for BitsShow in menu (was done for keyboard interaction) - using mouse its possible to leave the menu which would now result in inverted menu topic not displayed - fixed
svn-id: r47526
2010-01-24 21:24:07 +00:00
Martin Kiewitz
a1daf54425 SCI: never set palette for amiga games (fixes kq5 palette corruption at the beginning)
svn-id: r47525
2010-01-24 21:11:26 +00:00
Martin Kiewitz
44827b340f SCI: changed amiga palette mapping table to map color 15 (white) again, scripts dont like it to be 255 :P
svn-id: r47524
2010-01-24 21:01:21 +00:00
Martin Kiewitz
75816d4ca1 SCI: added comment about using color 255 all the time for amiga games
svn-id: r47523
2010-01-24 20:51:34 +00:00
Martin Kiewitz
2ef7848586 SCI: changing white to be 255 for amiga all the time (works for our interpreter) - fixes mouse cursor on amiga sci1 games
svn-id: r47522
2010-01-24 20:47:35 +00:00
Martin Kiewitz
029154ab3a SCI: fixing amiga mapping for colors 0 and 15, those are hardcoded like everywhere else
svn-id: r47521
2010-01-24 20:38:56 +00:00
Martin Kiewitz
b4ecf7f0e1 SCI: self drawn stuff on amiga uses ega palette, we need to match it onto currently used amiga palette (fixes user interface colors for amiga sci1 games)
svn-id: r47520
2010-01-24 20:31:01 +00:00
Kari Salminen
69e6b2a27a Cine: executePlayerInput: Operation Stealth: Fix target object name not disappearing when passing over an empty area with a verb already chosen.
svn-id: r47519
2010-01-24 20:23:09 +00:00
Kari Salminen
710dd33592 Cine: executePlayerInput: Fix broken Y-movement in Operation Stealth (D'oh! Copy-pasted X to where Y was meant :-P).
- Hopefully NOW things should work without r33872!

svn-id: r47518
2010-01-24 20:16:16 +00:00
Kari Salminen
bd7b9400a6 Cine: executePlayerInput: Add TODO about investigating why some buttons don't work currently.
svn-id: r47517
2010-01-24 19:57:23 +00:00
Kari Salminen
ab730891ad Cine: executePlayerInput: Revert r33872 as things should work without it now.
With the latest changes to executePlayerInput we
should now be able to free the girl at the bottom of the
ocean without the r33872.

The commit log from r33872 was:

"Fix for bugging moving at the bottom of the ocean when trying to free the girl from the ropes and swimming to the surface. Some global variables related to mouse position weren't being updated in executePlayerInput, now they are and things seem to work. Also enables moving in the labyrinth arcade sequence at the palace."

svn-id: r47516
2010-01-24 19:52:11 +00:00
Kari Salminen
c19afec75a Cine: executePlayerInput: Add makeActionMenu-part to keyboard handling and a couple of TODOs for Operation Stealth.
- NOTE: This doesn't seem to work correctly yet.
   My current guess is that it has to do with how
   some keyboard events are handled in cine/main_loop.cpp's
   processEvent-function and some in cine/various.cpp's
   executePlayerInput.

svn-id: r47515
2010-01-24 19:47:53 +00:00
Martin Kiewitz
e51721f7b1 SCI: handle intensity calls for amiga the same way as we handle palette animation (abort instead of process)
svn-id: r47514
2010-01-24 19:42:12 +00:00
Kari Salminen
f2882cc2df Cine: executePlayerInput: Implement moving using keyboard for Operation Stealth.
svn-id: r47513
2010-01-24 19:14:09 +00:00
Kari Salminen
d8cb07251e Cine: executePlayerInput: Implement 'A player command is given, left mouse button is down, right mouse button is up'-case for Operation Stealth.
- Also changed a do-while -loop into a
   while-loop as it should be for both
   FW and OS according to disassembly.

svn-id: r47512
2010-01-24 18:58:57 +00:00
Walter van Niftrik
e7e9006122 SCI: Fix list control scrolling in Jones EGA and VGA.
svn-id: r47511
2010-01-24 18:57:23 +00:00
Kari Salminen
865b176b15 Cine: executePlayerInput: Fix 'No player command is given, left mouse button is down, right mouse button is up'-case for Operation Stealth.
svn-id: r47510
2010-01-24 18:40:29 +00:00
Kari Salminen
650a9b9c49 Cine: executePlayerInput: Fix 'left and right mouse buttons are up'-case for Operation Stealth.
svn-id: r47509
2010-01-24 18:27:56 +00:00
Kari Salminen
7ce227b670 Cine: executePlayerInput: Combine 'left mouse button is up, right mouse button is down'-cases into one code part.
Additionally:
 - Operation Stealth specific: Make makeActionMenu() use canUseOnItemTable.
   This would seem to be the correct way according to disassembly
   (Although there is of course a possibility that I have overlooked
   some part of the code).

svn-id: r47508
2010-01-24 18:20:22 +00:00
Kari Salminen
40cb795fe7 Cine: executePlayerInput: Name used keys in switch-clause (F1-F10, Ins, Del).
svn-id: r47507
2010-01-24 17:56:23 +00:00
Walter van Niftrik
10da245619 SCI: Cleanup
svn-id: r47506
2010-01-24 17:52:27 +00:00
Kari Salminen
414eadfb2a Cine: executePlayerInput: Combine mouse handling plus a few other things.
- Combines mouse position and button state fetching
   from two branches (allowPlayerInput / !allowPlayerInput)
   into a single loop with a little more exotic while-clause.
   NOTE! Added manageEvents-call into the unified version although
   there was no manageEvents-call in one of the versions that was
   combined. Tested a little and didn't seem to matter, but hopefully
   won't cause any regressions!
 - Limit first possible 'renderer->setCommand(commandBuffer)' call
   to Future Wars only (Checked with FW & OS disassembly).
 - Combined all cases of 'left and right mouse buttons are down'
   into a single if-clause (All those cases call makeSystemMenu).

svn-id: r47505
2010-01-24 17:46:37 +00:00
Torbjörn Andersson
45cbc7b265 Fixed warning.
svn-id: r47504
2010-01-24 17:24:11 +00:00
Kari Salminen
34581f12e4 Cine: Document branches in executePlayerInput and remove dead code (if-clauses that are always true or always false).
svn-id: r47503
2010-01-24 16:40:37 +00:00
Kari Salminen
53d8bd9760 Cine: Cleanup (Use an enumeration for mouse button states rather than values 1 and 2).
svn-id: r47502
2010-01-24 16:25:08 +00:00
Florian Kagerer
4eb077dcf3 LOL: save/load menu speed up
svn-id: r47501
2010-01-24 15:40:36 +00:00
Walter van Niftrik
bffdcc9e54 SCI: Fix left aligning and centering in kFormat.
svn-id: r47500
2010-01-24 15:21:51 +00:00
Jordi Vilalta Prat
0d2a75c75d Fix indentation
svn-id: r47499
2010-01-24 12:19:09 +00:00
Filippos Karapetis
aab6485d32 Always memset the newly malloc'ed argument memory to 0 inside kFormat
svn-id: r47498
2010-01-24 11:57:10 +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
1352940688 Replaced CHECK_OVERFLOW1 with asserts
svn-id: r47496
2010-01-24 11:00:21 +00:00
Martin Kiewitz
d0b8a8e468 SCI: supporting .used bit 1 in palettes (force direct palette setting) and clipping palette intensity results fixes fade in/out in sq5 intro (some timing problems remain)
svn-id: r47495
2010-01-24 10:06:27 +00:00
Torbjörn Andersson
0be507e9c3 Silenced two more trivial cppcheck warnings.
svn-id: r47493
2010-01-24 08:19:15 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
2010-01-23 23:55:35 +00:00
Arnaud Boutonné
9369c9f3c5 Add header
svn-id: r47491
2010-01-23 23:11:07 +00:00
Arnaud Boutonné
5cca3d8edd Oups, I missed a second copyright string
svn-id: r47490
2010-01-23 23:05:15 +00:00
Arnaud Boutonné
1f79fd5788 Some more header modifications ("Graphic Adventure Engine" and the legal property paragraph)
svn-id: r47489
2010-01-23 22:50:24 +00:00
Arnaud Boutonné
00b4e1440c Header modifications. Add standard header parts and properties.
svn-id: r47488
2010-01-23 22:29:05 +00:00
Arnaud Boutonné
a1b181cedd Headers - Add URL in properties so it's displayed properly in the header
svn-id: r47487
2010-01-23 22:13:40 +00:00
Arnaud Boutonné
084c1b8032 Some more header modifications
svn-id: r47486
2010-01-23 21:50:26 +00:00
Filippos Karapetis
5b4fcfdbcb Added some skeleton code for kPalVary()
svn-id: r47485
2010-01-23 21:33:24 +00:00
Filippos Karapetis
dcbcb41855 kSetSynonyms is really parser related, but it's an empty function in games without a parser
svn-id: r47484
2010-01-23 20:27:14 +00:00
Filippos Karapetis
722233fd0d - Moved all of the parser-related variables inside the Vocabulary class
- Moved the kSetSynonyms() function inside kscripts (as it's for script synonyms, not parser word synonyms)
- The parser vocabulary is now only initialized for SCI0 and SCI01 games, which had a parser

svn-id: r47483
2010-01-23 19:10:56 +00:00
Johannes Schickel
edbc368398 Cleanup. (And along with it add some additional asserts).
svn-id: r47482
2010-01-23 18:24:11 +00:00
Johannes Schickel
2489340cc8 Fix build broken with r47480.
svn-id: r47481
2010-01-23 18:11:21 +00:00
Filippos Karapetis
df149e1509 Separated the parser code
svn-id: r47480
2010-01-23 17:55:54 +00:00
Johannes Schickel
4fcc82e7a6 Paranoia change: add some explicit terminating 0 after some strncpy uses.
svn-id: r47479
2010-01-23 16:15:18 +00:00
Arnaud Boutonné
a469913c60 Tools - Replace some more headers by standard headers
svn-id: r47478
2010-01-23 15:27:47 +00:00
Filippos Karapetis
27b37ed97e Amiga SCI1 games had signed sound data. Fixes PQ3 Amiga
svn-id: r47477
2010-01-23 15:01:17 +00:00
Arnaud Boutonné
e488e0f7d5 Tools - Use standard header
svn-id: r47476
2010-01-23 15:00:11 +00:00