Commit Graph
86814 Commits
Author SHA1 Message Date
Martin Kiewitz 604d906038 SCI: make event type, modifiers + character uint16 2016-02-02 15:07:36 +01:00
Martin Kiewitz 7635f3c73e SCI: Make event handling helper tables static 2016-02-02 15:03:54 +01:00
Martin Kiewitz b052ff2762 SCI: Fix comment about debugger keys
Was changed to Ctrl-Shift-D at some point, because a SCI game
uses Ctrl-D. Comment wasn't changed accordingly back then.
2016-02-02 12:51:25 +01:00
Martin Kiewitz 42cb01f57c SCI: Keyboard event handling cleanup
Renamed "ourModifiers" to "scummVMKeyFlags"
Now also using the flags directly from the ScummVM event in case
it actually was a Keyboard event.
2016-02-02 12:47:47 +01:00
Martin Kiewitz bc0dd6f821 SCI: Fix regression of previous keycode commit
7aeadba863
Thanks LordHoto for spotting it
2016-02-02 11:43:58 +01:00
Martin Kiewitz 7aeadba863 SCI: Removed ".data" from SciEvent
Was the ScummVM-system-Keycode, sometimes modified.
Changed Menu/Portrait/Controls32-code to use .character instead.
Cleaned up a bit of code in getScummVMEvent()
2016-02-02 11:33:40 +01:00
Eugene Sandulenko a9511e78d1 I18N: Regenerated translations.dat 2016-02-02 11:15:05 +01:00
Eugene Sandulenko fc96d77417 I18N: Update Russian translation 2016-02-02 11:15:05 +01:00
Eugene Sandulenko 3adc02a5ba I18N: Update Ukrainian translation 2016-02-02 11:15:04 +01:00
Martin Kiewitz 5acce8276e AGI: changed debug msg VGA font -> PC BIOS font 2016-02-02 11:04:08 +01:00
Martin Kiewitz 82a27a33da SCI: fix typo in comment 2016-02-02 10:46:16 +01:00
Johannes Schickel d88b1c9477 Merge pull request #656 from lordhoto/xdg-dirs-posix
POSIX: Follow XDG Base Directory Specification for User's Files
2016-02-02 09:22:41 +01:00
Johannes Schickel 7d014be0a2 NEWS: Mention switch to XDG style locations for Unix ports. 2016-02-02 09:16:40 +01:00
Johannes Schickel 687f6067f5 POSIX: Use XDG specification for default save path.
This is what the XDG Base Directory Specification suggests to use. We still
use ~/.scummvm as default path in case the directory exists.

This tackles an aspect of bug #6036 "POSIX: Use XDG dirs instead of HOME".
2016-02-02 09:16:40 +01:00
Johannes Schickel 2622cded72 POSIX: Move assureDirectoryExists to posix-fs{.h,.cpp}. 2016-02-02 09:16:40 +01:00
Johannes Schickel dde89c36f5 POSIX: Move default config file location to '$XDG_CONFIG_HOME/scummvm/scummvm.ini'.
This is what the XDG Base Directory Specification suggests to use. We still
use the old location of '~/.scummvmrc' in case that is present.

This tackles an aspect of bug #6036 "POSIX: Use XDG dirs instead of HOME".
2016-02-02 09:16:40 +01:00
Johannes Schickel 79acfd28e9 POSIX: Use modern path for log file.
This makes use use the XDG Base Directory Specification for the log file path.
This tackles one part of bug #6036 "POSIX: Use XDG dirs instead of HOME".
2016-02-02 09:16:40 +01:00
Johannes Schickel b4e360188f POSIX: Restructure code in OSystem_POSIX::createLogFile. 2016-02-02 09:16:40 +01:00
Johannes Schickel 589c3046aa POSIX: Make assureDirectoryExists create full path if needed.
This is kind of like 'mkdir -p' now. But the permissions are different from
standard POSIX behavior.
2016-02-02 08:45:58 +01:00
Johannes Schickel d8394d3f77 POSIX: Factor directory creation code into its own function. 2016-02-02 08:45:58 +01:00
Tarek Soliman be2af06131 MAEMO: Update debian/changelog 2016-02-01 22:40:48 -06:00
Willem Jan Palenstijn 658306d005 Merge pull request #659 from wjp/sword25_loading
SWORD25: Use more appropriate function for growing the stack
2016-02-02 02:17:43 +01:00
Willem Jan Palenstijn ad688f9d6f SWORD25: Remove now unused function 2016-02-02 02:16:41 +01:00
Martin Kiewitz 59d2c4b27e SCI: Do not pass/use .data for mouse button type
Also added comment about .data field. Should be renamed.
2016-02-02 02:10:43 +01:00
Martin Kiewitz c0bdbe1ca8 SCI: Fix control/Fx keys not working anymore
Was effectively caused by commit adding the keyboard driver bug
for SCI0/SCI01, although the bug is actually real and happens.

It seems Sierra did not check the key-modifier in kMenuSelect.
We do and that's why the code didn't recognize all sorts of
menu keys anymore.
We now isolate the lower byte before comparing.

I also noticed, that Sierra passed keyboard modifiers in mouse
events. This was probably done, so that owners of a 1-button
mouse were able to right-click. We do this now too.

Also added information about mouse modifiers in kGetEvent.

Moved the mouse modifier code into getScummVMEvent().

This should fix bug #7009.
2016-02-02 01:56:08 +01:00
Willem Jan Palenstijn 75f1d2e259 SWORD25: Use more appropriate function for growing the stack
The call to lua_growstack in unpersistThread would unconditionally at
least double the size of the stack. This caused memory usage to grow
exponentially (literally) with the number of serialized threads.

Bugs #6977, #6999.
2016-02-02 01:21:28 +01:00
Willem Jan Palenstijn 727ba4f2b1 LAB: Fix loading rules from room 0
Regression from cd3ebf687c.

This fixes bug #6997.
2016-02-02 00:18:34 +01:00
Torbjörn Andersson d9b4f02d79 SHERLOCK: Silence GCC signed/unsigned warning 2016-02-01 23:20:20 +01:00
Thierry Crozat 832845cd25 I18N: Update source code line numbers in po files 2016-02-01 21:59:30 +00:00
Willem Jan Palenstijn f94153f07a TOUCHE: Fix semi-intentional array overrun
op_getInventoryItem/op_setInventoryItem could operate on
inventoryItems[4] while inventoryItems has only 4 elements. This
effectively accesses the 'money' field right behind this array.
Due to a broken assert, this was never detected.

This commit fixes it by redirecting accesses to inventoryItems[4] to
money, and also fixes the assert.

An alternative solution would have been enlarging the array, and
removing the money field, but that would require more changes in the
engine.
2016-02-01 20:21:27 +01:00
Willem Jan Palenstijn 8a0e813493 Revert "TOUCHE: Fix buffer overrun. CID 1003934"
This reverts commit 9d2cc7ce84.
2016-02-01 20:17:09 +01:00
Eugene Sandulenko fcdf68df42 NEWS: Mention Labyrinth of Time support 2016-02-01 20:02:13 +01:00
Martin Kiewitz 2a4a290d31 AGI: change how menus are triggered on Non-PC 2016-02-01 19:08:22 +01:00
Martin Kiewitz 9fff1686fc AGI: Pass vm pointer directly to commands
No functional change
2016-02-01 16:37:28 +01:00
Martin Kiewitz 839ac0a6a4 AGI: Rename _game.lognum to _game.curLogicNr
Also a bit of cleanup
2016-02-01 16:21:13 +01:00
Martin Kiewitz 264222ec29 AGI: Change _game.exitAllLogics to boolean 2016-02-01 16:15:07 +01:00
Martin Kiewitz 6749f22981 AGI: Remove _game.hasPrompt, no longer needed 2016-02-01 16:13:19 +01:00
Martin Kiewitz f86d68d214 AGI: Remove old clockEnabled boolean
No longer needed
We use ScummVM system total play time functionality instead
2016-02-01 15:54:32 +01:00
Martin Kiewitz 896bf83ddc AGI: Fix pause command effectively freezing game
In game timer wasn't resumed, which caused no more cycles to
get executed.
2016-02-01 15:52:18 +01:00
Martin Kiewitz 0b17a67a30 SCI: Revert revert the keyboard handling changes
It seems the issues on AmigaOS aren't actually caused by the new
code. Reverting the revert.
2016-02-01 15:04:03 +01:00
Martin Kiewitz 14f338e2dd AGI: Revert revert the keyboard handling changes
It seems the issues on AmigaOS aren't actually caused by the new
code. Reverting the revert.
2016-02-01 15:02:52 +01:00
Martin Kiewitz cf5133742c AGI: Improve original save/load menus
Description is trimmed for the verify window, width is now accurate
Actual save filename is now also shown, just like in the original
Cleanup
2016-02-01 14:51:03 +01:00
Eugene Sandulenko 68ff933206 Merge pull request #657 from lordhoto/scumm-alt-x
ALL: Handle Alt-x internally in SCUMM.
2016-02-01 10:35:13 +01:00
Tarek Soliman 7b521edac7 MAEMO: Package missing engine-data files 2016-01-31 23:04:54 -06:00
Tarek Soliman 6b4255d8e8 MAEMO: Split packaging of engine-data into multiple lines 2016-01-31 23:04:41 -06:00
Paul Gilbert 86409142bf SHERLOCK: SS: Fix Settings dialog hotkeys 2016-01-31 23:36:14 -05:00
Johannes Schickel 24c6d50301 SDL: Don't mix our key code with SDL's.
This case for F# keys was forgotten to update in 8530997fff.
2016-02-01 02:23:55 +01:00
Martin Kiewitz 83ad64f947 AGI: Keyboard handling change
It seems the current code causes issues on at least AmigaOS.
Changed current code to the way SCI handled it.
Needs to get investigated in detail.
Added FIXME. Also see engines/sci/event.cpp
2016-02-01 02:17:47 +01:00
Martin Kiewitz a3774072a3 SCI: Revert ascii detection for key event handling
Seems to cause at least issues on AmigaOS probably b/c SDL.
See bug #7009.
Added FIXME. Underlying issue needs to get fixed in SDL backend
or in SDL itself.
2016-02-01 02:09:12 +01:00
Martin Kiewitz c28e101cdb AGI: implement predictive dialog 2016-02-01 01:34:36 +01:00