aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-04-11Ooops, re-enable code in allocBlock()Travis Howell
svn-id: r21776
2006-04-11Update waitForSync() for FF and minor cleanupTravis Howell
svn-id: r21775
2006-04-10Might as well clear ptr1 and ptr2 in animDataTable[] when loading a savegame.Torbjörn Andersson
The previous commit should ensure that the elements that need to be loaded are. svn-id: r21774
2006-04-10CleanupTravis Howell
svn-id: r21773
2006-04-10If I understand things correctly, cinE used to dump the entire animDataTableTorbjörn Andersson
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-10More commented out stuff: added generateFilenameForDetection method, for use ↵Max Horn
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-10Some more tweaks to the (still unused) gameFilenamesTable; also readded an ↵Max Horn
enhanced version of the (also unused) generateFilename function svn-id: r21770
2006-04-10Removing dummy code from resource.cppMax Horn
svn-id: r21769
2006-04-10Merged scumm_settings into extra_versions, which in turn got renamed to ↵Max Horn
gameVariantsTable svn-id: r21768
2006-04-10Fallback to using stat() if readdir returns DT_UNKNOWN (replacing the AMD64 ↵Max Horn
hack) svn-id: r21767
2006-04-10Implements saving the color cache to a file (much faster startup for custom ↵Johannes Schickel
effect + less memory while gui isn't shown) svn-id: r21766
2006-04-10Add code for bltOracleText() in FFTravis Howell
svn-id: r21765
2006-04-10Cleanup.Torbjörn Andersson
svn-id: r21764
2006-04-10Split the playTune opcode into Simon 1, Simon 2 and FF versions. The FF versionTorbjörn Andersson
was wrong before, but since it is a no-op, it probably never caused any problems. svn-id: r21763
2006-04-10Some opcodes have been made Simon 1-specific, either because they really areTorbjörn Andersson
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-10With the old o_ functions out of the way, I have renamed all o1_ functions asTorbjörn Andersson
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-10By now, it should be obvious that I'm trying to get rid of the o_ functions.Torbjörn Andersson
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-10Merged o_setup_cond_c() into o1_getDollar2(). (We could mergeTorbjörn Andersson
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-10Merged o_printStr() into o1_screenTextMsg().Torbjörn Andersson
svn-id: r21758
2006-04-10Merged o_pathfind() into o1_getPathPosn().Torbjörn Andersson
svn-id: r21757
2006-04-10Merged o_restoreIconArray() into o1_restoreIconArray().Torbjörn Andersson
svn-id: r21756
2006-04-10Merged o_confirmQuit() into o1_pauseGame().Torbjörn Andersson
svn-id: r21755
2006-04-10Merged o_inventory_descriptions() into o1_screenTextPObj().Torbjörn Andersson
svn-id: r21754
2006-04-10Merged o_loadGame() and o_saveGame() into o1_loadUserGame() andTorbjörn Andersson
o1_saveUserGame(). svn-id: r21753
2006-04-10Merged o_loadZone() and o_unloadZone() into o1_loadZone() and o1_unloadZone().Torbjörn Andersson
svn-id: r21752
2006-04-10Merged o_playSFX() into o1_playEffect().Torbjörn Andersson
svn-id: r21751
2006-04-10Merged o_loadBeard() and o_unloadBeard() into o1_loadBeard() andTorbjörn Andersson
o1_unloadBeard(). svn-id: r21750
2006-04-10Merged o_lockZone() and o_unlockZone() into o1_lockZones() and o1_unlockZones()Torbjörn Andersson
svn-id: r21749
2006-04-10Merged o_playMusic() into o1_playTune().Torbjörn Andersson
svn-id: r21748
2006-04-10Merged o_set_video_mode() into o1_picture().Torbjörn Andersson
svn-id: r21747
2006-04-10Merged o_unk_103() into o1_cls().Torbjörn Andersson
svn-id: r21746
2006-04-10Merged o_defineWindow() into o1_defWindow().Torbjörn Andersson
svn-id: r21745
2006-04-10Merged o_vga_reset() into o1_killAnimate().Torbjörn Andersson
svn-id: r21744
2006-04-10Merged o_chance() into o1_chance().Torbjörn Andersson
svn-id: r21743
2006-04-10Slight change to make it easier to change the FF and Simon word-wrapping rulesTorbjörn Andersson
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-10Use our standard save file manager class to read and write the save games,Torbjörn Andersson
instead of putting them in the current working directory. svn-id: r21741
2006-04-10Fixed line breaking regression caused by adding the width of the word a secondTorbjörn Andersson
time, rather than the width of a blankspace character. svn-id: r21740
2006-04-09Forces usage of SYSTEM_NOT_SUPPORTING_D_TYPE on amd64 systems. (read comment ↵Johannes Schickel
for more information) svn-id: r21739
2006-04-09Adjust line breaks, to prevent regression.Travis Howell
svn-id: r21738
2006-04-09Adjust line breaks, to prevent regression.Travis Howell
svn-id: r21737
2006-04-09Changed the precedence of the MD5 overrides (highest priority: config file, ↵Max Horn
then target_md5.txt override, finally the 'reaL md5); also did some cleanup and code unification svn-id: r21736
2006-04-09Removed some obsolete codeMax Horn
svn-id: r21735
2006-04-09Added gameFilenamesTable (currently unused, and hence disabled)Max Horn
svn-id: r21734
2006-04-09Moved GameSettings to namespace Cine; moved savePath to various.cppMax Horn
svn-id: r21733
2006-04-09Oops.Torbjörn Andersson
svn-id: r21732
2006-04-09Fixed excess line breaks in FF when listing the Oracle's ENCY articles.Torbjörn Andersson
svn-id: r21731
2006-04-09Fix some line breaks in oracle of FFTravis Howell
svn-id: r21730
2006-04-09Sev now is project lead, tooMax Horn
svn-id: r21728
2006-04-09Fix hitareas when scrolling in oracle of FFTravis Howell
svn-id: r21725
2006-04-09Casting an array of integers to a pointer to a struct seems like a pretty hackyTorbjörn Andersson
thing to do. This replacement hopefully works as intended. svn-id: r21724