Menu
▾
▴
sc2-devel
|
From: <ms...@mo...> - 2002-12-27 08:48:35
|
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)
|
|
From: <ms...@mo...> - 2002-12-27 10:46:07
|
On Fri, Dec 27, 2002 at 03:47:17AM -0500, ms...@mo... wrote:
> 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.
While reading father into the TODO list I noticed that this item is
fixed by the above patch as well:
---
- Melnorme conversation Will repeat the same sentence 3 times.
(because of numbers to be inserted).
---
The following [untested] patch fixes the rainbow problem. Based on what I
see from the content file the Melnorme would say three sentences but the
second two would have been incorrect for the text. I see no reason this
patch shouldn't also be applied...
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 10:44:09 -0000
@@ -530,11 +530,11 @@ I wish to sell you Rainbow world locatio
#(SOLD_RAINBOW_LOCATIONS1) melno075.ogg
Your ship's log indicates that you discovered the whereabouts of
-#(SOLD_RAINBOW_LOCATIONS2) melno076.ogg
+#(SOLD_RAINBOW_LOCATIONS2)
of the Rainbow worlds which so fascinate us.
In exchange, we will give you
-#(SOLD_RAINBOW_LOCATIONS3) melno076.ogg
+#(SOLD_RAINBOW_LOCATIONS3)
Credits.
#(sell_precursor_find)
|
|
From: TD <td...@pa...> - 2002-12-27 13:06:45
|
I actually submitted a fix for the Melnorme ogg repeating issue (plus another misplaced ogg in that txt file) and text disappearing at the bottom of the screen a while ago but no one ever commited them to the CVS :-\ ----- Original Message ----- From: <ms...@mo...> To: <sc2...@li...> Sent: Friday, December 27, 2002 11:44 PM Subject: Re: [Sc2-devel] Patch to fix Melnorme sale of life data text... > On Fri, Dec 27, 2002 at 03:47:17AM -0500, ms...@mo... wrote: > > 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. > > While reading father into the TODO list I noticed that this item is > fixed by the above patch as well: > --- > - Melnorme conversation Will repeat the same sentence 3 times. > (because of numbers to be inserted). > --- > > The following [untested] patch fixes the rainbow problem. Based on what I > see from the content file the Melnorme would say three sentences but the > second two would have been incorrect for the text. I see no reason this > patch shouldn't also be applied... > > 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 10:44:09 -0000 > @@ -530,11 +530,11 @@ I wish to sell you Rainbow world locatio > #(SOLD_RAINBOW_LOCATIONS1) melno075.ogg > Your ship's log indicates that you discovered the whereabouts of > > -#(SOLD_RAINBOW_LOCATIONS2) melno076.ogg > +#(SOLD_RAINBOW_LOCATIONS2) > of the Rainbow worlds which so fascinate us. > In exchange, we will give you > > -#(SOLD_RAINBOW_LOCATIONS3) melno076.ogg > +#(SOLD_RAINBOW_LOCATIONS3) > Credits. > > #(sell_precursor_find) > > > ------------------------------------------------------- > This sf.net email is sponsored by:ThinkGeek > Welcome to geek heaven. > http://thinkgeek.com/sf > _______________________________________________ > Sc2-devel mailing list > Sc2...@li... > https://lists.sourceforge.net/lists/listinfo/sc2-devel > |
|
From: Serge v. d. B. <sv...@st...> - 2002-12-29 03:43:11
|
On Sat, 28 Dec 2002, TD wrote: > I actually submitted a fix for the Melnorme ogg repeating issue (plus > another misplaced ogg in that txt file) and text disappearing at the > bottom of the screen a while ago but no one ever commited them to > the CVS :-\ I've committed this Melnorme fix. The other patches, I'll leave around for a while. If they're still relevant after the new resource system is done, I'll take another, closer look at them. Meep-Eep |
Thanks for helping keep SourceForge clean.
X