- Fixed crashing bug when loading CHX files.

- Fixed smdh icon and updated make file to build smdh
bubble2k16 · Apr 9, 2017 · 589d7e6 · 589d7e6
1 parent eb43b6e
commit 589d7e6
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -27,6 +27,12 @@ include $(DEVKITARM)/3ds_rules
 #     - icon.png
 #     - <libctru folder>/default_icon.png
 #---------------------------------------------------------------------------------
+APP_TITLE	:=	SNES9x for 3DS
+APP_DESCRIPTION	:=	High compatibility SNES emulator for 3DS. Based on SNES9x 1.43.
+APP_AUTHOR	:=	bubble2k16
+ASSETS		:=	assets
+ICON		:=	$(ASSETS)/icon.png
+
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	source

diff --git a/assets/Thumbs.db b/assets/Thumbs.db
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/snes9x_3ds.3dsx b/snes9x_3ds.3dsx
diff --git a/snes9x_3ds.cia b/snes9x_3ds.cia
diff --git a/source/3dsimpl.cpp b/source/3dsimpl.cpp
@@ -403,7 +403,6 @@ void impl3dsPrepareForNewFrame()
 void impl3dsRunOneFrame(bool firstFrame, bool skipDrawingFrame)
 {
 	Memory.ApplySpeedHackPatches();
-	gpu3dsStartNewFrame();
 	gpu3dsEnableAlphaBlending();
 
 	if (GPU3DS.emulatorState != EMUSTATE_EMULATE)

diff --git a/source/3dsmain.cpp b/source/3dsmain.cpp
@@ -1287,6 +1287,7 @@ void emulatorLoop()
         if (appExiting)
             break;
 
+        gpu3dsStartNewFrame();
         gpu3dsCheckSlider();
         updateFrameCount();
 

diff --git a/source/3dsmenu.cpp b/source/3dsmenu.cpp
@@ -15,7 +15,7 @@
 #define MENU_HEIGHT             (14)
 #define DIALOG_HEIGHT           (5)
 
-#define SNES9X_VERSION "v1.10"
+#define SNES9X_VERSION "v1.11"
 #define ANIMATE_TAB_STEPS 3
 
 

diff --git a/source/cheats2.cpp b/source/cheats2.cpp
@@ -401,14 +401,18 @@ bool8 S9xLoadCheatTextFile (const char *filename)
     {
         uint32 addr;
         uint8 byte;
-        
+
         fgets(line, 199, fp);
         S9xStripNewLine(line);
 
         enabled = line;
 
         char *newline = strchr(line, '\n');
-        *newline = 0;
+
+        // Fixed crashing bug when loading CHX files.
+        //
+        if (newline != NULL)
+            *newline = 0;
 
         code = strchr(line, ',');
         if (code == NULL)