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
138,157 Commits 45 Branches 139 Tags
4b2e3e67266ae4ed153ccbf98b2e5b94de85353b
Commit Graph
31 Commits
Author SHA1 Message Date
Paweł Kołodziejski 662481db00 GRIM: LUA: Cleanup variables name 2022-01-14 09:01:44 +01:00
Paweł Kołodziejski 690f9d2a5c GRIM,LUA: Janitorial 2022-01-06 18:26:30 +01:00
Paweł Kołodziejski 95250cfbb9 GRIM: Ignore not function param at startscript for all games 2022-01-05 09:08:44 +01:00
Paweł Kołodziejski e35989324b GRIM: Allow pass nil param to findscript func for all games 2022-01-05 09:00:46 +01:00
Paweł Kołodziejski 5dad979952 Revert "GRIM: Use exceptions instead of jumps" 
This reverts commit 7b42887895.
 2017-11-30 19:56:43 +01:00
Joel Teichroeb 7b42887895 GRIM: Use exceptions instead of jumps 2017-11-30 08:31:25 +01:00
Joel Teichroeb 0f3da43694 GRIM: Change NULL to nullptr. 2014-05-30 17:43:08 -07:00
Christian Krause 187d34d319 EMI: fix pause handling 
On vista point it may happen that two sequences for the rock landings
are executed at the same time. Although they intend to be locked via
pause_scripts(), changing the set will call unpause_scripts() and unlock
all of them.

The patch will use the optional parameter for (un)pause_scripts() to
determine whether the pause calls should be counting (e.g. when
switching a set or opening the inventory) or not.
 2013-12-24 00:14:49 +01:00
Christian Krause 4b6cf2055b GRIM/EMI: Count pause/unpause calls of LUA scripts 
Scripts that have explicitly been paused must not be resumed when
pause_scripts and unpause_scripts are called, e.g. when opening the
inventory, pausing the game or changing sets.

This patch splits the existing paused flag in two separate ones:
 - LState::all_paused is controlled by pause/unpause_scripts (plural)
 - LState::paused is controlled by pause/unpause_script (singular)

For compatibility with Grim savegames both flags are stored in a single
byte, with bit 0 having the same meaning as the former boolean.
 2013-12-09 23:40:34 +01:00
Dries Harnie 8fda6792bc EMI: Fix LUA stall in dlg_meathook2.lua. 
The offending line is start_script(meathook:head_shake(...)).
This patch can be reverted once we patchr the offending line.
 2013-08-04 16:05:54 +02:00
Dries Harnie eaa887c8e3 EMI: Implement (un)pause_script 2013-08-04 14:27:30 +02:00
Dries Harnie f3be1c299f GRIM: Fix Valgrind warning in start_script et al 2013-05-22 20:58:09 +02:00
Dries Harnie eda019ef86 EMI: Return current task for find_script() 2012-09-01 17:32:55 +02:00
Joel Teichroeb c9b33fc517 GRIM: Fix an error with patchr instead of detecting it later 2012-04-09 17:11:25 -07:00
Joel Teichroeb d72bea895b EMI: Implement sleep_for in the engine 2012-01-23 17:33:15 -08:00
Joel Teichroeb 3a61eaee8c EMI: Make chores actually work and fix compile error. Also fix a warning 2011-12-23 11:58:35 -08:00
Joel Teichroeb f94533e228 EMI: More work on getting EMI to do stuff 2011-12-21 20:35:37 -08:00
Giulio Camuffo 5012ebfbc9 GRIM: New, cleaner, lua_runtasks(). 2011-07-20 22:27:41 +02:00
Giulio Camuffo c1a1314824 GRIM: Make pause_scripts() actually pause the scripts. 2011-07-20 19:12:25 +02:00
Pawel Kolodziejski 0f5de71f70 sync with scummvm 2011-05-08 15:38:26 +02:00
Giulio Camuffo 1e868dd359 GRIM: Store ids instead of the pointers as lua's userdata objects. 
Removed ObjectManager as it became useless.
 2011-05-01 18:54:29 +02:00
Giulio Camuffo 3e67c18aa8 GRIM: Fix some free/delete mismatches. 2011-04-19 15:35:05 +02:00
Giulio Camuffo 2bee1ac47e Do not end forcedly a lua function that calls start_script with a bad argument. 
This fix si.set, as the function si.set_up_actors() calls start_script
with si.naranja_drinking, which doesn't exist.
 2011-04-05 15:36:51 +02:00
Pawel Kolodziejski 02477fc3b2 it seems used in gf demo 2009-06-27 19:45:27 +00:00
Pawel Kolodziejski a93763eeb7 fixed warnings 2009-06-21 08:12:49 +00:00
Pawel Kolodziejski 5f30bd242f cleanup with warnings 2009-06-18 13:57:17 +00:00
Pawel Kolodziejski 3a2d539f09 re-implemented multi threading in lua based on disassembly 2009-06-16 22:55:12 +00:00
Pawel Kolodziejski 4921599c97 remove hack here 2009-06-11 21:36:46 +00:00
Pawel Kolodziejski 807fffbbfa remove L macro 2009-06-11 07:01:01 +00:00
Pawel Kolodziejski 8b8e7e07d2 added namespace Grim 2009-05-25 06:49:57 +00:00
Pawel Kolodziejski f58c073a0a move/rename engine into engines/grim 2009-05-24 18:55:19 +00:00