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
171 Commits
Author SHA1 Message Date
elasota e280186a8c ALL: VS warning cleanup 2022-12-25 16:31:57 +01:00
Eugene Sandulenko fa387821b3 GRIM: LUA: Replace sprintf -> snprintf 2022-12-16 11:06:08 +01:00
Le Philousophe a4073b8c6f GRIM: Don't use unsafe sprintf and vsprintf 2022-10-23 22:46:19 +02:00
Le Philousophe e15aa92118 GRIM: Don't use unsafe strcat and strcpy 2022-10-23 22:46:19 +02:00
Donovan Watteau 671603aa27 GRIM: Backport a Bison fix for uninitialized yyval (Trac#13784) 
Reported by MSVC whenever pressing a key in EMI in debug builds.

Upstream fix from GNU Bison 1.28c on 2000-10-02:
https://git.savannah.gnu.org/cgit/bison.git/commit/?id=da9abf4366d824a23da3d2416856e9a482794eb1
 2022-10-18 08:42:12 +03:00
Orgad Shaneh 29e9cdc40f GRIM: Fix string comparison in lua 
Reported by GCC 12:

lobject.cpp: In function 'int32 Grim::luaO_equalObj(TObject*, TObject*)':
lobject.cpp:51:35: warning: comparison between two arrays [-Warray-compare]
   51 |                 return svalue(t1) == svalue(t2);

Upstream fix: https://github.com/lua/lua/commit/84790bb953a091eed06d260ef58e71987dda3dab
 2022-06-05 22:10:19 +02:00
aquadran bbe9b3cf64 Revert "GRIM: Fix string comparison in lua" 
This reverts commit d783be1570.
 2022-05-26 20:47:36 +02:00
Orgad Shaneh d783be1570 GRIM: Fix string comparison in lua 
Reported by GCC 12:

lobject.cpp: In function 'int32 Grim::luaO_equalObj(TObject*, TObject*)':
lobject.cpp:51:35: warning: comparison between two arrays [-Warray-compare]
   51 |                 return svalue(t1) == svalue(t2);

Upstream fix: https://github.com/lua/lua/commit/84790bb953a091eed06d260ef58e71987dda3dab
 2022-05-26 15:05:43 +03:00
D G Turner 6197a0da3d GRIM: Fix Redundant Declaration Warnings 
These are emitted by GCC if -Wredundant-decls is enabled.
 2022-03-07 19:57:34 +00:00
Paweł Kołodziejski 71119aafe2 GRIM: Make Lua_V1::DriveActorTo() stub 2022-01-16 22:12:14 +01:00
Paweł Kołodziejski 6c850c8f2e GRIM: LUA: Print function name in list of arguments 2022-01-16 08:50:38 +01:00
Paweł Kołodziejski 570d71ed5a GRIM: LUA: Do not touch stack. this is only helper for traces hook 2022-01-16 08:46:21 +01:00
Paweł Kołodziejski 0375a44f66 GRIM: LUA: Restore original callhooks 2022-01-16 08:33:08 +01:00
Paweł Kołodziejski 962d676346 GRIM: LUA: Replace numbers with macros 2022-01-16 08:30:23 +01:00
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 94463b3ae7 GRIM: Restore original signed type for hashing 2022-01-06 01:35:43 +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 2c997d175c GRIM: Remove W/A, it's not reproducible. Based on bug report, game was in bad state, by direct script jump. 2022-01-04 20:46:53 +01:00
Orgad Shaneh a05e54f00c JANITORIAL: Remove trailing whitespaces 2021-05-04 11:46:30 +03:00
Eugene Sandulenko 5e7fe2dc57 JANITORIAL: Replace spaces in indentation with tabs 2021-04-15 21:20:36 +02:00
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