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
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
Filippos Karapetis 9c17b66fa8 ASYLUM: Silenced a (very) annoying warning 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@416 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:58 +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
Alex Bevilacqua df377b52b4 ASYLUM: minor cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@412 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:58 +02:00
Alex Bevilacqua 003fe3e9ad ASYLUM: cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@411 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 7485e6ad7f ASYLUM: a little more formatting 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@407 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:57 +02:00
Alex Bevilacqua 7506f2d470 ASYLUM: minor whitespace cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@406 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:57 +02:00
Alex Bevilacqua 9e8cd4c502 ASYLUM: move video subtitle resource lookup table to staticres 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@405 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
Alex Bevilacqua 9e2855fd81 ASYLUM: include and comment macro for skipping intro videos 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@403 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:56 +02:00
Alexandre Fontoura 817cdc8ce6 ASYLUM: * Implemented start New Game from MainMenu. 
* Implemented MainMenu ReturnToGame screen when no game is loaded.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@402 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:56 +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 dcf0cce2c5 ASYLUM: * Fixed Sound::isPlaying buffered handle. 
* Fixed Intro play and display
* ConfigurationManager Config.showMovieSubtitles is now from type VideoSubtitles.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@400 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 9cc79d0cea ASYLUM: remove "processing" flag and just check for flag 183 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@398 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:56 +02:00
Alex Bevilacqua 84b6fde0d1 ASYLUM: Trying out a stack-based script queue management system. This is what I assume is an optimized version of the original :P 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@397 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:55 +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 63b9cfeb0a ASYLUM: commit staticres.h (forgot to do an svn add :P) 
svn props for speech.cpp/h

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@392 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:55 +02:00
Alex Bevilacqua 3f34ce3030 ASYLUM: Moved some static resources into a new staticres header. 
Simplified font switching in the menu code

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@391 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:54 +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
Alexandre Fontoura be1b96e4c0 ASYLUM: Little fix in Play Animation command. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@385 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 0f3e70f32e ASYLUM: added new opcode return type that indicates that the opcode is implemented, but there are still some comments to address 
fixed up some unsigned comparisson warnings

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@382 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:53 +02:00
Alex Bevilacqua 0437c5d622 ASYLUM: comment 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@381 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 99aa2737b3 ASYLUM: change command reads from Uint32 to Sint32 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@379 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
Joseph Davies fc33509d62 ASYLUM: Some fixes for ambiguous data endianness causing segfaults on big-endian architectures. 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@377 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:52 +02:00
Alex Bevilacqua ab96b43829 ASYLUM: Alter detection routine slightly to check if the version of Sanitarium that is found is one that has had the Level 2 lockout patch applied 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@376 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:35:52 +02:00
Filippos Karapetis f26c50461b ASYLUM: Updated the MSVC project file, and fixed compilation 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@375 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 1ea346e064 ASYLUM: cleanup and comments 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@373 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 83b9d232fb ASYLUM: Fixed another warning on an odd bit of code, and added a FIXME 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@370 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