diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib b/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib
index f4df17c48..bca64a637 100644
--- a/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib
+++ b/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib
@@ -56,7 +56,7 @@
-
-
-
diff --git a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h
index 95bd72cdc..e8f1622a4 100644
--- a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h
+++ b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h
@@ -46,6 +46,8 @@
BOOL isSelectedGameTheCurrentGame;
NSInteger currentGameTableRowIndex;
NSString *currentGameIndexString;
+ NSString *currentGameSerial;
+ NSUInteger currentGameCRC;
NSString *errorMajorString;
NSString *errorMinorString;
@@ -71,6 +73,9 @@
@property (assign) BOOL isFileLoading;
@property (assign) BOOL isCurrentGameFound;
@property (assign) BOOL isSelectedGameTheCurrentGame;
+@property (retain, nonatomic) NSString *currentGameSerial;
+@property (assign, nonatomic) NSUInteger currentGameCRC;
+@property (readonly, nonatomic) NSString *currentGameCRCString;
@property (assign) NSString *errorMajorString;
@property (assign) NSString *errorMinorString;
@@ -80,10 +85,9 @@
- (void) loadFileOnThread:(id)object;
- (void) loadFileDidFinish:(NSNotification *)aNotification;
- (void) updateWindow;
++ (void) setCurrentGameForAllWindowsSerial:(NSString *)serialString crc:(NSUInteger)crc;
- (void) validateGameTableFonts;
-+ (void) validateGameTableFontsForAllWindows;
- (BOOL) validateWillAddColumn;
-+ (void) validateWillAddColumnForAllWindows;
- (void) showErrorSheet:(NSInteger)errorCode;
- (void) didEndErrorSheet:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
diff --git a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm
index b6fd6de68..2ec9cb352 100644
--- a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm
+++ b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm
@@ -43,6 +43,9 @@ @implementation CheatDatabaseWindowController
@synthesize isFileLoading;
@synthesize isCurrentGameFound;
@synthesize isSelectedGameTheCurrentGame;
+@dynamic currentGameSerial;
+@synthesize currentGameCRC;
+@dynamic currentGameCRCString;
@synthesize errorMajorString;
@synthesize errorMinorString;
@@ -66,6 +69,8 @@ - (id) initWithWindowNibName:(NSString *)windowNibName delegate:(CheatWindowDele
isSelectedGameTheCurrentGame = NO;
currentGameIndexString = [[NSString alloc] initWithString:@"NSNotFound"];
currentGameTableRowIndex = NSNotFound;
+ currentGameSerial = nil;
+ currentGameCRC = 0;
errorMajorString = @"No error has occurred!";
errorMinorString = @"This is just a placeholder message for initialization purposes.";
@@ -261,10 +266,34 @@ - (void) updateWindow
[gameTable deselectAll:nil];
[gameTable selectRowIndexes:selectedRows byExtendingSelection:NO];
+ CheatWindowDelegate *delegate = [self cheatManagerDelegate];
+ CocoaDSCheatManager *cheatManager = [delegate cdsCheats];
+ [self setCurrentGameSerial:[cheatManager currentGameCode]];
+ [self setCurrentGameCRC:[cheatManager currentGameCRC]];
+
[self validateGameTableFonts];
[self selectCurrentGame:nil];
}
++ (void) setCurrentGameForAllWindowsSerial:(NSString *)serialString crc:(NSUInteger)crc
+{
+ if (cheatDatabaseWindowList == nil)
+ {
+ return;
+ }
+
+ for (CheatDatabaseWindowController *windowController in cheatDatabaseWindowList)
+ {
+ [windowController setCurrentGameSerial:serialString];
+ [windowController setCurrentGameCRC:crc];
+
+ [windowController validateGameTableFonts];
+ [[windowController gameTable] setNeedsDisplay];
+
+ [windowController validateWillAddColumn];
+ }
+}
+
- (void) validateGameTableFonts
{
CheatWindowDelegate *delegate = [self cheatManagerDelegate];
@@ -279,12 +308,9 @@ - (void) validateGameTableFonts
return;
}
- NSString *currentGameCode = [cheatManager currentGameCode];
- const NSUInteger currentGameCRC = [cheatManager currentGameCRC];
-
for (CocoaDSCheatDBGame *game in [gameListController content])
{
- if ( ([game crc] == currentGameCRC) && ([[game serial] isEqualToString:currentGameCode]) )
+ if ( ([game crc] == [self currentGameCRC]) && ([[game serial] isEqualToString:[self currentGameSerial]]) )
{
[currentGameIndexString release];
currentGameIndexString = [[NSString alloc] initWithFormat:@"%llu", (unsigned long long)[game index]];
@@ -294,20 +320,6 @@ - (void) validateGameTableFonts
}
}
-+ (void) validateGameTableFontsForAllWindows
-{
- if (cheatDatabaseWindowList == nil)
- {
- return;
- }
-
- for (CheatDatabaseWindowController *windowController in cheatDatabaseWindowList)
- {
- [windowController validateGameTableFonts];
- [[windowController gameTable] setNeedsDisplay];
- }
-}
-
- (BOOL) validateWillAddColumn
{
BOOL showWillAddColumn = NO;
@@ -325,7 +337,7 @@ - (BOOL) validateWillAddColumn
if ( (delegate != nil) && (cheatManager != nil) && ([selectedGame serial] != nil) )
{
- showWillAddColumn = ([[selectedGame serial] isEqualToString:[cheatManager currentGameCode]]) && ([selectedGame crc] == [cheatManager currentGameCRC]);
+ showWillAddColumn = ([[selectedGame serial] isEqualToString:currentGameSerial]) && ([selectedGame crc] == currentGameCRC);
}
NSTableColumn *willAddColumn = [entryOutline tableColumnWithIdentifier:@"willAdd"];
@@ -336,19 +348,6 @@ - (BOOL) validateWillAddColumn
return showWillAddColumn;
}
-+ (void) validateWillAddColumnForAllWindows
-{
- if (cheatDatabaseWindowList == nil)
- {
- return;
- }
-
- for (CheatDatabaseWindowController *windowController in cheatDatabaseWindowList)
- {
- [windowController validateWillAddColumn];
- }
-}
-
- (void) showErrorSheet:(NSInteger)errorCode
{
switch (errorCode)
@@ -486,6 +485,45 @@ - (NSString *) isEncryptedString
return @"---";
}
+- (void) setCurrentGameSerial:(NSString *)newString
+{
+ NSString *oldString = currentGameSerial;
+ currentGameSerial = [newString retain];
+ [oldString release];
+}
+
+- (NSString *) currentGameSerial
+{
+ if ( (currentGameSerial != nil) && ([currentGameSerial length] > 0) )
+ {
+ return currentGameSerial;
+ }
+
+ return @"---";
+}
+
+- (void) setCurrentGameCRC:(NSUInteger)crc
+{
+ [self willChangeValueForKey:@"currentGameCRCString"];
+ currentGameCRC = crc;
+ [self didChangeValueForKey:@"currentGameCRCString"];
+}
+
+- (NSUInteger) currentGameCRC
+{
+ return currentGameCRC;
+}
+
+- (NSString *) currentGameCRCString
+{
+ if (currentGameCRC != 0)
+ {
+ return [NSString stringWithFormat:@"%08lX", (unsigned long)currentGameCRC];
+ }
+
+ return @"---";
+}
+
#pragma mark -
#pragma mark IBActions
@@ -582,9 +620,7 @@ - (IBAction) addSelected:(id)sender
return;
}
- NSString *currentGameCode = [cheatManager currentGameCode];
- NSUInteger currentGameCRC = [cheatManager currentGameCRC];
- if ( (currentGameCode == nil) || (currentGameCRC == 0) )
+ if ( ([self currentGameSerial] == nil) || ([self currentGameCRC] == 0) )
{
return;
}
@@ -598,7 +634,7 @@ - (IBAction) addSelected:(id)sender
NSInteger selectedIndex = [gameTable selectedRow];
CocoaDSCheatDBGame *selectedGame = (CocoaDSCheatDBGame *)[[gameListController arrangedObjects] objectAtIndex:selectedIndex];
- if ( (![[selectedGame serial] isEqualToString:currentGameCode]) || ([selectedGame crc] != currentGameCRC) )
+ if ( (![[selectedGame serial] isEqualToString:[self currentGameSerial]]) || ([selectedGame crc] != [self currentGameCRC]) )
{
return;
}
@@ -631,9 +667,7 @@ - (IBAction) selectCurrentGame:(id)sender
return;
}
- NSString *currentGameCode = [cheatManager currentGameCode];
- NSUInteger currentGameCRC = [cheatManager currentGameCRC];
- if ( (currentGameCode == nil) || (currentGameCRC == 0) )
+ if ( ([self currentGameSerial] == nil) || ([self currentGameCRC] == 0) )
{
return;
}
@@ -643,7 +677,7 @@ - (IBAction) selectCurrentGame:(id)sender
NSArray *arrangedObjects = (NSArray *)[gameListController arrangedObjects];
for (CocoaDSCheatDBGame *game in arrangedObjects)
{
- if ( ([game crc] == currentGameCRC) && ([[game serial] isEqualToString:currentGameCode]) )
+ if ( ([game crc] == [self currentGameCRC]) && ([[game serial] isEqualToString:[self currentGameSerial]]) )
{
selectionIndex = [arrangedObjects indexOfObject:game];
NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:selectionIndex];
diff --git a/desmume/src/frontend/cocoa/userinterface/cheatWindowDelegate.mm b/desmume/src/frontend/cocoa/userinterface/cheatWindowDelegate.mm
index 53a421d09..9c35b251c 100644
--- a/desmume/src/frontend/cocoa/userinterface/cheatWindowDelegate.mm
+++ b/desmume/src/frontend/cocoa/userinterface/cheatWindowDelegate.mm
@@ -122,8 +122,7 @@ - (BOOL) cheatSystemStart:(CocoaDSCheatManager *)cheatManager
[cheatListController setContent:[cheatManager sessionList]];
[self setCheatSearchViewByStyle:CheatSearchStyle_ExactValue];
- [CheatDatabaseWindowController validateWillAddColumnForAllWindows];
- [CheatDatabaseWindowController validateGameTableFontsForAllWindows];
+ [CheatDatabaseWindowController setCurrentGameForAllWindowsSerial:[cheatManager currentGameCode] crc:[cheatManager currentGameCRC]];
didStartSuccessfully = YES;
return didStartSuccessfully;
@@ -143,8 +142,7 @@ - (void) cheatSystemEnd
[self setCurrentGameCRC:0];
[self setCdsCheats:nil];
- [CheatDatabaseWindowController validateWillAddColumnForAllWindows];
- [CheatDatabaseWindowController validateGameTableFontsForAllWindows];
+ [CheatDatabaseWindowController setCurrentGameForAllWindowsSerial:nil crc:0];
}
- (IBAction) addToList:(id)sender