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
Julien Templier 977afaa9c3 ASYLUM: Actor class was reading too much data 
Scenes > 5 are now loading a bit further

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@520 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:14 +02:00
Julien Templier b1c3d9d7e0 ASYLUM: Add some init code to Scene & Actor classes 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@519 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:14 +02:00
Julien Templier df639342c4 ASYLUM: Remove unused variables from Config class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@518 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:14 +02:00
Julien Templier 25fac6195d ASYLUM: Rename some methods of Text class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@517 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:14 +02:00
Julien Templier 32f3eed36c ASYLUM: Refactor Speech class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@516 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:14 +02:00
Julien Templier 46d1acac79 ASYLUM: Small correction to Actor::updateStatus9 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@515 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:14 +02:00
Julien Templier 2532fcd021 ASYLUM: Refactor game start and scene loading 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@514 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:14 +02:00
Julien Templier d7c22354a6 ASYLUM: Add ResourceManager class 
It will keep track of opened resource files and simplify handling of resource packs

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@513 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:13 +02:00
Julien Templier ee438adbdc ASYLUM: Introduce ResourcePackId 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@512 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:13 +02:00
Julien Templier ef1ebc55da ASYLUM: Extract SceneTitle to its own file 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@511 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:13 +02:00
Alex Bevilacqua fd534e562e ASYLUM: implement Actor::updateStatus9() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@510 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:13 +02:00
Julien Templier 20754d9dd9 ASYLUM: Initialize scene before entering it 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@509 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:13 +02:00
Alex Bevilacqua fdb53b6b13 ASYLUM: expand Actor::toString to show a more detailed view when examining a particular actor 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@508 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:13 +02:00
Julien Templier de67e921e2 ASYLUM: Do not try to play music with an empty ResourceId 
This fixes part of scene loading

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@507 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:13 +02:00
Julien Templier 51b9a95e51 ASYLUM: Get rid of numActors/Objects/Actions 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@506 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:12 +02:00
Alex Bevilacqua 66982f21af ASYLUM: remove unnecessary comment 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@505 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:12 +02:00
Alex Bevilacqua 03bac323a6 ASYLUM: silence warning and minor cleanup 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@504 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:12 +02:00
Julien Templier 9b7e72932d ASYLUM: Fix object debug command 
- Remove debug output in Object::toString()
- Added pack id & resource index to full output

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@503 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:12 +02:00
Julien Templier 43805ab2d8 ASYLUM: Fix some problems with the Actor code 
- Fix typos that prevented updateStatus functions from being called
- Initalize the encounter flags properly
- Update error strings for not yet implemented special sound functions

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@502 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:12 +02:00
Julien Templier 8eafe1b911 ASYLUM: Backed out revision 495 (fix object disable) 
The flag update was done properly and the same as in the original.
The change prevented objects from being disabled and they would
stay on screen all the time.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@501 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:12 +02:00
Julien Templier 88dab248d1 ASYLUM: Implement enableActorsChapter2 
- Moved from Special class to Actor (as a static function)
- Added TODO for update of shared data

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@500 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:12 +02:00
Julien Templier a821f1a583 ASYLUM: Fix ClearScreen opcode 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@499 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:11 +02:00
Julien Templier eae999fed4 ASYLUM: Implement special logic for chapter 2 (remaining part), 5 & 9 
- Fix graphic resource leak in Actor & Object
- Replace WorldStats targetX, targetY and following variables into
a coordinate array.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@498 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:11 +02:00
Alex Bevilacqua e10ad80b88 ASYLUM: added 'object' console command and an onscreen param for 'objects' 
Inspecting a particular object is now done via the 'object' console command. Also, listing all objects is done by using 'objects *'.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@497 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:11 +02:00
Alex Bevilacqua d8457b0bc2 ASYLUM: enhance "objects" console command 
this command now takes a format option of "idx" or "id" so you can look up an object entry by its internal id as well as it's physical location within the objects array.

Also enhanced Objects::toString with an optional formatting parameter that displays a short dump or a long dump.

sample usage:

objects idx 51   // summary view of object at array index 51
objects id 1258  // detail view of object with id of 1258
objects          // show all objects (summary list)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@496 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:11 +02:00
Alex Bevilacqua 62305021da ASYLUM: fix object disable (actor is now no longer hidden after the first script runs) 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@495 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:11 +02:00
Julien Templier 659a3e281e ASYLUM: Reduce header inter-dependency 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@494 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:10 +02:00
Julien Templier 4b449a14c2 ASYLUM: Treat ResourceId as an unsigned int 
This should hopefully fix the overflow warnings until we convert
all callers to use the enum.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@493 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:10 +02:00
Julien Templier 96878fef6e ASYLUM: Implement special logic for Chapter 7 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@492 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:10 +02:00
Julien Templier dd6afe7523 ASYLUM: Use subsystems access macros in ActionList 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@491 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:10 +02:00
Julien Templier 9eb5d19d3b ASYLUM: Implement Object::setVolume() 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@490 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:10 +02:00
Julien Templier 9249130d59 ASYLUM: Check that a scene exists before trying to load it 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@489 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:10 +02:00
Julien Templier 582794ff12 ASYLUM: Implement special logic for chapters 1, parts of 2, 3, 4 and 6 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@488 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:10 +02:00
Julien Templier fecb700e69 ASYLUM: Update shared enumerations 
- Add ObjectId enumeration
- Add some missing game flags
- Add macros for access to more subsystems

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@487 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:09 +02:00
Julien Templier ce330b1a45 ASYLUM: Rename Barrier to Object 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@486 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:09 +02:00
Julien Templier 0eb39da884 ASYLUM: Enhance Debug console 
- Add actors & objects debug commands for showing Actor and Object info (only name & id for now)
- Add ls command to list the engine files
- Add option to show only set/unset flags
- Add option to show action per index
- Add better help output
- Check validity of video index in video command

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@485 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:09 +02:00
Alex Bevilacqua 66b12b324f ASYLUM: add missing ADParams initializers 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@484 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:09 +02:00
Alex Bevilacqua 7170f10f7b ASYLUM: even more GCC warnings silenced 
- shadow declarations of x/y in actor class
- suggest parentheses around arithmetic in operand of ‘|’

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@483 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:09 +02:00
Alex Bevilacqua 3dfab1cc46 ASYLUM: fix more GCC warnings (overflow in implicit constant conversion) 
- minor whitespace cleanup as well

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@482 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:09 +02:00
Alex Bevilacqua 7f7a8d4a26 ASYLUM: silenced GCC warnings 
- also added svn:ignore on .deps (seems like I keep doing this :P)

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@481 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:08 +02:00
Julien Templier c62108194e ASYLUM: Implement Scene spec function for Chapter 1 
- Implement parts of Barrier::playSounds

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@480 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:08 +02:00
Julien Templier cf7c7ed9f6 ASYLUM: Cleanup Barrier::update 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@479 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:08 +02:00
Julien Templier d569216ea4 ASYLUM: Implement processUpdateList 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@478 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:08 +02:00
Julien Templier 29d47c54cc ASYLUM: Update scene drawing implementation 
- Finish implementation of Actor::draw() & Barrier::draw()
- Add Scene::buildUpdateList
- Misc cleanup to Barrier functions

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@477 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:08 +02:00
Julien Templier 051ea98d5e ASYLUM: Update ConfigManager 
- Added registration and loading/reading engine-related config options
- Make showing intro & scene loading config options

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@476 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:08 +02:00
Julien Templier 1e04f736ed ASYLUM: Refactor Barrier class 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@475 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:08 +02:00
Julien Templier 3a64ce802a ASYLUM: Add helper macros for access to engine subsystems 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@474 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:07 +02:00
Julien Templier 4d08eeae4d ASYLUM: Implement Actor::updateStatusEnabled() && Actor::updateFinish() 
- Fix uses of the global tick value

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@473 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:07 +02:00
Julien Templier 0f13d7dc3f ASYLUM: Refactor and cleanup Actor class 
- Reorganize methods
- Make most variables private
- Finish implementation of updateFromDirection, updateStatus

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@472 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:07 +02:00
Julien Templier e808235ae3 ASYLUM: Disable obsolete Actor methods 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@471 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
 2021-05-17 15:36:07 +02:00