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
61,292 Commits 45 Branches 139 Tags
7331a7cbefed7be415da170a32a2549b1c18fd12
Commit Graph
65 Commits
Author SHA1 Message Date
Alyssa Milburn 41d337c549 PARALLACTION: Clean up global variables a bit. 2012-09-27 22:41:51 +02:00
Tarek Soliman a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast 
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
 2012-02-15 10:07:10 -06:00
Tarek Soliman 921f602ab8 JANITORIAL: Fix whitespace in pointer template arg 2012-02-15 10:07:08 -06:00
Filippos Karapetis 2883ebc40e PARALLACTION: Fixed bugs #2880939 and #3135868 
A regression from commit 774773b. Many thanks to digitall for bisecting
 2011-10-01 01:10:30 +03:00
Max Horn 88913c0139 ALL: Remove trailing whitespaces 
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
 2011-06-20 00:59:48 +02:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion 9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code 
Some backends may break as I only compiled SDL
 2011-04-28 15:08:58 +03:00
Nicola Mettifogo bcd18232ad PARALLACTION: Cleanup dialogue code. 
Hide mood and balloon winding extraction into Question and Answer objects.

svn-id: r55606
 2011-01-29 07:21:48 +00:00
Nicola Mettifogo e1046d3eae PARALLACTION: Simplify text comparisons in dialogue code. 
Encapsulate text comparison into string owners and removed some ugly
double negative logic.

svn-id: r55605
 2011-01-29 07:21:31 +00:00
Nicola Mettifogo 498d8000ca Fix bug 2969257 (labels) and hopefully plug all the leaks. 
svn-id: r48811
 2010-04-27 08:59:13 +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 6b79910bcb Fixed some more warnings about unreachable code 
svn-id: r44300
 2009-09-24 10:15:50 +00:00
Nicola Mettifogo 3607c63758 Refactoring. 
svn-id: r40210
 2009-04-29 16:59:10 +00:00
Nicola Mettifogo 666f0720ab (Re)link bounding animations after location has been completely parsed. This avoids problems due to forward references. 
svn-id: r39740
 2009-03-29 13:56:16 +00:00
Nicola Mettifogo 011b73a09b Commands now evaluate their reference Zone at runtime, thus handling of forward references in the parser is no more needed. 
svn-id: r39738
 2009-03-29 12:41:00 +00:00
Nicola Mettifogo 28465d73bb Merged CommandData into Command. 
svn-id: r39732
 2009-03-29 10:18:09 +00:00
Nicola Mettifogo f2d7875db6 Added initialization for _index and _locationIndex in Zone objects. 
svn-id: r39723
 2009-03-28 14:17:17 +00:00
Nicola Mettifogo 76c0d08200 * Pushed evaluation of 'following question' from dialogue parsing to dialogue execution. 
* Removed all the question forwards declaration code

svn-id: r39654
 2009-03-24 08:20:08 +00:00
Nicola Mettifogo 2223627c75 Merged GetData, HearData, SpeakData, PathData, ExamineData, MergeData into TypeData struct. This simplifies life a bit especially in the parsers. 
svn-id: r39645
 2009-03-23 20:41:54 +00:00
Nicola Mettifogo 8cebcaf017 Pushed down dependencies from parser.h 
svn-id: r39636
 2009-03-23 17:42:08 +00:00
Nicola Mettifogo d18274d0ee Implemented all variants of IF script instruction. Program class has been changed to store an Array of instruction instead of a List, so that references to instructions are integers. 
svn-id: r39631
 2009-03-23 11:38:09 +00:00
Nicola Mettifogo 88efc8603e Removed null*Ptr dummy objects, using SharedPtr's reset method to null pointers instead. 
svn-id: r38897
 2009-02-26 10:44:01 +00:00
Nicola Mettifogo 659c9fb901 Changed interface to walk code, to better handle the differences between games. Moreover: 
* merged PathBuilder_BR into PathWalker_BR
* implemented checkTrap routine for BRA

svn-id: r38836
 2009-02-24 08:42:46 +00:00
Nicola Mettifogo e3afa772e2 Cleanup. 
svn-id: r38817
 2009-02-23 12:17:25 +00:00
Nicola Mettifogo 9bef5a0cfc Rewrote the sarcophagus puzzle in Nippon Safes, since I finally understood how it was implemented in the original! 
svn-id: r38816
 2009-02-23 11:55:25 +00:00
Nicola Mettifogo f2b495ba2d Implemented counters in BRA. Only valid answer options are shown, and counter calculations in scripts are performed. 
svn-id: r35723
 2009-01-04 14:23:20 +00:00
Nicola Mettifogo b3b23642bf Fixed selection of invalid frame numbers. This means that most locations can be switched to and don't crash up anymore! 
svn-id: r35550
 2008-12-26 05:44:32 +00:00
Nicola Mettifogo 774773b7cd Reduced code duplication when manipulating Animations, and cleanup. 
svn-id: r35408
 2008-12-17 11:15:47 +00:00
Nicola Mettifogo b3475d8178 * Replaced char* with Common::String in the parser. 
* Enforced const-correctness on related routines.

svn-id: r35326
 2008-12-13 03:37:43 +00:00
Nicola Mettifogo 6ecc17010d Fixed some more leaks and mismatched allocations/deallocations. 
svn-id: r35277
 2008-12-07 14:33:30 +00:00
Nicola Mettifogo 181a44fc21 Fixed default zone flags, so that labels in BRA are only shown on zones which have one. 
svn-id: r35012
 2008-11-12 07:08:43 +00:00
Nicola Mettifogo a403372ae1 Cleanup. 
svn-id: r34185
 2008-08-26 12:15:11 +00:00
Nicola Mettifogo 22eaffcb34 Updated layer calculation: animations are now hidden properly by background elements (but not items yet). 
svn-id: r33894
 2008-08-15 08:44:41 +00:00
Nicola Mettifogo c70d09bc26 Made scripts access Animation fields via accessors and mutators, instead of using raw pointers. 
svn-id: r33891
 2008-08-15 03:59:45 +00:00
Nicola Mettifogo ea2a2cbb7c Simplified handling of script variables (especially locals). 
svn-id: r33889
 2008-08-15 02:52:42 +00:00
Nicola Mettifogo c6cbf1f144 Added a post processing step to runScripts, so that Animation can be validated after buggy scripts have been executed. 
svn-id: r33363
 2008-07-28 08:56:37 +00:00
Nicola Mettifogo 7950a9183b * Added walk calculations to BRA (doesn't walk yet, though). 
* Adapted Character and Animation to handle both versions of the engine.

svn-id: r33296
 2008-07-26 04:01:11 +00:00
Nicola Mettifogo 12cefc4132 Fixed leaks in NS and BRA. 
svn-id: r32976
 2008-07-09 13:27:09 +00:00
Nicola Mettifogo 77a60673ef - Changed labels to be GfxObj's, thus removing the Label object altogether. 
- Changed Item's to be almost GfxObj's, since ownership and destruction of underlying resource is an issue here (got to think some more about it).

svn-id: r32873
 2008-07-02 01:41:08 +00:00
Nicola Mettifogo d2609258cc Added constructor and destructor to Dialogue, thus fixing a long standing leak. 
svn-id: r32757
 2008-06-22 14:46:08 +00:00
Nicola Mettifogo c7c8bb99ee Tiny cleanup to ease extraction of the program parser code. 
svn-id: r31959
 2008-05-09 01:42:25 +00:00
Nicola Mettifogo 3d1a2e2049 Replaced custom ManagedList with Common::SharedPtr. 
svn-id: r31415
 2008-04-06 05:40:02 +00:00
Nicola Mettifogo cf724e889c Added new debug command to dump scripts execution status. 
svn-id: r30840
 2008-02-09 22:07:51 +00:00
Nicola Mettifogo 4be7dac9c3 Fix system hang under linux. 
svn-id: r30813
 2008-02-06 19:50:45 +00:00
Nicola Mettifogo 265621de58 Fixes to make BRA introduction run: 
- fixed location command parser
- implemented stop command
- temporary disabled speak zones (audio is not yet supported)

svn-id: r30796
 2008-02-05 09:30:58 +00:00
Nicola Mettifogo ea15cf7236 Adjusted random number generator, thus improving animation quality in the intro. The general still acts like he is on amphetamines. 
svn-id: r30791
 2008-02-04 20:35:18 +00:00
Nicola Mettifogo 85171eadaa Programs are now handled in their own list, instead of being accessed via the referring Animation. 
svn-id: r30768
 2008-02-03 14:58:16 +00:00
Nicola Mettifogo be2c5d3c87 All interactive objects are now drawn in the framebuffer instead of using the old kBitBack/kBitFront buffers. Animation are not sorted yet, so they can overlap in an inconsistent fashion for the time being. 
svn-id: r30673
 2008-01-28 12:20:53 +00:00
Nicola Mettifogo bdf440fdae Replaced the remaining old string code with the new label code. All the text is now drawn in the framebuffer instead of being blitted onto the internal game screen buffer. 
svn-id: r30360
 2008-01-09 21:46:57 +00:00
Nicola Mettifogo e21fd496f8 Restructured label handling and moved all related code to Gfx. 
svn-id: r30345
 2008-01-08 20:46:58 +00:00