Skip to content

Commit

Permalink
fix bug in key mapping, revert emu to 320px width, speed bug fix, bum…
Browse files Browse the repository at this point in the history
…p version
  • Loading branch information
badda71 committed May 5, 2020
1 parent 59a1ecb commit bb553f9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ICON := icon.png

VERSION_MAJOR := 0
VERSION_MINOR := 3
VERSION_MICRO := 0
VERSION_MICRO := 1

ifeq ($(VERSION_MICRO),0)
VERSION := $(VERSION_MAJOR).$(VERSION_MINOR)
Expand Down
1 change: 1 addition & 0 deletions src/3ds/uibottom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,7 @@ int uib_handle_event(SDL_Event *e) {
toggle_keyboard();
return 1;
}
if (e->key.keysym.sym == DS_TOUCH) return 1;
}
if (e->type != SDL_MOUSEMOTION &&
e->type != SDL_MOUSEBUTTONUP &&
Expand Down
8 changes: 4 additions & 4 deletions src/drawing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ int fps_counter = 0;


#define GFXVIDINFO_PIXBYTES 2
#define GFXVIDINFO_WIDTH 400
#define GFXVIDINFO_WIDTH 320
#define GFXVIDINFO_HEIGHT 240
#define MAXBLOCKLINES 240
#define VISIBLE_LEFT_BORDER 32
#define VISIBLE_RIGHT_BORDER 432
#define VISIBLE_LEFT_BORDER 72
#define VISIBLE_RIGHT_BORDER 392
#define LINETOSCR_X_ADJUST_BYTES 64

#define maxhpos MAXHPOS
Expand Down Expand Up @@ -324,7 +324,7 @@ static __inline__ void count_frame (void)
if ((ahora+PARTIDA)<proximo_frameskip)
{
#ifdef _3DS
SDL_Delay(proximo_frameskip-ahora-PARTIDA+1);
SDL_Delay(proximo_frameskip-ahora-(PARTIDA/3)+1);
#else
SDL_Delay(proximo_frameskip-ahora);
#endif
Expand Down
3 changes: 2 additions & 1 deletion src/gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,8 @@ void gui_handle_events (SDL_Event *e)
scale -= 5;
if (scale < 100) scale=100;
if (scale > 200) scale=200;
N3DS_SetScalingDirect((float)scale/100.0f, (float)scale/100.0f, 0);
float f = scale==100 ? 1.0f : ((float)scale/100.0f);
N3DS_SetScalingDirect(f, f, 0);
snprintf(buf,50,"Scale %d%%",scale);
gui_set_message(buf,1000);
}
Expand Down
3 changes: 1 addition & 2 deletions src/include/custom.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ extern uae_u16 INTREQR (void);

/* maximums for statically allocated tables */

//#define MAXHPOS 227
#define MAXHPOS 247
#define MAXHPOS 227
#define MAXVPOS 312
//#define MAXVPOS 280

Expand Down

0 comments on commit bb553f9

Please sign in to comment.