From: sparky4 <sparky4@cock.li>
Date: Sun, 13 Nov 2022 00:22:52 +0000 (-0600)
Subject: added a file and testing pcxtest on other machines
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=82706f1175144599dd76e3a92cbc3d56f7f0d383;p=16.git

added a file and testing pcxtest on other machines
---

diff --git a/PCXTEST.LOG b/PCXTEST.LOG
new file mode 100755
index 00000000..b716baa0
--- /dev/null
+++ b/PCXTEST.LOG
@@ -0,0 +1,5 @@
+11264
+CPU to VGA: 1.208791
+VGA to VGA: 0.329670
+gvar.video.page[0].width: 320
+gvar.video.page[0].height: 240
diff --git a/data/maryai.pal b/data/maryai.pal
deleted file mode 100755
index f8c4861f..00000000
--- a/data/maryai.pal
+++ /dev/null
@@ -1 +0,0 @@
-ÿÿÿ	%&4H	
6636<++4-PW)#-3j)8A-6T49)BB?AE9@6CK5'#<l"C^4;›\=)EŽh;ROVB#UH8K†.SlCO[VLRuD?5WZ_LLFUAbW0VŽTO_hJX~I*gOCXW.'dIJ]3UUqLXslV0KVº|OZ|T-uY*sb4ob=g¹…_&Pe«CqVxbSbeƒocvPlˆXoYŠ^m”a.nmC‚mRrwˆchiP\uH‘f8-‚b“c[›cB’gH‡l;“l0‹o0‡oKwv<~pwzq€qpœhyws“†sg”z¹rL‡€¤~9€D¬w‚I˜r‘…KœR´zR†‚¡•‚l8Ÿv…ƒ­vWžƒaˆ†‘`•s…ŒV¬P_”•¨jH$©‹¼}r¸„B†nQž•{‘––en˜†¦‘E¬^­S¶E’‘²{”磔W)·ˆG²ƒ+º—_¶Š{§Ø/ŔÀgÁ¡E͜VÁ XAČº¢e¸¤X¢£¼‡²Œv´µÑžm5ʤᖠX©®aKȊ ®†Ö¢Oӏµ¦Ú “µª¦q¾¹š²¿¹¯‹Î¯D¥®ç;Ö¤EԚϨ©Ò®wвSȲrË´^Ê´i`ћӲf²¶ÉlПQ٘LݶGã°Ü¼læ»jÞÁZß¿xWåªÚÃqÝÃfØÃy徆ÖŎÔÎmâ±®Èú᾿ÔôºÎ£ì½¾ä׿ÊáîÀ²åËUÖ˚¶ÔÅÌÏÖgñ¸ØÏ°ìÏhïÍyëÏråÑëΒêÊÉèÒzç҇í̺ãӓÕÓÇ{ñ¾÷ՀxöÐñÔÒöۅõßd†úÆõÞ~ïߋößwðà…ñá“ùÜËò⠘ûÍòènøÞÕ÷ßܞûÚ¸õêäçñ¨þÕúì“øížïëã²ÿ×Òõïñìëùò’õîÑúð§àõÏøó›ýîèúõ¤öòãýô´÷ñðúø¯øóòúóëüöÃúõô÷÷îúüÁøúþ
\ No newline at end of file
diff --git a/data/maryai.vrl b/data/maryai.vrl
deleted file mode 100755
index 7b9f312c..00000000
Binary files a/data/maryai.vrl and /dev/null differ
diff --git a/data/maryai4a.pcx b/data/maryai4a.pcx
new file mode 100755
index 00000000..d2503606
Binary files /dev/null and b/data/maryai4a.pcx differ
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 70667e38..15cb2a1a 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -50,9 +50,9 @@
 #define PLAYERBMPDATA		*PLAYERBMPDATAVAR
 #define PLAYERBMPDATAPTR	PLAYERBMPDATAVAR
 
-#define PCXBMPVAR	gvar.player[0].data
-#define PCXBMP		*PCXBMPVAR
-#define PCXBMPPTR	PCXBMPVAR
+//#define PCXBMPVAR	gvar.player[0].data
+//#define PCXBMP		*PCXBMPVAR
+//#define PCXBMPPTR	PCXBMPVAR
 
 //row and colum drawing routines
 #define FULLRCREND
diff --git a/src/pcxtest.c b/src/pcxtest.c
index 1c3aa9c9..9732cc28 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -65,7 +65,7 @@ void main() {
 
 //0000	PCXBMP = bitmapLoadPcx("data/koishi~~.pcx");
 //0000	PCXBMP = bitmapLoadPcx("data/chikyuu.pcx"/*, &gvar*/);
-	PCXBMP = bitmapLoadPcx("data/maryai.pcx");
+	PCXBMP = bitmapLoadPcx("data/maryai4a.pcx");
 //	PCXBMP = bitmapLoadPcx("data/koishi^^.pcx");
 //	PCXBMP = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
 //----	p = planar_buf_from_bitmap(PCXBMPPTR);
diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index dadb2c45..57d08ec2 100755
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -86,7 +86,7 @@ void main() {
 
 //0000	bmp = bitmapLoadPcx("data/koishi~~.pcx");
 //0000	bmp = bitmapLoadPcx("data/chikyuu.pcx"/*, &gvar*/);
-	bmp = bitmapLoadPcx("data/maryai.pcx"/*, &gvar*/);
+	bmp = bitmapLoadPcx("data/maryai4a.pcx"/*, &gvar*/);
 //	bmp = bitmapLoadPcx("data/koishi^^.pcx");
 //	bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
 //----	p = planar_buf_from_bitmap(&bmp);