Nintendo Sixty Foooouuuur!

7 files changed, 34 insertions, 29 deletions

diff --git a/retroarch.hmod/bin/gb b/retroarch.hmod/bin/gb
index bb97411..408b46b 100644
--- a/retroarch.hmod/bin/gb
+++ b/retroarch.hmod/bin/gb
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover gambatte "$@"
+exec retroarch-clover gambatte "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/gba b/retroarch.hmod/bin/gba
index 3ef42e0..0796c9b 100644
--- a/retroarch.hmod/bin/gba
+++ b/retroarch.hmod/bin/gba
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover mednafen_gba "$@"
+exec retroarch-clover mednafen_gba "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/n64 b/retroarch.hmod/bin/n64
index 3ecc32f..f59e7af 100644
--- a/retroarch.hmod/bin/n64
+++ b/retroarch.hmod/bin/n64
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover mupen64plus "$@"
+exec retroarch-clover mupen64plus "$@" --ra-nosaves
diff --git a/retroarch.hmod/bin/nes b/retroarch.hmod/bin/nes
index 7fb6453..ca0f380 100644
--- a/retroarch.hmod/bin/nes
+++ b/retroarch.hmod/bin/nes
@@ -7,4 +7,4 @@ if [ "$extension" == "fds" ]; then
   cp -f /usr/share/kachikachi/fds_bios.bin /tmp/disksys.rom
 fi
 
-exec retroarch-clover "$core" "$@"
+exec retroarch-clover "$core" "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/retroarch-watchdog b/retroarch.hmod/bin/retroarch-watchdog
index 75de199..71a9423 100644
--- a/retroarch.hmod/bin/retroarch-watchdog
+++ b/retroarch.hmod/bin/retroarch-watchdog
@@ -9,47 +9,50 @@ autosave="/var/cache/$id.state.auto"
 rsram="/var/cache/$id.srm"
 shift 3
 
-scanlines=0
-[ "$corename" == "fceumm" ] && scanlines_allowed=1
-[ "$corename" == "nestopia" ] && scanlines_allowed=1
-[ "$corename" == "emux_sms" ] && scanlines_allowed=1
+crt=0
+allow_crt=0
 
 while [ $# -gt 0 ]; do
-  [ "$1" == "--load-state-file" ] && load="$2"
-  [ "$1" == "--save-on-quit" ] && save="$2"
-  [ "$1" == "--save-screenshot-on-quit" ] && screenshot="$2"
-  [ "$1" == "--save-data-backing-file" ] && sram="$2"
-  [ "$1" == "--graphic-filter" ] && filter="$2"
-  [ "$scanlines_allowed" == "1" ] && [ "$1" == "--enable-crt-scanlines" ] && scanlines=1
-  [ "$1" == "--ra-scanlines" ] && scanlines=1
+  [ "$1" == "--load-state-file" ] && load=$2
+  [ "$1" == "--save-on-quit" ] && save=$2
+  [ "$1" == "--save-screenshot-on-quit" ] && screenshot=$2
+  [ "$1" == "--save-data-backing-file" ] && sram=$2
+  [ "$1" == "--graphic-filter" ] && filter=$2
+  [ "$1" == "--enable-crt-scanlines" ] && crt=1
+  [ "$1" == "--ra-allow-crt" ] && allow_crt=1
+  [ "$1" == "--ra-extra" ] && extra=$2
+  [ "$1" == "--ra-nosaves" ] && nosaves=1
   shift
 done
 
 # saves if any
 rm -f /var/cache/*.state /var/cache/*.auto /var/cache/*.srm
-[ ! -z "$load" ] && [ -f "$load" ] && cp -f "$load" "$autosave" && echo cp -f "$load" "$autosave"
+[ ! -z "$load" ] && [ -f "$load" ] && [ -z "$nosaves" ] && cp -f "$load" "$autosave" && echo cp -f "$load" "$autosave"
 [ ! -z "$sram" ] && [ -f "$sram" ] && cp -f "$sram" "$rsram" && echo cp -f "$sram" "$rsram"
 
 # core provided ratio for CRT mode
-[ "$filter" == "crt720" ] && ratio=21 && smooth=true && [ "$scanlines_allowed" == "1" ] && scanlines=1
+[ "$filter" == "crt720" ] && ratio=21 && smooth=true && crt=1
 # core provided ratio for 4:3 mode
 [ "$filter" == "gpu720" ] && ratio=21 && smooth=true
 # pixel perfect - 1:1 for pixel perfect mode
 [ "$filter" == "ppu" ] && ratio=20 && smooth=false
 
+# Allow scanlines only for simple systems
+[ "$allow_crt" == "1" ] || crt=0
+
 # set aspect ratio in config
 [ -z "$ratio" ] || sed -i -e 's/aspect_ratio_index = "[^"]*"/aspect_ratio_index = "'$ratio'"/g' /etc/libretro/retroarch.cfg
 [ -z "$smooth" ] || sed -i -e 's/video_smooth = "[^"]*"/video_smooth = "'$smooth'"/g' /etc/libretro/retroarch.cfg
 
 # enable shader scanlines if need
-if [ "$scanlines" == "1" ]; then
+if [ "$crt" == "1" ]; then
   sed -i -e 's/video_shader = "[^"]*"/video_shader = "~\/shaders\/retroarch\.glslp"/g' /etc/libretro/retroarch.cfg
-  cp -f /etc/libretro/shaders/scanlines.glslp /etc/libretro/shaders/retroarch.glslp
+  cp -f /etc/libretro/shaders/scanline.glslp /etc/libretro/shaders/retroarch.glslp
 else
   sed -i -e 's/video_shader = "[^"]*"/video_shader = ""/g' /etc/libretro/retroarch.cfg
 fi
 
-retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" &
+retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" $extra &
 rpid=$!
 sleep 1
 rm -f /var/cache/*.state /var/cache/*.auto /var/cache/*.srm
@@ -70,14 +73,16 @@ done
 pkill -KILL clover-mcp
 pkill -KILL ReedPlayer-Clover
 
-# Saves! It's primary task
-mkdir -p $(dirname "$save")
-mkdir -p $(dirname "$sram")
-mkdir -p $(dirname "$screenshot")
-[ ! -z "$save" ] && [ -f "$autosave" ] && mv -f "$autosave" "$save"
-[ ! -z "$sram" ] && [ -f "$rsram" ] && mv -f "$rsram" "$sram"
+[ ! -z "$save" ] && mkdir -p $(dirname "$save")
+[ ! -z "$sram" ] && mkdir -p $(dirname "$sram")
+[ ! -z "$screenshot" ] && mkdir -p $(dirname "$screenshot")
 
-[ -z "$screenshot" ] || fbgrab -z 0 "$screenshot"
+# Screenshot! It's not so fast...
+[ -z "$screenshot" ] || [ -z "$nosaves" ] && fbgrab -z 0 "$screenshot"
+
+# Saves!
+[ ! -z "$save" ] && [ -f "$autosave" ] && [ -z "$nosaves" ] && mv -f "$autosave" "$save"
+[ ! -z "$sram" ] && [ -f "$rsram" ] && mv -f "$rsram" "$sram"
 
 # Back to shell
 clover-mcp
diff --git a/retroarch.hmod/bin/sms b/retroarch.hmod/bin/sms
index dca6d3b..e5b73ac 100644
--- a/retroarch.hmod/bin/sms
+++ b/retroarch.hmod/bin/sms
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover genesis_plus_gx "$@"
+exec retroarch-clover genesis_plus_gx "$@" --ra-allow-crt
diff --git a/retroarch.hmod/bin/snes b/retroarch.hmod/bin/snes
index 215b4ab..a06b22b 100644
--- a/retroarch.hmod/bin/snes
+++ b/retroarch.hmod/bin/snes
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec retroarch-clover snes9x2010 "$@"
+exec retroarch-clover snes9x2010 "$@" --ra-allow-crt