libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 11:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
109,697 Commits 5 Branches 5 Tags 1.8 GiB
7ff34bc9ec
Commit Graph

284 Commits

Author SHA1 Message Date
Andrei Prykhodko
c5062e0f74 PINK: fixed loading WorldBook when clicking on inv window 2018-06-28 23:51:32 +02:00
Andrei Prykhodko
7a6c8f70e6 PINK: removed unused functions 2018-06-28 23:51:32 +02:00
Andrei Prykhodko
be3e0148df PINK: removed unused include directives 2018-06-28 23:51:32 +02:00
Andrei Prykhodko
633649398f PINK: added position recalculation of walking sprites 2018-06-28 23:51:32 +02:00
Andrei Prykhodko
81f60be7c8 PINK: fixed playing last audio subsequence 2018-06-28 23:51:32 +02:00
whiterandrek
278e279e80 PINK: added commands to manipulate inventory 2018-06-28 23:51:32 +02:00
whiterandrek
ba161a9e25 PINK: added more debug commands 2018-06-28 23:51:32 +02:00
whiterandrek
d0f0f41857 PINK: fixed clicking on empty part of screen 2018-06-28 23:51:32 +02:00
whiterandrek
60d2c3e2f2 PINK: fixed playing SequenceAudio with long songs 2018-06-28 23:51:32 +02:00
whiterandrek
ffcaf74b08 PINK: implement OnMouseOverWithItem for LeadActor 2018-06-28 23:51:32 +02:00
whiterandrek
3e2c9b6bc2 PINK: fix updating cursor in some situations 2018-06-28 23:51:32 +02:00
whiterandrek
914ee715eb PINK: fix warning 2018-06-28 23:51:32 +02:00
Eugene Sandulenko
bb8a64d22d PINK: JANITORIAL: Fix code formatting 2018-06-28 23:51:32 +02:00
Eugene Sandulenko
85e0c7ccd3 PINK: JANITORIAL: Indentation fixes 2018-06-28 23:51:32 +02:00
Eugene Sandulenko
9c176c5702 PINK: Format 'else' statement oneliners 2018-06-28 23:51:32 +02:00
Eugene Sandulenko
a224e41edc PINK: JANITORIAL: More whitespace fixes 2018-06-28 23:51:32 +02:00
Eugene Sandulenko
c3e1157d18 PINK: JANITORIAL: More formatting fixes 2018-06-28 23:51:32 +02:00
Eugene Sandulenko
5142ed203c PINK: JANITORIAL: Indentation fixes 2018-06-28 23:51:32 +02:00
whiterandrek
b670fba4c9 PINK: remove extra indentation 2018-06-28 23:51:32 +02:00
whiterandrek
99416cb331 PINK: fix mismatched declarations 2018-06-28 23:51:32 +02:00
whiterandrek
28a1ff7555 PINK: fix shadowing declarations 2018-06-28 23:51:32 +02:00
whiterandrek
25a9e093c2 PINK: fix include statement 2018-06-28 23:51:32 +02:00
whiterandrek
3143cc3f29 PINK: add saving/loading of parallel contexts 2018-06-28 23:51:32 +02:00
whiterandrek
3134b2d230 PINK: fix wrong deleting of conflicting contexts 2018-06-28 23:51:32 +02:00
whiterandrek
6a2dc6fa0f PINK: remove unused variable 2018-06-28 23:51:32 +02:00
whiterandrek
6278ab72b4 PINK: fix compiler warning about string literal 2018-06-28 23:51:32 +02:00
whiterandrek
e2ac931ccb PINK: rework scripting system 2018-06-28 23:51:32 +02:00
whiterandrek
cfc5538f95 PINK: fix skipping sequence 2018-06-28 23:51:32 +02:00
whiterandrek
0835b0fee1 PINK: fix SeqTimer updating when actor isn't found 2018-06-28 23:51:32 +02:00
whiterandrek
99301a773f PINK: rework item changing in inventory 2018-06-28 23:51:32 +02:00
whiterandrek
5f61d96bae PINK: rework InventoryMgr updating 2018-06-28 23:51:32 +02:00
whiterandrek
b32af31601 PINK: fix updating cursor when mouse isn't moving 2018-06-28 23:51:32 +02:00
whiterandrek
c4461cb4c3 PINK: fix playing of sprites which have incorrect stopFrame 2018-06-28 23:51:32 +02:00
whiterandrek
4879f7600c PINK: fix ActionTalk sound balance. Thanks Henke37 for bugreport 2018-06-28 23:51:32 +02:00
whiterandrek
425e034bee PINK: add some debug output to simplify communication with testers 2018-06-28 23:51:32 +02:00
whiterandrek
4aa908860b PINK: add Hokus Pokus scripting system 2018-06-28 23:51:32 +02:00
whiterandrek
9b8d72bfb5 PINK: fix naming 2018-06-28 23:51:32 +02:00
whiterandrek
861ef3be97 PINK: rework CursorMgr 2018-06-28 23:51:32 +02:00
whiterandrek
e4402a90eb PINK: rework LeadActor states 2018-06-28 23:51:32 +02:00
whiterandrek
4af995079a PINK: fix playing looped ActionPlayWithSfx 2018-06-28 23:51:32 +02:00
whiterandrek
64bb3baab8 PINK: fix pausing when click on panther with empty inventory 2018-06-28 23:51:32 +02:00
whiterandrek
1af15bf46b PINK: rework changing page routine 2018-06-28 23:51:32 +02:00
whiterandrek
60d423cabb PINK: implement AudioInfoManager 2018-06-28 23:51:32 +02:00
whiterandrek
ed25075146 PINK: rewrite onLeftButtonClick 2018-06-28 23:51:32 +02:00
whiterandrek
2c6ab1c775 PINK: fix inventory opening 2018-06-28 23:51:32 +02:00
whiterandrek
cf8971ae45 PINK: implemented skipping of walk 2018-06-28 23:51:32 +02:00
whiterandrek
2c4336cd8c PINK: move the same code to function setReadyAfterWalk 2018-06-28 23:51:32 +02:00
whiterandrek
84af69cdf6 PINK: move same code to startInventory function 2018-06-28 23:51:32 +02:00
whiterandrek
7b651e41c6 PINK: move the same code to functions(getInventoryMgr and getActorByPoint) 2018-06-28 23:51:32 +02:00
whiterandrek
def6698164 PINK: add init method to InventoryActor 2018-06-28 23:51:32 +02:00
whiterandrek
9db2368028 PINK: fix toConsole method 2018-06-28 23:51:32 +02:00
whiterandrek
02524d81c8 PINK: remove sprite unnecessary updating by another hack 2018-06-28 23:51:32 +02:00
whiterandrek
5282560ba1 PINK: fix drawing of some sprites after setting frame 2018-06-28 23:51:32 +02:00
whiterandrek
e0fa8fe171 PINK: fix ActionLoop Random 2018-06-28 23:51:32 +02:00
whiterandrek
471840514f PINK: fix determination of Actor by point 2018-06-28 23:51:32 +02:00
whiterandrek
2fb268b155 PINK: reworked sprite class(ActionCEL) and his inheritors. 2018-06-28 23:51:32 +02:00
whiterandrek
3ca2c13893 PINK: remove observing of looped sounds 2018-06-28 23:51:32 +02:00
whiterandrek
58e7d560ee PINK: inline small functions 2018-06-28 23:51:32 +02:00
whiterandrek
ccd0ec7ffb PINK: inline one line archive functions; remove stream getters 2018-06-28 23:51:32 +02:00
whiterandrek
078557a1ad PINK: fix condition of miniGame 2018-06-28 23:51:32 +02:00
whiterandrek
5babed5790 PINK: fix playing looped sounds 2018-06-28 23:51:32 +02:00
whiterandrek
b9a5f84515 PINK: fix game page destruction after saving 2018-06-28 23:51:32 +02:00
whiterandrek
10f6e0a6b3 PINK: fix loading empty page from save 2018-06-28 23:51:32 +02:00
whiterandrek
0659ca4846 PINK: fix mem leaks 2018-06-28 23:51:32 +02:00
whiterandrek
f11d331129 PINK: implement sound balance 2018-06-28 23:51:32 +02:00
whiterandrek
cf04fb20c7 PINK: rework sound system 2018-06-28 23:51:32 +02:00
whiterandrek
4fd0ec3ff7 PINK: fix ending of ActionCEL 2018-06-28 23:51:32 +02:00
whiterandrek
a76d86a342 PINK: add check to startFrame because it can be greater than sprite's frames number 2018-06-28 23:51:32 +02:00
whiterandrek
fb8d8c1f57 PINK: remove redundant adding sprite to scene, which doesn't need to be drawn 2018-06-28 23:51:32 +02:00
whiterandrek
bfd1b62063 PINK: change drawing method 2018-06-28 23:51:32 +02:00
whiterandrek
4dd40b0f7b PINK: add saving/loading for PDA 2018-06-28 23:51:32 +02:00
whiterandrek
f7693d3971 PINK: add proper implementation of Actor init function 2018-06-28 23:51:32 +02:00
whiterandrek
44efa90377 PINK: revised page initialization 2018-06-28 23:51:32 +02:00
whiterandrek
4874ed50d2 PINK: implement exit from PDA 2018-06-28 23:51:32 +02:00
whiterandrek
da0adc92a2 PINK: reformat Action's code 2018-06-28 23:51:32 +02:00
whiterandrek
b682ecb0ea PINK: refactor Actors to remove casts and improve readability 2018-06-28 23:51:32 +02:00
whiterandrek
a531381f2b PINK: change pause/unpause to pause method with parameter 2018-06-28 23:51:32 +02:00
whiterandrek
127e2fdf55 PINK: add PDAButtonActor(Pokus) implementation 
Peril's pda actor is different
 2018-06-28 23:51:32 +02:00
whiterandrek
9f23b4238c PINK: add Pokus World Book implementation 2018-06-28 23:51:32 +02:00
whiterandrek
001a08c91c PINK: fix deserializing of ActionText 2018-06-28 23:51:32 +02:00
whiterandrek
80622943e4 PINK: prepare page interface to add PDAPage 2018-06-28 23:51:32 +02:00
whiterandrek
11b5865b48 PINK: fix loading inventory save 2018-06-28 23:51:32 +02:00
whiterandrek
90864279f4 PINK: fixes to save system 2018-06-28 23:51:32 +02:00
whiterandrek
d6b1b9396e PINK: add state saving/loading of Module and GamePage 2018-06-28 23:51:32 +02:00
whiterandrek
578b93af20 PINK: add state saving/loading of LeadActor 2018-06-28 23:51:32 +02:00
whiterandrek
9b5dac452d PINK: add state saving/loading of Inventory 2018-06-28 23:51:32 +02:00
whiterandrek
04a0c4ead6 PINK: add saving/loading state of WalkMgr 2018-06-28 23:51:32 +02:00
whiterandrek
0b4c0b2bee PINK: add saving and loading state of sequencer 2018-06-28 23:51:32 +02:00
whiterandrek
de6932f771 PINK: fix letter case 2018-06-28 23:51:32 +02:00
whiterandrek
e98c14c3d7 PINK: fix formatting 2018-06-28 23:51:32 +02:00
whiterandrek
d7f09d4c3c PINK: remove extended initializer lists 2018-06-28 23:51:32 +02:00
whiterandrek
2bb2834782 PINK: fix compiler warning about UB 2018-06-28 23:51:32 +02:00
whiterandrek
d3d7a92800 PINK: fix compilation error 2018-06-28 23:51:32 +02:00
whiterandrek
f6dd0f2f49 PINK: remove commas at the end of enumerator lists 2018-06-28 23:51:32 +02:00
whiterandrek
82974a9ce3 PINK: fix indentation 2018-06-28 23:51:32 +02:00
whiterandrek
ea5c093410 PINK: remove lambda functions 
PINK: remove lambda functions

PINK: remove >> << operators
 2018-06-28 23:51:32 +02:00
whiterandrek
c06452594f PINK: fix no newline warning 2018-06-28 23:51:32 +02:00
whiterandrek
37574a3bcf PINK: remove >> << operators 2018-06-28 23:51:32 +02:00
whiterandrek
b89de53fb1 PINK: fix arguments in InventoryItem method 2018-06-28 23:51:32 +02:00
whiterandrek
c32c642eba PINK: change _endFrame type from uint32 to int32 2018-06-28 23:51:32 +02:00
whiterandrek
a45e58319d PINK: fix signed vs unsigned comparison 2018-06-28 23:51:32 +02:00
whiterandrek
8733e54cd4 PINK: remove the use of auto variables 2018-06-28 23:51:32 +02:00
whiterandrek
39ed15d2f7 PINK: fix includes 2018-06-28 23:51:32 +02:00
whiterandrek
3411750a1c PINK: removed single-line function from SeqTimer 2018-06-28 23:51:32 +02:00
whiterandrek
d54c2a68cb PINK: fixed forward declaration 2018-06-28 23:51:32 +02:00
whiterandrek
f3ac46e887 PINK: renamed method parameters to appropriate names in Condition classes 2018-06-28 23:51:32 +02:00
whiterandrek
9566439683 PINK: fixed sprites which start playing with delay 2018-06-28 23:51:32 +02:00
whiterandrek
c1af0371ee PINK: fixed crash in Hokus Pokus 2018-06-28 23:51:32 +02:00
whiterandrek
d11115a6aa PINK: fixed finding of nullptr Actor 2018-06-28 23:51:32 +02:00
whiterandrek
ab4980aa59 PINK: added basic implementation of HandlerTimerSequences just to make Hokus Pokus playable after Black Hole 2018-06-28 23:51:32 +02:00
whiterandrek
cdcb8f5ec6 PINK: changed size method to empty to improve readability 2018-06-28 23:51:32 +02:00
whiterandrek
23157a6450 PINK: fix for Pokus game 2018-06-28 23:51:32 +02:00
whiterandrek
0103b904a8 PINK: added missing include 2018-06-28 23:51:32 +02:00
whiterandrek
a7ad5fe86a PINK: fixes crash on loading final scene of Passport to Peril(not tested) 2018-06-28 23:51:32 +02:00
whiterandrek
4ce6b3dbd2 PINK: fixed compilation errors 2018-06-28 23:51:32 +02:00
whiterandrek
c9e7c001ad PINK: fixed unstoppable talk animation 2018-06-28 23:51:32 +02:00
whiterandrek
08d0652297 PINK: implemented stopFrame 2018-06-28 23:51:32 +02:00
whiterandrek
9cfa4970a2 PINK: fixed choosing item after getting it from click using other item 2018-06-28 23:51:32 +02:00
whiterandrek
84529c9177 PINK: fixed entering to Mucky Duck Pub 2018-06-28 23:51:32 +02:00
whiterandrek
866b552eed PINK: changed static_cast to dynamic_cast 2018-06-28 23:51:32 +02:00
whiterandrek
9364010e5e PINK: fixed setting action method 2018-06-28 23:51:32 +02:00
whiterandrek
954ee72b87 PINK: fixed finding nullptr action 2018-06-28 23:51:32 +02:00
whiterandrek
362db13d17 PINK: fixed SideEffectLocation 2018-06-28 23:51:32 +02:00
whiterandrek
d83022b607 PINK: added implementation of mini-games (PubPink and ParlSqPink) 2018-06-28 23:51:32 +02:00
whiterandrek
181b89035a PINK: added implementation of item using 2018-06-28 23:51:32 +02:00
whiterandrek
ed3fce3267 PINK: fixed compilation error 2018-06-28 23:51:32 +02:00
whiterandrek
52df3e15f8 PINK: removed unnecessary method call 2018-06-28 23:51:32 +02:00
whiterandrek
6f128e9146 PINK: added missing parameter in ActionPlayWithSfx::toConsole method; 2018-06-28 23:51:32 +02:00
whiterandrek
ba29d37ccd PINK: fixed stopping sfx according to disasm 2018-06-28 23:51:32 +02:00
whiterandrek
c9887c6151 PINK: added PDAButtonActor and AudioInfoPDAButton 2018-06-28 23:51:32 +02:00
whiterandrek
9f8356e52e PINK: fixed Inventory onClick method and other bugfixes 2018-06-28 23:51:32 +02:00
whiterandrek
888f5b668f PINK: added more constants 2018-06-28 23:51:32 +02:00
whiterandrek
ec96a3b1e7 PINK: added check for item owner 2018-06-28 23:51:32 +02:00
whiterandrek
2f43cbafa0 PINK: moved more values to constants section 2018-06-28 23:51:32 +02:00
whiterandrek
dac8d2a72b PINK: bugfixes and added basic inventory implementation 2018-06-28 23:51:32 +02:00
whiterandrek
78c4ed85ab PINK: implemented page state saving 2018-06-28 23:51:32 +02:00
whiterandrek
c29b1d1112 PINK: started inventory implementation 2018-06-28 23:51:32 +02:00
whiterandrek
cad72b1532 PINK: basic walk, left click and seqTimer implementation 2018-06-28 23:51:32 +02:00
whiterandrek
4b7c75607a PINK: added onMouseOver method to LeadActor 2018-06-28 23:51:32 +02:00
whiterandrek
49d5ea28c0 PINK: added basic cursor implementation, fixed sequenceAudio restarting and skipping, fixed various mem leaks, hopefully fixed finding of transparent color index. 2018-06-28 23:51:32 +02:00
whiterandrek
e48ac17f68 PINK: small fixes 2018-06-28 23:51:32 +02:00
whiterandrek
475f6a62bd PINK: fixed some segfaults 2018-06-28 23:51:32 +02:00
whiterandrek
5db9a45458 PINK: added ActionTalk implementation 2018-06-28 23:51:32 +02:00
whiterandrek
1a2bd666b0 PINK: added ActionPlayWithSfx implementation 2018-06-28 23:51:32 +02:00
whiterandrek
65eccb7ba7 PINK: added basic ActionLoop implementation 2018-06-28 23:51:32 +02:00
whitertandrek
f9c94a40a4 PINK: Implemented SequenceAudio as in original. 
Now Peril's intro is almost like in original
 2018-06-28 23:51:32 +02:00
whiterandrek
a75aeb62ee PINK: fixes for Peril 2018-06-28 23:51:32 +02:00
whiterandrek
37dbe057a8 PINK: fixed sideEffect and choosing of handler 2018-06-28 23:51:32 +02:00
whiterandrek
e55839ff20 PINK: added restart method to SequenceAudio 2018-06-28 23:51:32 +02:00
whiterandrek
896511c34a PINK: hacky implementation of SequenceAudio 2018-06-28 23:51:32 +02:00