Commit Graph

413 Commits

Author SHA1 Message Date
Max Horn
0df319e952 #include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)
svn-id: r9359
2003-08-01 12:21:04 +00:00
Travis Howell
479bc9645f Ooops
svn-id: r9356
2003-08-01 05:44:18 +00:00
Travis Howell
a15dab5fb8 This should be Microsoft Visual C++ only
svn-id: r9355
2003-08-01 05:41:07 +00:00
Paweł Kołodziejski
e5e117006a back disable warnings into stdafx.h, vc6 is lack of warnings support
svn-id: r9337
2003-07-31 18:35:01 +00:00
Max Horn
1b52e9f19c added new header file backends/intern.h; removed some stuff from common/system.h which is either only of interest to backends or code instantiating a backend (->backends/intern.h); also removed fmopl specific enums (->sound/fmopl.h)
svn-id: r9327
2003-07-31 12:33:33 +00:00
Max Horn
f7ee6d2ce1 use #define instead of enum here because that makes ccache more effective when changing sample rates
svn-id: r9326
2003-07-31 12:10:13 +00:00
Jamieson Christian
c5de745580 Disabled unknown pragma warning in MSVC-6.
svn-id: r9320
2003-07-31 06:47:05 +00:00
Paweł Kołodziejski
b9f227bb90 moved turn off warnings into vc7 project files. someone must also update vc6
svn-id: r9311
2003-07-30 22:55:18 +00:00
Paweł Kołodziejski
efc32d9dbc disable empty statement warnings for vc
svn-id: r9310
2003-07-30 22:04:31 +00:00
Paweł Kołodziejski
66635b5e97 disable conversion type warnings for vc
svn-id: r9309
2003-07-30 21:54:50 +00:00
Max Horn
1a70fe4413 version 0.5.3cvs
svn-id: r9304
2003-07-30 20:26:59 +00:00
Oliver Kiehl
0f85cc3061 rename bs2 to sword2 to have the same name as the original engine.
besides this way all our engines start with an "s" ;)

svn-id: r9301
2003-07-30 19:25:31 +00:00
Max Horn
26d05c0190 the VC warning for unknown pragmas is now gloabally disabled, no need to work around it locally
svn-id: r9300
2003-07-30 18:40:28 +00:00
Max Horn
cae96f35b0 globally disable 'unknown pragma' warning for VC
svn-id: r9299
2003-07-30 18:24:50 +00:00
Travis Howell
11aa36ff90 Add option for the demo included in Maniac Mansion (Classic version)
svn-id: r9279
2003-07-29 12:13:39 +00:00
Jonathan Gray
da1cdeb0ec change version to 0.5.3-cvs allowing room for two follow up minor releases...
svn-id: r9247
2003-07-28 12:59:39 +00:00
Jonathan Gray
9865deb0bc bs2
svn-id: r9213
2003-07-28 01:50:45 +00:00
Max Horn
d592095fb9 Patch #715991: Quit Confirmation Dialog (feature request #642721) with some tweaks by me
svn-id: r9210
2003-07-28 01:36:16 +00:00
Torbjörn Andersson
5f3cd3b584 Fix warning (no newline at end of file)
svn-id: r9172
2003-07-24 16:18:41 +00:00
Chris Apers
731a1bbbc9 Remove palmos fixme
svn-id: r9169
2003-07-24 15:01:01 +00:00
Jonathan Gray
a8bffdf1c9 scumm_strnicmp
svn-id: r9168
2003-07-24 14:47:48 +00:00
Max Horn
88cf307273 start -> start_frame, to match backends (purely cosmetic :-)
svn-id: r9140
2003-07-22 23:27:41 +00:00
Max Horn
d15039d2e4 fixed play_cdrom docs
svn-id: r9131
2003-07-22 20:29:06 +00:00
Max Horn
a7391d0a9a Rest of patch #774556 (small optimization for aspect ratio correction)
svn-id: r9103
2003-07-21 00:07:27 +00:00
Travis Howell
a4b5891dd1 Use automatic dirty rect code for simon games for now to reduce CPU usage
svn-id: r9093
2003-07-20 15:31:47 +00:00
Max Horn
dcbd402670 added TODOs; made switching between asepct modes a bit nice; made scale a template parameter to help compile optimizations
svn-id: r9074
2003-07-19 11:35:01 +00:00
Max Horn
b05e7de7bb replaced SCUMMVM_VERSION/SCUMMVM_CVS by gScummVMVersion/gScummVMBuildDate/gScummVMFullVersion; made engine.o depend on all other .o files, so that the build date in it is always up-to-date
svn-id: r9032
2003-07-15 02:16:33 +00:00
Jonathan Gray
bc1120b67a linux/mingw compilation fix pointed out by Jeroen Janssen
svn-id: r8984
2003-07-13 13:57:19 +00:00
Nicolas Bacca
f163ae5ce5 Update WINDBG to WinCE
svn-id: r8976
2003-07-13 12:24:36 +00:00
Nicolas Bacca
a2f2d4c40a Do not use free_check on WinCE
svn-id: r8975
2003-07-13 12:15:43 +00:00
Robert Göffringmann
8b36d14696 added support for different languages and fixed memory leak and screen refreshes in load/save dialogs
svn-id: r8921
2003-07-12 03:40:44 +00:00
Max Horn
bf4e574250 check for odd addresses being free'd
svn-id: r8850
2003-07-07 23:11:19 +00:00
Max Horn
fcfe55f574 gah. I am stupid
svn-id: r8780
2003-07-05 15:37:23 +00:00
Max Horn
ce9d154957 fixed stack lock at startup
svn-id: r8779
2003-07-05 15:28:28 +00:00
Max Horn
8a7d540687 enforce use of type MutexRef
svn-id: r8778
2003-07-05 15:20:16 +00:00
Max Horn
d098334fe6 updated code to use type MutexRef; added class StackLock (from sdl backend, now in util.*)
svn-id: r8777
2003-07-05 15:19:11 +00:00
James Brown
b3e30fc0ff Fix irky old date. We need to autogenerate this somehow.
svn-id: r8771
2003-07-05 11:14:16 +00:00
Travis Howell
c1002b4ad2 Fix multiple debug level messages, when debug level is set in the config file.
svn-id: r8764
2003-07-05 08:42:50 +00:00
Joost Peters
934611c348 applied eriktorbjorn's floppy-intro-with-cd-version patch (#765885)
svn-id: r8753
2003-07-05 00:57:03 +00:00
Max Horn
0ed8e1ef36 prevent (or rather: make much less likely) some sound output related race conditions
svn-id: r8740
2003-07-04 13:17:56 +00:00
Torbjörn Andersson
f5f9061d86 Allow "no-" prefix to long command-line options, e.g. --no-aspect-ratio,
to invert their meanings. This is useful for overriding settings in the
config file.

svn-id: r8733
2003-07-04 06:54:47 +00:00
Max Horn
3ed9aae095 const correctness
svn-id: r8727
2003-07-03 22:06:13 +00:00
Max Horn
8f0c739f87 Timer now uses a mutex, which should make it thread safe (it wasn't before, particuarly bad if timers are implemented via threads), plus this should help in fixing race conditions in classes using class Timer
svn-id: r8722
2003-07-03 11:18:07 +00:00
Torbjörn Andersson
7404d5662d Made read() return the number of bytes that were actually read, rather than
the number that was requested. A lot of our code obviously assumes this
behaviour, and the MP3 file player depends on it because otherwise, when
reaching the end of the file, it will think it read a full buffer, when in
fact it only got part of it and the rest is the remains from the previous
read.

This would cause a brief note from earlier in the track at the end of the
MI1 chapter one screen. Probably other cases as well.

Of course, this may cause regressions but only - I think - if the code was
buggy to begin with.

svn-id: r8721
2003-07-03 07:03:18 +00:00
Max Horn
621e356b42 don't default to the slowest aspect ratio correcter; rather use the medium one (good quality with acceptable speed)
svn-id: r8715
2003-07-02 14:47:06 +00:00
Paweł Kołodziejski
91cf11e99c ops
svn-id: r8667
2003-06-27 05:11:16 +00:00
Paweł Kołodziejski
0ccd872187 chenged ifdef to handle all win32 ports
svn-id: r8666
2003-06-27 05:10:11 +00:00
Max Horn
71ea8f7228 fix the inaccurate version of interpolate5Line to work correctly for odd widths
svn-id: r8628
2003-06-22 17:32:50 +00:00
Max Horn
31bdf9f450 undoing this optimization: despite my initial sureness about this being correct - I was wrong :-) just plug in 0xFFFFFFFF to see it (roughly spoken, we can loose the uppermost bits if we shift after the addition instead of before it)
svn-id: r8627
2003-06-22 17:29:55 +00:00
Paweł Kołodziejski
288f101bc9 fixed warning
svn-id: r8623
2003-06-22 15:06:48 +00:00
Torbjörn Andersson
160c4f9104 Fixed the last (?) glitches around the mouse cursor [*] in aspect-ratio
correction mode by making sure that dirty rects always start on a line
that won't have its colours changed by the stretching function. This was
probably only noticeable when using the 1x scaler.

[*] Actually, the glitches weren't specific to the mouse cursor, but it was
    useful for triggering them.

svn-id: r8621
2003-06-22 14:59:21 +00:00
Bertrand Augereau
7e86b215bb Rearranged logic in SuperEagle
svn-id: r8620
2003-06-22 14:52:34 +00:00
Torbjörn Andersson
53d679bfb7 Fix some graphics glitches that would sometimes be visible around the mouse
cursor in aspect-ratio correction mode.

svn-id: r8618
2003-06-22 14:41:09 +00:00
Max Horn
2aa0a86038 cleanup
svn-id: r8616
2003-06-22 14:36:12 +00:00
Paweł Kołodziejski
9d09b77f21 fixed warnings
svn-id: r8613
2003-06-22 14:30:32 +00:00
Travis Howell
5132ca1b2f Add opengl filter option
for opengl backend
Enable poll_event in opengl backend

svn-id: r8612
2003-06-22 14:18:33 +00:00
Max Horn
e7c3fae1e8 no need to keep these regression tests: the changes are mathematically and operationally (read: taking into account side effects and special cases in computer arithmetics) equivalent to the old code
svn-id: r8606
2003-06-22 12:03:24 +00:00
Max Horn
11ff7fe9a3 Patch #757827: Aspect-ratio correction
svn-id: r8605
2003-06-22 11:55:40 +00:00
Bertrand Augereau
fa184730af Reduced the number of shifts in highly used functions in Super2xSaI and SuperEagle
svn-id: r8604
2003-06-22 11:52:40 +00:00
Max Horn
2db275b109 make File constructor virtual to allow subclassing; made seek default to SEEK_SET mode for conveniance
svn-id: r8587
2003-06-21 20:21:40 +00:00
Max Horn
8b567ddaf8 cleanup
svn-id: r8557
2003-06-19 15:14:17 +00:00
Jamieson Christian
3567c13361 Fix for bug [756559] ALL: 'multi_midi=true' in scummvm.ini does not work.
Fix properly propogates previously encountered value of multi_midi
and native_mt32 so follow-on config domains that don't include
multi_midi or native_mt32 won't reset the settings.

svn-id: r8545
2003-06-18 22:39:17 +00:00
Chris Apers
d120ea093f I will add a wrapper for that (currently NULL driver)
svn-id: r8526
2003-06-17 08:50:15 +00:00
Travis Howell
94e88917da Make OpenGL specific scaler use other keys so all normal scaler canbe made available.
svn-id: r8521
2003-06-17 06:13:57 +00:00
Bertrand Augereau
dd5bd03dc9 Parentheses didn't compile on WIN32
svn-id: r8512
2003-06-15 18:56:41 +00:00
Max Horn
101df28e0b moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
svn-id: r8496
2003-06-15 01:42:19 +00:00
Max Horn
f51caefbe0 some more cleanup
svn-id: r8488
2003-06-14 23:05:40 +00:00
Max Horn
5c56edc26f fix for LE systems
svn-id: r8487
2003-06-14 22:42:14 +00:00
Max Horn
f7a8cbf7c7 Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine
svn-id: r8482
2003-06-14 18:52:30 +00:00
Max Horn
9658dd6ea3 fixed aquadran's Windows fix (a pointer is const for good reasons; simply casting it to something non-const is bad, and undermines the compilers aliasing detection
svn-id: r8481
2003-06-14 18:20:56 +00:00
Max Horn
a4edad02b6 cleanup
svn-id: r8480
2003-06-14 18:15:14 +00:00
Paweł Kołodziejski
a42fa9e25c fix for bug #749249, related with path of game data placed on root drive under win98
svn-id: r8478
2003-06-14 16:45:38 +00:00
Jonathan Gray
6bce6b4069 make -z output align nicely
svn-id: r8459
2003-06-13 10:13:41 +00:00
Jamieson Christian
fd931291d1 Fixed problem with variant game IDs (e.g. 'tentaclea')
svn-id: r8454
2003-06-12 19:22:40 +00:00
Jamieson Christian
baaf6502ec Made notation of transient config domains consistent.
Now all transient config domains use a name
in the form _TRANSIENT_DOMAIN

svn-id: r8452
2003-06-12 18:46:37 +00:00
Max Horn
01cb6e2ab9 indention
svn-id: r8447
2003-06-12 15:20:58 +00:00
Jamieson Christian
fdf69876ae Fixed command line options being ignored when the launcher is used.
Again, I hope I'm manipulating the domain-based config architecture
correctly. I've created yet another transient domain called
"_COMMAND_LINE", so that after game-specific options are loaded,
the command line options can be loaded and override the config
file. GUI options are then loaded so as to override command line
options.

svn-id: r8437
2003-06-11 18:34:37 +00:00
Jamieson Christian
c117ef1e50 Fix for bug [741592] GUI: Switching music driver mixes up music
Implement true music driver selection from the GUI options dialog.

This implementation depends on a new, transient config domain called
"user-overrides". Probably any other config changes made from the
options dialog will need to go into this domain, which is now
loaded after the game settings are loaded.

I hope this is the right way to do it. I'm still a little fuzzy
about our game settings architecture. If anybody suddenly gets
a "[user-overrides]" section showing up in their scummvm.ini or
scummvm.rc files, you'll know why.

svn-id: r8434
2003-06-11 06:49:47 +00:00
Jamieson Christian
167ad2575a Fixed MSVC warning
svn-id: r8431
2003-06-11 05:08:41 +00:00
Max Horn
f36459f8ba cleanup
svn-id: r8429
2003-06-10 16:25:49 +00:00
Max Horn
82af035f91 added clear_sound_proc method to backend API (this requires all backends to be modified, but can't help it)
svn-id: r8409
2003-06-09 01:19:25 +00:00
Max Horn
be9e6e85db added quit event
svn-id: r8398
2003-06-08 12:11:14 +00:00
Max Horn
6f0943e9c8 removed GF_AFTER flags (except GF_AFTER_HEV7)
svn-id: r8374
2003-06-07 00:16:54 +00:00
Max Horn
badfdeedd3 added to new feature flags
svn-id: r8369
2003-06-06 23:58:39 +00:00
Max Horn
9f4d675eba remove version column
svn-id: r8368
2003-06-06 23:57:59 +00:00
Max Horn
4b227da824 Preparations for removing GF_AFTER_V? flags
svn-id: r8364
2003-06-06 22:51:33 +00:00
Bertrand Augereau
91a3d553e4 unmacro-ed and templated ABS, MIN & MAX
svn-id: r8311
2003-06-05 03:28:35 +00:00
Max Horn
c1dcc1a1ec Korean is kr, not ko
svn-id: r8279
2003-06-02 22:07:41 +00:00
Max Horn
d4982a0b1d fixed compilation
svn-id: r8276
2003-06-02 21:29:54 +00:00
Max Horn
f91de2ae1e renamed&fixed contains(Rect) -> intersects(Rect); added extend() method
svn-id: r8246
2003-06-01 17:06:07 +00:00
Travis Howell
771dcfaad7 Rename SimonState to SimonEngine
svn-id: r8228
2003-06-01 09:41:56 +00:00
Max Horn
06ab068a41 added some front matter text for doxygen
svn-id: r8119
2003-05-29 23:13:15 +00:00
Max Horn
e08d4f072e more OSystem docs & cleanup
svn-id: r8118
2003-05-29 22:34:35 +00:00
Max Horn
f0a9f4fb2c added some doxygen comments to common/system.h; cleaned up the OSystem interface a bit
svn-id: r8116
2003-05-29 21:45:26 +00:00
Max Horn
c991d40c58 fixed doc comment
svn-id: r8107
2003-05-29 16:37:49 +00:00
Max Horn
b07927da3d added some doxygen (javadoc style) comments. yes I sure these function probably needed documentation the least, but I just wanted something simple to test this on :-)
svn-id: r8094
2003-05-29 11:40:48 +00:00
Max Horn
db43466ea2 removed cruft
svn-id: r8093
2003-05-29 11:15:32 +00:00
Max Horn
2dd2e99cab the _encbyte code was evil, because it modified the memory passed to write(); worse, though, it incremented ptr2, which then was later passed to fwrite - hence if used to write something while _encbyte != 0, write() resulted in wrong data being written
svn-id: r8055
2003-05-28 19:03:12 +00:00
Max Horn
3fae6fbf46 added some missing checks for file being open before reading/writing
svn-id: r8043
2003-05-28 02:06:53 +00:00
Chris Apers
bf565613b2 Prepare support for wide display on HiRes+ device
svn-id: r8001
2003-05-26 12:59:16 +00:00