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

Countdown messages display fix

Browse Source 
as per http://www.aegidian.org/bb/viewtopic.php?t=8314 
(trunk & maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3733 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
getafix 2010-08-04 09:37:48 +00:00
parent d16dc20f0b
commit e9935b6955
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Universe.h
View File

@ -179,7 +179,8 @@ enum
NSString *currentMessage;
OOTimeAbsolute messageRepeatTime;
OOTimeAbsolute countdown_messageRepeatTime; // Getafix(4/Aug/2010) - Quickfix countdown messages colliding with weapon overheat messages.
// For proper handling of message dispatching, code refactoring is needed.
GuiDisplayGen *gui;
GuiDisplayGen *message_gui;
GuiDisplayGen *comm_log_gui;

4
src/Core/Universe.m
View File

@ -4704,11 +4704,11 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
- (void) displayCountdownMessage:(NSString *) text forCount:(OOTimeDelta)count
{
if (![currentMessage isEqual:text])
if (![currentMessage isEqual:text] && universal_time >= countdown_messageRepeatTime)
{
if (currentMessage) [currentMessage release];
currentMessage = [text retain];
countdown_messageRepeatTime=universal_time + count;
[message_gui printLineNoScroll:text align:GUI_ALIGN_CENTER color:[OOColor yellowColor] fadeTime:count key:nil addToArray:nil];
}
}