Commit Graph

39844 Commits

Author SHA1 Message Date
Alejandro Marzini
c93adcbd29 OPENGL: For GLES, add glOrthox and do not use GL_BGR.
svn-id: r51552
2010-07-31 20:58:14 +00:00
Alejandro Marzini
6d6756b46a Add OpenGL dependencies to MinGW configure.
svn-id: r51551
2010-07-31 19:57:54 +00:00
Alejandro Marzini
fc94a3246a OPENGL: Fix texture updating.
svn-id: r51549
2010-07-31 19:20:33 +00:00
Alejandro Marzini
fb4086cadb Merged from trunk, from Rev 50841 to HEAD
svn-id: r51495
2010-07-30 05:28:09 +00:00
Alejandro Marzini
7b070bbef8 SDL/OPENGL: Add ability to switch between SDL and OpenGL graphics managers.
OSystem_SDL will create a merged list of all graphics modes from SDL and OpenGL. When the user changes the graphics mode in options and restarts ScummVM should switch to that graphics mode in the corresponding graphics manager.

svn-id: r51493
2010-07-30 03:31:05 +00:00
Alejandro Marzini
9daa1c7f93 OSYSTEM: Add resetGraphicsScale() method.
This fixes a hack for resetting the graphics scale to x1 when starting games that have a large screen size. The SDL graphics manager should now scale back to x1 without changing the current scaler in use, as well as the OpenGL graphics manager.

svn-id: r51492
2010-07-30 03:06:57 +00:00
Alejandro Marzini
37f7748a4a OPENGL: Fix crash on Broken Sword 2 when refreshing screen.
I must admit that I do not know why it does crash, but it seems that updating row by row is safer and does not makes problems.

svn-id: r51491
2010-07-30 02:58:35 +00:00
Alejandro Marzini
ffb5868ac5 SDL: Add SDL backend subfolders paths to makefile MODULE_DIRS.
This should fix subfolders sources not recompiling after a header change.

svn-id: r51489
2010-07-30 00:48:10 +00:00
Filippos Karapetis
a17e3c4449 SCI: Fixed script bug #3036601 - "LONGBOW: Druid hand code brings up ScummVM console", along with a related bug after giving an answer through the hand code
svn-id: r51486
2010-07-29 23:58:47 +00:00
Martin Kiewitz
2c9d30290e SCI: fixing hoyle 3
hoyle 3 is using kCanBeHere, but it has cantBeHere and canBeHere selectors so our auto detection would fail
it also has a cantBeHere stub in Actor, thus it won't set acc at all. We reset acc because of that before calling cantBeHere selector (!) of the actors (canBeHere isnt used) so that we wont get a collision otherwise because acc is non zero when calling kDoBresen (fixes all sorts of bugs, clone2727 should clean it up :P

svn-id: r51485
2010-07-29 22:52:48 +00:00
Martin Kiewitz
df9f4b5bfe SCI: reverting r51479 and adding TODOs for fixing the hoyle issue (fixing this properly should make credits etc. appear and solve all the other issues that clone submitted)
svn-id: r51484
2010-07-29 22:04:23 +00:00
Martin Kiewitz
4101d40957 SCI: finished logkernel command
use 'logkernel DoSound' on to log calls to all kDoSound subfunctions. use 'logkernel DoSoundPlay' to log calls to kDoSound(play)

svn-id: r51483
2010-07-29 21:33:42 +00:00
Martin Kiewitz
1c24f2ca8f SCI: midi hold behaviour fixed
we shouldnt react on hold midi data when no actual hold was called, fixes eq2/amulet problem (bug #3035392)

svn-id: r51482
2010-07-29 21:12:16 +00:00
Marcus Comstedt
630127bc07 DC: Let scummvm.ini override autodetect of games
If a game CD has a scummvm.ini file with at least one game domain in
it, the normal autodetection is now bypassed and a menu of only the
games in the .ini file is presented instead.  The descriptions of the
games are taken from the .ini file, but icons are still scanned for
in the old fashion.

Note that previously ScummVM would read global options from the
scummvm.ini file on the boot disc (if present), but now global options
are instead taken from the scummvm.ini on the game disc (in case of
a disc swap).

svn-id: r51480
2010-07-29 20:37:56 +00:00
Filippos Karapetis
e9234b61d6 SCI: Fixed Hoyle 3 bugs #3035077, #3035080, #3035081 and #3035242, by using the "completed" case removed in rev #50921 for Hoyle 3
svn-id: r51479
2010-07-29 19:48:17 +00:00
Marcus Comstedt
3e8a972602 DC: Specialize createConfig{Read,Write}Stream
Implement platform-specific variants of createConfigReadStream() 
and createConfigWriteStream(), instead of inheriting the BaseBackend 
definitions.  Nonstandard behavious is as follows: 
 
* createConfigWriteStream() always returns 0 (read-only filesystem) 
 
* createConfigReadStream() returns an empty MemoryReadStream instead 
  of NULL if scummvm.ini does not exist.  This is to make sure that 
  loadDefaultConfigFile() always clears out any old config data, as 
  I'll want to restart config parsing from scratch after a disc 
  swap.

svn-id: r51478
2010-07-29 19:11:49 +00:00
Matthew Hoops
bc54fde8e1 SCI: Ignore setAttribute() on any non-existent menu items
This fixes two fan games: Al Pond 2 and Aquarius. The original interpreter did this as well.

svn-id: r51477
2010-07-29 19:08:07 +00:00
Martin Kiewitz
483f25b9e6 SCI: fixing qfg1 workaround
svn-id: r51476
2010-07-29 17:26:56 +00:00
Martin Kiewitz
41ed8b4389 SCI: some subfunction support for logkernel
svn-id: r51475
2010-07-29 17:22:38 +00:00
Max Horn
148c830d76 DS: Add WRAP_MALLOC support to ds.mk, update comments
svn-id: r51474
2010-07-29 16:24:25 +00:00
Max Horn
8de57b0b29 DS: Get rid of DS_NON_SCUMM_BUILD and DS_SCUMM_BUILD
svn-id: r51473
2010-07-29 16:24:08 +00:00
Filippos Karapetis
c61ed6e3aa SCI: Removed the language check from the
KQ5 workaround, as there could be an issue
with other non-English versions, too (e.g. 
the Spanish floppy version)

svn-id: r51472
2010-07-29 15:50:53 +00:00
Filippos Karapetis
123d1f6bf6 Extended the workaround for KQ5 French floppy for the German floppy too. Fixes bug #3035396 - "KQ5: Crash when start the game"
svn-id: r51471
2010-07-29 15:40:09 +00:00
Filippos Karapetis
9b6c78a4fe SCI: Fixed bug #3036331 - "KQ5: Floppy version
crashes after title", together with a related
problem (kRedrawBox is called erroneously with
an additional parameter when any dialog is
closed)

svn-id: r51470
2010-07-29 15:24:19 +00:00
Matthew Hoops
a113986dc2 SCI: Add detection for the April 2010 competition template (fan game)
svn-id: r51469
2010-07-29 13:45:52 +00:00
Max Horn
d22ebd358d BUILD: Unify how MODULE_DIRS is computed for backends
This should help avoid situations where MODULE_DIRS is not set to a
complete list of build dirs (which causes troubles with the automatic
header dependency detection logic).

On the long run, we should replace the relevant code by a macro or also
use rules.mk for this (with yet another if/else case add to it).

svn-id: r51467
2010-07-29 13:03:21 +00:00
Max Horn
2692e55208 BUILD: Fix MODULE_DIRS for WinCE port
svn-id: r51466
2010-07-29 13:02:30 +00:00
Max Horn
264d17ccc7 BUILD: Compile & link certain files only for specific BACKEND values
svn-id: r51465
2010-07-29 13:02:14 +00:00
Max Horn
7364b9bb2f BUILD: Remove redundant MODULE_DIRS modification
svn-id: r51464
2010-07-29 13:01:39 +00:00
Filippos Karapetis
a64131ec0f SCI: Fixed script bug #3036483 - "LSL2: Crash at the ship"
svn-id: r51463
2010-07-29 12:43:33 +00:00
Paul Gilbert
28de229b51 M4: Added further code fragments to enable player to move again
svn-id: r51462
2010-07-29 11:41:51 +00:00
Paul Gilbert
fd804eb44b M4: Further work done on the setup and starting of actions
svn-id: r51461
2010-07-29 11:04:54 +00:00
Filippos Karapetis
f22821af66 SCI: Added back debug output to sound commands
svn-id: r51460
2010-07-29 10:58:01 +00:00
Martin Kiewitz
6b63c951eb SCI: updating screen within kAnimate as well - fixes pseudo hang in eq1 credits (bug #3036154)
svn-id: r51459
2010-07-29 10:48:54 +00:00
Filippos Karapetis
82bf2437e3 SCI: also break in AvoidPath instead of continuing, when the start point is contained in multiple polygons, otherwise we'll end up in an infinite loop
svn-id: r51458
2010-07-29 09:08:20 +00:00
Filippos Karapetis
5d72193c51 Oops, removed leftover code
svn-id: r51457
2010-07-29 08:03:16 +00:00
Filippos Karapetis
c40b9801df SCI: Silenced warning when exiting in LSL6 (bug report #3035533), and commented out a related unused variable in kSetQuitStr
svn-id: r51456
2010-07-29 07:58:48 +00:00
Filippos Karapetis
3e6f3716ac SCI: Fixed bug #3036390 - "QFG3: Crash when talking to King Rajah", along with a similar problem later on while talking to the king
svn-id: r51455
2010-07-29 07:17:42 +00:00
Matthew Hoops
b19433e6d3 SCI: Re-enable the throttle for kFrameout, I must have been asleep that day
svn-id: r51451
2010-07-29 01:05:11 +00:00
Filippos Karapetis
c099127c3d SCI: Break out instead of continuing when an end point is contained in multiple polygons, while running the avoidpath algorithm (or we'll end up in an infinite loop). Fixes bug #3036299 - "LB2CD: Game Hangs at Speakeasy"
svn-id: r51450
2010-07-28 23:30:59 +00:00
Filippos Karapetis
b3230b26a1 SCI: Added forgotten bug number to the previous workaround
svn-id: r51448
2010-07-28 23:21:27 +00:00
Filippos Karapetis
09ae3b7ca4 SCI: Fixed bug #3036291, "LB2CD: Crash in Docks, actor animation"
svn-id: r51446
2010-07-28 23:09:42 +00:00
Filippos Karapetis
9e164f429d SCI: Changed another warning into debug output
svn-id: r51445
2010-07-28 23:01:28 +00:00
Filippos Karapetis
a2b6b84bfb SCI: Changed a warning into a debug message
svn-id: r51444
2010-07-28 22:41:03 +00:00
Filippos Karapetis
fb35d46c1d SCI: Extended the LB2 workaround for bug #3035068 to all rooms. Fixes bug #3036274, "LB2CD: Crash in Police Station, asking about Ziggy"
svn-id: r51443
2010-07-28 22:36:22 +00:00
Martin Kiewitz
021c5d11db SCI: changed kRandom signature
accepts 1-3 parameters now for all SCI versions (shouldnt hurt and argc 3 will error() out anyway)
changed comments a bit

svn-id: r51438
2010-07-28 21:55:40 +00:00
Martin Kiewitz
abf53f839a SCI: implement additional variants of kRandom
fixes pq1vga poker game (bug #3036125)

svn-id: r51435
2010-07-28 21:47:15 +00:00
Matthew Hoops
07b67fe44b SCI: Fix using the parser in SCI Fan Games
Get a pointer to the said spec instead of copying to a buffer. The fan games use a said spec with size < 64. Also, make said() take a const pointer as the spec cannot change. Thanks to waltervn and wjp.

svn-id: r51432
2010-07-28 19:03:49 +00:00
Martin Kiewitz
9a1afc5a24 SCI: fix typo in comment
svn-id: r51431
2010-07-28 18:37:13 +00:00
Matthew Hoops
78f0e4ce40 SCI: Add updated detection for al pond 2/new year's mystery (fan games)
svn-id: r51430
2010-07-28 18:23:43 +00:00