libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 01:39:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,380 Commits 5 Branches 5 Tags 1.8 GiB
9d087cb314
Commit Graph

226 Commits

Author SHA1 Message Date
David Turner
4ba1f78dc5 TOLTECS: Fix Detection For ADParams Removal From AdvancedMetaEngine. 2011-11-20 22:43:11 +01:00
David Turner
eb0b7c957f TOLTECS: Update AdvancedMetaEngine For Removal of ADParams. 2011-11-20 22:43:11 +01:00
David Turner
3967da03ef TOLTECS: Fix Compilation With Latest Git Master. 2011-11-20 22:43:11 +01:00
David Turner
8a34de2c45 TOLTECS: Replace snprintf() usage with Common::String::format() 
Safer and less portability issues.
 2011-11-20 22:43:11 +01:00
David Turner
ddaf38bdcd TOLTECS: Fix Compilation After Common::RandomSource Changes in Latest master. 2011-11-20 22:43:11 +01:00
Benjamin Haisch
ae4437aea4 TOLTECS: Fix compilation 2011-11-20 22:43:10 +01:00
David Turner
9f3cc261c2 TOLTECS: Fix Compilation After Graphics::Surface PixelFormat changes. 2011-11-20 22:43:10 +01:00
David Turner
a3007d6e2a TOLTECS: Fix Compilation After Base Code Header Changes. 2011-11-20 22:43:10 +01:00
Benjamin Haisch
acd4d4098f TOLTECS: Fix bugs 
- Save scene parameters before playing a movie and restore them afterwards (fixes crash)
- Fix text disappearing too fast
- Implement script function sfGetCameraChanged
- Replace nop script functions with stubs which print debug info when called
- Some cleanup, remove obsolete TODOs
 2011-11-20 22:43:10 +01:00
David Turner
e1fefefff2 TOLTECS: Updated For OSystem Palette RGBA->RGB Change. 2011-11-20 22:43:10 +01:00
David Turner
e4005ae927 TOLTECS: Fix compilation after sound->audio directory rename. 2011-11-20 22:43:10 +01:00
Filippos Karapetis
02514db64f TOLTECS: Sync with the latest changes in trunk 2011-11-20 22:43:10 +01:00
Benjamin Haisch
581f0ba8b5 TOLTECS: Use CursorMan instead of OSystem for showMouse 2011-11-20 22:43:10 +01:00
Filippos Karapetis
3f78e1c8d9 TOLTECS: Rewrote ArchiveReader::dump() to use Common::DumpFile() 2011-11-20 22:43:10 +01:00
Filippos Karapetis
75842b031f TOLTECS: Added comments on main game loop, and added a FIXME 2011-11-20 22:43:10 +01:00
Filippos Karapetis
e1abe47fbe TOLTECS: Reduced header dependencies and removed a TODO 2011-11-20 22:43:10 +01:00
Filippos Karapetis
4cc5934d84 TOLTECS: Reduced header dependencies 2011-11-20 22:43:10 +01:00
Filippos Karapetis
e1f795fb6d TOLTECS: Added ScummVM headers 2011-11-20 22:43:10 +01:00
Filippos Karapetis
26a7bf4eb5 TOLTECS: Reduced header dependencies 2011-11-20 22:43:10 +01:00
Filippos Karapetis
7746fbc543 TOLTECS: Reduced header dependencies 2011-11-20 22:43:10 +01:00
Filippos Karapetis
a9f7094a68 TOLTECS: Reduced header dependencies 2011-11-20 22:43:10 +01:00
Filippos Karapetis
e9dc055089 TOLTECS: Reduced header dependencies 2011-11-20 22:43:10 +01:00
Filippos Karapetis
febda31f50 TOLTECS: Reduced header dependencies 2011-11-20 22:43:10 +01:00
Filippos Karapetis
c52aa31a18 TOLTECS: Added some FIXME comments 2011-11-20 22:43:10 +01:00
Filippos Karapetis
d3811422f8 TOLTECS: Fixed compilation and reduced header dependencies a bit 2011-11-20 22:43:10 +01:00
Benjamin Haisch
dde75d709e TOLTECS: Fix compilation 2011-11-20 22:43:10 +01:00
Benjamin Haisch
8203563c69 TOLTECS: - New constant kMaxChannels instead of number for clarity 2011-11-20 22:43:10 +01:00
Benjamin Haisch
661ce95478 TOLTECS: - Fix regression in movie player (use drawScreen instead of updateScreen) 2011-11-20 22:43:10 +01:00
Benjamin Haisch
1cb95f36e7 TOLTECS: - More work on the menu system, saving and loading from there is now possible 
- Add blastSprite method which draws a sprite directly to the frontScreen without the renderQueue
- Add F10 scancode in sfHandleInput to open the menu
 2011-11-20 22:43:10 +01:00
Benjamin Haisch
9698127c5d TOLTECS: - Undef menu test code (oops) 
- Rename updateScreen to drawScreen
- Move code from sfUpdateScreen to engine updateScreen
- Use better screen sync code to get closer to the original game's speed
 2011-11-20 22:43:10 +01:00
Benjamin Haisch
ce7f9a088c TOLTECS: - Work on the menu system (use strings from resources instead of hardcoded ones) 
- ...and load the system strings from the resource on startup
- Only redraw menu screen when required
- Change parameters for some text functions from byte* to const byte*
- Rename some mouse vars
 2011-11-20 22:43:10 +01:00
Filippos Karapetis
5e154f634a TOLTECS: Fixed compilation 2011-11-20 22:43:10 +01:00
Benjamin Haisch
9c3a4bc055 TOLTECS: - Implement kSupportsLoadingDuringStartup 2011-11-20 22:43:10 +01:00
Benjamin Haisch
8f3b287db1 TOLTECS: Update todo (no real fixes, though) 2011-11-20 22:43:09 +01:00
Benjamin Haisch
6034e4ffb4 TOLTECS: - Don't add test entries to the save/loadgame menu 2011-11-20 22:43:09 +01:00
Filippos Karapetis
99bd410cb3 TOLTECS: Sync with the latest ScummVM changes (renamed skipThumbnailHeader to skipThumbnail) 2011-11-20 22:43:09 +01:00
Benjamin Haisch
2acf1bf6f5 TOLTECS: - Hopefully fixed a bug in findRectAtPoint which causes the game to crash before the first scene 
- sfHandleInput
 2011-11-20 22:43:09 +01:00
Benjamin Haisch
8ea6831825 TOLTECS: Fix warning 2011-11-20 22:43:09 +01:00
Benjamin Haisch
39b8bda921 TOLTECS: Fix warning 2011-11-20 22:43:09 +01:00
Benjamin Haisch
2e06f4b088 TOLTECS: Added detection entries for French and Spanish versions 2011-11-20 22:43:09 +01:00
Benjamin Haisch
d885aedd48 TOLTECS: Fix compilation with trunk 2011-11-20 22:43:09 +01:00
Benjamin Haisch
fc324073d5 TOLTECS: Rename savegame version define 2011-11-20 22:43:09 +01:00
Benjamin Haisch
7f78f62467 TOLTECS: Fixed compilation with current SVN changes 2011-11-20 22:43:09 +01:00
Benjamin Haisch
34eb899b25 TOLTECS: Fixed compilation 2011-11-20 22:43:09 +01:00
Benjamin Haisch
0d1a9148f3 TOLTECS: Fix bug caused by most recent revision (don't free the audio data in makeRawStream) 2011-11-20 22:43:09 +01:00
Filippos Karapetis
e8ec5148a2 TOLTECS: Fixed compilation 2011-11-20 22:43:09 +01:00
Filippos Karapetis
89a5208a58 TOLTECS: Fixed compilation with the latest trunk changes. 
This change also unveiled a serious problem: the same include files are used EVERYWHERE (e.g. code manipulating the screen is using sound includes). Added a FIXME concerning this
 2011-11-20 22:43:09 +01:00
Filippos Karapetis
16baa44a2f TOLTECS: Fixed compilation with the latest trunk 2011-11-20 22:43:09 +01:00
Filippos Karapetis
baf4218b05 TOLTECS: Fixed compilation with the latest trunk changes 2011-11-20 22:43:08 +01:00
Benjamin Haisch
69f35c8709 TOLTECS: Fixed compilation 2011-11-20 22:43:08 +01:00
Filippos Karapetis
5948672be5 TOLTECS: Fixed compilation with the latest sound changes in the trunk 2011-11-20 22:43:08 +01:00
Filippos Karapetis
ac97b441ec TOLTECS: Silenced warning 2011-11-20 22:43:08 +01:00
Benjamin Haisch
a0432fd546 TOLTECS: Fixed compilation 2011-11-20 22:43:08 +01:00
Filippos Karapetis
cb5c0e6986 TOLTECS: Sync with ScummVM rev. 46379 2011-11-20 22:43:08 +01:00
Benjamin Haisch
b038d2e4f2 TOLTECS: Added GUI options to detection entries 2011-11-20 22:43:08 +01:00
Benjamin Haisch
4c7cef996a TOLTECS: Misc fixes in the menu system 2011-11-20 22:43:08 +01:00
Benjamin Haisch
54cb86950c TOLTECS: Fixed odd bug in drawChar (I subtracted 2 from the font height before, though I don't recall why exactly I did that; now I use the font height as-is) 2011-11-20 22:43:08 +01:00
Benjamin Haisch
145a696fe0 TOLTECS: Implemented scrolling in the savegame list 2011-11-20 22:43:08 +01:00
Benjamin Haisch
d80cc85347 TOLTECS: More work on the menu; started the savegame page and implemented editing of the savegame description 2011-11-20 22:43:08 +01:00
Benjamin Haisch
28c74ff3b4 TOLTECS: More work on the menu; started with the saveload menu page and fixed some early bugs 2011-11-20 22:43:08 +01:00
Benjamin Haisch
3d0775bd89 TOLTECS: More work on the menu 2011-11-20 22:43:08 +01:00
Benjamin Haisch
284c358f7c TOLTECS: Started implementing the menu from scratch 2011-11-20 22:43:08 +01:00
Filippos Karapetis
d93bd3c01c TOLTECS: Silenced some warnings 2011-11-20 22:43:08 +01:00
Benjamin Haisch
eb04f85673 TOLTECS: - Added detection entry for the German demo version 2011-11-20 22:43:08 +01:00
Benjamin Haisch
3c49d36d5f TOLTECS: Fix compilation. 2011-11-20 22:43:08 +01:00
Benjamin Haisch
d6edbe97c9 TOLTECS: Oops, forgot to disable the debug path drawing. 2011-11-20 22:43:08 +01:00
Benjamin Haisch
22db6b1558 TOLTECS: - Fixed clipping bugs (in 256-color sprites and scaled sprites) 
- Minor cleanup
 2011-11-20 22:43:08 +01:00
Benjamin Haisch
9a84c13bef TOLTECS: - Implemented playSoundAtPos and fixed sound panning (0 is center, not 64 like in the original) 
- Minor cleanup
 2011-11-20 22:43:08 +01:00
Benjamin Haisch
ce7febcd70 TOLTECS: Reworked the ArchiveReader and ResourceCache classes. 
ResourceCache needs more work since resources are never freed (which is bad).
 2011-11-20 22:43:07 +01:00
Benjamin Haisch
af7e1c1683 TOLTECS: - Fixed sound playing 
- Renaming
 2011-11-20 22:43:07 +01:00
Benjamin Haisch
eab360f3e7 TOLTECS: - Moved script functions out of the switch statement and into an array 2011-11-20 22:43:07 +01:00
Benjamin Haisch
041fe21417 TOLTECS: - Added enum for sound channel type 
- Added isPointInside
 2011-11-20 22:43:07 +01:00
Benjamin Haisch
170b66b2cb TOLTECS: Updated TODO (nothing new, just syncing local copy with the repo) 2011-11-20 22:43:07 +01:00
Benjamin Haisch
5c481dd116 TOLTECS: - Removed TODO, external resources aren't explicitly used (the original game extracts resources from WESTERN to HD to increase access speed) 2011-11-20 22:43:07 +01:00
Filippos Karapetis
b9de8beb6e TOLTECS: Fixed compilation 2011-11-20 22:43:07 +01:00
Filippos Karapetis
edefa37a45 TOLTECS: Fixed compilation 2011-11-20 22:43:07 +01:00
Benjamin Haisch
2156fecf53 TOLTECS: Added German version 2011-11-20 22:43:07 +01:00
Benjamin Haisch
2eb6482b06 TOLTECS: - Fixed compilation after Fingolfin's latest series of commits 
- Added a warning for the yet unimplemented palette transparency code
- Removed "debug" calls from script, they weren't that useful
- Removed unneccessary delete in the MoviePlayer
- Fixed the renderer (hopefully?)
 2011-11-20 22:43:07 +01:00
Filippos Karapetis
46257f7bb4 TOLTECS: Silenced MSVC warnings 2011-11-20 22:43:07 +01:00
Benjamin Haisch
1f4764ad1c TOLTECS: - Implemented RTL 
- Fixed return values in savegame/loadgame
- Some minor cleanup
 2011-11-20 22:43:07 +01:00
Benjamin Haisch
ec6f0d23a7 TOLTECS: Very very minor cleanup. 2011-11-20 22:43:07 +01:00
Benjamin Haisch
9e78b5d393 TOLTECS: - Listing savestates via command line or Launcher 
- Loading/Saving during run time
Other savestate functions yet todo.
I'll probably remove the "original" in-game menu and move everything to the GMM.
 2011-11-20 22:43:07 +01:00
Benjamin Haisch
47ae908589 TOLTECS: - Fixed Screen::updateTalkText (text x position was read incorrectly and font color wasn't nibble-swapped) 
- Hooked up the movie player; movies can be aborted with Escape (not with mouse clicks at the moment because I was too lazy to implement it; funny, writing this explanation probably took longer :))
 2011-11-20 22:43:07 +01:00
Benjamin Haisch
4b13982116 TOLTECS: Implemented preliminary sound playback; some stuff is still missing (correct volumes etc.) 2011-11-20 22:43:07 +01:00
Benjamin Haisch
f77960e81b TOLTECS: Removed unused functions. 2011-11-20 22:43:07 +01:00
Eugene Sandulenko
beab4e3ca5 TOLTECS: Correct initialization for graphics. Since the game is 640x480, it should be 
default to 1x scaler.
 2011-11-20 22:43:07 +01:00
Benjamin Haisch
02e2b78e5c TOLTECS: Added sound to the movie player (finally). Still TODO: Ability to abort movies. 2011-11-20 22:43:07 +01:00
Benjamin Haisch
3acd787145 TOLTECS: Updated TODO.txt 2011-11-20 22:43:06 +01:00
Benjamin Haisch
7b97e8cd93 TOLTECS: A lot of changes in the graphics code: 
- Optimized drawing code; now only items (sprites, text, screen masks) which have changed from the previous frame are redrawn, this speeds up things a lot
- Implemented dirty rectangles using a microtile array
- The previously committed Microtile Array implementation from SEL seemed buggy so I wrote my own version which works nicely so far (and is less code and GPL), only MicroTileArray::getRectangles uses parts from the old version, this will be changed later
- One known bug related to dirty rectangles remains: Sometimes the background isn't restored correctly and gfx artifacts are visible
 2011-11-20 22:43:06 +01:00
Benjamin Haisch
37a5f9e9ef TOLTECS: Switched quicksave key from F6 to F5. 2011-11-20 22:43:06 +01:00
Benjamin Haisch
8f3e598f85 TOLTECS: Cleanup. 2011-11-20 22:43:06 +01:00
Benjamin Haisch
d299bbba01 TOLTECS: Changed how screen masks are handled. 
At load time, a Surface is created for each screen mask, in which the gfx data from the background is copied.
This is the first step towards more optimized gfx rendering (more to come later).
 2011-11-20 22:43:06 +01:00
Benjamin Haisch
150e555953 TOLTECS: Renamed ybottom to priority 2011-11-20 22:43:06 +01:00
Benjamin Haisch
ade8eec8cf TOLTECS: Moved sprite drawing code to sprite.cpp 2011-11-20 22:43:06 +01:00
Benjamin Haisch
ca49ded9b3 TOLTECS: More changes to wrapGuiText 2011-11-20 22:43:06 +01:00
Benjamin Haisch
3c47914648 TOLTECS: Removed _tempString etc. and replaced it with GuiTextWrapState 2011-11-20 22:43:06 +01:00
Benjamin Haisch
3b89304dd9 TOLTECS: Forgot script.cpp. 
And some tests for menu & movie player in toltecs.cpp.
 2011-11-20 22:43:06 +01:00
Benjamin Haisch
d09fbbabe6 TOLTECS: - Added menu system prototype (may change later) 
- Added movie player (still incomplete, sound is not yet implemented)
Both are not yet hooked to the engine.
- Added code for microtile arrays (from the SEL - Simple DirectMedia Layer Extension Library project), under the LGPL
This will be used as dirty rectangle "manager". This is experimental for now, it may be removed later.
 2011-11-20 22:43:06 +01:00
Benjamin Haisch
20d60e6286 TOLTECS: Renamed some functions. 2011-11-20 22:43:06 +01:00
Benjamin Haisch
398d0daac0 TOLTECS: Adjust y position of talk text lines. 2011-11-20 22:43:06 +01:00
Benjamin Haisch
aaded0f546 TOLTECS: Added Screen::getTextWidth 2011-11-20 22:43:06 +01:00
Eugene Sandulenko
3eb449f236 TOLTECS: Add Russian version detection which works great. 2011-11-20 22:43:06 +01:00
Benjamin Haisch
be69bb986f TOLTECS: Added TODO/NOTES/BUGS text 
Also: The game is completable with this revision! (yay!:)
 2011-11-20 22:43:06 +01:00
Benjamin Haisch
a94503765d TOLTECS: - Fixed setDeltaPalette (sprites at night now look correct) 
- Renamed TalkTextItem.rects/rectCount to lines/lineCount
- Workaround for font glitch in updateTalkText (text sets invalid font number)
 2011-11-20 22:43:06 +01:00
Benjamin Haisch
6a83d7d851 TOLTECS: Cancel all talkText items when camera position is changed (fixes some crashes and odd behaviour) 2011-11-20 22:43:06 +01:00
Benjamin Haisch
367be5b345 TOLTECS: Merged text drawing routines into drawString 2011-11-20 22:43:06 +01:00
Benjamin Haisch
3c326b5c40 TOLTECS: Fixed bug in anim frame displaying. 2011-11-20 22:43:06 +01:00
Benjamin Haisch
bbf882016a TOLTECS: Fixed text command parsing in updateVerbLine 2011-11-20 22:43:05 +01:00
Benjamin Haisch
b287588149 TOLTECS: Clear the text duration first in updateTalkText before adding text lines (else the durations add up and the text stays on screen a really long time) 2011-11-20 22:43:05 +01:00
Benjamin Haisch
2930003864 TOLTECS: Fixed a script bug (compare opcodes work on unsigned values). So far this caused one error I noticed when climbing up the ladder in the barn where the camera didn't scroll up properly, but now it's all fine. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
e2b3a35486 TOLTECS: Corrected debug output. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
59bbad2ac8 TOLTECS: Fixed clipping (the clipping of the right border with flipped sprites was buggy) 2011-11-20 22:43:05 +01:00
Benjamin Haisch
c82349c1b8 TOLTECS: Finished sprite clipping. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
32d958508b TOLTECS: Deleted obsolete files. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
74c05f6aa8 TOLTECS: - Merged input.cpp with toltecs.cpp 
- Kernel function 5 returns a random value; use ScummVM's RNG
 2011-11-20 22:43:05 +01:00
Benjamin Haisch
5660ff5148 TOLTECS: Implemented buildColorTransTable (still TODO) and shadow sprite drawing. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
98ac7885ac TOLTECS: Merged drawChar and drawChar2 2011-11-20 22:43:05 +01:00
Benjamin Haisch
f0c9e489fe TOLTECS: Minor cleanup. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
d561cb7ae3 TOLTECS: Fixed tabs. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
03cae51129 TOLTECS: - Made game "quittable" 
- Save/load mouse position and if the cursor is enabled
 2011-11-20 22:43:05 +01:00
Benjamin Haisch
51214a461a TOLTECS: Saving/loading is working; it still needs work but will suffice to make debugging somewhat easier. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
dd5567613f TOLTECS: - Renamed stuff and cleanups 
- Beginnings of the saveload system (incomplete)
 2011-11-20 22:43:05 +01:00
Benjamin Haisch
21f6dad09a TOLTECS: - Renamed some variables & functions 
- Mouse cursor is hidden/shown when _mouseDisabled variable is set via script
 2011-11-20 22:43:05 +01:00
Benjamin Haisch
0c3f2ab5d5 TOLTECS: Some cleanup of the pathfinding code. 2011-11-20 22:43:05 +01:00
Benjamin Haisch
f4e156b3b3 TOLTECS: Fixed tabs and formatting. 2011-11-20 22:43:05 +01:00
Eugene Sandulenko
7c2835313e TOLTECS: Initial checkin 2011-11-20 22:43:05 +01:00