aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStapleButter <thetotalworm@gmail.com>2017-03-29 22:56:30 +0200
committerStapleButter <thetotalworm@gmail.com>2017-03-29 22:56:30 +0200
commit99e4ad409f3c94a3e7760bdc06f57fb20c23c8da (patch)
tree816b5ca3888d4b9b1b199f85e3fd8fd5843a58ed
parent9baeb3bd1afb26c1525939ed75ba70486ffe24bf (diff)
maybe this shit will finally work. also update the README.
-rw-r--r--README.md26
-rw-r--r--src/wx/scancode_wx2sdl.h4
2 files changed, 9 insertions, 21 deletions
diff --git a/README.md b/README.md
index c50a884..e528001 100644
--- a/README.md
+++ b/README.md
@@ -2,44 +2,31 @@
DS emulator, sorta
-the goal is to do things right and fast, akin to blargSNES (but hopefully better)
+The goal is to do things right and fast, akin to blargSNES (but hopefully better). But also to, you know, have a fun challenge :)
-but also to have fun coding this shit
+The source code is provided under the GPLv3 license.
-LOVE MELONS
-
-NO ASKING ROMZ!! ILLEGAL
-
-
-license is GPL. don't steal the code.
-
-
-how to use:
+How to use:
melonDS requires BIOS/firmware copies from a DS. Files required:
* bios7.bin, 16KB: ARM7 BIOS
* bios9.bin, 4KB: ARM9 BIOS
* firmware.bin, 256KB: firmware
-note: the DS-mode firmware in the 3DS isn't bootable, it only contains the bare minimum to run games.
+Note: the DS-mode firmware in the 3DS isn't bootable, it only contains the bare minimum to run games.
-ROM filename is currently hardcoded, check NDS.cpp for the required filename. this will eventually be addressed.
+As for the rest, the interface should be pretty straightforward. If you have a question, don't hesitate to ask, though!
TODO LIST
- * sorta-UI (ie not hardcode ROM name)
+ * better 3D engine
* sound
* wifi
* other non-core shit (debugger, graphics viewers, cheat crapo, etc)
-
-
-IMMEDIATE TODO LIST (prior release 1.0)
-
- * UI
TODO LIST FOR LATER
@@ -51,3 +38,4 @@ TODO LIST FOR LATER
* maybe emulate flashcarts or other fancy hardware
* big-endian compatibility (Wii, etc)
* LCD refresh time (used by some games for blending effects)
+ * any feature you can eventually ask for that isn't outright stupid
diff --git a/src/wx/scancode_wx2sdl.h b/src/wx/scancode_wx2sdl.h
index 1091a1c..a1030ee 100644
--- a/src/wx/scancode_wx2sdl.h
+++ b/src/wx/scancode_wx2sdl.h
@@ -299,7 +299,7 @@ SDL_Scancode scancode_wx2sdl(wxKeyEvent& event)
int keysym = event.GetRawKeyCode();
- if (keysym == NoSymbol)
+ if (keysym == 0)
{
return SDL_SCANCODE_UNKNOWN;
}
@@ -322,7 +322,7 @@ SDL_Scancode scancode_wx2sdl(wxKeyEvent& event)
return (SDL_Scancode)(SDL_SCANCODE_1 + (keysym - GDK_1));
}
- for (i = 0; i < SDL_arraysize(KeySymToSDLScancode); ++i)
+ for (int i = 0; i < SDL_arraysize(KeySymToSDLScancode); ++i)
{
if (keysym == KeySymToSDLScancode[i].keysym)
{