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

144 commits

Author SHA1 Message Date
Joseph Davies
c31a0d39c8
ASYLUM: Fix warning introduced by r442. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@443 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:03 +02:00
Joseph Davies
6a94eee3c2
ASYLUM: Changed uses of rand() to utilize AsylumeEngine::_rnd instead (Issue #4). 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@442 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:03 +02:00
Alex Bevilacqua
bc43a2bfd5
ASYLUM: remove global_x/y (find a better way ... and actually finish it :P) 
cleanup adjustScreen() a bit

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@434 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:01 +02:00
Alex Bevilacqua
da61880d8e
ASYLUM: This commit breaks A LOT of existing functionality. It also introduces a slew of new functions (namely hittests). For the time being, I'm disabling Menus, Encounters and BlowupPuzzles, as these were all implemented with incorrect cursor handling. 
Feel free to revert to a previous version if you want to try something out, but for the next little while (as I get cursors working more accurately), these features will be unavailable.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@427 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:00 +02:00
Alex Bevilacqua
efa59ec92a
ASYLUM: Removed the commonRes struct from Worldstats, as there's really no need for it to be an entity unto itself. Rolled those struct members into worldstats where they belong. 
Also split actionarea out into it's own class. This is just for logical seperation at the moment.

Finally, deleted the OLD_UPDATE from the scene. There's also a bug in the update() logic where left-clicking causes the barrier animations to referesh when they shouldn't (added a comment for now).

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@418 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:59 +02:00
Alex Bevilacqua
cb90401e0d
ASYLUM: This commit is to checkin the changes I've made in relation to Scene::update::updateMouse. It doesn't really work yet, but there has been a lot of work done on the various hit tests that may help in other's efforts. 
Right now, I think one of the hit tests isn't properly implemented, as I'm always getting the same result when moving the cursor over anything.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@417 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:59 +02:00
Arthur Blot
7963bd8aef
ASYLUM: Remove GCC warnings 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@415 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:58 +02:00
Alexandre Fontoura
b23f2c8cec
ASYLUM: * Fixed issue6 (unsigned characters for multi-language support) - revert signed to unsigned in resId, frameId, frameCount and draw characters. 
* Add support for French Version.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@414 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:58 +02:00
Alexandre Fontoura
5b36ee78b5
ASYLUM: * Fixed scene/barriers drawing positions. We can now see all Barriers active in scene. 
* Add mouse scrolling debug be activated in Console (still have a bug in barriers positions while scrolling)
(CAREFUL: while scrolling in debug, the engine could crash due to incomplete code)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@413 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:58 +02:00
Alexandre Fontoura
6629b1baf5
ASYLUM: * Fixed Update Barriers. Now all barriers should be visible. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@410 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:57 +02:00
Alex Bevilacqua
15e2aad8c8
ASYLUM: a little more work on volume calculation for ambient sound update 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@409 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:57 +02:00
Alex Bevilacqua
878182c704
ASYLUM: starting to unwind Scene::updateAmbientSounds a bit further 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@408 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:57 +02:00
Alex Bevilacqua
cc43cc88a3
ASYLUM: Major overhaul of data casting. Converted all uint32 member variables and fields to int32 (and uint16 to int16) and update the associated reads. There may be regressions as a result, but so far everything seems to be working as expected. 
Also combed through the source and silenced 99% of the warnings that GCC was generating.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@404 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:57 +02:00
Alexandre Fontoura
611e9e9582
ASYLUM: * Rework on game initially steps to build the real flow to start a new game. (Still missing SaveGame checks, New Game and Return to Game in main menu) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@401 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:56 +02:00
Alexandre Fontoura
05ec1ccd5e
ASYLUM: * Fixed proper _currentScript pointer initialization. 
* Silent some warnings.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@399 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:56 +02:00
Alex Bevilacqua
d22a3cae67
ASYLUM: minor cleanup and silenced a couple warning 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@396 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:55 +02:00
Alex Bevilacqua
20184c8486
ASYLUM: Starting to implement proper actionlist processing using the scripts queue. 
With this update, I've renamed all the structs within the actionlist, so be forewarned ;)

This update doesn't work 100% though, as the processing loop exits early when there is a kWaitForFrame command cycling. I'm checking this is so the rest of the team can see the direction (and hopefully fix these for me while I'm at work :P).

I've also removed the hard-setting of script indices within the actionlist in favour of pulling them from the script queue instead. This breaks console debugging compatibility for now, but can be easily re-instated by pushing a script into the queue, as opposed to just setting it directly.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@395 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:55 +02:00
Alex Bevilacqua
d9aaf26c18
ASYLUM: Removed the actionarray class and rolled it into actionlist (which makes way more sense). 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@394 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:55 +02:00
Alex Bevilacqua
a33b9e677a
ASYLUM: Added the ActionArray type. Slowly working on implementing this, but it looks to be what ties the actionlist to the character. 
Also started implementing more standardized music handling.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@393 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:55 +02:00
Alex Bevilacqua
b64ddddf9e
ASYLUM: cleanup and comments 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@390 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:54 +02:00
Alex Bevilacqua
233812dee1
ASYLUM: Implement a more accurate scene initialization (40E460). Part of this involves setting the actor type, so the lookup table has been added to the scene as actorType[16]. We may want to break some of these static resources into a seperate header file at some point down the road ... 
Also start converting some worldstats from  uint32 to int32, as i think our signing is wrong for a lot of variables...

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@389 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:54 +02:00
Alex Bevilacqua
05f33c9a4c
ASYLUM: More accurate implementation of updateActorDirection (40A2E0), updateActorDirectionDefault (407260), and defaultActorDirectionLoaded (407260). 
These updates all occur on the scene, and not the actor as they rely heavily on the values in WorldStats.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@388 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:54 +02:00
Alexandre Fontoura
1ca31867e8
ASYLUM: PlayerSpeech showing Text. (Still need to fix Sound::isPlaying to display the text while speech is playing) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@387 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:54 +02:00
Alexandre Fontoura
abf0365eaa
ASYLUM: New player speech implementation.(Missing subtitles) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@386 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:54 +02:00
Alex Bevilacqua
27437d1796
ASYLUM: A bit more work and cleanup. This is not coming along very well though. I may have to start re-writing all the scene code from scratch just to get a better handle on what's supposed to be happeneing :( 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@384 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:53 +02:00
Alex Bevilacqua
6354e07969
ASYLUM: started implementation of drawActorsAndBarriers() 
this method is failing due to the actor's x1/y1 values not being set (this is supposed to happen in updateActor() case 0x04)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@383 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:53 +02:00
Alex Bevilacqua
b70ec65759
ASYLUM: Commented out OLD_UPDATE on the scene for now, as I'm going to try to start implementing this properly (so things may be broken for a bit). 
Added a changeOrientation() method to the actor class. Removed the old setDirection() method, as this was not properly done from the original disassembly.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@380 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:53 +02:00
Alex Bevilacqua
005cfdcf5a
ASYLUM: * changed some variable casting from uint32 to int 
* force kDebugFlagScripts to be on by default (for now)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@378 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:52 +02:00
Alex Bevilacqua
e60a1293cf
ASYLUM: created a configuration management singleton. I know I've made a few of these and then factored them out in the past, but I think common options are a good candidate for this pattern. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@374 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:52 +02:00
Alex Bevilacqua
b439e33021
ASYLUM: Emulate the title loader. I'm calling this emulation because we're not buffering resources the same way as the original (we don't load all scene assests prior to initialization). 
This can be toggled by commenting out the SHOW_SCENE_LOADING macro to faciliate development ;)

I also unified access to the Text* instance by moving it to the engine level and adding a getter.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@372 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:51 +02:00
Filippos Karapetis
800f24b810
ASYLUM: Commented out unused variables 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@371 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:51 +02:00
Filippos Karapetis
dae5c31a10
ASYLUM: Fixed two warnings, for now, and added 2 FIXME's 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@369 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
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
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
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
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
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
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