libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,748 Commits 5 Branches 5 Tags 1.8 GiB
a85346cb16
Commit Graph

382 Commits

Author SHA1 Message Date
Alejandro Marzini
fb4086cadb Merged from trunk, from Rev 50841 to HEAD 
svn-id: r51495
 2010-07-30 05:28:09 +00:00
Max Horn
1d4c82885d DEBUGGER: Simplify how our console debugger works / is used 
* Remove _isAttached member var and isAttached method
* Engines now always call the onFrame method; whether it does
  something is decided by the debugger class resp. its subclasses
* Make detach() protected instead of private, so that subclasses
  can invoke it
* Remove _detach_now member var (call detach() instead).
* Rename _frame_countdown to _frameCountdown and properly
  document it.
* Add more doxygen comments
* Cleanup

svn-id: r50963
 2010-07-17 18:38:42 +00:00
Torbjörn Andersson
bcb4c49a03 Cleanup. 
svn-id: r50924
 2010-07-16 03:14:03 +00:00
Alejandro Marzini
609e08d5db Merged from trunk, from Rev 49499 to HEAD 
svn-id: r50840
 2010-07-13 04:31:15 +00:00
Max Horn
4f914e7a9f TINSEL: Replace global object s_rectList by a TinselEngine member var 
svn-id: r50834
 2010-07-12 23:19:33 +00:00
Johannes Schickel
bf2b059a63 Silence possible use of uninitialized variable warning in g++. 
svn-id: r50501
 2010-06-29 18:20:10 +00:00
Torbjörn Andersson
5997307081 Fixed GCC warnings. (Same warning twice, actually.) 
svn-id: r50383
 2010-06-27 17:06:26 +00:00
Paul Gilbert
b6b4247335 Workaround that corrects some bad frame data in the Russian version that was causing the several game crashes 
svn-id: r50372
 2010-06-27 11:16:49 +00:00
Paul Gilbert
b161310193 Script workaround fix for bug #2917661 - Crash when interacting with D'Blah 
svn-id: r50360
 2010-06-27 01:06:51 +00:00
Florian Kagerer
c35e350531 AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either select MDT_PREFER_MT32 or MDT_PREFER_GM 
svn-id: r50288
 2010-06-25 20:51:57 +00:00
Max Horn
bbad3f333a Patch #1956501: "GUI/LAUNCHER: Midi device selection" 
svn-id: r50128
 2010-06-21 21:36:36 +00:00
Eugene Sandulenko
44a39ffbc6 AdvancedDetector: Add new parameter directoryGlobs. 
Without this parameter mass detection gave tons of false alarms.
Use globbing for narrowing down the depth search.

svn-id: r49788
 2010-06-15 10:59:23 +00:00
Eugene Sandulenko
d5c3cda8c5 Moved tinsel detection tables to separate file. 
svn-id: r49694
 2010-06-15 10:15:29 +00:00
Alejandro Marzini
e1ef3cd9fc Renamed getAudioCD to getAudioCDManager. 
svn-id: r49678
 2010-06-15 04:13:12 +00:00
Eugene Sandulenko
4d517ed0e9 Extended advancedDetector with depth parameter. 
Now AD can search nested directories. By default it is turned off,
but there is new parameter to ADParameters struct. Usually value
of 2 is good enough for all purposes.

svn-id: r49653
 2010-06-14 14:50:23 +00:00
Alejandro Marzini
e991cd8c53 - Revised abstract AudioCDManager. 
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.

svn-id: r49548
 2010-06-09 20:09:57 +00:00
Paul Gilbert
c253a57e47 Bugfix for #2974817 - Mad Drongo Animation Malfunction 
svn-id: r49447
 2010-06-06 01:12:41 +00:00
Johannes Schickel
5bb4fadc4c Fix change in r49356, Common::strlcpy should only be used on zero terminated source strings. 
The original code change with r49086 did only aimed at zero terminating
the szFilename string (as the comment suggests), so I now changed it
to use memcpy and a manual placement of the terminating zero.

svn-id: r49357
 2010-05-31 18:05:39 +00:00
David Turner
d1da820a75 Fix for DW2 engine abort with message "Cannot find file hienergy.sc!". 
Bug introduced by r49086 change which could trim the last character of filenames.

svn-id: r49356
 2010-05-31 15:16:46 +00:00
Johannes Schickel
62717eafc4 Replace some strncpy usages with Common::strlcpy. 
svn-id: r49086
 2010-05-18 18:16:47 +00:00
Max Horn
970745e60c Move DebugChannel related code to new header 
svn-id: r48935
 2010-05-04 11:59:22 +00:00
Max Horn
b3e404109c Move initGraphics and initCommonGFX from to new header. 
These functions are only used internally be Engine subclasses, and
by moving them to a separate header we can reduce indirect header
dependencies.

svn-id: r48934
 2010-05-04 11:58:12 +00:00
Max Horn
5568a8473b Get rid of Engine::_gameDataDir. 
This greatly reduces indirect dependencies on several header files
from common.

svn-id: r48933
 2010-05-04 11:56:52 +00:00
Max Horn
a5aedb73be TINSEL: Avoid global constructor for clickPos 
svn-id: r48841
 2010-04-28 22:23:00 +00:00
Max Horn
460d69e885 COMMON: Move DebugChannel stuff into a new DebugMan singleton 
svn-id: r48821
 2010-04-27 21:40:52 +00:00
Willem Jan Palenstijn
6f4063fd5f Fix warning 
svn-id: r48817
 2010-04-27 20:14:56 +00:00
Max Horn
f103f01284 TINSEL: Change cdGraphStream to a Common::File pointer, 
to not rely on global constructors

svn-id: r48765
 2010-04-21 21:23:08 +00:00
Max Horn
6d80424908 Fix warnings when FLAC&MP3&VORBIS is disabled; also fixes leak in Tinsel 
svn-id: r48696
 2010-04-17 23:57:50 +00:00
Max Horn
ae3962ce36 Fix for bug #2987895: "DW2: graphical errors in video on Windows" 
svn-id: r48665
 2010-04-16 11:00:13 +00:00
Ori Avtalion
2fc9d6845b Apply patch #2982163 - CONFIG: Use HE keyword instead of HB for the Hebrew language 
svn-id: r48645
 2010-04-12 21:21:06 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Johannes Schickel
de3dd04005 Commit of the updated version of Fingolfin's patch for bug #2981788 "TINSEL: Build with -O2 broken". 
svn-id: r48534
 2010-04-05 07:22:34 +00:00
Max Horn
cac0ac66e2 COMMON: Get rid of Common::StringList 
svn-id: r48287
 2010-03-18 15:54:40 +00:00
Max Horn
75de0ebccb TINSEL: Change SaveSceneSsData from char* to SAVED_DATA* 
svn-id: r48285
 2010-03-18 15:39:56 +00:00
Max Horn
d78dba3bca COMMON: Move Common::RandomSource to common/random.* 
svn-id: r48279
 2010-03-18 15:07:11 +00:00
Paul Gilbert
f4bf67cd21 Increased the default Discworld 2 double-click time from 0.33 seconds to 0.55 seconds (from 6 to 10 frames) 
svn-id: r48255
 2010-03-14 03:40:16 +00:00
Yotam Barnoy
ef330ed9b4 Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling 
svn-id: r48101
 2010-02-21 04:04:13 +00:00
Fabio Battaglia
8502d9248e tinsel: Add detection for Discworld 1 floppy EUR version 
svn-id: r48088
 2010-02-19 12:33:58 +00:00
Max Horn
9de580aa6e TINSEL: Cleanup the 'script workaround' code a bit. 
* Rewrap comments to 72 columns
* Add some references to relevant bug tracker items
* Use sizeof instead of handcoding array lengths, which is error prone
  and tedious
* Move definition of WorkaroundEntry from pcode.h to pcode.cpp
* Define FRAGMENT_WORD to make fragment code a bit more readable,
  and also encoding of 16 bit words into it less error prone
* Make all code fragments static

svn-id: r48065
 2010-02-15 10:01:26 +00:00
Paul Gilbert
86163d5a6c Script workaround fix for DW1, for being able to give the whistle back to the pirate before the parrot 
svn-id: r47987
 2010-02-08 10:02:18 +00:00
Johannes Schickel
8ae24a27b3 Yet more Flac -> FLAC changes for consistency. 
svn-id: r47847
 2010-02-03 09:42:40 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream. 
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
 2010-02-03 09:42:11 +00:00
Max Horn
21e1cc4cf8 Switch makeADPCMStream to DisposeAfterUse::Flag 
svn-id: r47736
 2010-01-31 02:11:41 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream. 
svn-id: r47716
 2010-01-30 15:26:54 +00:00
Max Horn
1c906a1f08 Hide VagStream implementation, only expose it via a factory method 
svn-id: r47634
 2010-01-28 09:38:21 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/ 
svn-id: r47579
 2010-01-26 22:48:45 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream 
svn-id: r47492
 2010-01-23 23:55:35 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h 
svn-id: r47395
 2010-01-19 22:30:33 +00:00
Max Horn
5ee6c79b5d Convert more engines from Mixer::playRaw to Mixer::playInputStream 
svn-id: r47377
 2010-01-19 11:22:14 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE. 
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
 2010-01-19 00:56:29 +00:00
Max Horn
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag 
svn-id: r47334
 2010-01-16 21:36:08 +00:00
Johannes Schickel
0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company. 
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
 2010-01-12 21:07:56 +00:00
Max Horn
f720d99b0a Switch Mixer::playInputStream to use DisposeAfterUse::Flag 
svn-id: r47182
 2010-01-08 22:09:43 +00:00
Max Horn
0cf53b025d Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h 
svn-id: r47180
 2010-01-08 22:07:35 +00:00
Max Horn
474d49946f Rename QueuedAudioStream to QueuingAudioStream 
svn-id: r47179
 2010-01-08 22:06:04 +00:00
Max Horn
7efba85064 Switch Tinsel, MADE and some of the video players to QueuedAudioStream 
svn-id: r47178
 2010-01-08 22:05:12 +00:00
Johannes Schickel
a597e5fef9 Make VagStream a RewindableAudioStream. 
svn-id: r47132
 2010-01-07 17:04:01 +00:00
Torbjörn Andersson
c83058d30b LordHoto spotted the same kind of overlapping strcpy() call in one more place. 
I didn't notice it because it never executed that part when I used Valgrind.

svn-id: r46945
 2010-01-03 20:47:04 +00:00
Torbjörn Andersson
f15db40927 Don't uses strcpy() on overlapping memory areas. It's undefined. 
svn-id: r46944
 2010-01-03 20:42:51 +00:00
Paul Gilbert
2d7c1e2c71 Corrected the Russian Discworld 1 MD5 values 
svn-id: r46704
 2009-12-29 08:56:41 +00:00
Paul Gilbert
84569c4792 Added MD5 data for Russian Discworld 1 
svn-id: r46667
 2009-12-28 06:24:06 +00:00
Max Horn
f692015301 Got rid of ReadStream::ioFailed() 
svn-id: r46379
 2009-12-15 08:18:57 +00:00
Max Horn
c8873d8492 Changed MidiDriver::createMidi to take a MidiDriverType instead of an int 
svn-id: r46316
 2009-12-09 18:12:51 +00:00
Max Horn
df651bf20f Added Doxygen comments for the various engine namespaces (currently mostly without details; help filling these out is welcome) 
svn-id: r46128
 2009-11-24 22:10:14 +00:00
Max Horn
6b8dd7ab7a COMMON: Remove various variants of the md5_file / md5_file_string funcs; turned the (disabled) MD5 test code into a working unit test 
svn-id: r46108
 2009-11-23 22:30:22 +00:00
Max Horn
b3c3222c23 TINSEL: cleanup 
svn-id: r45787
 2009-11-09 22:21:23 +00:00
Max Horn
1497c4120e TINSEL: Mark all functions in dialogs.cpp explicitly as public (=extern) or private (=static) 
svn-id: r45785
 2009-11-09 22:20:25 +00:00
Max Horn
80b8d0af65 TINSEL: Make some const tables static; move static int priorVolMusic into SetMidiVolume to reduce its scope 
svn-id: r45784
 2009-11-09 22:19:54 +00:00
Max Horn
10b8741c8b TINSEL: Simplifying PolyTinselProcess 
svn-id: r45783
 2009-11-09 22:19:21 +00:00
Max Horn
2bb7476a20 TINSEL: Add EnablePointing() & DisablePointing() to pdisplay.h; turn DisablePointing from a coroutine into a plain function 
svn-id: r45782
 2009-11-09 22:18:25 +00:00
Max Horn
e959ef33e5 TINSEL: Small correction to the previous hotfix for _vm->_config crash 
svn-id: r45621
 2009-11-02 23:48:21 +00:00
Max Horn
d10fe42416 TINSEL: Fix regression caused by the introduction of _vm->_config; proper fix will be introduced later, when dialogs.cpp gets objectified 
svn-id: r45620
 2009-11-02 23:42:30 +00:00
Max Horn
26981a5ffc TINSEL: Add isValidObject(OBJECT *obj) function; make objectList & currentCD static vars; merge two logic blocks ('ifs') in DoRestoreSceneFrame 
svn-id: r45618
 2009-11-02 21:57:16 +00:00
Max Horn
5cf868b757 TINSEL: Turn config code into a simple C++ class 
svn-id: r45617
 2009-11-02 21:56:29 +00:00
Max Horn
51933629d1 Changed foo(void) to foo() in almost all non-backend source files 
svn-id: r45616
 2009-11-02 21:54:57 +00:00
Max Horn
7d6e96fa80 TINSEL: Formatting cleanup, remove a dead var, tweaked comment to Get/SetNoBlocking 
svn-id: r45450
 2009-10-27 21:34:43 +00:00
Max Horn
4b681f7ec7 TINSEL: Add some debugging code; fix LockMem() regression 
svn-id: r45430
 2009-10-27 00:38:41 +00:00
Max Horn
02636c2071 TINSEL: Rename Poly pp to ptp in various places, for consistency; cleanup 
svn-id: r45429
 2009-10-27 00:38:19 +00:00
Max Horn
79734dbc15 TINSEL: Make HeapCompact local to heapmem.cpp; add code to print heap statistics 
svn-id: r45428
 2009-10-27 00:37:54 +00:00
Max Horn
e07a9b0524 TINSEL: Changed heap manager to use malloc internally 
svn-id: r45427
 2009-10-27 00:37:23 +00:00
Max Horn
05508d8dcd TINSEL: Change MemoryAllocFixed to return a (kind of fake) MEM_NODE pointer; add MemoryDeinit() 
svn-id: r45426
 2009-10-27 00:36:56 +00:00
Max Horn
5672f353dd TINSEL: Fix warning again 
svn-id: r45419
 2009-10-26 21:08:15 +00:00
Max Horn
6c1c9eda3a TINSEL: Make MEM_NODE internal to heapmem.cpp 
svn-id: r45418
 2009-10-26 20:38:34 +00:00
Max Horn
d2e64a350a TINSEL: cleanup 
svn-id: r45417
 2009-10-26 20:36:44 +00:00
Max Horn
e1de772e72 TINSEL: Fix handling of free memory blocks 
svn-id: r45416
 2009-10-26 20:35:06 +00:00
Johannes Schickel
692a4b74dc Change assert parameter to match the comment above it. 
svn-id: r45415
 2009-10-26 20:08:33 +00:00
Torbjörn Andersson
939d8d1a37 Silence GCC warning. 
svn-id: r45413
 2009-10-26 20:03:07 +00:00
Max Horn
6591010f66 TINSEL: Further untangle memory managment. 
* Add new function MemoryNoAlloc
* Make MemoryAlloc private
* Get rid of params to various memory related functions

svn-id: r45409
 2009-10-26 16:01:34 +00:00
Max Horn
b9534216ed TINSEL: Remove MemoryHandle(), some unneeded #includes and the return value of MemoryReAlloc() 
svn-id: r45408
 2009-10-26 16:01:12 +00:00
Max Horn
e963dfbd17 TINSEL: Remove dead stuff from memory managment code, doxygenify some comments 
svn-id: r45402
 2009-10-26 10:41:28 +00:00
Max Horn
bbe0b81aff TINSEL: Remove DWM_FIXED and add new MemoryAllocFixed() function 
svn-id: r45401
 2009-10-26 10:41:11 +00:00
Max Horn
9065dca09a TINSEL: cleanup 
svn-id: r45400
 2009-10-26 10:40:51 +00:00
Max Horn
d19a831d29 TINSEL: Move ExtractActor from scn.* to play.* 
svn-id: r45399
 2009-10-26 10:40:35 +00:00
Max Horn
240f230c1e TINSEL: Cleanup 
svn-id: r45398
 2009-10-26 10:40:16 +00:00
Max Horn
a4c27cfe98 TINSEL: Some cleanup to the BMV code 
svn-id: r45397
 2009-10-26 10:39:51 +00:00
Johannes Schickel
56181a475c Change "=" to ":=" in some module.mk files for consistency. 
svn-id: r45364
 2009-10-24 21:55:53 +00:00
Max Horn
91ba886e01 TINSEL: Move Common::List instances mouseButtons & keypresses into TinselEngine. 
Global C++ objects are not portable, as their constructors / destructors may
never be called.

svn-id: r45283
 2009-10-20 19:12:54 +00:00
Max Horn
8870b5dbbf TINSEL: Fix apparent bug (?) in the support for the 5 flags version(s) 
svn-id: r45271
 2009-10-20 14:07:27 +00:00
Max Horn
774183ddce TINSEL: Make lots of stuff in dialogs.cpp static 
svn-id: r45270
 2009-10-20 14:06:40 +00:00