From 271c55c8548eb8cfce6c945f970df085c81fb9a6 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Fri, 18 Feb 2011 02:44:02 +0000
Subject: [PATCH] RamWatch - implement 2 byte (big & little endian) value
 display

---
 BizHawk.MultiClient/tools/RamWatch.cs | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 02ad990684..e04f55ff61 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -38,7 +38,29 @@ namespace BizHawk.MultiClient
             for (int x = 0; x < watchList.Count; x++)
             {
                 if (watchList[x].type == atype.SEPARATOR) continue;
-                watchList[x].value = Global.Emulator.MainMemory.PeekByte(watchList[x].address);
+                switch (watchList[x].type)
+                {
+                    case atype.BYTE:
+                        watchList[x].value = Global.Emulator.MainMemory.PeekByte(watchList[x].address);
+                        break;
+                    case atype.WORD:
+                        {
+                            if (watchList[x].bigendian)
+                            {
+                                watchList[x].value = ((Global.Emulator.MainMemory.PeekByte(watchList[x].address)*256) + 
+                                    Global.Emulator.MainMemory.PeekByte((watchList[x+1].address)+1) );
+                            }
+                            else
+                            {
+                                watchList[x].value = (Global.Emulator.MainMemory.PeekByte(watchList[x].address) +
+                                   (Global.Emulator.MainMemory.PeekByte((watchList[x].address)+1)*256) );
+                            }
+                        }
+                        break;
+                    case atype.DWORD:
+                        break;
+                }
+                
                 switch (watchList[x].signed)
                 {
                     case asigned.HEX:
@@ -494,7 +516,7 @@ namespace BizHawk.MultiClient
                 }
                 else
                 {
-                    ListViewItem item = new ListViewItem(String.Format("{0:X4}", watchList[x].address));
+                    ListViewItem item = new ListViewItem(String.Format("{0:X}", watchList[x].address));
                     
                     if (watchList[x].signed == asigned.HEX)
                     {