Commit Graph

17122 Commits

Author SHA1 Message Date
Paul Gilbert
70654bc2a9 Added a script method for setting a blocking hotspot script
svn-id: r21778
2006-04-11 10:42:32 +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
Torbjörn Andersson
62a163bc43 Might as well clear ptr1 and ptr2 in animDataTable[] when loading a savegame.
The previous commit should ensure that the elements that need to be loaded are.

svn-id: r21774
2006-04-10 23:48:22 +00:00
Travis Howell
8ae793c81e Cleanup
svn-id: r21773
2006-04-10 23:44:17 +00:00
Torbjörn Andersson
badb5218fa If I understand things correctly, cinE used to dump the entire animDataTable
element to the savefile, including data pointers. After reading the savefile,
it would then test if ptr1 was NULL, to see if it should load the object.

I've extended the savefile format with a byte to indicate whether or not ptr1
was non-NULL. This seems to fix the problems I had with with loading savegames,
but of course any old savegame is now even more broken than before.

I still can't seem to get out of the room with the machine, though. Another
regression when migrating the code from cinE, or just my ability to get past
this annoying, timed puzzle?

svn-id: r21772
2006-04-10 23:22:26 +00:00
Max Horn
935989d8cd More commented out stuff: added generateFilenameForDetection method, for use by the detector; and applied various fixes to generateFilename (which is still completely untested, so it certainly contains more 'bugs' :)
svn-id: r21771
2006-04-10 22:45:05 +00:00
Max Horn
0ed3018f2b Some more tweaks to the (still unused) gameFilenamesTable; also readded an enhanced version of the (also unused) generateFilename function
svn-id: r21770
2006-04-10 22:25:42 +00:00
Max Horn
64ae34400f Removing dummy code from resource.cpp
svn-id: r21769
2006-04-10 22:11:05 +00:00
Max Horn
8cbe1f3823 Merged scumm_settings into extra_versions, which in turn got renamed to gameVariantsTable
svn-id: r21768
2006-04-10 21:43:49 +00:00
Max Horn
8271273cb5 Fallback to using stat() if readdir returns DT_UNKNOWN (replacing the AMD64 hack)
svn-id: r21767
2006-04-10 19:26:40 +00:00
Johannes Schickel
a06a28fa97 Implements saving the color cache to a file (much faster startup for custom effect + less memory while gui isn't shown)
svn-id: r21766
2006-04-10 17:32:04 +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
9c15dc06eb Use our standard save file manager class to read and write the save games,
instead of putting them in the current working directory.

svn-id: r21741
2006-04-10 05:37:31 +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
Johannes Schickel
df1bc871f1 Forces usage of SYSTEM_NOT_SUPPORTING_D_TYPE on amd64 systems. (read comment for more information)
svn-id: r21739
2006-04-09 23:30:16 +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
Max Horn
7b7eb1f331 Changed the precedence of the MD5 overrides (highest priority: config file, then target_md5.txt override, finally the 'reaL md5); also did some cleanup and code unification
svn-id: r21736
2006-04-09 22:18:48 +00:00
Max Horn
cd5b1fee40 Removed some obsolete code
svn-id: r21735
2006-04-09 22:05:05 +00:00
Max Horn
39a2bc6812 Added gameFilenamesTable (currently unused, and hence disabled)
svn-id: r21734
2006-04-09 22:03:29 +00:00
Max Horn
66cdbaf1b5 Moved GameSettings to namespace Cine; moved savePath to various.cpp
svn-id: r21733
2006-04-09 19:44:40 +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
Max Horn
b75be44d06 Sev now is project lead, too
svn-id: r21728
2006-04-09 14:51:47 +00:00
Travis Howell
5cd18ccad3 Fix hitareas when scrolling in oracle of FF
svn-id: r21725
2006-04-09 13:12:59 +00:00