From 99ff9b1e8a8ef76386572f4576aa04f2e60b9010 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Wed, 12 Apr 2017 14:14:33 -0500 Subject: [PATCH] p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] MM_ShowMemory is quite buggy on real machines. i need to debug it and fix added a struct printer[gvar.mm is FUCKING HUGE 14402 bytes FAT\!]16_rf now compiles BT UNKNOWN ON WHAT IT DOSE\! text box creates a ghost because page 1 do not have bg info thus it is stored and saved.... wwww --- DLD.BAT | 1 + DLDV.BAT | 1 + awoo.sh | 19 +++++++++++++++ boop.sh | 7 ++++++ btget.bat | 60 +++++++++++++++++++++++++++++++++++++++++++++++ cutetest.bat | 3 +++ dld.sh | 1 + dldv.sh | 1 + l4get.bat | 60 +++++++++++++++++++++++++++++++++++++++++++++++ mkdld.sh | 5 ++++ q.sh | 15 ++++++++++++ qcata.sh | 11 +++++++++ qdl.sh | 1 + qkeen.sh | 8 +++++++ qwolf.sh | 11 +++++++++ runtest.bat | 5 ++++ spri.sh | 17 ++++++++++++++ src/lib/16_vl_2.c | 3 ++- x4get.bat | 60 +++++++++++++++++++++++++++++++++++++++++++++++ xxdiff.sh | 2 ++ 20 files changed, 290 insertions(+), 1 deletion(-) create mode 100755 DLD.BAT create mode 100755 DLDV.BAT create mode 100755 awoo.sh create mode 100755 boop.sh create mode 100755 btget.bat create mode 100755 cutetest.bat create mode 100755 dld.sh create mode 100755 dldv.sh create mode 100755 l4get.bat create mode 100755 mkdld.sh create mode 100755 q.sh create mode 100755 qcata.sh create mode 100755 qdl.sh create mode 100755 qkeen.sh create mode 100755 qwolf.sh create mode 100755 runtest.bat create mode 100755 spri.sh create mode 100755 x4get.bat create mode 100755 xxdiff.sh diff --git a/DLD.BAT b/DLD.BAT new file mode 100755 index 00000000..25d94e8d --- /dev/null +++ b/DLD.BAT @@ -0,0 +1 @@ +cd src\lib\doslib diff --git a/DLDV.BAT b/DLDV.BAT new file mode 100755 index 00000000..953defe5 --- /dev/null +++ b/DLDV.BAT @@ -0,0 +1 @@ +cd src\lib\doslib\hw\vga diff --git a/awoo.sh b/awoo.sh new file mode 100755 index 00000000..7f561cc3 --- /dev/null +++ b/awoo.sh @@ -0,0 +1,19 @@ +#!/bin/bash +. ./wbuild.sh +#if [ -f "*.exe" ] +# then +#fi +wmake -s -h www +wmake -s -h clean +wmake -s -h backupscript +if [ -z "$*" ]; then + pee="wwww" + else + pee="$*" +fi +##echo "$pee" +git add . +. src/util/shbat/boop.sh "$pee" +wmake -s -h initscript +. ./wbuild.sh +##. ./mkdld.sh# slow compile ww diff --git a/boop.sh b/boop.sh new file mode 100755 index 00000000..c0348e30 --- /dev/null +++ b/boop.sh @@ -0,0 +1,7 @@ +#!/bin/bash +git commit -a -m "$1" +git push x4 master +git push origin master +git push jp master +git push sf master +git push bb master diff --git a/btget.bat b/btget.bat new file mode 100755 index 00000000..ed1d6b23 --- /dev/null +++ b/btget.bat @@ -0,0 +1,60 @@ +@echo off +iff exist %* then + del %* +endiff +setlocal +set url="beta.latech.edu/~wwc001/16/" +rem for %@eval[%#+1] in (%*) do ( +rem for %# in (1,1,%*) do ( +:loop + set /a o=0 +:oooo + set /a q=%@EVAL[%@LEN[%1] - 4] + set w=%@INSTR[0,%q,%1] + iff NOT "%w" == "" then + set /a o=%o+1 + set y=%w.z%o +rem echo y=%y + if %o lt 100 ( + if %o lt 10 ( + set z=00%o + ) else ( + set z=0%o + ) endif + ) else if %o gt 99 ( + set z=%o + ) endif + + htget http://%url/%1.zip.%z > %y +rem pause + iff NOT "%@FILESIZE[%y,b]" == "0" then + type %y >> %w.zip + iff "%@FILESIZE[%y,b]" == "65536" then +rem echo o=%o + goto oooo + endiff + iff NOT "%#" == "0" then + shift /1 + iff exist %w.zip then + unzip %w.zip + del %w.z* + endiff + goto loop + else + del %# + endiff + else + del %y + echo Error null zip file wwww + endiff + else + rem del %y.z* + rem need to add a cleaner wwww + echo done~ wwww + endiff +rem echo y="%y" +rem echo q=%q +rem echo o=%o +rem echo w=%w +rem echo %%1=%1 +endlocal diff --git a/cutetest.bat b/cutetest.bat new file mode 100755 index 00000000..efaf91d1 --- /dev/null +++ b/cutetest.bat @@ -0,0 +1,3 @@ +@echo off +tesuto cute.vrl cute.pal + diff --git a/dld.sh b/dld.sh new file mode 100755 index 00000000..0af760d7 --- /dev/null +++ b/dld.sh @@ -0,0 +1 @@ +cd src/lib/doslib diff --git a/dldv.sh b/dldv.sh new file mode 100755 index 00000000..4f134c84 --- /dev/null +++ b/dldv.sh @@ -0,0 +1 @@ +cd src/lib/doslib/hw/vga diff --git a/l4get.bat b/l4get.bat new file mode 100755 index 00000000..78617810 --- /dev/null +++ b/l4get.bat @@ -0,0 +1,60 @@ +@echo off +iff exist %* then + del %* +endiff +setlocal +set url="138.47.241.23" +rem for %@eval[%#+1] in (%*) do ( +rem for %# in (1,1,%*) do ( +:loop + set /a o=0 +:oooo + set /a q=%@EVAL[%@LEN[%1] - 4] + set w=%@INSTR[0,%q,%1] + iff NOT "%w" == "" then + set /a o=%o+1 + set y=%w.z%o +rem echo y=%y + if %o lt 100 ( + if %o lt 10 ( + set z=00%o + ) else ( + set z=0%o + ) endif + ) else if %o gt 99 ( + set z=%o + ) endif + + htget http://%url/%1.zip.%z > %y +rem pause + iff NOT "%@FILESIZE[%y,b]" == "0" then + type %y >> %w.zip + iff "%@FILESIZE[%y,b]" == "65536" then +rem echo o=%o + goto oooo + endiff + iff NOT "%#" == "0" then + shift /1 + iff exist %w.zip then + unzip %w.zip + del %w.z* + endiff + goto loop + else + del %# + endiff + else + del %y + echo Error null zip file wwww + endiff + else + rem del %y.z* + rem need to add a cleaner wwww + echo done~ wwww + endiff +rem echo y="%y" +rem echo q=%q +rem echo o=%o +rem echo w=%w +rem echo %%1=%1 +endlocal diff --git a/mkdld.sh b/mkdld.sh new file mode 100755 index 00000000..e60e695a --- /dev/null +++ b/mkdld.sh @@ -0,0 +1,5 @@ +#! /bin/bash +. ./dld.sh +./cleanup.sh +./buildall.sh +#cd ../../../ diff --git a/q.sh b/q.sh new file mode 100755 index 00000000..b7d2513e --- /dev/null +++ b/q.sh @@ -0,0 +1,15 @@ +#! /bin/bash +dir1="src" +dir2=$dir1"/lib" +dir3=$dir2"/vgmsnd" +. ./src/util/qhead.sh $0 +#echo ==== $dir1 ==== +grep "$1" "$dir1"/*.c +grep "$1" "$dir1"/*.h +#echo ==== $dir2 ==== +grep "$1" "$dir2"/*.c +grep "$1" "$dir2"/*.h +#echo ==== $dir3 ==== +grep "$1" "$dir3"/*.c +grep "$1" "$dir3"/*.h +. ./src/util/qfoot.sh $0 diff --git a/qcata.sh b/qcata.sh new file mode 100755 index 00000000..1170d3cd --- /dev/null +++ b/qcata.sh @@ -0,0 +1,11 @@ +#! /bin/bash +dir1="16/Catacomb3D" +dir2="16/CatacombApocalypse" +. ./src/util/qhead.sh $0 +echo ==== $dir1 ==== +grep "$1" "$dir1"/*.C +grep "$1" "$dir1"/*.H +echo ==== $dir2 ==== +grep "$1" "$dir2"/*.C +grep "$1" "$dir2"/*.H +. ./src/util/qfoot.sh $0 diff --git a/qdl.sh b/qdl.sh new file mode 100755 index 00000000..ac14d9e8 --- /dev/null +++ b/qdl.sh @@ -0,0 +1 @@ +grep -iR "$1" src/lib/doslib/* diff --git a/qkeen.sh b/qkeen.sh new file mode 100755 index 00000000..a0349b1e --- /dev/null +++ b/qkeen.sh @@ -0,0 +1,8 @@ +#! /bin/bash +dir="16/keen" +. ./src/util/qhead.sh $0 +grep "$1" "$dir"/*.c +grep "$1" "$dir"/*.h +grep "$1" "$dir"/lib/*.c +grep "$1" "$dir"/lib/*.h +. ./src/util/qfoot.sh $0 diff --git a/qwolf.sh b/qwolf.sh new file mode 100755 index 00000000..d900d481 --- /dev/null +++ b/qwolf.sh @@ -0,0 +1,11 @@ +#! /bin/bash +dir1="16/wf3d8086" +dir2="16/wolf3d/WOLFSRC" +. ./src/util/qhead.sh $0 +echo ==== $dir1 ==== +grep "$1" "$dir1"/*.c +grep "$1" "$dir1"/*.h +echo ==== $dir2 ==== +grep "$1" "$dir2"/*.C +grep "$1" "$dir2"/*.H +. ./src/util/qfoot.sh $0 diff --git a/runtest.bat b/runtest.bat new file mode 100755 index 00000000..093735f0 --- /dev/null +++ b/runtest.bat @@ -0,0 +1,5 @@ +@echo off +wmake clean +wmake exmmtest.exe > exmmtest.16 +@rem wmakescroll.exe > scroll.16 +@rem wmake maptest.exemaptest.exe > maptest.16 diff --git a/spri.sh b/spri.sh new file mode 100755 index 00000000..d0a4618b --- /dev/null +++ b/spri.sh @@ -0,0 +1,17 @@ +#! /bin/bash +cd data/spri +if [ ! -f "$1".vrs ] && [ -f "$1".vrl ] && [ -f "$1".sht ]; then + ../../vrl2vrs -s "$1".sht -o "$1".vrs -hc "$1".h -hp _"$1"_ + echo "$1".vrs created +# echo "1st condition ok!" +fi +if [ -f "$1".vrl ] && [ -f "$1".sht ]; then + ../../pcxsscut -s "$1".sht -hc "$1".h -hp _"$1"_ -i ../"$1".pcx -p "$1".pal -tc 0x"$2" -y +# echo "2nd condition ok!" +else + ../../pcx2vrl -i ../"$1".pcx -o "$1".vrl -p "$1".pal -tc 0x"$2" + echo "$1".vrl created +# echo check if "$1".sht exist! +# echo "3rd condition ok!" +fi +cd ../../ diff --git a/src/lib/16_vl_2.c b/src/lib/16_vl_2.c index 7fc2bf99..288a8c66 100755 --- a/src/lib/16_vl_2.c +++ b/src/lib/16_vl_2.c @@ -35,7 +35,7 @@ void VL_modexPrintTextBox(global_game_variables_t *gvar) { #define PRINTTEXTBOXW gvar->video.page[0].sw #define PRINTTEXTBOXH 160 -//#define PRINTTEXTBOXSIZE 51200 +#define PRINTTEXTBOXSIZE 20480//51200 #define PRINTTEXTBOXHLINE 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD//, 0xCD, 0xCD, 0xCD, 0xCD #define PRINTTEXTBOXHLINETOP 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCB, 0xCD, PRINTTEXTBOXHLINE #define PRINTTEXTBOXHLINEBOTTOM 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCA, 0xCD, PRINTTEXTBOXHLINE @@ -63,6 +63,7 @@ void VL_modexPrintTextBox(global_game_variables_t *gvar) word q; #endif //backuppart + modexCopyPageRegion(&gvar->video.page[1], &gvar->video.page[0], x, gvar->video.page[0].height-PRINTTEXTBOXH, diff --git a/x4get.bat b/x4get.bat new file mode 100755 index 00000000..b89cc657 --- /dev/null +++ b/x4get.bat @@ -0,0 +1,60 @@ +@echo off +iff exist %* then + del %* +endiff +setlocal +set url="4ch.mooo.com/16" +rem for %@eval[%#+1] in (%*) do ( +rem for %# in (1,1,%*) do ( +:loop + set /a o=0 +:oooo + set /a q=%@EVAL[%@LEN[%1] - 4] + set w=%@INSTR[0,%q,%1] + iff NOT "%w" == "" then + set /a o=%o+1 + set y=%w.z%o +rem echo y=%y + if %o lt 100 ( + if %o lt 10 ( + set z=00%o + ) else ( + set z=0%o + ) endif + ) else if %o gt 99 ( + set z=%o + ) endif + + htget http://%url/%1.zip.%z > %y +rem pause + iff NOT "%@FILESIZE[%y,b]" == "0" then + type %y >> %w.zip + iff "%@FILESIZE[%y,b]" == "65536" then +rem echo o=%o + goto oooo + endiff + iff NOT "%#" == "0" then + shift /1 + iff exist %w.zip then + unzip %w.zip + del %w.z* + endiff + goto loop + else + del %# + endiff + else + del %y + echo Error null zip file wwww + endiff + else + rem del %y.z* + rem need to add a cleaner wwww + echo done~ wwww + endiff +rem echo y="%y" +rem echo q=%q +rem echo o=%o +rem echo w=%w +rem echo %%1=%1 +endlocal diff --git a/xxdiff.sh b/xxdiff.sh new file mode 100755 index 00000000..c47a98db --- /dev/null +++ b/xxdiff.sh @@ -0,0 +1,2 @@ +#!/bin/bash +screen xxdiff -wB "$1" "$2" -- 2.39.2