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
171 Commits
Author SHA1 Message Date
Pawel Kolodziejski 83de2e6600 refactor movie playback and game detection params 2011-05-14 12:11:53 +02:00
Pawel Kolodziejski 0f5de71f70 sync with scummvm 2011-05-08 15:38:26 +02:00
Giulio Camuffo f533450f7e GRIM: Fix the hashindex for userdata on 32bit. 2011-05-08 11:05:46 +02:00
Pawel Kolodziejski aa93ea2b06 GRIM-LUA: fix warning and add check code is right 2011-05-08 09:54:59 +02:00
Pawel Kolodziejski 6c6bcbf3ed GRIM: few renames in Lua to prevent clash names 2011-05-08 09:52:07 +02:00
Pawel Kolodziejski 136ba95286 formatting 2011-05-08 09:38:00 +02:00
Pawel Kolodziejski 5f8f28a0f6 GRIM: node->Node to prevent clash names 2011-05-08 09:31:17 +02:00
Giulio Camuffo 7e3e63dbbd GRIM: Rename GrimEngine's getters. 2011-05-05 11:25:08 +02:00
Giulio Camuffo 07d6e51c24 GRIM: Rename Color's getters. 2011-05-05 10:58:29 +02:00
Giulio Camuffo 6f29d7c55a GRIM: Remove two leftover casts to residualptr. 2011-05-03 17:15:46 +02:00
Giulio Camuffo 465c3d64ec GRIM: Renamed some Actor's getters to getFoo() or isFoo(). 2011-05-03 17:14:24 +02:00
Giulio Camuffo ce716e4580 GRIM: Store USERDATAs with a new struct { int32 id; int32 tag }. 
This way we don't have to deal with casts between integers and void*
anymore.
 2011-05-03 16:51:30 +02:00
Giulio Camuffo 29d6b3c5c1 New residualptr type typedeffed to int32 or int64 depending on the arch. 2011-05-02 19:12:15 +02:00
Giulio Camuffo 465ea8951a GRIM: Moved g_files back into liolib.cpp and made it stay on the heap. 2011-05-02 18:29:24 +02:00
Giulio Camuffo 1e34636e62 GRIM: Turned the warning back into the assert. 2011-05-02 16:05:28 +02:00
Giulio Camuffo 7fdec03c44 GRIM: removed luaO_resetObject. 2011-05-02 11:44:57 +02:00
Giulio Camuffo 9ca6ec1db5 GRIM: Return early from recreateObject() if the ttype == LUA_T_TASK. 2011-05-02 10:23:52 +02:00
Joel Teichroeb 26b80baece GRIM: Update lstate to match the latest changes. 2011-05-02 13:00:23 +08:00
Matthew Hoops 938800e170 GRIM: Silence a ton of warnings 2011-05-02 03:56:42 +08:00
Giulio Camuffo bb529e9647 GRIM: SYSTEM_*_ENDIAN -> SCUMM_*_ENDIAN 2011-05-01 21:02:45 +02:00
Pawel Kolodziejski cc8d694d2d fixed compilation 2011-05-01 19:48:16 +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
Pawel Kolodziejski 90c407b028 fix few typos 2011-04-27 20:45:07 +02:00
Giulio Camuffo 39c232ddbe GRIM: Default taskFunc.ttype to LUA_T_NIL when initting a LState. 2011-04-23 18:15:50 +02:00
Giulio Camuffo 8563dea474 GRIM: Recreate taskFunc only if its type is PROTO or CPROTO. 2011-04-23 18:12:31 +02:00
Giulio Camuffo cf5c0e67ef GRIM: Do not throw a lua_error when trying to call a unexisting function. 
This is necessary for year 4' blue casket. Fixes #15
 2011-04-22 17:46:06 +02:00
Pawel Kolodziejski 6cb4b2d267 fix minor types differences 2011-04-21 22:51:41 +02:00
Giulio Camuffo 3e67c18aa8 GRIM: Fix some free/delete mismatches. 2011-04-19 15:35:05 +02:00
Pawel Kolodziejski 7f37609a84 shutup compiler warning 2011-04-17 12:19:27 +02:00
Pawel Kolodziejski 82864550f0 rename few missed files common/sys.h -> common/scummsys.h 2011-04-17 10:08:52 +02:00
Pawel Kolodziejski 252d484434 common/sys.h -> common/scummsys.h to minimalize diffs with scummvm 2011-04-17 01:00:10 +02:00
Sven Hesse c7c65eb83c Initialize LUA ref objects when growing the pool 
This fixes saving/loading for me.
The problem was that when unitialized objects were saved, their type
and value could be anything. On loading, LUA_T_USERDATA value
pointers are searched for in a global array, and said random
unitialized values are, of course, not in that array, so loading such
a save triggered an assert().

Interestingly, it only failed with a 64bit build for me, the 32bit
build works fine regardless.
 2011-04-17 06:19:19 +08:00
Giulio Camuffo 61a72559d0 The previous commit allows lua_funcinfo to be fully functional again. No more crashes. 2011-04-15 19:20:12 +02:00
Giulio Camuffo 28f4d4751b Recreate the "taskFunc" objects of the lua states. 2011-04-15 18:57:41 +02:00
Pawel Kolodziejski 0640dcf2c7 synced with scummvm to 2011-Apr-13 2011-04-14 12:41:26 +02:00
Matthew Hoops 00ee0554be GRIM: Remove global constructor usage and silence warnings 2011-04-12 20:51:55 +08:00
Pawel Kolodziejski 55415ee174 fix compilation using msvc 2011-04-10 11:24:03 +02:00
Einar Johan T. Sømåen f4aab8c1cb Silence a bunch of 64-bit float warnings. 2011-04-06 06:29:40 +08: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
Matthew Hoops 1554e1ab2f ALL: Silence a ton of warnings 2011-03-25 07:42:03 +08:00
Giulio Camuffo 5212ffe10d Do not try to remove an userdata object from lua if lua is closed. 2011-03-23 23:13:53 +01:00
Giulio Camuffo e89ca555ef ObjectManager uses a new T::restoreObject(SaveGame*) function to restore saved objects. 
This function replaces newObject() and allows more flexibility.
 2011-03-21 06:46:35 +08:00
Giulio Camuffo 59dcece9ae Working savegame support. 
Implemented also the movement of Manny's head when looking at usable items.
This commit also introduces a new Object class with a ObjectPtr used for
caching the resources loaded by ResourceLoader. This fixes also the lipsync
regression.
 2011-03-21 05:41:30 +08:00
Torbjorn Andersson 20a5e580b7 Silenced a bunch of mostly harmless cppcheck warnings. 2010-02-04 19:43:50 +00:00
Pawel Kolodziejski edadbb35be synced code with scummvm trunk 2010-01-21 19:25:03 +00:00
Pawel Kolodziejski 8c0ae1c771 fix restore longest string, 
fix terminating end of string
 2009-12-03 17:18:24 +00:00
Pawel Kolodziejski 788713d3b4 fix warnings 2009-10-17 12:48:23 +00:00
Ori Avtalion 3a7ff1415c Fix misplaced curly brace 2009-10-01 13:35:15 +00:00
Pawel Kolodziejski 02477fc3b2 it seems used in gf demo 2009-06-27 19:45:27 +00:00
Pawel Kolodziejski 6e489b1c2d get rid Resource and ResPtr 2009-06-26 16:13:11 +00:00