libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 09:49:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,788 Commits 5 Branches 5 Tags 1.8 GiB
7428af9a4c
Commit Graph

156 Commits

Author SHA1 Message Date
Alyssa Milburn
41d337c549 PARALLACTION: Clean up global variables a bit. 2012-09-27 22:41:51 +02:00
Max Horn
4f8665fc83 COMMON: Move isFoo functions to namespace Common, add doxygen comments 2012-02-20 16:18:27 +01:00
Max Horn
658080deed ALL: Avoid using is* macros from ctype.h 
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
 2012-02-15 16:51:37 +01: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
d3ae7da133 PARALLACTION: Cleanup dialogue code. 
Shorten long lines to increase readability.

svn-id: r55610
 2011-01-29 10:42:40 +00:00
Torbjörn Andersson
bf01059be1 PARALLACTION: Add default case to silence GCC warning. 
Not that I understand exactly what this function does, but since it's
a piece of debug code I figure I don't really have to.

svn-id: r55608
 2011-01-29 08:08:58 +00:00
Nicola Mettifogo
2856e959be PARALLACTION: Cleanup dialogue code. 
Turned 'no answer selected' into a constant.

svn-id: r55607
 2011-01-29 07:22:04 +00: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
c3698a2cd5 PARALLACTION: Clarify strategy for choosing (answer) dialogue paths. 
svn-id: r55604
 2011-01-29 07:21:13 +00:00
Nicola Mettifogo
d39d75779e PARALLACTION: Don't show 'null' answers in dialogues. 
Skip a 'runanswer' state when the text of the only answer available is 'null'.

svn-id: r55603
 2011-01-29 07:20:57 +00:00
Nicola Mettifogo
6d4d253ec4 PARALLACTION: Improve dialogue debug output. 
Print out the current question or the available answers when debug level is 9.

svn-id: r55602
 2011-01-29 07:20:42 +00:00
Nicola Mettifogo
cf4f041c63 PARALLACTION: encapsulate dialogue state changes to aid debugging. 
svn-id: r55601
 2011-01-29 07:20:26 +00:00
Nicola Mettifogo
7760628bdb PARALLACTION: Flexible monologues in BRA (patch #3021740 by fuzzie) 
Some dialogue answers are set to the literal 'null', which is used in NS to
simulate a fixed monologue ('null' instructs the engine to jump to the first
entry in the list of available questions, which is always made of a single
item in this case).
BRA has flexible monologues that depend on the game state, so this patch goes
and checks all the available branches before picking the correct one.

svn-id: r55591
 2011-01-28 14:19:39 +00:00
Nicola Mettifogo
dd7bc67f82 Replaced char* with Common::String in balloon code. 
svn-id: r55590
 2011-01-28 13:24:32 +00:00
Nicola Mettifogo
1b6d9c86e2 Make sure a dialogue is valid before entering dialogue mode. 
svn-id: r49139
 2010-05-22 15:30:18 +00:00
Willem Jan Palenstijn
16afdc372e Fix missing dialogue index. 
This is the BR case of the NS fix in r45053. Patch by fuzzie@fuzzie.org .

svn-id: r49072
 2010-05-18 09:24:53 +00:00
Nicola Mettifogo
dae53f7d74 Changed the last global objects to class members. 
svn-id: r49011
 2010-05-12 09:28:29 +00:00
Nicola Mettifogo
a0d55ca586 Make sure dialogue manager is destroyed on quit. 
svn-id: r48847
 2010-04-28 23:11:34 +00:00
Willem Jan Palenstijn
fe51070977 Fix whitespace 
svn-id: r48477
 2010-04-02 22:14:18 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Nicola Mettifogo
017b0e0acb Fixed bug 2879785. Dialogue commands were partly executed too early: see comment at line 480 in dialogue.cpp. 
svn-id: r45120
 2009-10-15 13:40:39 +00:00
Nicola Mettifogo
8c17b257ea Fixed regression bug #2874229. Regression had happened in r39878, when the dialogue code was refactored. 
svn-id: r45053
 2009-10-14 06:12:16 +00:00
Nicola Mettifogo
8151a1d878 Removed useless references to the global _vm. 
svn-id: r39879
 2009-04-06 17:31:22 +00:00
Nicola Mettifogo
0e05ec8cc8 Cleanup of Balloon and Dialogue code: 
* moved version-specific code into DialogueManager's derivatives
* reworked construction of BalloonManager's derivatives
* moved a couple of globals used in dialogues (NS specific) to engine

svn-id: r39878
 2009-04-06 17:21:23 +00:00
Nicola Mettifogo
0a2ff7f18f Fixed dialogue balloon appearing in the wrong position after commit 39772. 
svn-id: r39774
 2009-03-31 17:00:36 +00:00
Nicola Mettifogo
9880a2e578 There have been subclasses of DialogueManager for a while, so now we use their constructors for something. 
svn-id: r39772
 2009-03-31 14:35:06 +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
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
d5d006bb30 Cleanup of CommandExec and ProgramExec, and pushed down dependencies from exec.h. 
svn-id: r38892
 2009-02-26 06:16:35 +00:00
Nicola Mettifogo
c6935f2f69 Fixed broken condition check for displaying dialogue balloons. 
svn-id: r35748
 2009-01-06 06:13:45 +00:00
Max Horn
83a8f7bc29 Fixed warning 
svn-id: r35730
 2009-01-04 17:17:28 +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
e11c17a005 Moved more GfxObj management to Gfx object. 
svn-id: r35466
 2008-12-21 15:42:47 +00:00
Nicola Mettifogo
dc3e9027f4 Removed references to _vm from the engine itself. 
svn-id: r35358
 2008-12-14 10:32:26 +00:00
Nicola Mettifogo
800db6f142 Restructuring of rendering code. 
svn-id: r35342
 2008-12-13 17:31:48 +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
fbc9483ed2 Extended balloon manager to handle color constants and fixed color of text in balloons for BRA. 
svn-id: r33940
 2008-08-16 13:10:54 +00:00
Nicola Mettifogo
d3440f2cc5 Some variable renamed to make more sense. 
svn-id: r33864
 2008-08-14 13:45:32 +00:00
Nicola Mettifogo
c8400e9725 * Fixed positioning of balloons and faces in BRA (dos, at least). 
* Adapted loading of faces.

svn-id: r33392
 2008-07-29 03:14:35 +00:00
Nicola Mettifogo
cc0f95ce74 Fix build. 
svn-id: r33193
 2008-07-22 10:17:19 +00:00
Nicola Mettifogo
446a0406de Fixed regression in dialogue code: certain commands weren't executed anymore after dialogue ended. 
svn-id: r33191
 2008-07-22 10:12:20 +00:00
Nicola Mettifogo
361bed0a95 Massive refactoring of dialogue code, which is now implemented as a finite state machine. Related code in other files has been updated has well. 
svn-id: r33162
 2008-07-21 06:08:30 +00:00
Nicola Mettifogo
17d86414cb Fixed regression bug in dialogue, which de-facto allowed user to skip in-game protection. 
svn-id: r33086
 2008-07-17 00:38:11 +00:00
Nicola Mettifogo
8ed023142a Moved program and command execution code out of the engine, into their own brand new 
classes.

svn-id: r33003
 2008-07-11 13:06:28 +00:00
Nicola Mettifogo
d387d1af0e - Moved dialogue balloon management code from Gfx to its own class 
- Added a class to draw balloons in BRA (still without text and with wrong placement)

svn-id: r32902
 2008-07-04 00:29:21 +00:00
Nicola Mettifogo
d8645297cd Changed all remaining code to use the GfxObj class to keep frames data. This allows for more uniform processing during rendering, and also fixes the display of dialogue faces for BRA. 
svn-id: r32833
 2008-06-29 09:30:32 +00:00