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
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
3264 Commits
Author SHA1 Message Date
Matthew Hoops e67ba769b3 Merge remote branch 'upstream/master' into pegasus 2012-05-28 17:00:50 -04:00
Matthew Hoops d54e53d462 SCUMM: Add support for Spy Fox iOS 2012-05-28 14:29:44 -04:00
Matthew Hoops f1f6a82cd5 Merge remote branch 'upstream/master' into pegasus 2012-05-25 00:35:38 -04:00
Matthew Hoops b253a05454 GRAPHICS: Hide the WinCursor implementation 2012-05-14 09:56:56 -04:00
Matthew Hoops e80d622fa5 Merge remote branch 'upstream/master' into pegasus 2012-05-04 23:32:29 -04:00
Johannes Schickel e2238e4a25 Merge pull request #234 from BenCastricum/master 
SCUMM: Fix bug #3493317 by removing assert() in detection algorithm.
 2012-04-28 08:07:52 -07:00
Ben Castricum bdb12a9c65 SCUMM: Fix bug #3493317 by removing assert() in detection algorithm. 
Bug #3493317 ("SCUMM: Detecting Loom PCE without 16bpp support crashes")
is caused by an assert() in detection algorithm. In case an MD5 is found
the md5table, but the variant from the md5table is not found in
detection_tables.h this assert triggers. However since certain variants
can be left out compile-time this situation can occur. By ignoring
instead of assert()-ing the entry ScummVM will no longer abort but
continue the detection process.
 2012-04-28 11:10:53 +02:00
Travis Howell a322ee83dd Add another English demo version of the Humongous Interactive Catalog. 2012-04-24 15:19:32 +10:00
Matthew Hoops 9971e74c4c Merge remote branch 'upstream/master' into pegasus 
Conflicts:
	base/plugins.cpp
	configure
 2012-04-19 08:16:24 -04:00
Ben Castricum 99f0d544ca SCUMM: Add another Dutch Balloon-O-Rama variant. 2012-04-17 07:18:05 +02:00
Joel Teichroeb 93632681c0 SCUMM: Fix spelling of length 2012-04-04 21:23:14 -07:00
Johannes Schickel d8aecf006a Merge pull request #221 from klusark/const 
Fix casting away const
 2012-04-04 15:27:42 -07:00
Willem Jan Palenstijn a6ba9f150a SCUMM/ARM: Fix crashes in ARM asm costume renderer 
It was possible to bypass the initialization of r11, and
mask was being read before the corresponding bounds check.

Thanks to fuzzie for analysis and LordHoto for testing.

This fixes bug #3500023 and a crash in the DOTT ending.
 2012-04-04 08:54:58 +02:00
Joel Teichroeb 8dfa33ff1f SCUMM: Fix casting away const 2012-04-03 16:53:54 -07:00
Matthew Hoops b6374a3103 Merge remote branch 'upstream/master' into pegasus 2012-04-02 10:07:45 -04:00
Ben Castricum 4e266f466c SCUMM: More HES games detection fixes 2012-03-24 17:57:36 +01:00
Matthew Hoops 71756bdf4e Merge remote branch 'upstream/master' into pegasus 2012-03-20 14:49:16 -04:00
Johannes Schickel 223794fb38 ALL: Make use of defined() for the preprocessor consistent. 
This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
 2012-03-17 22:02:44 +01:00
Eugene Sandulenko 97ed6a5abb Merge pull request #206 from BenCastricum/master 
SCUMM: More HE Games Detection
 2012-03-17 04:01:00 -07:00
Christoph Mallon 75efdd2d84 JANITORIAL: Replace (x ? false : true) by !(x). 2012-03-13 15:43:36 +01:00
Ben Castricum f57e7e959a SCUMM: Fix duplicate MD5 warning 2012-03-11 09:43:43 +01:00
Ben Castricum d652719ea6 SCUMM: Several detection fixes for mostly dutch HES games/demos 2012-03-11 09:43:20 +01:00
Eugene Sandulenko 2a1f0a2176 Merge pull request #191 from BenCastricum/master 
SCUMM: More HE Games Detection
 2012-02-26 07:22:13 -08:00
Max Horn 367131ef0e COMMON: Move Language and Platform functionality into separate files 2012-02-26 15:21:36 +01:00
Max Horn 215b41b244 COMMON: Move RenderMode and GUIOptions functionality into separate files 2012-02-26 15:19:31 +01:00
Johannes Schickel d3c4243ab5 SCUMM: Fix utilization of ARM assembly routines. This fixes bug #3494448. 
The bug in question is: "SCUMM: Loom PCE Japanese broken on ARM".

Thanks to fuzzie and wjp for this patch. If anything is broken after this I
take no blame.
 2012-02-26 13:01:23 +01:00
Ben Castricum 44c5e48bd3 SCUMM: Add 2 not yet recognized MD5s from Dutch Putt-Putt 3 in 1 CD 2012-02-24 13:01:51 +01:00
Ben Castricum 7e7cb21531 SCUMM: Add windows platform detection for several HES games/demos 2012-02-24 13:01:51 +01:00
Willem Jan Palenstijn 9ffe3e11d9 Merge pull request #182 from fingolfin/forbid-ctype 
ALL: Avoid using is* macros from ctype.h
 2012-02-21 11:33:32 -08:00
Max Horn 4f8665fc83 COMMON: Move isFoo functions to namespace Common, add doxygen comments 2012-02-20 16:18:27 +01:00
Tarek Soliman a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast 
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
 2012-02-15 10:07:10 -06:00
Max Horn 658080deed ALL: Avoid using is* macros from ctype.h 
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
 2012-02-15 16:51:37 +01:00
Willem Jan Palenstijn 3f5aaa0ca5 SCUMM: Clean up resetSentence 2012-02-13 20:26:43 +01:00
Travis Howell 7a030fcdcd SCUMM: Fix compiler warning. 2012-02-13 13:38:25 +11:00
Willem Jan Palenstijn 784472a669 Revert "SCUMM: revert savegame version to 89" 
This reverts commit 65fc7225bb.

Increasing the savegame version on a branch and then decreasing it again
leads to problems with loading current savegames in old commits during
a bisect.
 2012-02-11 10:55:55 +01:00
Tobias Gunkel 65fc7225bb SCUMM: revert savegame version to 89 
Previous versions 89-92 are merged into version 89.
 2012-02-11 08:36:38 +01:00
Tobias Gunkel 0d5b03d8da SCUMM: remove unnecessary cast to Actor_v0 2012-02-11 08:36:37 +01:00
Tobias Gunkel 67d67ec4f6 SCUMM: replaced A with a0 to avoid upper-case local vars 2012-02-11 08:36:35 +01:00
Tobias Gunkel 4922055063 SCUMM: cleanup and separation of objIsActor()/objToActor()/actorToObj() for v0 and other engines 2012-02-11 08:36:27 +01:00
Tobias Gunkel 0aabf95cb8 SCUMM: match style-guide, add missing spaces between some "if ()", "for ()" 2012-02-11 08:30:15 +01:00
Tobias Gunkel ef56bd6de2 SCUMM: add support for diagonal walking between boxes (e.g. used for meteor opening scene) 2012-02-11 08:30:14 +01:00
Robert Crossfield 6c40b3f36f SCUMM: Remove old code 2012-02-11 08:30:12 +01:00
Robert Crossfield 163f698cf0 SCUMM: Few changes for animations, dont move while turning & not necessary to call animateactor during startanimactor 2012-02-11 08:30:10 +01:00
Tobias Gunkel 9dd6105ce6 SCUMM: replace "c64" with "v0" when it applies to both C64 and AppleII v0 versions 
In addition some routines (e.g. the gfx ones) that are even used in v1.
 2012-02-11 08:30:08 +01:00
Tobias Gunkel 8d3b272939 SCUMM: save complete v0 state and initialize actors correctly 2012-02-11 08:30:07 +01:00
Tobias Gunkel 5d3e1dd0dc SCUMM: remove the temporary variable _limb_current 2012-02-11 08:30:05 +01:00
Tobias Gunkel daff6f36ae SCUMM: _currentLights is v0 only 2012-02-11 08:30:03 +01:00
Tobias Gunkel e14e4ab3b0 SCUMM: adjust to coding style-guide 2012-02-11 08:30:02 +01:00
Tobias Gunkel 434aaaf0c0 SCUMM: fix gcc compiler warnings 2012-02-11 08:30:00 +01:00
Robert Crossfield a8008e0a71 SCUMM: Fix if there is no costume set 2012-02-11 08:29:59 +01:00