modified: 16/Project 16.bfproject

	modified:   16/modex16/DP_PREFS
	modified:   16/modex16/PCXTEST.C
	modified:   16/modex16/PCXTEST.EXE
	modified:   16/modex16/PCXTEST.OBJ
	new file:   16/modex16/chikyuu-.pcx
	new file:   16/modex16/chikyuu-.png

diff --git a/16/Project 16.bfproject b/16/Project 16.bfproject
index 6612d80b960b565287b0f5d9448712f59961a4c3..804128c12135eb522e6e98d74a896e5b1fb80e67 100644 (file)
--- a/16/Project 16.bfproject
+++ b/16/Project 16.bfproject
@@ -1,23 +1,21 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
 c2e.convert_special: 0
 e2c.convert_num: 0

-openfiles: /dos/z/16/16/dos_gfx.cpp:9064:8494:1:
+openfiles: /dos/z/16/16/dos_gfx.cpp:8455:8455:0:

 openfiles: /dos/z/16/16/dos_gfx.h:391:285:0:
 openfiles: /dos/z/16/16/dos_kb.c:1039:46:0:
 openfiles: /dos/z/16/16/dos_kb.h:23:0:0:
 openfiles: /dos/z/16/16/lib/lib_com.cpp:0:0:0:
 openfiles: /dos/z/16/16/dos_gfx.h:391:285:0:
 openfiles: /dos/z/16/16/dos_kb.c:1039:46:0:
 openfiles: /dos/z/16/16/dos_kb.h:23:0:0:
 openfiles: /dos/z/16/16/lib/lib_com.cpp:0:0:0:

-openfiles: /dos/z/16/16/lib/lib_com.h:2503:1575:0:
+openfiles: /dos/z/16/16/lib/lib_com.h:2503:1416:0:

 openfiles: /dos/z/16/16/scroll.txt:5256:4537:0:
 openfiles: /dos/z/16/16/scroll.txt:5256:4537:0:

-openfiles: /dos/z/16/16/project16.txt:8063:7058:0:
+openfiles: /dos/z/16/16/project16.txt:8063:6091:0:

 openfiles: /dos/z/16/16/16.txt:0:0:0:
 openfiles: /dos/z/16/16/lib/x/MODEX.H:3164:2733:0:
 openfiles: /dos/z/16/16/lib/intro/lib.c:2412:1757:0:
 openfiles: /dos/z/16/src/lib/dos_gfx.cpp:2364:1106:0:
 openfiles: /dos/z/16/src/lib/dos_gfx.h:0:0:0:
 openfiles: /dos/z/16/16/lib/x/MXBB.ASM:559:0:0:
 openfiles: /dos/z/16/16/16.txt:0:0:0:
 openfiles: /dos/z/16/16/lib/x/MODEX.H:3164:2733:0:
 openfiles: /dos/z/16/16/lib/intro/lib.c:2412:1757:0:
 openfiles: /dos/z/16/src/lib/dos_gfx.cpp:2364:1106:0:
 openfiles: /dos/z/16/src/lib/dos_gfx.h:0:0:0:
 openfiles: /dos/z/16/16/lib/x/MXBB.ASM:559:0:0:

-openfiles: /dos/z/4x4_16/modex/DEMO01.PAS:2972:2048:0:
-openfiles: /dos/z/4x4_16/modex/DEMO07.PAS:1567:547:0:
-openfiles: /dos/z/16/16/lib/x/MXCR.ASM:252:0:0:

 openfiles: /dos/z/16/16/scrasm/MAIN.ASM:4251:1619:0:
 openfiles: /dos/z/16/16/scrasm/MAIN.ASM:4251:1619:0:

+openfiles: /dos/z/16/16/modex16/PCXTEST.C:223:0:1:

 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0


@@ -29,7 +27,7 @@ view_left_panel: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0

-opendir: file:///dos/z/16/16/scrasm
+opendir: file:///dos/z/16/16/modex16

 wrap_text_default: 0
 bookmarks_filename_mode: 1
 ssearch_text: mxpt
 wrap_text_default: 0
 bookmarks_filename_mode: 1
 ssearch_text: mxpt


@@ -84,23 +82,24 @@ recent_files: file:///dos/z/16/16/lib/x/MXVS.ASM
 recent_files: file:///dos/z/16/16/lib/x/MAKEFILE
 recent_files: file:///dos/z/16/16/lib/x/MODEX.DEF
 recent_files: file:///dos/z/16/16/dos_gfx.cpp
 recent_files: file:///dos/z/16/16/lib/x/MAKEFILE
 recent_files: file:///dos/z/16/16/lib/x/MODEX.DEF
 recent_files: file:///dos/z/16/16/dos_gfx.cpp

+recent_files: file:///dos/z/16/16/dos_gfx.h
+recent_files: file:///dos/z/16/16/16.txt

 recent_files: file:///dos/z/16/16/lib/lib_com.cpp
 recent_files: file:///dos/z/16/16/dos_kb.c
 recent_files: file:///dos/z/16/16/dos_kb.h
 recent_files: file:///dos/z/16/16/lib/lib_com.cpp
 recent_files: file:///dos/z/16/16/dos_kb.c
 recent_files: file:///dos/z/16/16/dos_kb.h

-recent_files: file:///dos/z/16/16/dos_gfx.h
+recent_files: file:///dos/z/16/16/lib/lib_com.h

 recent_files: file:///dos/z/16/16/project16.txt
 recent_files: file:///dos/z/16/16/scroll.txt
 recent_files: file:///dos/z/16/16/project16.txt
 recent_files: file:///dos/z/16/16/scroll.txt

-recent_files: file:///dos/z/16/16/lib/lib_com.h
-recent_files: file:///dos/z/16/16/16.txt

 recent_files: file:///dos/z/16/16/lib/x/MODEX.H
 recent_files: file:///dos/z/16/16/lib/x/MODEX.H

+recent_files: file:///dos/z/16/src/lib/dos_gfx.h

 recent_files: file:///dos/z/16/16/lib/x/MXBB.ASM
 recent_files: file:///dos/z/16/16/lib/x/MXBB.ASM

-recent_files: file:///dos/z/16/16/scrasm/MAIN.ASM
-recent_files: file:///dos/z/4x4_16/modex/DEMO07.PAS

 recent_files: file:///dos/z/4x4_16/modex/DEMO01.PAS
 recent_files: file:///dos/z/4x4_16/modex/DEMO01.PAS

-recent_files: file:///dos/z/16/src/lib/dos_gfx.h

 recent_files: file:///dos/z/16/src/lib/dos_gfx.cpp
 recent_files: file:///dos/z/16/src/lib/dos_gfx.cpp

-recent_files: file:///dos/z/16/16/lib/intro/lib.c

 recent_files: file:///dos/z/16/16/lib/x/MXCR.ASM
 recent_files: file:///dos/z/16/16/lib/x/MXCR.ASM

+recent_files: file:///dos/z/16/16/lib/intro/lib.c
+recent_files: file:///dos/z/4x4_16/modex/DEMO07.PAS
+recent_files: file:///dos/z/16/16/scrasm/MAIN.ASM
+recent_files: file:///dos/z/16/16/modex16/PCXTEST.C

 snr_replacetype: 0
 savedir: file:///dos/z/16/16
 spell_check_default: 1
 snr_replacetype: 0
 savedir: file:///dos/z/16/16
 spell_check_default: 1

diff --git a/16/modex16/DP_PREFS b/16/modex16/DP_PREFS
index d27b7ecbf4c5a4a5c83733c1965a51f240836a5a..2ea338367087365d7ae7e59476f1e9fe43365ec1 100644 (file)
Binary files a/16/modex16/DP_PREFS and b/16/modex16/DP_PREFS differ

diff --git a/16/modex16/PCXTEST.C b/16/modex16/PCXTEST.C
index 6e3e6a3feb55dac01dab2e1f15afc97b80a12974..5eded12493da97c93cf5165ad90ce10acb2a4ff1 100644 (file)
--- a/16/modex16/PCXTEST.C
+++ b/16/modex16/PCXTEST.C
@@ -10,16 +10,16 @@ void main() {
        //int ch=0x0;\r
 \r
     //bmp = modexLoadPcx("ed.pcx");\r
        //int ch=0x0;\r
 \r
     //bmp = modexLoadPcx("ed.pcx");\r

-       bmp = modexLoadPcx("w.pcx");
+       bmp = modexLoadPcx("w.pcx");\r

        bmp2 = modexLoadPcx("q.pcx");\r
        bmp2 = modexLoadPcx("q.pcx");\r

-       bmp3 = modexLoadPcx("flower.pcx");\r
+       bmp3 = modexLoadPcx("chikyuu-.pcx");\r

     /*bmp2 = modexLoadPcx("ed2.pcx");\r
     bmp3 = modexLoadPcx("flower.pcx");\r
     bmp4 = modexLoadPcx("koishi^^.pcx");*/\r
        modexEnter();\r
 \r
     /* fix up the palette and everything */\r
     /*bmp2 = modexLoadPcx("ed2.pcx");\r
     bmp3 = modexLoadPcx("flower.pcx");\r
     bmp4 = modexLoadPcx("koishi^^.pcx");*/\r
        modexEnter();\r
 \r
     /* fix up the palette and everything */\r

-       modexPalUpdate(bmp.palette);\r
+       //modexPalUpdate(bmp3.palette);\r

 \r
     /* don't show the drawing page */\r
     modexShowPage(VGA + PAGE_SIZE);\r
 \r
     /* don't show the drawing page */\r
     modexShowPage(VGA + PAGE_SIZE);\r


@@ -30,9 +30,9 @@ void main() {
     modexDrawBmp(VGA, 180, 20, &bmp, 1);\r
        modexDrawBmp(VGA, 180, 0, &bmp3, 1);\r
        modexDrawBmp(VGA, 170, 100, &bmp4, 1);*/\r
     modexDrawBmp(VGA, 180, 20, &bmp, 1);\r
        modexDrawBmp(VGA, 180, 0, &bmp3, 1);\r
        modexDrawBmp(VGA, 170, 100, &bmp4, 1);*/\r

-       modexDrawBmp(VGA, 100, 0, &bmp, 0);
-       //modexDrawBmp(VGA, 120, 20, &bmp3, 0);
-       modexDrawBmp(VGA, 100, 0, &bmp2, 1);
+       modexDrawBmp(VGA, 100, 40, &bmp, 0);\r
+       modexDrawBmp(VGA, 100, 40, &bmp2, 1);\r
+       modexDrawBmp(VGA, 0, 20, &bmp3, 0);\r

        //modexDrawBmp(VGA, 120, 60, &bmp3, 1);\r
     modexShowPage(VGA);\r
 //    for(index = 0; index<500; index++) {\r
        //modexDrawBmp(VGA, 120, 60, &bmp3, 1);\r
     modexShowPage(VGA);\r
 //    for(index = 0; index<500; index++) {\r

diff --git a/16/modex16/PCXTEST.EXE b/16/modex16/PCXTEST.EXE
index f8ee41dc797304fb307d5ef6dc7234609855ac30..0e2f5fb009ee7d24622f236039f03396d1b47c4c 100644 (file)
Binary files a/16/modex16/PCXTEST.EXE and b/16/modex16/PCXTEST.EXE differ

diff --git a/16/modex16/PCXTEST.OBJ b/16/modex16/PCXTEST.OBJ
index aef600438498e676ebb57b223bf9ef3f0fc23d9b..6d1743f357ee45c437b1d2c8298b73e20b624e29 100644 (file)
Binary files a/16/modex16/PCXTEST.OBJ and b/16/modex16/PCXTEST.OBJ differ

diff --git a/16/modex16/chikyuu-.pcx b/16/modex16/chikyuu-.pcx
new file mode 100644 (file)
index 0000000..d99a0dd
Binary files /dev/null and b/16/modex16/chikyuu-.pcx differ

diff --git a/16/modex16/chikyuu-.png b/16/modex16/chikyuu-.png
new file mode 100644 (file)
index 0000000..789c6ae
Binary files /dev/null and b/16/modex16/chikyuu-.png differ