From: sparky4 Date: Wed, 22 Mar 2017 15:35:15 +0000 (-0500) Subject: seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=96dd0791aae1ca753abc0f19aaaf1db2122f971f;p=16.git seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd.c ][ ca needs huge amounts of work and i should remember what needs to be done soon also i should reverify 16_in.c to make sure it can work with other code of id engine] going to port rest of code to borland c some time so we can use the core components of id engine here[script file cleanup] --- diff --git a/makefile b/makefile index 82bab4d3..6c97f4e4 100755 --- a/makefile +++ b/makefile @@ -73,6 +73,7 @@ SPRI=$(DATADIR)/spri SRC=src UTIL=$(SRC)/util GITCONFIGDIR=$(UTIL)/git +SCRIPTBATDIR=$(UTIL)/shbat SRCLIB=$(SRC)/lib JSMNLIB=$(SRCLIB)/jsmn NYANLIB=$(SRCLIB)/nyan @@ -417,14 +418,36 @@ clean: .symbolic nuke: .symbolic @wmake clean + @wmake backupscript @wmake cldl @wmake all @wmake comp backupconfig: .symbolic - @$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)git_con.fig - @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)git_modu.les - @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)git_igno.re + @$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)/git_con.fig + @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les + @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re + +initconfig: + @$(COPYCOMMAND) $(GITCONFIGDIR)/git_con.fig .git/config + @$(COPYCOMMAND) $(GITCONFIGDIR)/git_modu.les .gitmodules + @$(COPYCOMMAND) $(GITCONFIGDIR)/git_igno.re .gitignore + + +backupscript: .symbolic + @if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/ + @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/ +!ifdef __LINUX__ + @if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/ +!endif + +initscript: .symbolic + @if not exist *.bat $(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./ + @if not exist *.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./ +!ifdef __LINUX__ + @if not exist *.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./ +!endif + comp: .symbolic @*upx -9 $(EXEC) @@ -501,9 +524,7 @@ reinitlibs: .symbolic @wmake -h initlibs initlibs: .symbolic - @$(COPYCOMMAND) $(GITCONFIGDIR)git_con.fig .git/config - @$(COPYCOMMAND) $(GITCONFIGDIR)git_modu.les .gitmodules - @$(COPYCOMMAND) $(GITCONFIGDIR)git_igno.re .gitignore + @wmake -h initconfig @wmake -h getlib @cd 16 @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git diff --git a/src/lib/wl_debug.c b/src/lib/wl_debug.c new file mode 100755 index 00000000..dd4674b1 --- /dev/null +++ b/src/lib/wl_debug.c @@ -0,0 +1,722 @@ +// WL_DEBUG.C + +#include "WL_DEF.H" +#pragma hdrstop +#include + +/* +============================================================================= + + LOCAL CONSTANTS + +============================================================================= +*/ + +#define VIEWTILEX (viewwidth/16) +#define VIEWTILEY (viewheight/16) + +/* +============================================================================= + + GLOBAL VARIABLES + +============================================================================= +*/ + + +int DebugKeys (void); + +/* +============================================================================= + + LOCAL VARIABLES + +============================================================================= +*/ + + +int maporgx; +int maporgy; +enum {mapview,tilemapview,actoratview,visview} viewtype; + +void ViewMap (void); + +//=========================================================================== + +/* +================== += += DebugMemory += +================== +*/ + +void DebugMemory (void) +{ + int i; + char scratch[80],str[10]; + long mem; + spritetype _seg *block; + + CenterWindow (16,7); + + US_CPrint ("Memory Usage"); + US_CPrint ("------------"); + US_Print ("Total :"); + US_PrintUnsigned (mminfo.mainmem/1024); + US_Print ("k\nFree :"); + US_PrintUnsigned (MM_UnusedMemory()/1024); + US_Print ("k\nWith purge:"); + US_PrintUnsigned (MM_TotalFree()/1024); + US_Print ("k\n"); + VW_UpdateScreen(); + IN_Ack (); +} + +//=========================================================================== + +/* +================== += += CountObjects += +================== +*/ + +void CountObjects (void) +{ + int i,total,count,active,inactive,doors; + objtype *obj; + + CenterWindow (16,7); + active = inactive = count = doors = 0; + + US_Print ("Total statics :"); + total = laststatobj-&statobjlist[0]; + US_PrintUnsigned (total); + + US_Print ("\nIn use statics:"); + for (i=0;inext;obj;obj=obj->next) + { + if (obj->active) + active++; + else + inactive++; + } + + US_Print ("\nTotal actors :"); + US_PrintUnsigned (active+inactive); + + US_Print ("\nActive actors :"); + US_PrintUnsigned (active); + + VW_UpdateScreen(); + IN_Ack (); +} + +//=========================================================================== + +/* +================ += += PicturePause += +================ +*/ + +void PicturePause (void) +{ + int i; + byte p; + unsigned x; + byte far *dest,far *src; + memptr buffer; + + VW_ColorBorder (15); + FinishPaletteShifts (); + + LastScan = 0; + while (!LastScan) + ; + if (LastScan != sc_Enter) + { + VW_ColorBorder (0); + return; + } + + VW_ColorBorder (1); + VW_SetScreen (0,0); +// +// vga stuff... +// + + ClearMemory (); + CA_SetAllPurge(); + MM_GetPtr (&buffer,64000); + for (p=0;p<4;p++) + { + src = MK_FP(0xa000,displayofs); + dest = (byte far *)buffer+p; + VGAREADMAP(p); + for (x=0;x<16000;x++,dest+=4) + *dest = *src++; + } + + +#if 0 + for (p=0;p<4;p++) + { + src = MK_FP(0xa000,0); + dest = (byte far *)buffer+51200+p; + VGAREADMAP(p); + for (x=0;x<3200;x++,dest+=4) + *dest = *src++; + } +#endif + + asm mov ax,0x13 + asm int 0x10 + + dest = MK_FP(0xa000,0); + _fmemcpy (dest,buffer,64000); + + VL_SetPalette (&gamepal); + + + IN_Shutdown (); + + VW_WaitVBL(70); + bioskey(0); + VW_WaitVBL(70); + Quit (NULL); +} + + +//=========================================================================== + + +/* +================ += += ShapeTest += +================ +*/ + +#pragma warn -pia +void ShapeTest (void) +{ +extern word NumDigi; +extern word _seg *DigiList; +static char buf[10]; + + boolean done; + ScanCode scan; + int i,j,k,x; + longword l; + memptr addr; + PageListStruct far *page; + + CenterWindow(20,16); + VW_UpdateScreen(); + for (i = 0,done = false;!done;) + { + US_ClearWindow(); +// sound = -1; + + page = &PMPages[i]; + US_Print(" Page #"); + US_PrintUnsigned(i); + if (i < PMSpriteStart) + US_Print(" (Wall)"); + else if (i < PMSoundStart) + US_Print(" (Sprite)"); + else if (i == ChunksInFile - 1) + US_Print(" (Sound Info)"); + else + US_Print(" (Sound)"); + + US_Print("\n XMS: "); + if (page->xmsPage != -1) + US_PrintUnsigned(page->xmsPage); + else + US_Print("No"); + + US_Print("\n Main: "); + if (page->mainPage != -1) + US_PrintUnsigned(page->mainPage); + else if (page->emsPage != -1) + { + US_Print("EMS "); + US_PrintUnsigned(page->emsPage); + } + else + US_Print("No"); + + US_Print("\n Last hit: "); + US_PrintUnsigned(page->lastHit); + + US_Print("\n Address: "); + addr = PM_GetPageAddress(i); + sprintf(buf,"0x%04x",(word)addr); + US_Print(buf); + + if (addr) + { + if (i < PMSpriteStart) + { + // + // draw the wall + // + bufferofs += 32*SCREENWIDTH; + postx = 128; + postwidth = 1; + postsource = ((long)((unsigned)addr))<<16; + for (x=0;x<64;x++,postx++,postsource+=64) + { + wallheight[postx] = 256; + FarScalePost (); + } + bufferofs -= 32*SCREENWIDTH; + } + else if (i < PMSoundStart) + { + // + // draw the sprite + // + bufferofs += 32*SCREENWIDTH; + SimpleScaleShape (160, i-PMSpriteStart, 64); + bufferofs -= 32*SCREENWIDTH; + } + else if (i == ChunksInFile - 1) + { + US_Print("\n\n Number of sounds: "); + US_PrintUnsigned(NumDigi); + for (l = j = k = 0;j < NumDigi;j++) + { + l += DigiList[(j * 2) + 1]; + k += (DigiList[(j * 2) + 1] + (PMPageSize - 1)) / PMPageSize; + } + US_Print("\n Total bytes: "); + US_PrintUnsigned(l); + US_Print("\n Total pages: "); + US_PrintUnsigned(k); + } + else + { + byte far *dp = (byte far *)MK_FP(addr,0); + for (j = 0;j < NumDigi;j++) + { + k = (DigiList[(j * 2) + 1] + (PMPageSize - 1)) / PMPageSize; + if + ( + (i >= PMSoundStart + DigiList[j * 2]) + && (i < PMSoundStart + DigiList[j * 2] + k) + ) + break; + } + if (j < NumDigi) + { +// sound = j; + US_Print("\n Sound #"); + US_PrintUnsigned(j); + US_Print("\n Segment #"); + US_PrintUnsigned(i - PMSoundStart - DigiList[j * 2]); + } + for (j = 0;j < page->length;j += 32) + { + byte v = dp[j]; + int v2 = (unsigned)v; + v2 -= 128; + v2 /= 4; + if (v2 < 0) + VWB_Vlin(WindowY + WindowH - 32 + v2, + WindowY + WindowH - 32, + WindowX + 8 + (j / 32),BLACK); + else + VWB_Vlin(WindowY + WindowH - 32, + WindowY + WindowH - 32 + v2, + WindowX + 8 + (j / 32),BLACK); + } + } + } + + VW_UpdateScreen(); + + while (!(scan = LastScan)) + SD_Poll(); + + IN_ClearKey(scan); + switch (scan) + { + case sc_LeftArrow: + if (i) + i--; + break; + case sc_RightArrow: + if (++i >= ChunksInFile) + i--; + break; + case sc_W: // Walls + i = 0; + break; + case sc_S: // Sprites + i = PMSpriteStart; + break; + case sc_D: // Digitized + i = PMSoundStart; + break; + case sc_I: // Digitized info + i = ChunksInFile - 1; + break; + case sc_L: // Load all pages + for (j = 0;j < ChunksInFile;j++) + PM_GetPage(j); + break; + case sc_P: +// if (sound != -1) +// SD_PlayDigitized(sound); + break; + case sc_Escape: + done = true; + break; + case sc_Enter: + PM_GetPage(i); + break; + } + } + SD_StopDigitized(); +} +#pragma warn +pia + + + +//=========================================================================== + + +/* +================ += += DebugKeys += +================ +*/ + +int DebugKeys (void) +{ + boolean esc; + int level,i; + + if (Keyboard[sc_B]) // B = border color + { + CenterWindow(24,3); + PrintY+=6; + US_Print(" Border color (0-15):"); + VW_UpdateScreen(); + esc = !US_LineInput (px,py,str,NULL,true,2,0); + if (!esc) + { + level = atoi (str); + if (level>=0 && level<=15) + VW_ColorBorder (level); + } + return 1; + } + + if (Keyboard[sc_C]) // C = count objects + { + CountObjects(); + return 1; + } + + if (Keyboard[sc_E]) // E = quit level + { + if (tedlevel) + Quit (NULL); + playstate = ex_completed; +// gamestate.mapon++; + } + + if (Keyboard[sc_F]) // F = facing spot + { + CenterWindow (14,4); + US_Print ("X:"); + US_PrintUnsigned (player->x); + US_Print ("\nY:"); + US_PrintUnsigned (player->y); + US_Print ("\nA:"); + US_PrintUnsigned (player->angle); + VW_UpdateScreen(); + IN_Ack(); + return 1; + } + + if (Keyboard[sc_G]) // G = god mode + { + CenterWindow (12,2); + if (godmode) + US_PrintCentered ("God mode OFF"); + else + US_PrintCentered ("God mode ON"); + VW_UpdateScreen(); + IN_Ack(); + godmode ^= 1; + return 1; + } + if (Keyboard[sc_H]) // H = hurt self + { + IN_ClearKeysDown (); + TakeDamage (16,NULL); + } + else if (Keyboard[sc_I]) // I = item cheat + { + CenterWindow (12,3); + US_PrintCentered ("Free items!"); + VW_UpdateScreen(); + GivePoints (100000); + HealSelf (99); + if (gamestate.bestweapon 99) + gamestate.ammo = 99; + DrawAmmo (); + IN_Ack (); + return 1; + } + else if (Keyboard[sc_M]) // M = memory info + { + DebugMemory(); + return 1; + } +#ifdef SPEAR + else if (Keyboard[sc_N]) // N = no clip + { + noclip^=1; + CenterWindow (18,3); + if (noclip) + US_PrintCentered ("No clipping ON"); + else + US_PrintCentered ("No clipping OFF"); + VW_UpdateScreen(); + IN_Ack (); + return 1; + } +#endif +#if 0 + else if (Keyboard[sc_O]) // O = overhead + { + ViewMap(); + return 1; + } +#endif + else if (Keyboard[sc_P]) // P = pause with no screen disruptioon + { + PicturePause (); + return 1; + } + else if (Keyboard[sc_Q]) // Q = fast quit + Quit (NULL); + else if (Keyboard[sc_S]) // S = slow motion + { + singlestep^=1; + CenterWindow (18,3); + if (singlestep) + US_PrintCentered ("Slow motion ON"); + else + US_PrintCentered ("Slow motion OFF"); + VW_UpdateScreen(); + IN_Ack (); + return 1; + } + else if (Keyboard[sc_T]) // T = shape test + { + ShapeTest (); + return 1; + } + else if (Keyboard[sc_V]) // V = extra VBLs + { + CenterWindow(30,3); + PrintY+=6; + US_Print(" Add how many extra VBLs(0-8):"); + VW_UpdateScreen(); + esc = !US_LineInput (px,py,str,NULL,true,2,0); + if (!esc) + { + level = atoi (str); + if (level>=0 && level<=8) + extravbls = level; + } + return 1; + } + else if (Keyboard[sc_W]) // W = warp to level + { + CenterWindow(26,3); + PrintY+=6; +#ifndef SPEAR + US_Print(" Warp to which level(1-10):"); +#else + US_Print(" Warp to which level(1-21):"); +#endif + VW_UpdateScreen(); + esc = !US_LineInput (px,py,str,NULL,true,2,0); + if (!esc) + { + level = atoi (str); +#ifndef SPEAR + if (level>0 && level<11) +#else + if (level>0 && level<22) +#endif + { + gamestate.mapon = level-1; + playstate = ex_warped; + } + } + return 1; + } + else if (Keyboard[sc_X]) // X = item cheat + { + CenterWindow (12,3); + US_PrintCentered ("Extra stuff!"); + VW_UpdateScreen(); + // DEBUG: put stuff here + IN_Ack (); + return 1; + } + + return 0; +} + + +#if 0 +/* +=================== += += OverheadRefresh += +=================== +*/ + +void OverheadRefresh (void) +{ + unsigned x,y,endx,endy,sx,sy; + unsigned tile; + + + endx = maporgx+VIEWTILEX; + endy = maporgy+VIEWTILEY; + + for (y=maporgy;y>12)); + LatchDrawChar(sx+8,sy,NUMBERCHARS+((tile&0x0f00)>>8)); + LatchDrawChar(sx,sy+8,NUMBERCHARS+((tile&0x00f0)>>4)); + LatchDrawChar(sx+8,sy+8,NUMBERCHARS+(tile&0x000f)); + } + } + +} +#endif + +#if 0 +/* +=================== += += ViewMap += +=================== +*/ + +void ViewMap (void) +{ + boolean button0held; + + viewtype = actoratview; +// button0held = false; + + + maporgx = player->tilex - VIEWTILEX/2; + if (maporgx<0) + maporgx = 0; + if (maporgx>MAPSIZE-VIEWTILEX) + maporgx=MAPSIZE-VIEWTILEX; + maporgy = player->tiley - VIEWTILEY/2; + if (maporgy<0) + maporgy = 0; + if (maporgy>MAPSIZE-VIEWTILEY) + maporgy=MAPSIZE-VIEWTILEY; + + do + { +// +// let user pan around +// + PollControls (); + if (controlx < 0 && maporgx>0) + maporgx--; + if (controlx > 0 && maporgx0) + maporgy--; + if (controly > 0 && maporgyvisview) + viewtype = mapview; + } + if (!c.button0) + button0held = false; +#endif + + OverheadRefresh (); + + } while (!Keyboard[sc_Escape]); + + IN_ClearKeysDown (); +} +#endif + diff --git a/src/util/git/git_igno.re b/src/util/git/git_igno.re index 3ef83bde..70ed7d75 100755 --- a/src/util/git/git_igno.re +++ b/src/util/git/git_igno.re @@ -8,6 +8,7 @@ *.[O] *.BCO *.*~ +FUCK *.err *.ERR *.lib @@ -25,13 +26,7 @@ __wcl__.lnk img !.git/config !.gitmodules -pcx2vrl -pcxsscut -vrl2vrs -vrsdump # except foo.html which is maintained by hand. #!foo.html # Ignore objects and archives. *.[oa] -#*.16W -#*.16B diff --git a/src/util/gitgit_con.fig b/src/util/gitgit_con.fig deleted file mode 100755 index f07fc6d5..00000000 --- a/src/util/gitgit_con.fig +++ /dev/null @@ -1,23 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "x4"] - url = ssh://sparky4@4ch.mooo.com:26/var/www/16/16.git - fetch = +refs/heads/*:refs/remotes/x4/* -[branch "master"] - remote = origin - merge = refs/heads/master -[remote "origin"] - url = git@github.com:sparky4/16.git - fetch = +refs/heads/*:refs/remotes/origin/* -[remote "sf"] - url = ssh://sparky4q@git.code.sf.net/p/project16/code - fetch = +refs/heads/*:refs/remotes/sf/* -[remote "jp"] - url = ssh://sparky4@git.osdn.jp:/gitroot/proj16/16.git - fetch = +refs/heads/*:refs/remotes/jp/* -[remote "bb"] - url = git@bitbucket.org:sparky4/16.git - fetch = +refs/heads/*:refs/remotes/bb/* diff --git a/src/util/gitgit_igno.re b/src/util/gitgit_igno.re deleted file mode 100755 index 70ed7d75..00000000 --- a/src/util/gitgit_igno.re +++ /dev/null @@ -1,32 +0,0 @@ -# Lines starting with '#' are considered comments. -# Ignore (generated) html files, -*.html -*.htm -!proj16.bfproject -*.obj -*.OBJ -*.[O] -*.BCO -*.*~ -FUCK -*.err -*.ERR -*.lib -*.LIB -makefile~ -README~ -TODO~ -LICENCE~ -*.meh -*.MEH -__wcl__.lnk -!bcexmm.map -!makefile -!modex.lib -img -!.git/config -!.gitmodules -# except foo.html which is maintained by hand. -#!foo.html -# Ignore objects and archives. -*.[oa] diff --git a/src/util/gitgit_modu.les b/src/util/gitgit_modu.les deleted file mode 100755 index 11d69bb6..00000000 --- a/src/util/gitgit_modu.les +++ /dev/null @@ -1,23 +0,0 @@ -[submodule "src/lib/doslib"] - path = src/lib/doslib - url = https://github.com/joncampbell123/doslib.git - -[submodule "src/lib/jsmn"] - path = src/lib/jsmn - url = https://github.com/zserge/jsmn.git - -[submodule "CatacombApocalypse"] - path = 16/CatacombApocalypse - url = https://github.com/FlatRockSoft/CatacombApocalypse.git - -[submodule "wolf3d"] - path = 16/wolf3d - url = https://github.com/id-Software/wolf3d.git - -[submodule "keen"] - path = 16/keen - url = https://github.com/keendreams/keen.git - -[submodule "Catacomb3D"] - path = 16/Catacomb3D - url = https://github.com/FlatRockSoft/Catacomb3D.git diff --git a/DLD.BAT b/src/util/shbat/DLD.BAT similarity index 100% rename from DLD.BAT rename to src/util/shbat/DLD.BAT diff --git a/DLDV.BAT b/src/util/shbat/DLDV.BAT similarity index 100% rename from DLDV.BAT rename to src/util/shbat/DLDV.BAT diff --git a/WBUILD.BAT b/src/util/shbat/WBUILD.BAT similarity index 100% rename from WBUILD.BAT rename to src/util/shbat/WBUILD.BAT diff --git a/awoo.sh b/src/util/shbat/awoo.sh similarity index 73% rename from awoo.sh rename to src/util/shbat/awoo.sh index 3626e3a6..6ccf53ac 100755 --- a/awoo.sh +++ b/src/util/shbat/awoo.sh @@ -5,6 +5,7 @@ #fi wmake -h www wmake -h clean +wmake -h backupscript if [ -z "$*" ]; then pee="wwww" else @@ -12,6 +13,7 @@ if [ -z "$*" ]; then fi ##echo "$pee" git add . -. ./boop.sh "$pee" +. src/util/shbat/boop.sh "$pee" +wmake -h initscript . ./wbuild.sh ##. ./mkdld.sh# slow compile ww diff --git a/boop.sh b/src/util/shbat/boop.sh similarity index 100% rename from boop.sh rename to src/util/shbat/boop.sh diff --git a/btget.bat b/src/util/shbat/btget.bat similarity index 100% rename from btget.bat rename to src/util/shbat/btget.bat diff --git a/cutetest.bat b/src/util/shbat/cutetest.bat similarity index 100% rename from cutetest.bat rename to src/util/shbat/cutetest.bat diff --git a/dld.sh b/src/util/shbat/dld.sh similarity index 100% rename from dld.sh rename to src/util/shbat/dld.sh diff --git a/dldv.sh b/src/util/shbat/dldv.sh similarity index 100% rename from dldv.sh rename to src/util/shbat/dldv.sh diff --git a/l4get.bat b/src/util/shbat/l4get.bat similarity index 100% rename from l4get.bat rename to src/util/shbat/l4get.bat diff --git a/mkdld.sh b/src/util/shbat/mkdld.sh similarity index 100% rename from mkdld.sh rename to src/util/shbat/mkdld.sh diff --git a/q.sh b/src/util/shbat/q.sh similarity index 100% rename from q.sh rename to src/util/shbat/q.sh diff --git a/qcata.sh b/src/util/shbat/qcata.sh similarity index 100% rename from qcata.sh rename to src/util/shbat/qcata.sh diff --git a/qdl.sh b/src/util/shbat/qdl.sh similarity index 100% rename from qdl.sh rename to src/util/shbat/qdl.sh diff --git a/qkeen.sh b/src/util/shbat/qkeen.sh similarity index 100% rename from qkeen.sh rename to src/util/shbat/qkeen.sh diff --git a/qwolf.sh b/src/util/shbat/qwolf.sh similarity index 100% rename from qwolf.sh rename to src/util/shbat/qwolf.sh diff --git a/run.bat b/src/util/shbat/run.bat similarity index 100% rename from run.bat rename to src/util/shbat/run.bat diff --git a/spri.sh b/src/util/shbat/spri.sh similarity index 100% rename from spri.sh rename to src/util/shbat/spri.sh diff --git a/ud.sh b/src/util/shbat/ud.sh similarity index 100% rename from ud.sh rename to src/util/shbat/ud.sh diff --git a/wbuild.sh b/src/util/shbat/wbuild.sh similarity index 100% rename from wbuild.sh rename to src/util/shbat/wbuild.sh diff --git a/winrun.bat b/src/util/shbat/winrun.bat similarity index 100% rename from winrun.bat rename to src/util/shbat/winrun.bat diff --git a/x4get.bat b/src/util/shbat/x4get.bat similarity index 100% rename from x4get.bat rename to src/util/shbat/x4get.bat diff --git a/xxdiff.sh b/src/util/shbat/xxdiff.sh similarity index 100% rename from xxdiff.sh rename to src/util/shbat/xxdiff.sh