diff --git a/Makefile b/Makefile index f359c18..41ff3fb 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ INCLUDES := # options for code generation #--------------------------------------------------------------------------------- +PCFLAGS = -DPRECISE_CPU_CYCLES=1 -DPRECISE_CIA_CYCLES=1 -DPC_IS_POINTER=0 CFLAGS = -g -Wall $(MACHDEP) $(INCLUDE) -I$(DEVKITPRO)/SDL/include -U__unix -DHAVE_SDL CXXFLAGS = $(CFLAGS) @@ -105,7 +106,21 @@ $(BUILD): clean: @echo clean ... @rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol Src/sysconfig.h Frodo FrodoPC \ - FrodoSC + FrodoSC dist + +dist: $(BUILD) + install -d $@/apps/frodo + install -d $@/apps/frodo/images + install -d $@/apps/frodo/saves + cp $(TARGET).dol $@/apps/frodo/boot.dol + cp meta.xml $@/apps/frodo/ + cp icon.png $@/apps/frodo/ + cp FreeMono.ttf $@/apps/frodo/ + cp "Kernal ROM" $@/apps/frodo/Kernal_ROM + cp "Char ROM" $@/apps/frodo/Char_ROM + cp "1541 ROM" $@/apps/frodo/1541_ROM + cp "Basic ROM" $@/apps/frodo/Basic_ROM + cp frodorc $@/apps/frodo/ #--------------------------------------------------------------------------------- run: diff --git a/Src/C64_SDL.i b/Src/C64_SDL.i index edaae74..4162d06 100644 --- a/Src/C64_SDL.i +++ b/Src/C64_SDL.i @@ -20,7 +20,7 @@ #define SAVES_PATH "saves" #define IMAGE_PATH "images" #endif -#define MS_PER_FRAME 40 +#define MS_PER_FRAME 30 static struct timeval tv_start; static int MENU_SIZE_X, MENU_SIZE_Y; diff --git a/Src/menu.cpp b/Src/menu.cpp index 705491b..46498a5 100644 --- a/Src/menu.cpp +++ b/Src/menu.cpp @@ -157,7 +157,7 @@ static void select_next(menu_t *p_menu, int dx, int dy) int next; p_menu->cur_sel = get_next_seq_y(p_menu, p_menu->cur_sel, dy); - next = get_next_seq_y(p_menu, p_menu->cur_sel, dy); + next = get_next_seq_y(p_menu, p_menu->cur_sel, dy + 1); if (p_menu->pp_msgs[p_menu->cur_sel][0] == ' ' || IS_SUBMENU(p_menu->pp_msgs[p_menu->cur_sel]) ) diff --git a/frodorc b/frodorc new file mode 100644 index 0000000..4dc9999 --- /dev/null +++ b/frodorc @@ -0,0 +1,26 @@ +NormalCycles = 63 +BadLineCycles = 23 +CIACycles = 63 +FloppyCycles = 64 +SkipFrames = 0 +DriveType8 = D64 +DrivePath8 = /apps/frodo/spy_vs_spy.d64 +DriveType9 = D64 +DrivePath9 = +DriveType10 = DIR +DrivePath10 = +DriveType11 = DIR +DrivePath11 = +SIDType = DIGITAL +SpritesOn = TRUE +SpriteCollisions = TRUE +Joystick1On = FALSE +Joystick2On = TRUE +JoystickSwap = FALSE +LimitSpeed = TRUE +FastReset = FALSE +CIAIRQHack = FALSE +MapSlash = TRUE +Emul1541Proc = FALSE +ShowOptions = FALSE +SIDFilters = TRUE