Commit Graph
86814 Commits
Author SHA1 Message Date
Max Horn 209413ed07 disable the custom operator 'new' on Mac OS X, as it cause multiple definition linker error when building ScummVM with loadable modules
svn-id: r10303
2003-09-18 18:22:15 +00:00
Max Horn f8997ba7cc link modules against LIBS, too (right now the only reason for this is that scumm/ needs MAD & Vorbis libs)
svn-id: r10302
2003-09-18 18:21:03 +00:00
Max Horn 7fd732f5bb cleanup
svn-id: r10301
2003-09-18 18:19:23 +00:00
Paweł Kołodziejski a83d9a9733 updated vc7 file
svn-id: r10300
2003-09-18 18:04:06 +00:00
Max Horn 57bcbfa993 trying to fix VC6 project file (beware! I am doing this manually, I may have screwed up)
svn-id: r10299
2003-09-18 16:29:22 +00:00
Max Horn 292cdb02ed just generate the data as stereo, instead of munging the buffer at the end
svn-id: r10298
2003-09-18 16:15:38 +00:00
Nicolas Bacca 79f546cb8f Update project files
svn-id: r10297
2003-09-18 16:14:38 +00:00
Nicolas Bacca 60de69b9da Add time.h
svn-id: r10296
2003-09-18 16:12:20 +00:00
Nicolas Bacca c4f053904a Change includes, fix BASS slowdowns
svn-id: r10295
2003-09-18 16:11:56 +00:00
Max Horn 9470c9f661 changed & documented the premixer semantics
svn-id: r10294
2003-09-18 16:01:33 +00:00
Torbjörn Andersson dcf77f7a10 Added EXECUTABLE to the MinGW makefile.
This slows down the build procedure enormously, but on the other hand it
actually does something now. :-)

Though, for some reason, make always crashes shortly before the end when I
build it from scratch. I have to repeat the command to get it to finish.
Time to check if there's a newer MinGW version to download, I guess...

svn-id: r10293
2003-09-18 14:07:36 +00:00
Max Horn a15fdcea21 plugin work: right now, only with build rules for OS X. Once I can get it to work here, I'll add more build rules. Work in progress, a lot ain't work, but the plugin stuff is disabled by default, so no harm should arise
svn-id: r10292
2003-09-18 13:03:56 +00:00
James Brown dbb20eaee5 This'll also break Makefile.noconf
svn-id: r10291
2003-09-18 12:07:56 +00:00
Max Horn 0ae88a7dfc Temporarily disabled this rule since it causes troubles for MinGW
svn-id: r10290
2003-09-18 10:51:42 +00:00
Nicolas Bacca 420043b76b Remove one more hackery - actually a complete port rewrite would be needed to get rid of all of them, I'm thinking about it :)
svn-id: r10289
2003-09-18 10:24:53 +00:00
Torbjörn Andersson 3342a20578 Extend the ALSA version check to look at SND_LIB_MAJOR as well. They're
bound to hit 1.0 any year now.

Of course, this is completely untested.

svn-id: r10288
2003-09-18 07:27:48 +00:00
Max Horn be9d4066e1 moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
svn-id: r10287
2003-09-18 02:07:18 +00:00
Max Horn ec0d41137c fix Circular dependency warning
svn-id: r10286
2003-09-17 23:59:13 +00:00
Max Horn f6ecb2e95d removed the module.mk dependency again since it make 'ar' add module.mk to the lib.a file
svn-id: r10285
2003-09-17 23:34:56 +00:00
Max Horn 3c55fd316f cleanup
svn-id: r10284
2003-09-17 23:05:07 +00:00
Max Horn 0eea7999eb no need for this evil hackery; just always pretend 'F5' was pressed, the Scumm engine will do the work from then
svn-id: r10283
2003-09-17 23:02:40 +00:00
Max Horn c1a678afeb new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner)
svn-id: r10282
2003-09-17 22:41:01 +00:00
Max Horn 0b16afb067 make module convenience libs depend on their module.mk file
svn-id: r10281
2003-09-17 22:16:14 +00:00
Max Horn 3f62b662fb didn't mean to commit this
svn-id: r10280
2003-09-17 22:13:38 +00:00
Max Horn 231cb16b5b some tweaks to the build system (work toward plugin support)
svn-id: r10279
2003-09-17 21:53:13 +00:00
Max Horn 468275bb94 added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes
svn-id: r10278
2003-09-17 21:06:16 +00:00
Max Horn c0d1061a2d cleanup
svn-id: r10277
2003-09-17 20:34:20 +00:00
Max Horn 0e5e39e64e remove unused variable
svn-id: r10276
2003-09-17 20:07:21 +00:00
Max Horn 1f2ee37642 BS2 works on BE systems now
svn-id: r10275
2003-09-17 19:12:45 +00:00
Torbjörn Andersson f291b13134 cleanup
svn-id: r10274
2003-09-17 17:34:04 +00:00
Torbjörn Andersson 0604d3ff10 cleanup
svn-id: r10273
2003-09-17 16:59:12 +00:00
Torbjörn Andersson 27b734a044 Rewrote Read_file() to use our File class, and removed the unused functions
Direct_read_file() and Direct_write_file().

This change is completely untested, but that should be ok since Read_file()
(which is now the only function left in tony_gsdk.cpp) only seems to be
used in debug builds.

Perhaps we should remove these files completely?

svn-id: r10272
2003-09-17 14:33:47 +00:00
Torbjörn Andersson ccf2eb2cc6 Removed some #includes that seem to be unnecessary. I think we're going to
have to clean up the header files at some point...

svn-id: r10271
2003-09-17 14:03:11 +00:00
Max Horn 1d60dc552d delete name only after closing the file
svn-id: r10270
2003-09-17 13:28:48 +00:00
Torbjörn Andersson d6c2957d5c cleanup
svn-id: r10269
2003-09-17 13:03:13 +00:00
Torbjörn Andersson 7d0b682cc9 Cleanup.
Since this file contains a list of global variables which are accessed
both directly by the engine and - presumably - by the scripts, this could
lead to some nasty regressions. I've triple-checked the list against the
old version, so it *should* be ok, I just thought I'd point it out.

svn-id: r10268
2003-09-17 09:03:40 +00:00
Torbjörn Andersson 2536823c23 cleanup
svn-id: r10267
2003-09-17 06:28:27 +00:00
Jamieson Christian dffa1cbc2f Removed redundant presets storage.
svn-id: r10266
2003-09-16 21:28:46 +00:00
Jamieson Christian 091b41a278 Partial fix for Bug [636985] ZAK256: No kazoo tune
Implemented a parser for Euphony music. No
FM instrument support yet, as the FM chip used
by FM Towns is not being emulated yet. In the
meantime, a stock FM-emulated GM instrument is
being used instead.

This at least makes the Zak Towns kazoo tune
and the Loom Towns distaff audible. Emulation
of the FM Towns synth chip, or suitable
emulation using the OPL2 synth, is still
under investigation.

svn-id: r10265
2003-09-16 11:44:48 +00:00
Torbjörn Andersson 00c1fdce3a Removed some unnecessary #includes and #defines.
svn-id: r10264
2003-09-16 09:57:57 +00:00
Torbjörn Andersson 48d0761286 Some cleanup. More to follow, I hope.
svn-id: r10263
2003-09-16 07:11:29 +00:00
Torbjörn Andersson bc90c04c25 Don't call the premix function when the mixer is paused. (This is
particularly noticeable in games with PC speaker emulation, but I could
hear faint noises in AdLib music as well.)

svn-id: r10262
2003-09-16 07:06:17 +00:00
Jamieson Christian e0129c34e7 Feature Request [806641] Increase MIDI
performance by omitting redundancies

Removed the use of the _bank member for iMuse Parts.
The member is still being saved/loaded, and a
warning will display if a non-zero _bank value is
set. If it turns out some musical passage is actually
using the _bank, we'll need to reinstate it.
Otherwise, after sufficient testing we can obsolete
it in the savegames.

svn-id: r10261
2003-09-15 21:35:30 +00:00
Max Horn 8f26c43b49 cleanup
svn-id: r10260
2003-09-15 19:48:54 +00:00
Oliver Kiehl 7eaf33e014 actually this is the correct fix to "Cutscene - Press ESC to exit" :)
svn-id: r10259
2003-09-14 23:42:07 +00:00
Oliver Kiehl 685d44940f fix "Cutscene - Press ESC to exit" message
svn-id: r10258
2003-09-14 23:39:06 +00:00
Jonathan Gray f69d97aadb add putttime target
svn-id: r10257
2003-09-14 22:46:47 +00:00
Oliver Kiehl ffd39dc95a if saveslot specified with -x doesn't exist, show restore menu
svn-id: r10256
2003-09-14 21:45:42 +00:00
Oliver Kiehl fe349d2d99 enable ``proper'' -x loading
svn-id: r10255
2003-09-14 21:10:14 +00:00
Jamieson Christian d91278198b Fix for Bug [805593] MI2: Music stops in LeChuck's fortress
Implemented _cmd_queue save/load. In addition to requiring
_cmd_queue information, this bug arises from a rare assumption
that sound resources are loaded in memory even though they
aren't currently playing. Therefore, a list of sound resources
loaded in memory is included in the savegame, so that all
relevant sound resources are reloaded when the savegame is
loaded. This also fixes an unreported music bug in S&M when
saving a game while outside the Bumpusville mansion.

As a result of savegame format modifications, we are now at
savegame version 23.

svn-id: r10254
2003-09-14 20:34:48 +00:00