ScummVM/scummvm
1
0 Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
137148 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Filippos Karapetis 94d40fcac5 ASYLUM: Added the missing cursor.* files to the MSVC project file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@368 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:51 +02:00
Filippos Karapetis d6c4926344 ASYLUM: Sync with ScummVM revision #44266 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@367 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:51 +02:00
Alex Bevilacqua ab44e5c66b ASYLUM: Ran our engine through AStyle :P 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@366 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:51 +02:00
Alex Bevilacqua 1142cd7286 ASYLUM: stopAllSounds() now optionally stops speech/music playback. 
Cleaned up the blowup puzzle sound handling

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@365 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:50 +02:00
Alexandre Fontoura 8a8ac36b21 ASYLUM: Finish missing sound parts from BlowUpPuzzleVCR. Still needs corrections in sound stop routines. After that, it should working well. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@364 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:50 +02:00
Alex Bevilacqua a6d5a2a714 ASYLUM: Cleanup and comments 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@363 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:50 +02:00
Alex Bevilacqua 52206f1189 ASYLUM: NEW SOUND SUBSYSTEM! This is still sort of WIP though because it's not a "true" implementation (direct from disassembly). It also doesn't really do anything with the new ambient sound queue, but the functionality's there for when we make more progress on the AmbientSoundItem initializations. 
Also started to re-write updateBarriers(). The original is there as updateBarriers2() for the time being.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@362 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:50 +02:00
Alexandre Fontoura 461ddd8dd0 ASYLUM: First steps on drawing actors with priority. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@361 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:50 +02:00
Alexandre Fontoura a422a0db00 ASYLUM: Scene actors init stuffs 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@360 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:50 +02:00
Alexandre Fontoura d91d5e5e5f ASYLUM: Fixed some warnings. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@359 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:50 +02:00
Alex Bevilacqua cf58a8244c ASYLUM: Fixed bug with cursor not being visible after the first script ran (hacked the fix and added a FIXME) 
Removed all WorldStats reference variables from the scene class (redundant)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@358 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:49 +02:00
Alex Bevilacqua 0a29c45b11 ASYLUM: properly check if the debugChannel is set :P 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@357 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:49 +02:00
Alex Bevilacqua 2c54ace443 ASYLUM: make function_map[] static/const, and undefine the MAPFUNC macro after the function_map has been set. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@356 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:49 +02:00
Alex Bevilacqua ddcb9beab2 ASYLUM: Removed Shared singleton. Moved getAngle() to actor class (only place it's used so far). Added screen() and scene() getters to the engine for classes that need the references. 
Moved a couple methods from the barrier class to worldstats (makes a bit more sense)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@355 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:49 +02:00
Alex Bevilacqua 72c1b3e398 ASYLUM: Removed Sound reference from Shared 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@354 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:49 +02:00
Alex Bevilacqua 9f39977ddd ASYLUM: Removed Video reference from Shared 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@353 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:49 +02:00
Alex Bevilacqua 9868f8c40a ASYLUM: oops (fixed: *** glibc detected *** /home/alex/workspaces/cpp/scummvm/scummvm: double free or corruption (out): 0x093a2668 ***) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@352 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:49 +02:00
Alex Bevilacqua badb49ed6d ASYLUM: Moved the gameflags from SharedResources to the AsylumEngine. Also removed the OSystem member from the SharedResources (slowly phasing out the last singleton) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@351 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:48 +02:00
Alex Bevilacqua 4c01ffb9e3 ASYLUM: moved the checkFlags() and setNextFrame() methods that relate directly to barriers into the barrier class (off of the actionlist) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@350 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:48 +02:00
Alex Bevilacqua 4caee427b7 ASYLUM: removed the flag assignment to 183 (process_action_list) from the scene constructor 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@349 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:48 +02:00
Alex Bevilacqua b4385f8e9e ASYLUM: Removed the ScriptManager. The singleton functionality is rolled into the actionlist class (where it belongs) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@348 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:48 +02:00
Alex Bevilacqua 2cb80c6d8d ASYLUM: Removed sceneres. Scene resource loading is now handled in the scene constructor, and the parsing of worldstats, polygons and actions is farmed out to the relevant classes. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@347 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:48 +02:00
Alex Bevilacqua 779cac61a9 ASYLUM: moved getActorX and getBarrierX from sceneres to worldstats 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@346 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:48 +02:00
Alex Bevilacqua 103f2513f1 ASYLUM: cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@345 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:48 +02:00
Alex Bevilacqua dc50ebf55f ASYLUM: polygon point cleanup moved to polygons destructor 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@344 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:47 +02:00
Alex Bevilacqua afff3e7222 ASYLUM: refactored worldstats into it's own class file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@343 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:47 +02:00
Alex Bevilacqua d1234430c2 ASYLUM: refactored actionlist into it's own class file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@342 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:47 +02:00
Alex Bevilacqua 612d6021f7 ASYLUM: * added proper source header to polygons.cpp/h 
* refactored the pointInPoly method into the PolyDefinitions and renamed the method to "contains()"

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@341 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:47 +02:00
Alex Bevilacqua 4e7c4a478b ASYLUM: refactored polygon code out to seperate class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@340 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:47 +02:00
Alex Bevilacqua 7550fd1453 ASYLUM: There's no need to access the scene's resources through Shared from within the scene itself 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@339 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:47 +02:00
Alexandre Fontoura 05e47b3d71 ASYLUM: Fixed scene moving command. Still crashing with Path-Finding. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@338 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:47 +02:00
Alexandre Fontoura 82016e35e1 ASYLUM: Little compilation fix. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@337 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:46 +02:00
Alex Bevilacqua 0002d52073 ASYLUM: minor cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@336 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:46 +02:00
Alex Bevilacqua 18733c4910 ASYLUM: fixed a valgrind warning 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@335 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:46 +02:00
Alex Bevilacqua 87b32eadd2 ASYLUM: added barrier.cpp/h to vcproj 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@334 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:46 +02:00
Alex Bevilacqua 7c330b4b8a ASYLUM: Refactored BarrierItem into it's own class. Also moved the sound item structs into sound.h 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@333 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:46 +02:00
Alex Bevilacqua bfec665d50 ASYLUM: Renamed actor->disable() to actor->update_4072A0. Also added the assignment to field_40 at the end of that method (as in the original). Still a lot of work to do here though ;) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@332 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:46 +02:00
Alex Bevilacqua 21dde9125e ASYLUM: Closer implementation of kSetActorStats. This actually initializes the characters x1/y1 values, which are needed by kActorFaceObject. 
We REALLY need to fix the character code now though, as our initial implementation is making progress very difficult :P

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@331 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:46 +02:00
Alex Bevilacqua a6b0965471 ASYLUM: * Re-enabled updateMouse() (WIP) 
* Updated return types for scripts (-1 == incomplete, -2 == unimplemented)
* Added actor method faceTarget(). This does NOT work, as the x1/y1 values are always -100 ... investigate!

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@330 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:45 +02:00
Alex Bevilacqua b1865b7319 ASYLUM: Refactored the actor code. Moved a lot of functions into the actor class where it belongs. 
NOTE that cursor changes when using the right mouse button aren't working at the moment

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@329 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:45 +02:00
Alex Bevilacqua feb852bd8b ASYLUM: Reworked the action list processor to use a function map as opposed to a switch tree. This is a cleaner solution, thought i'm not sure if there's a tradeoff as far as efficiency is concerned. 
Also implemented the angle processing algorithm (and the associated lookup tables)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@328 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:45 +02:00
Alex Bevilacqua 3f4a861a41 ASYLUM: Initial implementation of updateMouse(). This still needs some work, and will likely be completed after the actor code refactoring. 
The method implementation is currently commented out.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@327 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:45 +02:00
Alex Bevilacqua b9ee645fed ASYLUM: Implemented kJumpIfFlag2Bit0. Also modified kSetFlag2Bit0 to actually set the action area flag 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@326 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:45 +02:00
Alex Bevilacqua f169d00db0 ASYLUM: Comments 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@325 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:45 +02:00
Alex Bevilacqua bccc36a69c ASYLUM: This is still WIP, but it's the first steps towards refactoring the cursor code. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@324 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:45 +02:00
Alex Bevilacqua 0ebfa3758c ASYLUM: use CursorMan instead of the OSystem reference to manage cursors. This allows the cursor to be properly reset when returning from the GMM or the Debug Console 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@323 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:44 +02:00
Alexandre Fontoura 49c0f35428 ASYLUM: Some barrier fixes. 
Fixed addGraphicInQueue.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@322 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:44 +02:00
Alexandre Fontoura a52992c543 ASYLUM: Little work on Actors 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@321 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:44 +02:00
Alexandre Fontoura adbf7b6ab1 ASYLUM: More work on ScriptManager. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@320 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:44 +02:00
Alex Bevilacqua 7badaaaddc ASYLUM: Minor readability formatting 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@319 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:44 +02:00