thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17185 commits 35 branches 0 tags 1.4 GiB
Commit graph

49 commits

Author SHA1 Message Date
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
Travis Howell
4a6be800cb Fix clearing text window in oracle of FF 
svn-id: r21717
 2006-04-09 09:08:22 +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
65a3f88454 Minor cleanup 
svn-id: r21671
 2006-04-07 14:40:33 +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
e806e891e3 Sprite is always set to 1 in o_printStr() and o1_scnTxtLongText() for FF. Fixes wait timeouts in holomail. 
svn-id: r21660
 2006-04-07 03:30:52 +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
Travis Howell
d967db266c Add more icon differences in FF and cleanup 
svn-id: r21635
 2006-04-06 00:54:26 +00:00
Travis Howell
935ea28e7a Renames structures and other cleanup 
svn-id: r21626
 2006-04-05 02:45:28 +00:00
Torbjörn Andersson
7bcd0ba4dc Use the setBitFlag() and getBitFlag() functions, instead of manipulating 
_bitArray[] directly. This kind of change is, of course, rather error-prone. I
hope I haven't introduced any regressions.

svn-id: r21622
 2006-04-05 00:37:42 +00:00
Travis Howell
49dc2622dd Add verb codes differences in FF 
svn-id: r21589
 2006-04-04 10:12:22 +00:00
Travis Howell
c21b81f5e5 More work on oracle in FF 
svn-id: r21586
 2006-04-04 07:34:48 +00:00
Travis Howell
0ac5739ae2 More work on oracle in FF 
svn-id: r21583
 2006-04-04 01:38:53 +00:00
Travis Howell
506f33a025 Add opcode difference in FF 
svn-id: r21497
 2006-03-29 12:15:08 +00:00
Torbjörn Andersson
f6e6017d96 Added stubs for a couple of FF opcodes. 
svn-id: r21495
 2006-03-29 12:03:02 +00:00
Travis Howell
e265f1ab57 Commited too much 
svn-id: r21465
 2006-03-27 12:54:53 +00:00
Travis Howell
3bb25707b2 Add FF support to dump_bitmap() 
svn-id: r21464
 2006-03-27 12:49:17 +00:00
Travis Howell
ddc1a7a52f Add opcode 161 difference in FF, fixes some glitches in 2nd room 
svn-id: r21416
 2006-03-23 04:41:06 +00:00
Travis Howell
008b681dac Cleanup 
svn-id: r21327
 2006-03-16 07:08:05 +00:00
Travis Howell
81b820f7c9 Add hyperlink on/off functions of oracle in Feeble Files 
svn-id: r20665
 2006-02-13 10:29:25 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory 
svn-id: r20582
 2006-02-11 22:45:04 +00:00
Renamed from simon/items.cpp (Browse further)