Devel snapshot

1 files changed, 31 insertions, 2 deletions

diff --git a/src/main.c b/src/main.c
index 75352f5..a79464c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,8 +84,9 @@ int main(int argc, char *argv[])
 		SPECReadWord,
 		SPECWritePort,
 		SPECReadPort,
-		SPECReadForDisassem,
-		SPECGetLabel);
+		SPECReadForDisassem);
+
+    Z80SetLabels(z80,SPECGetLabel());
 
     GFXInit();
 
@@ -146,6 +147,8 @@ int main(int argc, char *argv[])
 				   "HELP",
 				   "ESC - Quit                        \n"
 				   "F1  - Help                        \n"
+				   "F2  - About                       \n"
+				   "F3  - View Spectrum keyboad       \n"
 				   "F8  - Select tape file for loading\n"
 				   "F9  - Select tape file for saving \n"
 				   "F10 - Close all open tape files   \n"
@@ -153,6 +156,32 @@ int main(int argc, char *argv[])
 				   "F12 - Toggle onscreen trace       ");
 		    break;
 
+		case SDLK_F2:
+		    if (e->key.state==SDL_PRESSED)
+			GUIMessage(eMessageBox,
+				   "espec - ZX Spectrum Emulator",
+				   "(c) 2004 Ian Cowburn\n"
+				   " \n"
+				   "This software comes with ABSOLUTELY \n"
+				   "NO WARRANTY, and you are free to    \n"
+				   "to redistribute it under certain    \n"
+				   "conditions.  See the supplied GNU   \n"
+				   "General Public License in LICENSE   \n"
+				   "for details.                        \n"
+				   " \n"
+				   "If you did not recieve a license,   \n"
+				   "vist www.gnu.org or wrote to:       \n"
+				   " \n"
+				   "Free Software Foundation, Inc.,     \n"
+				   "59 Temple Place, Suite 330,         \n"
+				   "Boston, MA 02111-1307 USA           ");
+		    break;
+
+		case SDLK_F3:
+		    if (e->key.state==SDL_PRESSED)
+			GUIMessage(eMessageBox,"TODO","Sorry, not done yet");
+		    break;
+
 		case SDLK_F8:
 		    if (e->key.state==SDL_PRESSED)
 		    {