Commit Graph

180 Commits

Author SHA1 Message Date
Jonathan Gray
12e1c4711b prune uneeded code
svn-id: r14418
2004-08-01 10:48:11 +00:00
Max Horn
4ef4583523 Oh the beauty of stack based objects: they free themselves automatically, so you don't leak them all the time (fixed 10e6 object leaks :-)
svn-id: r14417
2004-08-01 10:02:41 +00:00
Jonathan Gray
69cf6a070a move sceneproc.cpp/h into scene.cpp/h
svn-id: r14416
2004-08-01 09:15:12 +00:00
Jonathan Gray
5833e67076 try to stop the abuse of MemoryReadStream (ie actually delete the memory when we're done with it)
svn-id: r14415
2004-08-01 08:45:40 +00:00
Jonathan Gray
bc900fde60 init some member vars
svn-id: r14414
2004-08-01 07:56:08 +00:00
Eugene Sandulenko
6a2e05edb8 More tweaks
svn-id: r14413
2004-08-01 07:50:28 +00:00
Eugene Sandulenko
890d667087 oops
svn-id: r14412
2004-08-01 07:41:15 +00:00
Eugene Sandulenko
2ed2770eed Yet more proper memory free'ing
svn-id: r14411
2004-08-01 07:37:42 +00:00
Eugene Sandulenko
e20d53a869 More correct Anim destructor
svn-id: r14410
2004-08-01 07:32:27 +00:00
Eugene Sandulenko
d4c84fefde Initialize Anim object properly.
svn-id: r14409
2004-08-01 07:23:36 +00:00
Jonathan Gray
182dd48bd4 merge reinherit.h into saga.h and gfx_mod.h, note the error loading animations wasn't caused by this commit :)
svn-id: r14405
2004-08-01 01:56:22 +00:00
Eugene Sandulenko
f1cfbe9065 Forgot to implement destructor for ActionMap
svn-id: r14400
2004-08-01 00:07:17 +00:00
Eugene Sandulenko
d530fc7696 Objectize actionmap.cpp
svn-id: r14399
2004-08-01 00:03:45 +00:00
Eugene Sandulenko
46a1c45d70 Extended CVAR_RegisterFunc with callback object parameter.
Got rid of static structure in animation.cpp

svn-id: r14397
2004-07-31 23:33:14 +00:00
Eugene Sandulenko
c5836541fe Objectize render.cpp
svn-id: r14395
2004-07-31 23:00:48 +00:00
Eugene Sandulenko
2060a9475d Rename some more functions to fit our naming rules
svn-id: r14394
2004-07-31 20:50:34 +00:00
Max Horn
62bcb7975f Fix warning (static functions are source/object file local; declaring them in a header makes no sense anyway :-)
svn-id: r14393
2004-07-31 19:10:47 +00:00
Eugene Sandulenko
6e6edb8c0d Objectize image.cpp
svn-id: r14391
2004-07-31 13:49:26 +00:00
Eugene Sandulenko
6038cf68ad Add xref.txt to saga module, though it's empty.
svn-id: r14390
2004-07-31 13:44:23 +00:00
Jonathan Gray
52918b9197 no longer needed
svn-id: r14389
2004-07-31 13:36:06 +00:00
Jonathan Gray
59c88e428b merge animation.h and animation_mod.h into a class
svn-id: r14388
2004-07-31 13:34:43 +00:00
Jonathan Gray
387c8abeda update comment to relfect reality
svn-id: r14386
2004-07-31 12:39:26 +00:00
Jonathan Gray
c7d6425a38 remove YS_IGNORE_PARAM macro and some uneeded yslib.h includes
svn-id: r14385
2004-07-31 12:37:36 +00:00
Max Horn
a1b82d8e13 Cleanup for MemoryReadStream; made it match the File-class interface
svn-id: r14086
2004-06-27 21:30:33 +00:00
Max Horn
ca9448fe40 clearnup
svn-id: r14054
2004-06-25 21:47:37 +00:00
Max Horn
fb188716d5 cleanup
svn-id: r14053
2004-06-25 20:11:46 +00:00
Max Horn
bb3ef09efa Removed unused stuff; cleanup
svn-id: r14052
2004-06-25 20:01:31 +00:00
Jonathan Gray
fc2044f743 Set graphics cursor before using it, fixes segfault when launching ihnm from the launcher. Fixes bug #966614
svn-id: r13934
2004-06-05 11:12:51 +00:00
Torbjörn Andersson
28e63617e1 Set _parser to NULL after deleting it. I don't know if it's necessary, but
it'll make me sleep easier at night, and I should have remembered to do it
before anyway.

svn-id: r13912
2004-05-31 08:59:11 +00:00
Torbjörn Andersson
cddf02fc32 Make sure music is unloaded and the parser object deleted before starting a
new piece of music.

svn-id: r13909
2004-05-31 08:46:36 +00:00
Eugene Sandulenko
4ceb84c643 Extend midi music table.
Implement music looping.

svn-id: r13899
2004-05-29 21:04:44 +00:00
Eugene Sandulenko
b3feb1107e Remove slipped in underscores.
svn-id: r13898
2004-05-29 21:03:56 +00:00
Eugene Sandulenko
5464e0951b Some more actor struct renames to match disassembly
svn-id: r13843
2004-05-21 01:23:50 +00:00
Torbjörn Andersson
9ec42ab9a7 Added support for using the separate VOC file (P2_A.VOC) from the Wyrmkeep
release of ITE. The code is a bit rough, and there's a nasty 'pop' at the
beginning of the sound (and a smaller one at the end), but it's a start.

It's a shame that the sound is of such low quality: lower sample rate, and
8 bits instead of 16. Perhaps it was extracted from the floppy version?

svn-id: r13840
2004-05-17 16:11:04 +00:00
Torbjörn Andersson
c51d9fba08 Cleaned up the handling of external MIDI files, and added the missing ones.
This is based on experimentation and guesswork, so it might be wrong, but
it will have to do for now.

svn-id: r13839
2004-05-16 12:57:49 +00:00
Eugene Sandulenko
cd229dc57a Revamp static actor data. Add missed fields and reformat table.
svn-id: r13837
2004-05-14 02:25:36 +00:00
Eugene Sandulenko
1b78dc468f Added more stubs from script fucntions, some renames for consistency with
disassembly.

svn-id: r13835
2004-05-13 01:41:23 +00:00
Torbjörn Andersson
148872d1fd Replaced R_printf() with debug() and warning(). There are still a couple of
standard printf()s left, though.

svn-id: r13791
2004-05-05 13:05:45 +00:00
Torbjörn Andersson
4102a3b13f Removed data_dir, since it wasn't used.
svn-id: r13790
2004-05-05 12:05:00 +00:00
Paweł Kołodziejski
6c38484c1a workaround warning - fixme
svn-id: r13779
2004-05-05 06:56:01 +00:00
Eugene Sandulenko
5a5e6ba868 Now cursor is really always shown.
svn-id: r13778
2004-05-05 02:35:33 +00:00
Eugene Sandulenko
8de181f4f0 Move from ys_binread.cpp and ys_binwrite.cpp to MemoryReadStream.
In fact there were no binary writes at all.

svn-id: r13773
2004-05-04 03:33:03 +00:00
Eugene Sandulenko
5de55d2dfa indent
svn-id: r13771
2004-05-03 23:12:59 +00:00
Eugene Sandulenko
51801dc503 Started work on moving from ys_read/write to MemoryReadStream
svn-id: r13769
2004-05-03 23:06:57 +00:00
Eugene Sandulenko
86c055b796 Make sure cursor is always white
svn-id: r13750
2004-05-02 16:32:28 +00:00
Torbjörn Andersson
2617f36cb6 Made the cursor work a bit better in IHNM.
svn-id: r13749
2004-05-02 15:59:06 +00:00
Torbjörn Andersson
67d82f23d8 Got rid of r_softcursor by having the backend always draw the cursor
instead. This fixes graphics glitches in at least ITE.

Got rid of r_fullscreen, which wasn't even used anymore anyway.

svn-id: r13748
2004-05-02 15:44:19 +00:00
Jonathan Gray
88ac74992c get rid of the last bits of SDL timer usage, SAGA should now be 100% OSystem
svn-id: r13729
2004-05-02 02:11:55 +00:00
Jonathan Gray
64485a9314 use features so ihnm doesn't default to 1280x960, change over some of the timer stuff to osystem not yet finished
svn-id: r13728
2004-05-02 01:39:14 +00:00
Eugene Sandulenko
6722103aa8 Removed last sys* file
svn-id: r13727
2004-05-02 00:06:34 +00:00
Eugene Sandulenko
90a876798a Merged sysgfx.cpp and gfx.cpp to gfx.cpp
svn-id: r13726
2004-05-02 00:00:39 +00:00
Eugene Sandulenko
0765b272ae Renamed files for consistency
svn-id: r13725
2004-05-01 23:46:23 +00:00
Eugene Sandulenko
66876dc1d1 Proper #includes everywhere
Improved game detector

svn-id: r13724
2004-05-01 23:42:22 +00:00
Eugene Sandulenko
c0772498b6 All graphics and input now is in OSystem.
Only timers left.

svn-id: r13723
2004-05-01 19:41:47 +00:00
Torbjörn Andersson
4110aeb5d5 With Jamieson630's MIDI parser fix, all the ITE MIDIs should work.
svn-id: r13720
2004-05-01 16:49:23 +00:00
Paweł Kołodziejski
4d6b9206b9 fix warning
svn-id: r13717
2004-05-01 16:24:39 +00:00
Paweł Kołodziejski
da719908fe indent
svn-id: r13716
2004-05-01 16:23:54 +00:00
Paweł Kołodziejski
0af53f3c97 indent
svn-id: r13715
2004-05-01 16:15:55 +00:00
Eugene Sandulenko
d84d93b5d0 Fix IHNM hang
svn-id: r13714
2004-05-01 15:08:20 +00:00
Paweł Kołodziejski
3ad363a274 indent
svn-id: r13713
2004-05-01 14:34:00 +00:00
Paweł Kołodziejski
e04312c0a5 indent
svn-id: r13712
2004-05-01 14:05:10 +00:00
Jonathan Gray
6f33b9225c unbreak change that prevented ite disk version from launching, add detection for win32 demo
svn-id: r13711
2004-05-01 14:00:53 +00:00
Paweł Kołodziejski
273be948c0 indent
svn-id: r13710
2004-05-01 13:48:01 +00:00
Jonathan Gray
db5e659d0c add some debug calls in the verify functions
svn-id: r13709
2004-05-01 13:20:58 +00:00
Paweł Kołodziejski
d46b68d7fe indent
svn-id: r13708
2004-05-01 13:19:15 +00:00
Paweł Kołodziejski
84eb0101a7 indent
svn-id: r13706
2004-05-01 13:04:31 +00:00
Eugene Sandulenko
d82c9bd640 Remove scalers, 16bpp code, unused functions.
svn-id: r13703
2004-05-01 09:40:47 +00:00
Torbjörn Andersson
ca7b89d2a5 Fixed warning
svn-id: r13702
2004-05-01 09:38:03 +00:00
Paweł Kołodziejski
6b39b875fc indent
svn-id: r13701
2004-05-01 09:37:24 +00:00
Torbjörn Andersson
4265979a6a Fixed warnings
svn-id: r13700
2004-05-01 09:37:12 +00:00
Torbjörn Andersson
5f5e6e4279 Fixed warning. The R_GAMEDESC for the disk version of ITE didn't initialise
the gd_suppoerted flag, so I set it to 0.

svn-id: r13699
2004-05-01 09:36:02 +00:00
Paweł Kołodziejski
1d649b1c06 indent
svn-id: r13698
2004-05-01 09:19:35 +00:00
Paweł Kołodziejski
ae9f6dd86a indent
svn-id: r13697
2004-05-01 09:07:31 +00:00
Paweł Kołodziejski
a8453637f8 indent
svn-id: r13696
2004-05-01 08:44:00 +00:00
Paweł Kołodziejski
4b5e78b774 indent
svn-id: r13695
2004-05-01 07:50:08 +00:00
Paweł Kołodziejski
b7a1956382 indent
svn-id: r13694
2004-05-01 07:39:39 +00:00
Paweł Kołodziejski
b3fe9ee32a indent
svn-id: r13693
2004-05-01 07:32:48 +00:00
Paweł Kołodziejski
74fce461b8 indent
svn-id: r13692
2004-05-01 06:57:54 +00:00
Paweł Kołodziejski
7792c3fd5e indent
svn-id: r13691
2004-05-01 06:50:20 +00:00
Paweł Kołodziejski
e8cb50e17f indent
svn-id: r13690
2004-05-01 06:35:06 +00:00
Eugene Sandulenko
1ecf43aabe Remove unneeded #defines
svn-id: r13689
2004-05-01 06:31:50 +00:00
Paweł Kołodziejski
1ac5aef647 indent
svn-id: r13688
2004-05-01 06:16:57 +00:00
Eugene Sandulenko
1353e2d2dc Move from custom unsigned types to those provided by main config.h
svn-id: r13687
2004-04-30 23:02:23 +00:00
Eugene Sandulenko
06d9f402df Indentation madness
svn-id: r13686
2004-04-30 21:41:51 +00:00
Torbjörn Andersson
d5873104ad Added fixme comment about a bug that happens (at least) in the Wyrmkeep
re-release of ITE, and how to work around it.

svn-id: r13685
2004-04-30 17:49:33 +00:00
Torbjörn Andersson
7ab18634c7 Very experimental support for the separate MIDI files used by the Wyrmkeep
re-release of ITE.

Unfortunately I only know the mapping from resource number to file name for
the two tunes in the intro, and the second one causes ScummVM to crash so I
had to disable it.

svn-id: r13682
2004-04-30 07:13:26 +00:00
Max Horn
a6d632c6cf Fix warning
svn-id: r13681
2004-04-29 22:19:15 +00:00
Jonathan Gray
90075cd190 use timer rate from driver, makes midi a bit more audible
svn-id: r13679
2004-04-29 13:45:10 +00:00
Torbjörn Andersson
f3d4bc7f8f Quick-and-dirty music fix. I can hear music in the ITE intro now. I haven't
tried IHNM yet.

svn-id: r13678
2004-04-29 12:27:17 +00:00
Jonathan Gray
ce98de540d fix another unitialised var use
svn-id: r13675
2004-04-29 05:13:18 +00:00
Jonathan Gray
cd21d5919b init some things to fix segfaults
svn-id: r13674
2004-04-29 04:50:45 +00:00
Eugene Sandulenko
4ed0d02f05 Now it produces sound, but it's clear that XMIDI parsing is wrong
svn-id: r13673
2004-04-29 04:24:55 +00:00
Eugene Sandulenko
91f5c00a12 Make MIDI driver run, though no sound yet.
svn-id: r13672
2004-04-29 04:07:14 +00:00
Eugene Sandulenko
e344d4e1b0 Forgot to commit header file
svn-id: r13671
2004-04-29 03:54:03 +00:00
Eugene Sandulenko
bb8ee598c9 Music.cpp objectizing.
Initial MIDI checkin, doesn't work

svn-id: r13670
2004-04-29 03:52:59 +00:00
Eugene Sandulenko
b03304c870 Rename sysmusic.cpp to music.cpp
svn-id: r13669
2004-04-29 01:47:51 +00:00
Eugene Sandulenko
d7835da8c7 Voices are played
svn-id: r13668
2004-04-29 01:24:18 +00:00
Eugene Sandulenko
4c889000f2 Objectizing sound.cpp
svn-id: r13667
2004-04-28 23:54:40 +00:00
Eugene Sandulenko
c3171841aa Rename syssound.cpp to sound.cpp
svn-id: r13666
2004-04-28 23:24:56 +00:00
Eugene Sandulenko
4f25dbb45b Rename Snd object to SndRes
svn-id: r13665
2004-04-28 23:19:45 +00:00