libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 09:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,396 Commits 5 Branches 5 Tags 1.8 GiB
564727be2c
Commit Graph

240 Commits

Author SHA1 Message Date
Travis Howell
cc0ebb97e4 Use default cursor in FF for now, to make selection easier 
svn-id: r21929
 2006-04-16 05:37:16 +00:00
Travis Howell
426a75ad6a Correct sign, to fix weird path finding issues in FF 
svn-id: r21928
 2006-04-16 01:06:18 +00:00
Travis Howell
e83841e8c7 Fix speech id for o_screenTextMsg() in FF 
svn-id: r21927
 2006-04-15 23:23:55 +00:00
Travis Howell
5b388fc48e Cleanup 
svn-id: r21926
 2006-04-15 22:37:48 +00:00
Travis Howell
9d703f1fcf Remove out dated comment 
svn-id: r21925
 2006-04-15 22:22:03 +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
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
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
Torbjörn Andersson
3bc5d5b585 Slight change to make it easier to change the FF and Simon word-wrapping rules 
individually. Changed the FF rule so that it doesn't matter whether or not the
variables are signed or unsigned. This fixes missing line breaks in some of the
Oracle articles.

svn-id: r21742
 2006-04-10 06:18:39 +00:00
Torbjörn Andersson
8fc794b432 Fixed line breaking regression caused by adding the width of the word a second 
time, rather than the width of a blankspace character.

svn-id: r21740
 2006-04-10 03:51:04 +00:00
Travis Howell
071884589a Adjust line breaks, to prevent regression. 
svn-id: r21738
 2006-04-09 22:44:27 +00:00
Travis Howell
774476ee21 Adjust line breaks, to prevent regression. 
svn-id: r21737
 2006-04-09 22:41:52 +00:00
Torbjörn Andersson
46ee06135c Oops. 
svn-id: r21732
 2006-04-09 17:53:47 +00:00
Torbjörn Andersson
ef8426ee17 Fixed excess line breaks in FF when listing the Oracle's ENCY articles. 
svn-id: r21731
 2006-04-09 17:41:44 +00:00
Travis Howell
4684802091 Fix some line breaks in oracle of FF 
svn-id: r21730
 2006-04-09 15:34:14 +00:00
Travis Howell
5cd18ccad3 Fix hitareas when scrolling in oracle of FF 
svn-id: r21725
 2006-04-09 13:12:59 +00:00
Travis Howell
484fe8ab65 Fix input regression after using oracle in FF 
svn-id: r21723
 2006-04-09 12:01:41 +00:00
Travis Howell
6a1636c292 Add font table for FF 
svn-id: r21722
 2006-04-09 11:34:10 +00:00
Travis Howell
00a48b248f Disable constant display of object names, since oracle settings are usable in FF now. 
svn-id: r21721
 2006-04-09 10:58:18 +00:00
Travis Howell
9a44671bf6 Enable skipping scrolling in oracle for FF 
svn-id: r21719
 2006-04-09 09:21:21 +00:00
Travis Howell
4a6be800cb Fix clearing text window in oracle of FF 
svn-id: r21717
 2006-04-09 09:08:22 +00:00
Travis Howell
35a4b57189 Fix mistake in debug table for FF 
svn-id: r21716
 2006-04-09 09:05:21 +00:00
Travis Howell
6f6f60bab2 Update debug table for FF 
svn-id: r21715
 2006-04-09 06:14:45 +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
Eugene Sandulenko
5a2ad04a9e Introduced language EN_ANY used for general English game entries. EN_USA and 
EN_GRB should be used for games which have both variants. Currently it is
MM NES and BASS. All other are switched to EN_ANY.

svn-id: r21702
 2006-04-08 23:12:56 +00:00
Travis Howell
655b85bc84 Add FF difference in addTextBox() and minor cleanup 
svn-id: r21690
 2006-04-08 12:06:52 +00:00
Max Horn
e7a8bb6abf Modified the REGISTER_PLUGIN macro so that it allows (and requires) a trailing semicolon (this helps certain tools to parse our code better) 
svn-id: r21689
 2006-04-08 12:06:07 +00:00
Max Horn
dc77d02c7e Removed common/map.h with the Common::Map template class (it was a very bad implementation, and our HashMap is simply better). 
svn-id: r21688
 2006-04-08 11:38:41 +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
0bf0772e9c Remove debug leftover 
svn-id: r21678
 2006-04-08 00:28:36 +00:00
Travis Howell
e951f908f2 Fix load game display of oracle in FF 
svn-id: r21677
 2006-04-08 00:24:46 +00:00
Travis Howell
daa60166fe Remove excess ; in scrollEvent() 
svn-id: r21676
 2006-04-08 00:19:04 +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
65a3f88454 Minor cleanup 
svn-id: r21671
 2006-04-07 14:40:33 +00:00
Travis Howell
0c496f92a9 Cleanup and split scrolling code 
svn-id: r21670
 2006-04-07 14:27:28 +00:00
Travis Howell
3b1710c7f5 Add scrolling adjustments when drawing overlay in FF 
svn-id: r21669
 2006-04-07 13:39:59 +00:00
Travis Howell
f51575563e Add scrolling code for oracle in FF 
svn-id: r21668
 2006-04-07 12:57:40 +00:00