Commit Graph

746 Commits

Author SHA1 Message Date
Travis Howell
c77009e151 simon 1 dos talkie uses simon2.voc file
svn-id: r5277
2002-10-23 08:40:37 +00:00
Max Horn
efe90a3d53 more shadow var warnings fixed
svn-id: r5267
2002-10-23 00:11:27 +00:00
Travis Howell
7f9abfd839 oops again
svn-id: r5249
2002-10-22 14:14:44 +00:00
Travis Howell
3c6566c14f oops
svn-id: r5248
2002-10-22 14:04:22 +00:00
Travis Howell
4544aa6cc1 There is no speech in simon2dos target
svn-id: r5247
2002-10-22 13:50:20 +00:00
Travis Howell
37181172ed Remove warning
svn-id: r5246
2002-10-22 13:33:48 +00:00
Max Horn
d73c206579 fix (?) for windows compile problem
svn-id: r5244
2002-10-22 13:03:40 +00:00
Max Horn
c8905a5c8a fixed SIMONDEBUG; some cleanup
svn-id: r5240
2002-10-22 12:05:04 +00:00
Max Horn
5151e561d5 fixing various warnings that occur with -Wshadow;some other minor cleanup
svn-id: r5239
2002-10-22 11:48:24 +00:00
Travis Howell
b5f25dbf2d Minor fixes for simon2dos target
svn-id: r5227
2002-10-22 06:30:45 +00:00
Max Horn
4b8aa277f7 oops
svn-id: r5224
2002-10-21 22:19:59 +00:00
Max Horn
0c3f23bdfb don't crash if no voice file is present; also added a FIXME
svn-id: r5223
2002-10-21 22:06:06 +00:00
Max Horn
d58c7d43f0 fixed simon2win midi (I hope), bug #595813
svn-id: r5222
2002-10-21 22:03:59 +00:00
Max Horn
8af300fec3 The terms Word and DWord are somewhat Windows centric; in fact there are systems on which word is 32bit, as opposed to our 16 bits. Hence, use the uin16/uint32 naming scheme, which is not ambigious
svn-id: r5216
2002-10-21 13:23:25 +00:00
Max Horn
0006197cf1 fixed a memory leak (one thousand more to go :-)
svn-id: r5215
2002-10-21 12:58:53 +00:00
Max Horn
ad8347a6a5 clean up of the Simon MidiPlayer class
svn-id: r5214
2002-10-21 12:57:15 +00:00
Max Horn
31c773923e use File::size() method were it makes sense; one small change to simon.cpp based on comment on bug #595813
svn-id: r5210
2002-10-21 12:34:54 +00:00
Max Horn
4cbab55b7a maybe a fix for bug #595813, SIMON: fails to initialise midi
svn-id: r5203
2002-10-20 18:12:11 +00:00
Max Horn
3970de8064 fixed stupid typo
svn-id: r5124
2002-10-10 18:51:36 +00:00
Max Horn
ba39c5926c fix crash in Simon (see patch #620625)
svn-id: r5118
2002-10-09 20:54:15 +00:00
Max Horn
ab1cc774c8 patch #611450: Simon crash fix
svn-id: r4968
2002-09-19 10:22:32 +00:00
Paweł Kołodziejski
1e236d4c35 fixed crash at release mode under VC6 and cleanup
svn-id: r4952
2002-09-16 14:43:13 +00:00
Paweł Kołodziejski
29811c5fad simon also use class File
svn-id: r4948
2002-09-16 08:22:30 +00:00
Max Horn
a39711e256 fixed compilation on Mac OS X; some cleanup; moved header file scumm/smusH/rect.h to common/rect.h
svn-id: r4877
2002-08-31 13:29:10 +00:00
Paweł Kołodziejski
fe53d3ecc2 fixed VC6 linking
svn-id: r4845
2002-08-25 11:33:54 +00:00
Paweł Kołodziejski
492400e9fa fix for VC6 linking
svn-id: r4841
2002-08-25 01:17:33 +00:00
Max Horn
6d5529e0dd fixed warnings
svn-id: r4833
2002-08-24 21:57:00 +00:00
Paweł Kołodziejski
9f993a1d29 synced with scummvm
svn-id: r4821
2002-08-24 15:31:37 +00:00
Max Horn
2bc00e1079 patch #598375: SIMON: ugly hack to get beard working
svn-id: r4807
2002-08-23 22:17:24 +00:00
Max Horn
7aac293726 fixed the 'intelligent' GCC build rules; added .cvsignore files
svn-id: r4790
2002-08-21 16:28:19 +00:00
Max Horn
ce46866403 Initial revision
svn-id: r4785
2002-08-21 16:07:07 +00:00
James Brown
ca4789c2ff Fix lighting on actors in V6+ games (eg, Sam and Max)
Move boxflags debug to debug level 2 (we default to 1)
Apply patches:
  595414: Simon 2 lockup workarounds
  595875: Simon 2 save/load dialog fix
  597422: Preliminary support for CREA sound format (for FT)
  597627: Use savedir for save/load-string opcodes

svn-id: r4779
2002-08-20 09:58:35 +00:00
Max Horn
d354eaaf42 more code unification; as a side effect, simon can take advantage of the save path settings in the config file (inspired by patch #587694)
svn-id: r4770
2002-08-18 22:47:11 +00:00
Max Horn
404b8fd827 some more cleanup
svn-id: r4761
2002-08-18 18:39:42 +00:00
Max Horn
28058407c1 fixed simon crasher
svn-id: r4760
2002-08-18 18:15:15 +00:00
Max Horn
edae5b06db MAJOR change to the way how Engine objects are instantiated
svn-id: r4758
2002-08-18 17:48:18 +00:00
Max Horn
b204c21c32 trying to clean up the Simon code - gee this is a *BIG* mess! Argh!
svn-id: r4756
2002-08-18 16:21:34 +00:00
Max Horn
7f3ba176e1 added common Engine base class for Scumm and SimonState (not yet very useful)
svn-id: r4742
2002-08-14 10:18:03 +00:00
James Brown
3ba577842b Apply three patches:
593567 [painelf]: Fix SNM inventory icon centering, it's an actor
593444 [wjp and eriktorbjorn]: Simon2 lockup fix
593455 [wjp]: Simon2 map fix

svn-id: r4725
2002-08-11 09:05:30 +00:00
James Brown
ac7e6a15c1 Patch #589718: Simon2Win startup (by eriktorbjorn)
svn-id: r4700
2002-08-04 16:21:28 +00:00
Max Horn
f166da98fb Patch #590751: SIMON: FillOrCopyStruct unknowns
svn-id: r4699
2002-08-04 13:25:06 +00:00
Ralph Brorsen
1c6bc15f23 wjps simon save dialog patch. test for narrow letters was fixed, changed to non-negation for consistency
svn-id: r4690
2002-08-03 22:49:28 +00:00
Max Horn
9ad01eba91 got rid of UNIX_X11 - instead, use UNIX + X11_BACKEND
svn-id: r4632
2002-07-25 21:34:06 +00:00
Max Horn
703ed2267e patch #585725 - fix for overlapping text in simon
svn-id: r4628
2002-07-25 20:57:55 +00:00
Ruediger Hanke
1dd19c35fe Didn't mean to remove the warning
svn-id: r4613
2002-07-21 14:36:51 +00:00
Ruediger Hanke
59c58a3b68 Voices were broken in Simon on Big Endian systems ...
svn-id: r4612
2002-07-21 14:31:58 +00:00
Nicolas Bacca
8e3ba98de3 WinCE GUI friendly
svn-id: r4594
2002-07-18 22:51:29 +00:00
Nicolas Bacca
986987110b Workaround for French version crash
svn-id: r4593
2002-07-18 22:50:31 +00:00
Nicolas Bacca
984a6e7a49 Minor WinCE compile warning fix
svn-id: r4592
2002-07-18 22:49:59 +00:00
Max Horn
7ed45a6ef9 once more
svn-id: r4477
2002-07-07 19:08:28 +00:00
Max Horn
42ca9ea3a9 indent run
svn-id: r4476
2002-07-07 19:06:48 +00:00
James Brown
13db767d7b Make it Work (tm)
svn-id: r4441
2002-06-29 16:23:33 +00:00
James Brown
6a47365606 Large pointless commit #143: Start splitting Simon code into more managable and slightly understandable chunks
svn-id: r4438
2002-06-29 16:11:13 +00:00
James Brown
3bdb376afd Start of (non-functional) Simon2dos support.
Implement the holy (sic) cursor.

svn-id: r4436
2002-06-29 10:28:43 +00:00
James Brown
a38828fbd5 Simon1 fixes, Readme update
svn-id: r4425
2002-06-18 08:38:39 +00:00
James Brown
f3ab5d8228 Fix Simon case sensitivity, work around Win32 SDL bug (hang on audio exit)
svn-id: r4421
2002-06-16 04:09:22 +00:00
James Brown
5d53a81662 Fix copy/paste typo :)
svn-id: r4409
2002-06-06 07:12:17 +00:00
James Brown
3a2996a106 Remove Simons dependency on FLAG_FILE, as some dolt has broken that in the current mixer.
svn-id: r4408
2002-06-06 03:46:44 +00:00
James Brown
087ed25af5 Apply .VOC support for Simon, by olki.
svn-id: r4406
2002-06-05 02:59:35 +00:00
James Brown
e192a6ca87 Rewrite Simon filename parser.
svn-id: r4388
2002-05-29 13:04:56 +00:00
James Brown
ba6c570e20 Fix bug 558589. This shouldn't happen anyway, as 1641.VGA seems to be the video data for 'wearing' the beard... I suspect some people just have bad rips of the game.
svn-id: r4387
2002-05-29 12:30:22 +00:00
James Brown
aad1bf4104 fix some warnings, odd code, and prevent Simon segfaulting when wrong game specified.
svn-id: r4321
2002-05-14 19:44:41 +00:00
James Brown
a592de4333 Remove SCUMM dependancies from SDL.C - This fixes a regular crash in Simon due to the autosaver.
This changes the OSystem interface. Porters beware.

svn-id: r4318
2002-05-14 18:14:16 +00:00
Max Horn
2f2d4527ef cleaning up the mess drigo left... <sigh>
svn-id: r4215
2002-05-05 20:04:26 +00:00
Enrico Rolfi
bdcb76fe3b Fixed some things to support MacOS port
svn-id: r4210
2002-05-05 19:01:37 +00:00
Max Horn
fe8bfbc9e8 fix for MacOS native port
svn-id: r4205
2002-05-05 18:10:45 +00:00
Max Horn
ff376ea8a5 fixed some warnings
svn-id: r4204
2002-05-05 18:10:29 +00:00
Lionel Ulmer
ab0401242e Change the 'poperty' call to be 64-bits clean.
Porters, please check that I did not break anything while updating
your ports. Thanks :-)

svn-id: r4196
2002-05-04 09:55:10 +00:00
Nicolas Bacca
eda81d39ff Fixed packing for non GCC compilers - Loom & Zak work on WinCE now
svn-id: r4151
2002-05-01 00:13:03 +00:00
Ruediger Hanke
abc4c2f34f Endian and alignment fixes to make Simon games boot (and play) on big endian systems
svn-id: r4033
2002-04-21 12:51:13 +00:00
Lionel Ulmer
c673d1c760 Commit of the X11 driver using the new OSystem interface. Plus some warning fixes and gameDetector hacks.
svn-id: r4024
2002-04-20 17:41:42 +00:00
James Brown
eb773b477a Remove \M's, add IRIX support.
svn-id: r4019
2002-04-20 04:09:02 +00:00
James Brown
89d957090e Use relative include paths to easy some ports.
svn-id: r4005
2002-04-19 11:12:27 +00:00
Nicolas Bacca
44cc8c24a3 Update minimalist (and broken) WinCE port
svn-id: r4000
2002-04-19 06:23:49 +00:00
Ludvig Strigeus
6dfe2fc05f Now uses proper directory for savegames.
svn-id: r3993
2002-04-18 08:35:17 +00:00
Nicolas Bacca
fd6a44e7c5 Minor WinCE changes
svn-id: r3980
2002-04-17 20:21:40 +00:00
Marcus Comstedt
4442846ff8 Added missing newline at end of file.
svn-id: r3967
2002-04-16 23:22:15 +00:00
Marcus Comstedt
ff123564fb Make simon stuff compile with Dreamcast
svn-id: r3966
2002-04-16 23:15:58 +00:00
Ruediger Hanke
945d4f4ff0 Make simon stuff compile with MorphOS
svn-id: r3965
2002-04-16 20:49:55 +00:00
Ludvig Strigeus
71eac5acd3 endian fixes,
don't use adlib driver if sound initialization fails,
simon1 savedialog works

svn-id: r3955
2002-04-16 12:07:19 +00:00
Ludvig Strigeus
c3b734f79c command line option for sfx volume
svn-id: r3947
2002-04-15 18:07:56 +00:00
Ludvig Strigeus
084834f776 fixed a few alignment issues
svn-id: r3943
2002-04-15 14:37:47 +00:00
Ludvig Strigeus
df103f6b6b fixed a few endianness bugs
svn-id: r3940
2002-04-14 20:22:36 +00:00
Ludvig Strigeus
ac62a7cb2e wrote new mixer class,
cleaned up sound header files,
integrated mixer into scummvm & simon

svn-id: r3937
2002-04-14 18:13:08 +00:00
Ludvig Strigeus
a5e3dbb85d fixed alignment bugs and intro freeze in simon2
svn-id: r3936
2002-04-14 11:00:33 +00:00
Ludvig Strigeus
82d4f89d53 added null graphics driver (USE_NULL_DRIVER)
will make it nicer later.

svn-id: r3931
2002-04-13 21:06:48 +00:00
Ludvig Strigeus
23d134ae8e made more endian safe
svn-id: r3929
2002-04-13 20:08:58 +00:00
Ludvig Strigeus
65a98de8b9 removed anonymous struct
svn-id: r3926
2002-04-13 19:02:55 +00:00
Ludvig Strigeus
9f191ea9c5 new midi driver API,
no more USE_ADLIB,
a couple of sdl graphics driver fixes.

svn-id: r3925
2002-04-13 18:34:11 +00:00
Ludvig Strigeus
5b5778d561 full screen mode works now (even if SDL doesn't support it)
svn-id: r3923
2002-04-13 12:43:02 +00:00
Ludvig Strigeus
d71ba3e5ab try both uppercase and lowercase filename when opening files
svn-id: r3922
2002-04-13 11:44:56 +00:00
Ludvig Strigeus
b6aa3ab27d added ctrl-z quit option
svn-id: r3920
2002-04-13 11:31:54 +00:00
Ludvig Strigeus
223d1bd858 prevent crash if no wav file available
svn-id: r3919
2002-04-13 11:11:41 +00:00
Ludvig Strigeus
f5f504ae97 possibly fix of compile on unix
svn-id: r3918
2002-04-13 10:41:27 +00:00
James Brown
94670b2eef Fix various warnings, and things preventing non-win32 platforms from compiling.
svn-id: r3916
2002-04-13 04:39:04 +00:00
Ludvig Strigeus
d2b0070c5f new video engine (expect broken non-sdl builds),
simon the sorcerer 1 & 2 support (non SCUMM games)

svn-id: r3912
2002-04-12 21:26:59 +00:00