Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

That's what I get for trying to be clever.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4334 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2011-02-12 16:13:34 +00:00
parent 944ac15e75
commit 17a095ffb1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Core/Universe.m
View File

@ -4890,7 +4890,7 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
NSString *systemName = [self getSystemName:system_seed];
isStandard = [systemName isEqualToString: [self generateSystemName:system_seed]];
isStandard = [systemName isEqualToString:[self generateSystemName:system_seed]];
//if the name is not the standard generated one, we can't use the generated phonemes.
systemSaid = isStandard ? [self generatePhoneticSystemName:system_seed] : systemName;
@ -4971,9 +4971,14 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
if (!logOnly)
{
[self speakWithSubstitutions:[NSString stringWithFormat:DESC(@"speech-synthesis-incoming-message-@"), text]];
if ([player isSpeechOn])
{
// EMMSTRAN: should say "Incoming message from ..." when prefixed with sender name.
NSString *format = ExpandDescriptionForCurrentSystem(DESC(@"speech-synthesis-incoming-message-@"));
[self speakWithSubstitutions:[NSString stringWithFormat:format, text]];
}
[message_gui printLongText:text align:GUI_ALIGN_CENTER color:[OOColor greenColor] fadeTime:(float)count key:nil addToArray:nil];
[message_gui printLongText:text align:GUI_ALIGN_CENTER color:[OOColor greenColor] fadeTime:count key:nil addToArray:nil];
[currentMessage release];
currentMessage = [text retain];