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
113,441 Commits 45 Branches 139 Tags
dfe79052d2adaafc4ac3297f36953a2bb1d288cf
Commit Graph
149 Commits
Author SHA1 Message Date
Paweł Kołodziejski 35b9cccbde ALL: Merge ResidualVM 2020-10-09 19:44:13 +02:00
Pawel Kolodziejski 3d74c3dd4d GRIM: Post branch merge fixes. 2020-10-07 19:50:27 +02:00
Paweł Kołodziejski 6e619ca714 GRIM: Merge branch 'remastered' 2020-10-07 18:26:49 +02:00
Pawel Kolodziejski 490bedb584 ALL: Fixed some compiler warnings while using c++11 2020-09-25 18:51:18 +02:00
Pawel Kolodziejski 27e12d8a96 ALL: Eliminate LOCAL_PI macro 2020-09-23 23:20:23 +02:00
Bastien Bouclet 11cce71b06 GRIM: Fix warning due to the hash value now being unsigned 2017-12-07 19:24:17 +01:00
Bastien Bouclet b70686550c GRIM: Remove references to SCUMM_64BITS 2017-12-06 22:41:24 +01:00
Bastien Bouclet e105e6340e GRIM: Use 64bit integers for the save/restore code 
To remove usage of the now removed SCUMM_64BITS definition
 2017-12-06 21:41:23 +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
Bastien Bouclet fc67541742 ALL: Silence some GCC7 fall through warnings 2017-09-02 15:24:01 +02:00
Bastien Bouclet 79547a9a21 GRIM: Add the fallback functions to lua when initializing for the second time 
Fixes saving after returning to launcher and running the game a second time.
 2016-07-21 21:41:17 +02:00
Joel Teichroeb 9cfdb63406 Initial remastered work 2015-01-27 13:31:26 -08:00
Christian Krause ff74216678 LUA: Fix copy'n'paste error 2014-12-31 15:47:36 +01:00
Christian Krause 8ba97cb063 LUA: Fix memleak of lua file descriptors 
- don't delete the common LuaFile objects (like g_fin, g_stdout, ...)
  separately
- don't delete the LuaFile objects in closefile()
- delete all LuaFile objects in g_files at once in lua_iolibclose()
- for some objects LuaFile::close() is called twice (once by closefile()
  and a second time by lua_iolibclose()) but this is uncritically due to
  the way LuaFile::close() is implemented
 2014-12-31 15:47:36 +01:00
Joseph Jezak 142adcfb8b LUA: Make userdata print out a hex value like EMI. 2014-07-22 18:31:12 -04:00
Joel Teichroeb 0f3da43694 GRIM: Change NULL to nullptr. 2014-05-30 17:43:08 -07:00
Joel Teichroeb b52e43049e GRIM: Move include guards before any includes 2014-02-27 07:22:22 +00:00
Pawel Kolodziejski 9f54d1a56e JANITORIAL: cleanup licences 2014-02-16 17:57:34 +01:00
Ori Avtalion eed8769412 GRIM: Fix typos in include guards 2014-02-14 16:21:42 +02: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
Einar Johan Trøan Sømåen 2cee5eb06c Merge pull request #784 from inguin/emi-pause-scripts 
GRIM/EMI: Count pause/unpause calls of LUA scripts
 2013-12-11 16:30:47 -08:00
Pawel Kolodziejski 1aaf6829c9 GRIM: precise lua header about modifications 2013-12-10 18:33:15 +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
Joel Teichroeb aeda8c04ea GRIM: Add a const_cast as making ts const is not worth the effort 2013-11-28 17:26:36 -08:00
Giulio Camuffo be9b11570e GRIM: Make the savegames compatible with 1.1 again. Bump to 22.9 
New Lua's internal functions (int_funcs array in lbuiltin.cpp) must
be added to the bottom, and the savegame's minor version must
be increased.
 2013-10-30 15:28:36 +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
Joel Teichroeb 18c3940eba GRIM: Clean up io_readfrom with suggestions from Coverity 2013-07-07 13:29:50 -07:00
Pawel Kolodziejski 068ff94d20 ALL: synced with ScummVM 2013-07-07 15:29:33 +02:00
Einar Johan Trøan Sømåen ab34a830c1 GRIM: Avoid compressing LUA-output Savedata 2013-05-26 12:20:33 +02:00
Dries Harnie f3be1c299f GRIM: Fix Valgrind warning in start_script et al 2013-05-22 20:58:09 +02:00
Giulio Camuffo c08c5aaa31 GRIM/Lua: Don't close the stdin and stdout files when setting them. Fix #711 2013-01-23 14:38:44 +01:00
Joel Teichroeb 88c7bcb35b GRIM: Remove redundant code 2013-01-22 20:33:37 -08:00
Joel Teichroeb 478d9c2505 EMI: Save LState sleepFor and bump savegame to 22.3 2012-12-22 11:04:15 -08:00
Paweł Kołodziejski 175620b62a ALL: change license headers from LGPL to GPL, and few updates 2012-12-19 23:15:43 +01:00
Giulio Camuffo f79577c410 GRIM: Fix save/load of Lua's userdata objects. Bump savegame version to 22.1. 2012-12-14 18:11:12 +01:00
Dries Harnie 290392bbfc EMI: Fix stack clobbering in io_writeto, io_appendto 2012-11-20 00:25:48 +01:00
Einar Johan Trøan Sømåen c008e8a7dd EMI: Fix .\saves\efmi.cfg-loading for EMI. 2012-11-14 01:27:02 +01:00
Dries Harnie eda019ef86 EMI: Return current task for find_script() 2012-09-01 17:32:55 +02:00
Joel Teichroeb 115e3232b8 GRIM: Remove extra semicolons 2012-05-05 22:59:51 -07:00
Joel Teichroeb e63eda39bc GRIM: Remove old includes and their associated forbidden symbol exeptions 2012-05-05 22:32:21 -07: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 0dcfaf8fb1 GRIM: Do not include unneeded headers 2012-04-04 16:11:05 -07:00
Joel Teichroeb 44efbccff4 GRIM: Fix casting away const 2012-04-03 16:58:04 -07:00
Joel Teichroeb 83a70dde4d GRIM: Fix a memory leak closing files in lua 2012-03-24 16:53:01 -07:00
Paweł Kołodziejski 5d200347e6 COMMON, GRIM: fixed compilation after sync 2012-02-22 17:40:48 +01:00
Bastien Bouclet 00d756433f GRIM: Add return to launcher support. 
Also fix a memory leak, and reinitialize a global var in lua
 2012-01-31 21:39:34 +01:00
Paweł Kołodziejski 606092c9b5 GRIM: rename TARGET_64BITS to SCUMM_64BITS 2012-01-28 10:51:34 +01:00
Joel Teichroeb a9c664379e GRIM: Make saving and restoring use more appropriate types and rename functions to be more logical 2012-01-28 10:03:27 +01:00