[Sc2-devel] Patch to fix Melnorme sale of life data text...

[<ms...@mo...>]

The following patch fixes a bug in the TODO list
- Selling bio data gives an incomplete message: 'The 1000' [nothing].

... when selling life data to the melnorme merchants.


  A minor correction on this bug: 
- the audio plays three times before the inventory decrement happens.
- the text really does appear if you wait but in three separate chunks, 
  one per speech repetition.


  The problem is the content file says that the three text chunks are split
in three audio pieces (and lists the same audio file three times) when in fact 
the audio is really in one chunk in a single file... if the audio track file 
name is omitted in the content file for the additional chunks of text 
everything works out great.

  There are probably several other places this bug occurs, I can see another
one in the rainbow worlds sale handling... 


  The DoSell function (src/sc2code/comm/melnorm/melnorm.c), feeds several
chunks into the A/V output system:
===
    NPCPhrase (SOLD_LIFE_DATA1);
    NPCPhrase (-(int)GLOBAL_SIS (TotalBioMass));
    NPCPhrase (SOLD_LIFE_DATA2);
    NPCPhrase (-(int)added_credit);
    NPCPhrase (SOLD_LIFE_DATA3);
===

  The NPCPhrase function (src/sc2code/commglue.c), does a lookup function on
it's argument to decide what audio and what text to feed into the A/V system.
It calls SpliceTrack with a filename for the audio and a text string to 
display with the audio.  This information is looked up from the race content
files (in this case ./content/comm/melnorm/melnorm.txt).

  It turns out the code in SpliceTrack (src/sc2code/libs/sound/*/trackplayer.c)
is designed for three types of input: 
- Audio track, with no text.
- Text, with no audio.
- Audio with Text.

... so it shouldn't be given a audio track name when none actually exists.


old behavior:
=========
  The X
  units of biological data we downloaded from your computer earn you Y
  Credits.
==========

new behavior:
==========
  The X units of biological data we downloaded from your computer earn
you Y Credits.
==========

Index: ./content/comm/melnorm/melnorm.txt
===================================================================
RCS file: /cvsroot/sc2/sc2/content/comm/melnorm/melnorm.txt,v
retrieving revision 1.8
diff -u -p -r1.8 melnorm.txt
--- ./content/comm/melnorm/melnorm.txt	17 Oct 2002 17:23:20 -0000	1.8
+++ ./content/comm/melnorm/melnorm.txt	27 Dec 2002 08:36:44 -0000
@@ -518,10 +518,10 @@ I have some data on alien lifeforms.
 #(SOLD_LIFE_DATA1) melno074.ogg
 The 
 
-#(SOLD_LIFE_DATA2) melno074.ogg
+#(SOLD_LIFE_DATA2)
  units of biological data we downloaded from your ship earn you 
 
-#(SOLD_LIFE_DATA3) melno074.ogg
+#(SOLD_LIFE_DATA3)
  Credits.
 
 #(sell_rainbow_locations)