Commit Graph

55 Commits

Author SHA1 Message Date
Johannes Schickel
0fe2ba6a0d Some more enforcement of our formatting conventions in KYRA too.
svn-id: r49069
2010-05-17 23:29:44 +00:00
Johannes Schickel
7da8c8949b Replace KYRA's strncpy and strncat usages by strlcpy/strlcat.
svn-id: r48954
2010-05-05 17:53:30 +00:00
Max Horn
4e99cfc549 Switch from Common::tag2string(foo).c_str() to tag2str(foo)
svn-id: r48276
2010-03-18 15:04:38 +00:00
Max Horn
0d9609f7f9 Fix incorrectly placed doxygen comments; replace Common::ID2string by Common::tag2string
svn-id: r46127
2009-11-24 22:08:34 +00:00
Johannes Schickel
a30b8f0bdc - Fix some missing initialization warnings from cppcheck
- Fix two invalid memory accesses reported by cppcheck

svn-id: r45414
2009-10-26 20:07:37 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Filippos Karapetis
b4f1960318 Reverted parts of revisions #44298, #44299 and #44300, to prevent warnings and issues in compilers which don't support NORETURN
svn-id: r44314
2009-09-24 17:52:53 +00:00
Filippos Karapetis
16d7d9ba23 Fixed some more warnings about unreachable code
svn-id: r44299
2009-09-24 10:02:13 +00:00
Johannes Schickel
c3ce2087bb Add missing quotation mark to error message.
svn-id: r42406
2009-07-12 08:51:57 +00:00
Nicola Mettifogo
20d75f6ec7 Added missing return statements.
svn-id: r41473
2009-06-12 10:26:15 +00:00
Nicola Mettifogo
b2e5905327 * Adapted Kyra to the new IFFParser interface.
* Adapted the new IFFParser to Kyra (slightly).
The Kyra1 demo on the website works.

svn-id: r41468
2009-06-12 09:49:38 +00:00
Johannes Schickel
c7ee0a7ec8 More formatting.
svn-id: r40994
2009-05-29 13:09:26 +00:00
Johannes Schickel
64e6c596c7 Formatting.
svn-id: r40991
2009-05-29 12:52:03 +00:00
Johannes Schickel
09224573f5 Formatting.
svn-id: r40490
2009-05-12 14:43:57 +00:00
Johannes Schickel
76984ded25 Add proper error checking in file parsing code.
svn-id: r40489
2009-05-12 14:35:50 +00:00
Johannes Schickel
8524bf3a25 Change script file loading code to use Common::IFFParser instead of a self written IFF reader.
svn-id: r40488
2009-05-12 14:18:08 +00:00
Johannes Schickel
8d15765059 Fix strncpy usage.
svn-id: r40482
2009-05-12 12:35:40 +00:00
Johannes Schickel
a79716e367 Cleanup.
svn-id: r40480
2009-05-12 12:30:59 +00:00
Johannes Schickel
cf3ea8eec2 Cleanup.
svn-id: r40479
2009-05-12 12:20:45 +00:00
Max Horn
2d866c0483 Renamed Kyra's Resource::getFileStream to createReadStream
svn-id: r36022
2009-01-23 04:57:18 +00:00
Johannes Schickel
c003d62429 - Fixed bug in script code of LoL
- Cleanup

svn-id: r35905
2009-01-18 17:24:47 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +00:00
Max Horn
655ce26b3f Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
2008-09-13 16:51:46 +00:00
Johannes Schickel
a54d1dbde6 Cleanup.
svn-id: r34481
2008-09-10 18:01:02 +00:00
Johannes Schickel
e1e95f0c0e Added filename to unknown opcode/command warnings of EMC scripts.
svn-id: r32988
2008-07-10 12:05:38 +00:00
Johannes Schickel
df1aa7809a Added const to some static data.
svn-id: r32763
2008-06-24 13:59:48 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete [].
svn-id: r31925
2008-05-07 14:20:37 +00:00
Johannes Schickel
ec9a03964c - Renamed ScriptInterpreter -> EMCInterpreter
- Renamed ScriptState -> EMCState, ScriptData -> EMCData
- Removed 'Script' from function names inside EMCInterpreter
- Fixed KyraEngine::readSettings and KyraEngine::writeSettings for kyra3

svn-id: r31773
2008-04-29 15:12:09 +00:00
Johannes Schickel
5572f694c0 Implemented opcodes:
- 8: o3_getMalcolmsSpirit
 - 52: o3_setMalcolmsSpirit
 - 65: o3_updateConversations
 - 117: o3_runDialog

svn-id: r31664
2008-04-23 16:06:33 +00:00
Johannes Schickel
bf46b5f178 - reworked tim handling
- moved tim interpreter to new class TIMInterpreter

svn-id: r31569
2008-04-19 13:52:09 +00:00
Johannes Schickel
a2cdc5e393 - fixed bug in script interpreter code (could've also affected HoF)
- some more Kyra3 code:
  -> start sequence should show up now partially
  -> fixed a scene animation related bug
  -> a few more opcodes

svn-id: r31535
2008-04-17 13:38:44 +00:00
Johannes Schickel
7745100b8d - minor cleanup in script.cpp
- fix for memory leak in Kyra3
- fixed enterNewSceneUnk2

svn-id: r31534
2008-04-17 11:59:20 +00:00
Johannes Schickel
2a95c653eb - Impelemented opcode 155: o2_stopSceneAnimation
- fixed crash while switching chapters

svn-id: r31139
2008-03-16 13:31:18 +00:00
Johannes Schickel
5b31fe75d4 Print instruction offset of script commands for debug output.
svn-id: r30895
2008-02-17 14:14:26 +00:00
Johannes Schickel
ae0b605ad4 Reworked Kyrandia resource loading code.
svn-id: r30820
2008-02-07 23:13:13 +00:00
Johannes Schickel
244987b718 Fixes compiling on msvc7.1, it seems like it has problems to decide when to use operator bool.
svn-id: r30024
2007-12-28 00:20:56 +00:00
Oystein Eftevaag
af3b84c297 TIM file loading/unloading for HoF
svn-id: r29217
2007-10-14 16:58:11 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Johannes Schickel
fd6ca3b7ac - added PC-98 platform entry
- added Kyrandia 1 PC-98 detection entries

svn-id: r28907
2007-09-15 14:53:21 +00:00
Kari Salminen
44279df48e Fixes compilation error C2677: binary '&&' : no global operator found which takes type 'const Kyra::Opcode' (or there is no acceptable conversion) on Windows (VS2003), Xbox (VS2003) and Xbox 360 (VS2005).
For some reason the compilers didn't automatically use the operator bool() in the Kyra::Opcode so now doing it explicitly.
Thanks to Carch for reporting the compilation problems.

svn-id: r28447
2007-08-04 12:23:28 +00:00
Johannes Schickel
1140fca82e - Kyrandia 1 works again
- Added timer class for timer handling
- Little bit more resturcturing
- A little bit (almost nothing but a start!) Kyrandia 2 support

svn-id: r28297
2007-07-29 16:33:11 +00:00
Johannes Schickel
c6c06a922e Little renaming.
svn-id: r27963
2007-07-08 12:50:24 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Johannes Schickel
776423ff82 - started to move v1 specific functions to KyraEngine_v1 (just opcodes yet)
- reworked script opcode handling

svn-id: r26749
2007-05-05 12:18:02 +00:00
Johannes Schickel
b9443dfb60 More cleanup.
svn-id: r26502
2007-04-15 14:38:02 +00:00
Johannes Schickel
504df5a48e cleanup.
svn-id: r26499
2007-04-15 14:19:27 +00:00
Johannes Schickel
30b7ac3db5 Adds basic support for the FM Towns version with some restrictions:
- just english playable
 - no audio

svn-id: r25188
2007-01-25 12:52:27 +00:00
Johannes Schickel
ee5621137f - renaming all opcodes from cmd_* to c1_*
- changing ScriptHelper functions so it will be useable for kyra2 and kyra3 too
- unbreaking savegames (increasing the VERSION number since the game flags table got resized to be useable for kyra3)

svn-id: r23612
2006-07-27 20:30:51 +00:00
Johannes Schickel
ef6645c5ba - reworks quit handling (no _system->quit() anymore)
- fixes some deinitalization problems

svn-id: r22558
2006-05-21 15:41:32 +00:00