Commit Graph

145 Commits

Author SHA1 Message Date
Andrew Kurushin
b4b2e52df7 another step in verb implementation:
- objectMap responds to mouse move  (but respond script not run well ?)

loadStrings add some special count check
- so all other LUT based resource should implement this technique

svn-id: r16594
2005-01-18 15:01:21 +00:00
Andrew Kurushin
0b4fd4adbf - merged ActionMap and ObjectMap
- remove ActionMap.h & ActionMap.cpp
- ObjectMap names move to Scene::_sceneStrings as in original engine
- fix wrong StringsTable::stringsCount calculation

svn-id: r16592
2005-01-18 11:55:31 +00:00
Eugene Sandulenko
c9d0d4c840 Initialize converse properly.
svn-id: r16591
2005-01-18 10:45:36 +00:00
Eugene Sandulenko
dab894fdd4 First batch of converse implementation in scripts. To see it type
'scene_change 33' in debugger.

svn-id: r16588
2005-01-17 20:17:06 +00:00
Andrew Kurushin
2f20dd57c2 some work in progress on verb stuff:
- many structers and fields renamed to proper names
- added missing functions

svn-id: r16562
2005-01-15 20:12:49 +00:00
Torbjörn Andersson
96d5a1c88d I've changed getTextString() slightly so that if the translated string is
NULL it'll use the English string instead. It seems unnecessary to store
the same string twice, even if it's possible that the compiler is smart
enough to eliminate the duplicates.

Either way it doesn't make much difference now, but we may want to add the
intro strings to the getTextString() mechanism eventually. In that case
most of the credits would be duplicates, for instance.

svn-id: r16560
2005-01-14 11:22:45 +00:00
Eugene Sandulenko
ccacf6f82e o Added support for German ITE. There are also Puzzle-related messages
hardcoded, but I'll save that for later :)
o Eliminated all leftovers of previous language loader. If you'll spot another
  one, just remove it silently.

svn-id: r16556
2005-01-14 01:17:34 +00:00
Andrew Kurushin
326dd0c255 - introduced SagaEngine::getTextString (for i18n it should route to corresponding string array)
- first step in verb implementation: proper button draw, keyboard respond 'w','l' &etc
- added comments and some fields to GameDisplayInfo

svn-id: r16554
2005-01-13 22:42:49 +00:00
Andrew Kurushin
244b227b19 - remove game.h & image.h
- all display information of current game goes to SagaEngine
- remove GameFontIds
- hide SagaEngine _gameId,_gameType & etc with methods getGameId(), getGameType()

svn-id: r16545
2005-01-11 21:10:36 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Andrew Kurushin
31ceb0bb71 - GameModule is gone
- structures renamed
- SagaEngine class gives all current game descriptions
regression : "verb" is broken cause work in  progress

svn-id: r16511
2005-01-09 23:41:22 +00:00
Andrew Kurushin
7a8e1c1efd small fixes:
- actor barrier rects
- unreachable code

svn-id: r16510
2005-01-09 21:36:20 +00:00
Andrew Kurushin
9c7a604c8b rename StringsList to StringsTable
svn-id: r16492
2005-01-08 21:06:06 +00:00
Andrew Kurushin
bdb1b1eb1c begining of verb implementation
introduced getObjectName

svn-id: r16491
2005-01-08 20:30:07 +00:00
Eugene Sandulenko
0a89a28e45 o Add reported German IHNM and ITE
o Fix IHNM. It does not have actors now (all actors in IHNM are in resources,
  not hardcoded)

svn-id: r16478
2005-01-07 15:49:47 +00:00
Eugene Sandulenko
12c44e85de Fix crash in intro
svn-id: r16447
2005-01-06 15:29:17 +00:00
Eugene Sandulenko
26d5810b81 Next batch of panel-related fixes. Still wrong.
NOTE: lines which start with `;' should contain calls to not yet
implemented subsystems like Conversation subsystem

svn-id: r16443
2005-01-06 14:02:53 +00:00
Eugene Sandulenko
63be4b6435 o Started putting all panels stuff in order. Still incomplete
o Proper detection for Mac Wyrmkeep CD
o Support for wyrmkeep logos

svn-id: r16415
2005-01-02 20:29:27 +00:00
Max Horn
2664ca7eb1 oops, correct copyright string
svn-id: r16399
2005-01-01 16:20:17 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
2004-12-27 00:27:00 +00:00
Andrew Kurushin
3d9784f94d - rewriten actors action handling (now uses all original flags etc)
- added some script functions (swapactors...)
- many things were renamed according scummvm covention
- resource id definintions should begin with "RID_" prefix

- intro temporary broken - work in progress
todo:
- walking hanling also should be rewriten
- timings for speech and actor cycling should be more accurate

svn-id: r16263
2004-12-22 21:04:50 +00:00
Eugene Sandulenko
2fb8a8e453 o Moved GAME_* to SagaEngine object
o Renamed GAME_ITE_* to GID_ITE_*
o Renamed GID_ITE and GID_IHNM to GType_ITE and GType_IHNM

svn-id: r16258
2004-12-22 13:09:47 +00:00
Andrew Kurushin
ea3b0d1100 - rewritten actors speech engine :
1) there are three types of speech: one acor, multiple actor, non actor
  2) slow speech implemented
  3) uses native engine flags (async,noanimate...) instead of semaphores
- proper timings implemented

svn-id: r16237
2004-12-21 06:49:07 +00:00
Torbjörn Andersson
c64c7eb4d4 First pass at migrating from the old Reinherit console to the ScummVM
console.

Some things are likely to have broken. For instance, I believe the old
console was could be visible during gameplay, while ScummVM's is modal. So
any place where we output something to the console during gameplay should
probably be removed.

Some things I've stubbed out. Basically any code that registers a variable.

Most of the debugging commands are untested.

Syntax may have changed because of different command-line parsing. (I never
actually used the old console, so I don't know for sure. :-)

Actually, I'm not that interested in reproducing the old console commands
faithfully. What we should do now is to make the immediately useful console
stuff work. Anything that remains unimplemented should probably be removed.

svn-id: r15976
2004-12-03 19:15:44 +00:00
Max Horn
5d5a13eec7 Moved MidiDriver creation code into the MidiDriver class (as static methods), same for some other MIDI related stuff
svn-id: r15968
2004-12-02 00:33:42 +00:00
Eugene Sandulenko
99503e3a32 Fix music volume
svn-id: r15959
2004-11-29 00:17:03 +00:00
Jerome Fisher
1b638b829e Who started this trend? :)
MT-32 emulator should be handled just like all other drivers, except that it should always be considered native MT-32.

svn-id: r15952
2004-11-28 23:08:05 +00:00
Eugene Sandulenko
31e434dcf1 Fix a`ll engines. They work, though current fix is just temporary.
There are plans to add some brains to GameDetector class, which will let us
avoid passing detector to init() method.

svn-id: r15873
2004-11-24 00:14:21 +00:00
Max Horn
aad9f122c0 Added Engine::init() method; added return value to Engine::go()
svn-id: r15865
2004-11-23 00:03:25 +00:00
Max Horn
fa97d4ad89 Removing walkthrough stuff again (talked to aquadran about this, he had no objections)
svn-id: r15849
2004-11-20 23:49:11 +00:00
Torbjörn Andersson
9766d59b7e I'm told that the FM music file sounds terrible with MT-32 and that the
MT-32 is perfectly capable of playing General MIDI. My new guess is that
the FM file is for Adlib instead. It certainly sounds better - but quite
different - than playing the GM track through Adlib.

svn-id: r15846
2004-11-20 17:19:15 +00:00
Paweł Kołodziejski
309108430c init walkthrough dialog later
svn-id: r15841
2004-11-19 22:33:24 +00:00
Paweł Kołodziejski
734a7d3102 fixed missed ctrl key handle, and missed create() walklthrough call
svn-id: r15840
2004-11-19 22:30:18 +00:00
Paweł Kołodziejski
20e9cf6f20 added walkthrough
svn-id: r15835
2004-11-19 19:50:22 +00:00
Torbjörn Andersson
d173491acc Added music to the partial IHNM intro. I think I picked the correct tune,
but I can't be absolutely sure.

I'm also not sure if I'm using the correct music data. I'm fairly sure that
the MUSICGM.RES file is the appropriate choice for "General MIDI", but I
have no way of verifying that the MUSICFM.RES is really the right choice
for MT-32. (Is either of them a good choice for Adlib, or are they both
equally bad?)

svn-id: r15831
2004-11-19 07:41:59 +00:00
Eugene Sandulenko
f930782098 Make IHNM default be 1x scaler.
svn-id: r15829
2004-11-18 22:54:15 +00:00
Eugene Sandulenko
4295a17c23 o Make GAME_GetFileContext() more object-like
o Font::loadFont() now normally survives zero-length fonts as used in demos
o Removed unused SndRes::ITEVOC_Resample()
o Fixed playing of voice #4 on old DOS targets
o Implemented playing voices in VOX (Oki ADPCM) format
o Support of Win32 and Linux demos. There was old-style Win32 demo, which
  is not supported yet, same is with DOS demo.

svn-id: r15814
2004-11-15 03:03:48 +00:00
Torbjörn Andersson
c55ff57fc6 Initial inventory support.
svn-id: r15723
2004-11-07 14:15:41 +00:00
Paweł Kołodziejski
c7e5ab1f2d removed R_ prefix with few r_ too
svn-id: r15690
2004-10-27 21:32:28 +00:00
Eugene Sandulenko
44bd54b476 Better support of MT-32.
svn-id: r15636
2004-10-21 22:40:06 +00:00
Torbjörn Andersson
ec413cc8f9 Added support for digitized music, plus some other music-related fixes.
Note that I've only tried this with the music.rsc file from the full Linux
version. It seems likely that the Mac version uses the same file format,
but I have no way of verifying this. I'm told the demos use compressed
audio, so the music files from them probably won't work yet.

svn-id: r15527
2004-10-12 11:45:53 +00:00
Chris Apers
757f2fdcef Prevent double slash in path
svn-id: r15473
2004-10-08 16:09:52 +00:00
Eugene Sandulenko
4dc49e713b Turn ObjectMap into real object.
svn-id: r15457
2004-10-07 23:02:19 +00:00
Eugene Sandulenko
29a5f6bbd3 Remove duplicated code in actor walk code.
Turn ActionMap into real object.
Rename ActionMap variables to conform our code guidelines.

svn-id: r15456
2004-10-07 22:31:39 +00:00
Torbjörn Andersson
54cec2e011 Set up file paths to handle the differences between the file layout of the
Windows and Linux versions. (TODO: Handle game detection.)

Added preliminary support for the P2_A.aif file that the Linux version
uses, where the Windows version uses p2_a.voc. Someone will have to verify
the actual format of it, and we have a silly bug in playVoice() which will
have to be fixed before things work properly.

svn-id: r15365
2004-10-01 06:45:13 +00:00
Max Horn
ce8c99bf62 Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
2004-09-28 20:19:37 +00:00
Jonathan Gray
d1d308ff74 R_GAMETYPE -> GID, remove unused supported flag and trim some unused bits of GAME
svn-id: r14793
2004-08-27 01:32:10 +00:00
Eugene Sandulenko
3fe739efb2 Merge SDEBUG_*, SF_* and STHREAD_* into Script class.
svn-id: r14568
2004-08-12 23:57:45 +00:00
Eugene Sandulenko
94b377ce73 Handle fades in scene load routine.
Introduce immediate events.

svn-id: r14558
2004-08-11 22:27:39 +00:00
Eugene Sandulenko
720ea20bed Moved PALANIM_* to a class.
svn-id: r14540
2004-08-10 19:20:33 +00:00
Eugene Sandulenko
fe7ac87bc7 Move EVENT_* to a class.
svn-id: r14539
2004-08-10 19:00:30 +00:00
Eugene Sandulenko
632042dae4 Move CON_* to a class.
svn-id: r14538
2004-08-10 18:31:33 +00:00
Eugene Sandulenko
602cd289f3 Move INTERFACE_ to class.
svn-id: r14478
2004-08-06 01:39:17 +00:00
Eugene Sandulenko
51b5acfc9c Move SCENE_* to class.
svn-id: r14463
2004-08-04 20:28:57 +00:00
Eugene Sandulenko
11078570dc Move state static variable to appropriate class
svn-id: r14462
2004-08-04 18:07:57 +00:00
Eugene Sandulenko
b197c3dac8 Move SPRITE_ to a class
svn-id: r14451
2004-08-03 01:07:34 +00:00
Eugene Sandulenko
415400f24e Move TEXT_* to SagaEngine class.
svn-id: r14450
2004-08-03 00:40:16 +00:00
Eugene Sandulenko
fe1ab79bee Move FONT_* to class.
svn-id: r14449
2004-08-03 00:06:18 +00:00
Eugene Sandulenko
166b05aed4 Fix #include paths.
svn-id: r14443
2004-08-02 16:20:35 +00:00
Eugene Sandulenko
98816ad3ae Objectize actor.cpp
svn-id: r14441
2004-08-02 15:47:42 +00:00
Jonathan Gray
dcf5805440 create objectMap class
svn-id: r14440
2004-08-02 15:44:18 +00:00
Jonathan Gray
632612680b move isomap into a class
svn-id: r14439
2004-08-02 14:51:48 +00:00
Jonathan Gray
e4c813670f remove timer wrapper functions
svn-id: r14437
2004-08-02 12:41:40 +00:00
Joost Peters
4aaea2131e create Script class from SCRIPT_* and ScriptModule
svn-id: r14425
2004-08-01 22:48:40 +00:00
Joost Peters
48cddda4b9 move SDATA_* into seperate class
svn-id: r14424
2004-08-01 19:53:29 +00:00
Eugene Sandulenko
ea694ffd68 Pass SagaEngine object to Anim and ActionMap objects
svn-id: r14422
2004-08-01 13:34:20 +00:00
Jonathan Gray
c8d9018909 init _gfx in a less hacky manner
svn-id: r14420
2004-08-01 12:06:12 +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
Jonathan Gray
59c88e428b merge animation.h and animation_mod.h into a class
svn-id: r14388
2004-07-31 13:34:43 +00:00
Max Horn
bb3ef09efa Removed unused stuff; cleanup
svn-id: r14052
2004-06-25 20:01:31 +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
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
Paweł Kołodziejski
d46b68d7fe indent
svn-id: r13708
2004-05-01 13:19:15 +00:00
Jonathan Gray
ce98de540d fix another unitialised var use
svn-id: r13675
2004-04-29 05:13:18 +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
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
4f25dbb45b Rename Snd object to SndRes
svn-id: r13665
2004-04-28 23:19:45 +00:00
Eugene Sandulenko
1ad6498bd5 Objectize sndres.cpp
svn-id: r13664
2004-04-28 23:10:59 +00:00
Max Horn
56e25a8f7f Removing more files from SAGA. Justification: we already have XMIDI/SMF code; SDL already gets inited by OSystem (which this code should use, too, of course...); no need to have a simple poly hit test in a separate file
svn-id: r13657
2004-04-28 00:30:16 +00:00
Max Horn
9ae54838b9 cleanup
svn-id: r13652
2004-04-27 11:22:13 +00:00
Max Horn
d4f876b37d Fix many warnings; use C++ type system instead of C style typedefs; removed various unused stuff; const correctness; etc.
svn-id: r13622
2004-04-25 14:42:14 +00:00
Eugene Sandulenko
975a9015e8 Forgot to add header.
Please, remove SAGA engine from MSVC builds. It should be broken there until
porting to OSystem is finished

svn-id: r13565
2004-04-12 21:51:26 +00:00
Eugene Sandulenko
f3d340fb0c WIP for SAGA engine.
o text formatting is not consistent with rules, just indent utility is too
   dumb for that
 o it does not use OSystem, i.e. it runs on direct SDL calls
 o it may not even compile on your box
 o if you enable it, expect zillions of warnings
 o no sound

Now it runs ITE intro as reinherit did

svn-id: r13564
2004-04-12 21:40:49 +00:00
Paweł Kołodziejski
89d159f9c8 corrections to namespaces
svn-id: r13362
2004-03-22 21:25:29 +00:00
Eugene Sandulenko
8ca8912dbd Use Saga namespace everywhere
svn-id: r13293
2004-03-15 01:59:06 +00:00
Eugene Sandulenko
0d4cfaa559 Initial SAGA checkin
svn-id: r13281
2004-03-14 23:39:41 +00:00