Memory - Added an option to duplicate watches

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -214,6 +214,7 @@ enum MEMORY_OPTIONS
 {
 	ADD_WATCH = 1,
 	MODIFY_WATCH,
+	DUPLICATE_WATCH,
 	DELETE_WATCH,
 };
 

ttyd-tools/rel/include/memorywatch.h

@@ -11,6 +11,7 @@ const char *getAddressStringFromOffsets(int32_t slot, uint32_t maxOffset);
 const char *getValueString(int32_t slot);
 void addMemoryWatch(int32_t slot);
 void deleteWatch(int32_t slot);
+void duplicateWatch(int32_t currentSlot, int32_t emptySlot);
 uint32_t adjustWatchValueControls(int32_t slot);
 void adjustWatchTempValueAndBounds(int32_t slot, uint32_t highestDigit, int32_t valueChangedBy);
 void *fixBaseAddress(int32_t slot, void *address);

ttyd-tools/rel/source/draw.cpp

@@ -1220,13 +1220,13 @@ void drawMemoryWatches()
 
 	uint32_t tempCurrentPage 		= CurrentPage;
 	int32_t TotalMenuOptions 		= sizeof(MemoryWatch) / sizeof(MemoryWatch[0]);
-	int32_t MaxOptionsPerPage 		= 10;
+	int32_t MaxOptionsPerPage 		= 9;
 	int32_t IndexStart 				= tempCurrentPage * MaxOptionsPerPage;
 
 	uint32_t Color = 0xFFFFFFFF;
 	uint8_t Alpha = 0xFF;
 	int32_t PosX = -232;
-	int32_t PosY = 80;
+	int32_t PosY = 60;
 	float Scale = 0.6;
 
 	const int32_t TypeOffset 		= 150;

ttyd-tools/rel/source/global.cpp

@@ -6,7 +6,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.16";
+const char *VersionNumber = "v3.0.17";
 
 const char *RootLines[] = 
 {
@@ -318,6 +318,7 @@ const char *MemoryLines[] =
 	"Return",
 	"Add Watch",
 	"Modify Watch",
+	"Duplicate Watch",
 	"Delete Watch",
 };
 

ttyd-tools/rel/source/memorywatch.cpp

@@ -371,6 +371,12 @@ void deleteWatch(int32_t slot)
 	}
 }
 
+void duplicateWatch(int32_t currentSlot, int32_t emptySlot)
+{
+	uint32_t Size = sizeof(MemoryWatch[0]);
+	ttyd::__mem::memcpy(&MemoryWatch[emptySlot], &MemoryWatch[currentSlot], Size);
+}
+
 uint32_t adjustWatchValueControls(int32_t slot)
 {
 	uint32_t tempCurrentMenu 		= CurrentMenu;

ttyd-tools/rel/source/menu.cpp

@@ -1562,6 +1562,32 @@ void menuCheckButton()
 									}
 									break;
 								}
+								case DUPLICATE_WATCH:
+								{
+									uint32_t tempAddress = MemoryWatch[0].Address;
+									if (tempAddress)
+									{
+										int32_t EmptyWatchSlot = getEmptyWatchSlot();
+										if (EmptyWatchSlot >= 0)
+										{
+											SelectedOption 		= tempCurrentMenuOption;
+											CurrentMenuOption 	= tempCurrentPage * 10;
+										}
+										else
+										{
+											// There are no more free slots
+											FunctionReturnCode = NO_SLOTS_LEFT;
+											Timer = secondsToFrames(3);
+										}
+									}
+									else
+									{
+										// All slots are empty
+										FunctionReturnCode = ALL_SLOTS_EMPTY;
+										Timer = secondsToFrames(3);
+									}
+									break;
+								}
 								case MODIFY_WATCH:
 								{
 									uint32_t tempAddress = MemoryWatch[0].Address;
@@ -1601,6 +1627,40 @@ void menuCheckButton()
 							}
 							break;
 						}
+						case DUPLICATE_WATCH:
+						{
+							uint32_t tempAddress = MemoryWatch[0].Address;
+							if (tempAddress)
+							{
+								int32_t EmptyWatchSlot = getEmptyWatchSlot();
+								if (EmptyWatchSlot >= 0)
+								{
+									duplicateWatch(static_cast<int32_t>(tempCurrentMenuOption), EmptyWatchSlot);
+									
+									// Recheck to see if there are any empty slots left
+									if (getEmptyWatchSlot() < 0)
+									{
+										// There are no more free slots
+										closeSecondaryMenu();
+									}
+								}
+								else
+								{
+									// There are no more free slots
+									closeSecondaryMenu();
+									FunctionReturnCode = NO_SLOTS_LEFT;
+									Timer = secondsToFrames(3);
+								}
+							}
+							else
+							{
+								// All slots are empty
+								closeSecondaryMenu();
+								FunctionReturnCode = NO_SLOTS_LEFT;
+								Timer = secondsToFrames(3);
+							}
+							break;
+						}
 						case MODIFY_WATCH:
 						{
 							uint32_t tempAddress = MemoryWatch[0].Address;
@@ -1614,6 +1674,7 @@ void menuCheckButton()
 							else
 							{
 								// All slots are empty
+								closeSecondaryMenu();
 								FunctionReturnCode = NO_SLOTS_LEFT;
 								Timer = secondsToFrames(3);
 							}
@@ -1629,6 +1690,7 @@ void menuCheckButton()
 							else
 							{
 								// All slots are empty
+								closeSecondaryMenu();
 								FunctionReturnCode = NO_SLOTS_LEFT;
 								Timer = secondsToFrames(3);
 							}

ttyd-tools/rel/source/menufunctions.cpp

@@ -3327,7 +3327,7 @@ void adjustMemoryWatchSelection(uint32_t button)
 	}
 
 	uint32_t MaxOptionsPerRow = 1;
-	uint32_t MaxOptionsPerPage = 10;
+	uint32_t MaxOptionsPerPage = 9;
 
 	adjustMenuSelectionVertical(button, CurrentMenuOption, 
 		CurrentPage, TotalMenuOptions, MaxOptionsPerPage,