Commit Graph

185 Commits

Author SHA1 Message Date
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
Travis Howell
53698416f2 Use different methods to avoid overflows to FF, to avoid regressions
svn-id: r21923
2006-04-15 22:14:18 +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
Max Horn
ad45318328 Removed GameDetector::_gameid in favor of using a config manager entry
svn-id: r21915
2006-04-15 17:39:14 +00:00
Travis Howell
e3737b9f47 Fix display of swap character logo in FF
svn-id: r21912
2006-04-15 14:25: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
18e6b21e28 Add support for switching voice file in PC versions of FF and cleanup
svn-id: r21900
2006-04-15 05:24:44 +00:00
Travis Howell
f1592e1fef Fix compile warnings I caused
svn-id: r21899
2006-04-15 01:56:49 +00:00
Travis Howell
10bc7b0887 Remove last use of hard coded language values and adjust settings for FF
svn-id: r21898
2006-04-15 01:48:52 +00:00
Travis Howell
c8fa54ec80 Adjust video opcodes for second variable array
svn-id: r21897
2006-04-15 01:09:04 +00:00
Travis Howell
0076235ebb Fix another glitch in save game interface of FF
svn-id: r21893
2006-04-14 22:30:34 +00:00
Travis Howell
7a74eeda08 Fix glitch when entering saved game name in FF
svn-id: r21886
2006-04-14 11:05:54 +00:00
Travis Howell
6ba9a5fcf3 Correct size, when clearing image in renderString() for FF
svn-id: r21885
2006-04-14 11:02:56 +00:00
Travis Howell
601820548c Avoid possible regression in set_video_mode_internal() for Simon1
svn-id: r21884
2006-04-14 10:37:34 +00:00
Travis Howell
1a629682a5 Fix object name display, after conversation in FF
svn-id: r21883
2006-04-14 10:36:44 +00:00
Travis Howell
f254b5b73a Cleanup
svn-id: r21880
2006-04-14 09:57:43 +00:00
Travis Howell
8a7950d87b Remove unused code
svn-id: r21877
2006-04-14 09:06:39 +00:00
Travis Howell
081a7b737a A few corrections to path finding in FF
svn-id: r21876
2006-04-14 07:24:40 +00:00
Torbjörn Andersson
d3a0f122a9 Adjusted debug message levels: loading a cutscene is more interesting than the
drawing of a scaled sprite.

svn-id: r21875
2006-04-14 07:06:54 +00:00
Travis Howell
bd2adbee81 Ooops, increment table, not field in invertBox{}
svn-id: r21874
2006-04-14 06:36:35 +00:00
Travis Howell
89e0e27f6a Add missing increment in invertBox()
svn-id: r21873
2006-04-14 06:26:18 +00:00
Torbjörn Andersson
3058efc168 Fixed stupid mistake (it's my mistake, I can call it whatever I want!) in the
scaling code. Hopefully it's right now. The scaling glitches seem to be gone,
at any rate.

svn-id: r21872
2006-04-14 05:15:11 +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
Max Horn
1470dadb1d Changed File::open to take a Common::String as file name parameter
svn-id: r21867
2006-04-14 01:48:51 +00:00
Travis Howell
b1191c56ac Remove duplicate check in checkPaths
svn-id: r21864
2006-04-14 01:26:00 +00:00
Travis Howell
94774a148d Fix regression in Amiga version of FF
svn-id: r21857
2006-04-14 00:10:12 +00:00
Travis Howell
3407185358 Add invertBox function for FF
svn-id: r21854
2006-04-13 23:34:58 +00:00
Travis Howell
cd9dde81f4 Add checkPaths function for FF
svn-id: r21851
2006-04-13 22:29:08 +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
696cbe1a64 Fix display of saved games list in oracle of FF, when saving
svn-id: r21841
2006-04-13 12:23:30 +00:00
Travis Howell
eaddfc5ed8 vc36_setWindowImage is used for difference purpose in FF
svn-id: r21840
2006-04-13 10:03:45 +00:00
Travis Howell
a4c5a691cc Disable quick load/save is FF, since original sometimes disabled load/save and it isn't reliable at the moment
svn-id: r21838
2006-04-13 09:45:03 +00:00
Travis Howell
4ef316713e Minor fixes to scrolling in FF
svn-id: r21837
2006-04-13 09:43:27 +00:00
Travis Howell
09f4ae1580 Fix various crash issues in FF, the image number in vc2_call needed to be adjusted
svn-id: r21836
2006-04-13 07:16:42 +00:00
Travis Howell
95993df800 Ooops, re-enable code in allocBlock()
svn-id: r21776
2006-04-11 00:42:19 +00:00
Travis Howell
c17e46b1f1 Update waitForSync() for FF and minor cleanup
svn-id: r21775
2006-04-11 00:37:54 +00:00
Travis Howell
8ae793c81e Cleanup
svn-id: r21773
2006-04-10 23:44:17 +00:00
Travis Howell
520a7be91f Add code for bltOracleText() in FF
svn-id: r21765
2006-04-10 12:10:30 +00:00
Torbjörn Andersson
2f7932c456 Cleanup.
svn-id: r21764
2006-04-10 10:45:21 +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