libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 02:17:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
16,559 Commits 6 Branches 5 Tags
Commit Graph

285 Commits

Author SHA1 Message Date
Eugene Sandulenko
51495fb199 Moved keys mapping dialog to new scheme. Made it generic. Fixed several 
compilation errors associated with it.

svn-id: r21151
 2006-03-09 02:54:02 +00:00
Max Horn
86565fcca5 - Renamed GameSettings to PlainGameDescriptor 
- Added new GameDescriptor struct (similar to PlainGameDescriptor but with
  Common::String members instead of const char * ones)
- Changed DetectedGame to subclass GameDescriptor
- Removed toGameSettings() in favor of new (template) constructors in
  DetectedGame and GameDescriptor
- Fixed a bug in the obsolete gameid handling in the SCUMM & SIMON engines

svn-id: r21150
 2006-03-09 02:52:51 +00:00
Max Horn
d2f78184af - added new toDetectedGame() template function (analog to toGameSettings) 
- made use of the new DetectedGame constructor from my last commit
- some related cleanup

svn-id: r21149
 2006-03-09 01:42:56 +00:00
Eugene Sandulenko
c3f91ca288 Converted all scumm dialogs to new scheme 
svn-id: r21147
 2006-03-09 01:08:25 +00:00
Johannes Schickel
f5efc8b169 Commits patch #1437774 ("KYRA1: Game will crash if bitmap is missing"). 
svn-id: r21146
 2006-03-08 21:21:56 +00:00
Oystein Eftevaag
39c9af43ae Implemented the last menu (the settings screen). Walking speed, text speed, 
and speech modes (text only, speech only, speech & text) can now be
configured. Toggling music and sound in general is not enabled yet.
Also formatted the static menu resources a bit differently, made
sure some vars in the menu code always got initalized, and
fixed a slight formatting error :).

svn-id: r21145
 2006-03-08 13:15:13 +00:00
Max Horn
d9a9fac937 Fixed tons of format string warnings for debug/error calls (including several errors where the format string didn't match the number of arguments to the call) 
svn-id: r21141
 2006-03-08 11:37:25 +00:00
Max Horn
14f1337c60 Use %p to print pointers portably (even on 64bit systems). Note: this will add a 0x prefix automatically 
svn-id: r21140
 2006-03-08 10:07:02 +00:00
Eugene Sandulenko
a8a8624511 o Converted most (all?) widgets to new scheme. 
o Converted global options dialog to new scheme.

svn-id: r21137
 2006-03-08 01:42:02 +00:00
Oystein Eftevaag
cca7da5ba1 The adlib code was calling the Kyra delay() function instead of the 
system delay, which was causing concurrency problems.

svn-id: r21136
 2006-03-08 01:38:27 +00:00
Travis Howell
431c820e4f Correct order of cases in o72_redimArray() 
svn-id: r21135
 2006-03-07 22:27:14 +00:00
Oystein Eftevaag
3f31e1b27d Added the proper death dialog, changed the sequence skipping code a bit to avoid 
possible frame losses, and removed a (now) redundant call to showOverlay() in the
debugger.

svn-id: r21125
 2006-03-07 14:16:52 +00:00
Johannes Schickel
4aaa3eacbd Renamed setTempo to update_setTempo, also fixed tempo handling (intro is too fast now though, but seems to be another problem). 
Also changed some unsigned values to signed.

svn-id: r21111
 2006-03-06 16:37:03 +00:00
Torbjörn Andersson
628d64f136 More renamings: _unkTableByte1 is now _tempo, and updateCallback29() is 
setTempo().

svn-id: r21110
 2006-03-06 16:31:19 +00:00
Torbjörn Andersson
ddd312cea7 Cleanup 
svn-id: r21109
 2006-03-06 15:10:48 +00:00
Gregory Montoir
45656e9fcf fixed palette handling regression, as reported on the forum. 
svn-id: r21108
 2006-03-05 23:50:24 +00:00
Jamieson Christian
06398d1a84 Removed tag2str usage, which eliminates scumm/util.h dependency. 
svn-id: r21107
 2006-03-05 22:35:26 +00:00
Torbjörn Andersson
ac33309a4d I guess this is really a WORKAROUND, rather than a HACK. Updated comment. 
svn-id: r21106
 2006-03-05 22:31:49 +00:00
Johannes Schickel
e2779a0658 Corrects implementation of updateCallback48. 
svn-id: r21105
 2006-03-05 21:48:55 +00:00
Jamieson Christian
5e25b3b679 Restructured IMuse and IMuseInternal. 
* IMuse is no longer a concurrency front-end.
* IMuseInternal now derives from IMuse.
* Common::StackLock used to protect thread-sensitive interface methods (same as IMuseDigital).
* clear_queue() included in stopAllSounds() so it can be removed from the public interface.
* Game ID now specified at init using property().
* Timer callbacks receive a struct containing IMuseInternal and MidiDriver refs, instead of just the latter.
* OSystem pointer from init is now cached and used instead of global.

All references to the g_system and g_scumm globals are now gone. BOOYAH!

Tested with MI2, DOTT and S&M, under Windows, in Native MIDI, Adlib, and Mixed modes. No regressions or concurrency issues observed. Manifestations of the latter are the biggest concern at this point.

svn-id: r21104
 2006-03-05 21:30:44 +00:00
Torbjörn Andersson
27e49b6f56 Note to self: compile before commit. 
svn-id: r21103
 2006-03-05 20:11:43 +00:00
Torbjörn Andersson
4fb6c92473 The updateUnk6Value() appears to be some sort of random number generator, so I 
have renamed it getRandomNr(). The _unk6 variable has been renamed _rnd. (Our
MidiDriver_ADLIB class also has its own random number generator, so it's not
such a far-fetched guess as it may seem.)

svn-id: r21102
 2006-03-05 20:09:02 +00:00
Torbjörn Andersson
525690344b Renamed output1() to adjustVolume(). I'm still uncertain exactly *how* the 
volume is modified (it depends on several still unknown variables), but that's
all it does as far as I can tell.

svn-id: r21101
 2006-03-05 19:48:22 +00:00
Torbjörn Andersson
0651236066 Make sure there actually is a SMUSH mixer before stopping and deleting it. 
svn-id: r21099
 2006-03-05 13:57:05 +00:00
Paweł Kołodziejski
7a6ff46b38 that was not what I want. it should stop audio only for immediately stop. 
svn-id: r21095
 2006-03-05 12:29:13 +00:00
Paweł Kołodziejski
38b82fb585 that should help for bug #1352486, smush sound tracks are not stopped immediately, but outside smush when sound data are depleted in sound mixer buffer. 
svn-id: r21094
 2006-03-05 12:15:39 +00:00
Travis Howell
3fbf207ee5 Update box flags for C64 maniac 
svn-id: r21093
 2006-03-05 10:54:41 +00:00
Travis Howell
24493b3f45 Add back exclusion lost in last commit, exclude some verbs from verbs error script 
svn-id: r21091
 2006-03-05 10:02:43 +00:00
Travis Howell
279ad67506 Correct case of verb names in C64 Maniac 
svn-id: r21090
 2006-03-05 09:05:44 +00:00
Travis Howell
7a9ed5425b Add German verbs and more work on input in C64 maniac 
svn-id: r21089
 2006-03-05 08:22:39 +00:00
Travis Howell
5bf6fdf2f5 Update, to add new imuse file 
svn-id: r21087
 2006-03-05 05:53:29 +00:00
Travis Howell
429f7d43d6 Fix compiler warnings 
svn-id: r21086
 2006-03-05 05:43:46 +00:00
Jamieson Christian
b1f7f32ed1 Separated the IMuse Part methods into their own file. Updated the Bloodshed Dev-C++ project file at the same time. 
svn-id: r21085
 2006-03-05 05:14:20 +00:00
Travis Howell
1fe0deeb54 Add some basic walkbox support for C64 maniac 
svn-id: r21084
 2006-03-05 03:46:41 +00:00
Torbjörn Andersson
623514df01 Cleanup: output0x388(0xABCD) is now writeOPL(0xAB, 0xCD), which is slightly 
more easy to read.

svn-id: r21081
 2006-03-04 20:27:51 +00:00
Jamieson Christian
857abe4c8b Removed the default ignoreFadeouts parameter value for ImuseInternal's getSoundStatus method. The disposition of this method is going to be changing soon, and I'm getting confused by the assumptions being made by many of the calls to it. 
svn-id: r21080
 2006-03-04 19:35:38 +00:00
Jamieson Christian
01af975df4 Rearranged methods in the IMuse class declaration to denote those derived from the MusicEngine base class. 
svn-id: r21079
 2006-03-04 18:38:27 +00:00
Max Horn
6a4c709af6 No need to use generateSubstResFileName when we already know the result 
svn-id: r21072
 2006-03-04 12:57:12 +00:00
Max Horn
feeaa2c35e Removed unnecessary strcpy calls 
svn-id: r21071
 2006-03-04 12:34:14 +00:00
Travis Howell
bc735c4595 Older naming style only used by PC version of FT demo 
svn-id: r21070
 2006-03-04 12:08:19 +00:00
Max Horn
f66cc08bdb Const as const can (marking things as const/static allows better compiler optimizations and helps to catch certain bugs) 
svn-id: r21069
 2006-03-04 11:57:14 +00:00
Max Horn
7085bf3724 Slightly clarified an odd subcase in ScummEngine::openRoom 
svn-id: r21068
 2006-03-04 11:55:49 +00:00
Max Horn
bde6c151ad Cleanup for the container loading code (and always disable file name substitution when a container file is used 
svn-id: r21067
 2006-03-04 11:53:28 +00:00
Max Horn
cf0716734c When container files are used, we don't need file name substitution anymore 
svn-id: r21066
 2006-03-04 11:31:09 +00:00
Max Horn
78985cc8a6 Added a comment about the first few entries in substResFileNameTable 
svn-id: r21065
 2006-03-04 10:50:23 +00:00
Max Horn
a3069bbc1a Since findSubstResFileName / applySubstResFileName only compare up to the first '.', we should be able to safely remove anything after the '.' in all substResFileNameTable entries (I am leaving the 00.LFL names untouched for now, for clarity) 
svn-id: r21064
 2006-03-04 10:46:11 +00:00
Max Horn
5e881c158a This particular case in ScummEngine::openRoom only occurs for V4 games; changing the check accordingly, to ease future refactoring 
svn-id: r21063
 2006-03-04 10:41:40 +00:00
Max Horn
bb38ea2c17 Renamed SubstResFileNames::winName and macName to almostGameID / expandedName (the old names were misleading; the new ones aren't great either :) 
svn-id: r21062
 2006-03-04 10:38:05 +00:00
Travis Howell
16a8c60483 Add/Update string var tables for COMI and The Dig, to allow translated strings 
svn-id: r21059
 2006-03-04 05:44:48 +00:00
Travis Howell
28b6c92503 Update hack for bug #915575 - MANIAC: Disappearing New Kid verb 
svn-id: r21058
 2006-03-04 04:46:15 +00:00