Commit Graph

81 Commits

Author SHA1 Message Date
Travis Howell
5b3f73f27c Intergrate the DXA player for Amiga/Macintosh verisons of FF, from cyx
svn-id: r21959
2006-04-17 04:02:48 +00:00
Max Horn
6c076f80d7 Reduced dependencies on base/plugins.h
svn-id: r21940
2006-04-16 13:12:23 +00:00
Travis Howell
5b388fc48e Cleanup
svn-id: r21926
2006-04-15 22:37:48 +00:00
Travis Howell
b90b595060 Use different methods to avoid overflows to FF, to avoid regressions
svn-id: r21924
2006-04-15 22:14:39 +00:00
Max Horn
68cb7f52c8 - Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916
2006-04-15 20:36:41 +00:00
Travis Howell
2f024e2701 Increase size of variable array entries, to prevent overflows that often occur in FF. The original FF used unsigned variable arrays, but Simon 1/2 requires a signed variable array.
svn-id: r21905
2006-04-15 12:19:38 +00:00
Travis Howell
5e8f44fcf2 Minor cleanup
svn-id: r21904
2006-04-15 07:56:55 +00:00
Travis Howell
0c8d182106 Change _numTextBoxes to unsigned, to stop compile warnings
svn-id: r21903
2006-04-15 06:47:26 +00:00
Travis Howell
3d36a28296 Adjust various number of textBox checks for FF
svn-id: r21902
2006-04-15 06:42:40 +00:00
Travis Howell
647b318a97 Increase array sizes for FF and cleanup
svn-id: r21901
2006-04-15 06:35:40 +00:00
Travis Howell
f254b5b73a Cleanup
svn-id: r21880
2006-04-14 09:57:43 +00:00
Travis Howell
1a6849de91 Add speech support for Amiga verison of FF
svn-id: r21871
2006-04-14 05:13:59 +00:00
Travis Howell
de0dd94c9c Add support for sound effects in Amiga version of FF and cleanup
svn-id: r21870
2006-04-14 04:22:49 +00:00
Travis Howell
3407185358 Add invertBox function for FF
svn-id: r21854
2006-04-13 23:34:58 +00:00
Travis Howell
89c89c0209 Add code for save game interface in FF
svn-id: r21843
2006-04-13 14:26:46 +00:00
Travis Howell
8ae793c81e Cleanup
svn-id: r21773
2006-04-10 23:44:17 +00:00
Torbjörn Andersson
ebcee2beb6 Split the playTune opcode into Simon 1, Simon 2 and FF versions. The FF version
was wrong before, but since it is a no-op, it probably never caused any
problems.

svn-id: r21763
2006-04-10 10:18:55 +00:00
Torbjörn Andersson
4e14fd84f4 Some opcodes have been made Simon 1-specific, either because they really are
only used in Simon 1 (e.g. the "beard" opcodes), or because Simon 2 and FF have
their own versions.

svn-id: r21762
2006-04-10 10:07:56 +00:00
Torbjörn Andersson
8a8dd15dc6 With the old o_ functions out of the way, I have renamed all o1_ functions as
the corresponding o_ function. This is in preparation for separating the truly
Simon 1-specific opcode functions into a group of their own.

svn-id: r21761
2006-04-10 09:49:03 +00:00
Torbjörn Andersson
f07d60adc8 By now, it should be obvious that I'm trying to get rid of the o_ functions.
This is in preparation for the next stage of the cleanup.

By now, I have merged most of the o_ opcode functions into the corresponding
o1_ opcode function. There are a few pure o_ opcode functions left, but it
makes sense to keep them separate functions since they are part of groups of
other functions. Now, to get rid of the remaining o_ functions I have:

Dropped the "o_" prefix from the following functions: o_kill_sprite_simon1(),
o_kill_sprite_simon2(), o_waitForSync(), o_freezeBottom(), o_setTextColor(),
o_fadeToBlack(), o_waitForMark(), o_unk_132_helper_3(), o_unk_132_helper(),
o_clearCharacter(), o_fileError().

Renamed o_sync() to sendSync().
Renamed o_mouseOn() to scriptMouseOn(), and moved it to items.cpp
Renamed o_mouseOff() to scriptMouseOff(), and moved it to items.cpp

svn-id: r21760
2006-04-10 09:18:07 +00:00
Torbjörn Andersson
f1c79ee518 Merged o_setup_cond_c() into o1_getDollar2(). (We could merge
setup_cond_c_helper() into o1_getDollar2() as well, but for now I'm only trying
to get rid of the o_* functions.)

svn-id: r21759
2006-04-10 08:49:28 +00:00
Torbjörn Andersson
ea4e5dbb82 Merged o_printStr() into o1_screenTextMsg().
svn-id: r21758
2006-04-10 08:42:29 +00:00
Torbjörn Andersson
7ab84e4d99 Merged o_pathfind() into o1_getPathPosn().
svn-id: r21757
2006-04-10 08:34:16 +00:00
Torbjörn Andersson
1d9cd5ad7d Merged o_restoreIconArray() into o1_restoreIconArray().
svn-id: r21756
2006-04-10 08:28:29 +00:00
Torbjörn Andersson
008d4955dd Merged o_confirmQuit() into o1_pauseGame().
svn-id: r21755
2006-04-10 08:22:03 +00:00
Torbjörn Andersson
2ee9a34349 Merged o_inventory_descriptions() into o1_screenTextPObj().
svn-id: r21754
2006-04-10 08:09:49 +00:00
Torbjörn Andersson
28c34673dc Merged o_loadGame() and o_saveGame() into o1_loadUserGame() and
o1_saveUserGame().

svn-id: r21753
2006-04-10 08:04:45 +00:00
Torbjörn Andersson
e931f9d07d Merged o_loadZone() and o_unloadZone() into o1_loadZone() and o1_unloadZone().
svn-id: r21752
2006-04-10 08:00:29 +00:00
Torbjörn Andersson
d76cbb8439 Merged o_playSFX() into o1_playEffect().
svn-id: r21751
2006-04-10 07:48:58 +00:00
Torbjörn Andersson
2695cb6f88 Merged o_loadBeard() and o_unloadBeard() into o1_loadBeard() and
o1_unloadBeard().

svn-id: r21750
2006-04-10 07:21:44 +00:00
Torbjörn Andersson
50700d7ac6 Merged o_lockZone() and o_unlockZone() into o1_lockZones() and o1_unlockZones()
svn-id: r21749
2006-04-10 07:17:06 +00:00
Torbjörn Andersson
f444a68ffa Merged o_playMusic() into o1_playTune().
svn-id: r21748
2006-04-10 07:13:21 +00:00
Torbjörn Andersson
9dcd19778f Merged o_set_video_mode() into o1_picture().
svn-id: r21747
2006-04-10 07:09:03 +00:00
Torbjörn Andersson
71f1f1e86f Merged o_unk_103() into o1_cls().
svn-id: r21746
2006-04-10 07:02:28 +00:00
Torbjörn Andersson
4203b4f1ff Merged o_defineWindow() into o1_defWindow().
svn-id: r21745
2006-04-10 06:57:44 +00:00
Torbjörn Andersson
e67f1a9923 Merged o_vga_reset() into o1_killAnimate().
svn-id: r21744
2006-04-10 06:51:20 +00:00
Torbjörn Andersson
46ef60e1b9 Merged o_chance() into o1_chance().
svn-id: r21743
2006-04-10 06:40:15 +00:00
Travis Howell
55cc897cff Add time code for FF and minor cleanup
svn-id: r21714
2006-04-09 06:06:10 +00:00
Travis Howell
202406e31b Add centreScroll() for FF and hyperbox code differences in FF.
svn-id: r21712
2006-04-09 04:53:31 +00:00
Travis Howell
655b85bc84 Add FF difference in addTextBox() and minor cleanup
svn-id: r21690
2006-04-08 12:06:52 +00:00
Travis Howell
b596065122 Fixes for oracle in FF and cleanup
svn-id: r21680
2006-04-08 07:13:07 +00:00
Travis Howell
9a7b16e4d3 Add initial support for vertical scrolling in FF
svn-id: r21675
2006-04-08 00:12:16 +00:00
Travis Howell
0c496f92a9 Cleanup and split scrolling code
svn-id: r21670
2006-04-07 14:27:28 +00:00
Torbjörn Andersson
94f2174522 Cleanup of yesterday's changes. The opcode functions no longer need to take any
parameters.

svn-id: r21662
2006-04-07 09:37:44 +00:00
Travis Howell
c0e984a80a Fix some horizontal scrolling issues in FF
svn-id: r21661
2006-04-07 09:04:36 +00:00
Travis Howell
50983a3721 Fix subtitle output in FF
svn-id: r21659
2006-04-07 03:03:20 +00:00
Travis Howell
38bf0af540 Add some work on text output in FF
svn-id: r21656
2006-04-07 01:46:43 +00:00
Torbjörn Andersson
1fa1f9520d Split the opcodes into separate functions, and use an array of function
pointers for decoding them, like we do in most other engines. And I just want
to say that this is the second biggest opcode table I've ever seen!

svn-id: r21644
2006-04-06 17:56:41 +00:00
Travis Howell
dc73f361e1 Rename structures and correct array sizes
svn-id: r21641
2006-04-06 14:01:52 +00:00
Travis Howell
87de34a8d5 Cleanup
svn-id: r21640
2006-04-06 10:47:37 +00:00