pngwen help!!!!

	modified:   Project 16.bfproject
	modified:   data/g.pal
	modified:   maptest.exe
	modified:   maptest0.exe
	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   src/scroll.c

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 63ddf998b24a963c249e1f67c8b5c48841062a5a..bf63ef95ee5cecc8f59ba08741a5ac7fd0f5e583 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -1,29 +1,22 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:138:0:0:
-openfiles: /dos/z/16/src/palettec.c:0:0:0:
-openfiles: /dos/z/16/src/pcxtest.c:0:0:0:
-openfiles: /dos/z/16/src/scroll.c:0:0:0:
+openfiles: /dos/z/16/src/palettec.c:179:0:0:
+openfiles: /dos/z/16/src/pcxtest.c:504:0:0:
+openfiles: /dos/z/16/src/scroll.c:3723:3241:0:
 openfiles: /dos/z/16/src/test.c:0:0:0:
 openfiles: /dos/z/16/src/test2.c:0:0:0:
-openfiles: /dos/z/16/src/lib/xms.c:0:0:0:
-openfiles: /dos/z/16/src/lib/xms.h:0:0:0:
-openfiles: /dos/z/16/src/lib/ems.c:0:0:0:
-openfiles: /dos/z/16/src/lib/ems1.c:0:0:0:
 openfiles: /dos/z/16/src/lib/planar.h:0:0:0:
 openfiles: /dos/z/16/src/lib/PLANAR.C:0:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.c:0:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.h:0:0:0:
 openfiles: /dos/z/16/src/lib/dos_kb.c:0:0:0:
 openfiles: /dos/z/16/src/lib/dos_kb.h:0:0:0:
-openfiles: /dos/z/16/src/lib/lib_head.cpp:0:0:0:
-openfiles: /dos/z/16/src/lib/lib_head.h:0:0:0:
 openfiles: /dos/z/16/src/lib/modex16.c:444:0:0:
 openfiles: /dos/z/16/src/lib/modex16.h:0:0:0:
-openfiles: /dos/z/16/src/lib/scroll.c:0:0:0:
-openfiles: /dos/z/16/src/lib/scroll.h:0:0:0:
+openfiles: /dos/z/16/src/lib/mapread.c:2209:1453:1:
+openfiles: /dos/z/16/src/lib/mapread.h:0:23:0:
 openfiles: /dos/z/16/src/lib/types.h:0:0:0:
-openfiles: /dos/z/bakac.c:0:0:1:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -35,7 +28,7 @@ view_left_panel: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0
-opendir: file:///dos/z
+opendir: file:///dos/z/16/src/lib
 wrap_text_default: 0
 bookmarks_filename_mode: 1
 snr_casesens: 0
@@ -46,7 +39,7 @@ editor_tab_width: 4
 template: /usr/share/bluefish/templates/C_header_GPL
 show_visible_spacing: 0
 view_statusbar: 1
-display_right_margin: 1
+display_right_margin: 0
 c2e.IE_apos_workaround: 0
 outputb_scroll_mode: 0
 leftpanel_active_tab: 0
@@ -55,47 +48,45 @@ ssearch_regex: 0
 e2c.convert_iso: 0
 ssearch_casesens: 0
 charmap_block: 1
-recent_files: file:///dos/z/16/src/palettec.c
+recent_files: file:///dos/z/rbaka.c
+recent_files: file:///dos/z/baka.c
+recent_files: file:///dos/z/bakac.c
+recent_files: file:///dos/z/16/doc/project.txt
 recent_files: file:///dos/z/16/src/test.c
-recent_files: file:///dos/z/16/src/pcxtest.c
 recent_files: file:///dos/z/16/src/test2.c
-recent_files: file:///dos/z/16/src/scroll.c
 recent_files: file:///dos/z/16/src/lib/xms.c
 recent_files: file:///dos/z/16/src/lib/xms.h
+recent_files: file:///dos/z/16/src/palettec.c
+recent_files: file:///dos/z/16/src/pcxtest.c
+recent_files: file:///dos/z/16/src/lib/bitmap.h
 recent_files: file:///dos/z/16/src/lib/ems.c
-recent_files: file:///dos/z/16/src/lib/ems1.c
 recent_files: file:///dos/z/16/src/lib/planar.h
 recent_files: file:///dos/z/16/src/lib/PLANAR.C
-recent_files: file:///dos/z/16/doc/project.txt
 recent_files: file:///dos/z/16/src/lib/bitmap.c
-recent_files: file:///dos/z/16/src/lib/bitmap.h
+recent_files: file:///dos/z/16/src/scroll.c
 recent_files: file:///dos/z/16/src/lib/dos_kb.c
+recent_files: file:///dos/z/16/src/lib/types.h
 recent_files: file:///dos/z/16/src/lib/dos_kb.h
-recent_files: file:///dos/z/16/src/lib/lib_head.cpp
 recent_files: file:///dos/z/16/src/lib/lib_head.h
 recent_files: file:///dos/z/16/src/lib/modex16.h
 recent_files: file:///dos/z/16/src/lib/modex16.c
-recent_files: file:///dos/z/16/src/lib/scroll.c
-recent_files: file:///dos/z/16/src/lib/scroll.h
-recent_files: file:///dos/z/16/src/lib/types.h
-recent_files: file:///dos/z/rbaka.c
-recent_files: file:///dos/z/baka.c
-recent_files: file:///dos/z/bakac.c
+recent_files: file:///dos/z/16/src/lib/mapread.h
+recent_files: file:///dos/z/16/src/lib/mapread.c
 snr_replacetype: 0
-savedir: file:///dos/z
+savedir: file:///dos/z/16/src
 spell_check_default: 1
 spell_insert_entities: 0
 last_filefilter: 
 htmlbar_notebooktab: 0
 view_blockstack: 1
 snr_escape_chars: 0
-htmlbar_view: 1
+htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
-snippets_show_as_menu: 1
+snippets_show_as_menu: 0
 adv_open_recursive: 0
 encoding: SHIFT_JIS
 e2c.convert_special: 0
@@ -123,7 +114,7 @@ c2e.convert_symbol: 0
 snr_dotmatchall: 0
 c2e.convert_xml: 1
 editor_indent_wspaces: 0
-view_cline: 0
+view_cline: 1
 snr_type: 0
 snr_scope: 2
 bmarksearchmode: 0

diff --git a/data/g.pal b/data/g.pal
index a234f82cf8f66fa49d1057244aa661141c14cf8d..9ce11752436d2b674f5203a746a27cd658815e1c 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/maptest.exe b/maptest.exe
index d1324b9ffa23440ef339922f85f18c9f98c02fea..1dc3d4c40bbea4d05681097b87b66b211ae5d874 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/maptest0.exe b/maptest0.exe
index 6b4ef08af791a8ea796024899957e72e735bd9df..2f62f5028217b9d80a11b6abdd9a5ebee6f33206 100644 (file)
Binary files a/maptest0.exe and b/maptest0.exe differ

diff --git a/scroll.exe b/scroll.exe
index 66e5bfdedc17445e816879e0db2ca07f80b55b65..ebdaf820e3ab32bc660e2c4152f32ad7133b84d6 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index e5f80fc2e18d163ca8d619ceae56b5d48f838d11..c98b3eb84aad6e81f90f756521e6603063855159 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -77,8 +77,8 @@ word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, cha
                        map->tiles = /*_f*/malloc(sizeof(tiles_t));
                        //map->tiles->data = malloc(sizeof(bitmap_t));
                        //fix this to be far~
-                       bp = bitmapLoadPcx("data/ed.pcx");
-                       map->tiles->data = &bp;
+//++++                 bp = bitmapLoadPcx("data/ed.pcx");
+//++++                 map->tiles->data = &bp;
                        //map->tiles->data->data = malloc((16/**2*/)*16);
                        //map->tiles->data->width = (16/**2*/);\r
                        //map->tiles->data->height= 16;\r

diff --git a/src/scroll.c b/src/scroll.c
index ceee8644a7fcd03b181050fdf85ce34586820f17..72ad4d5c60d32ea8b14268721f0374bb3027ec94 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -121,12 +121,12 @@ void main() {
        mappalptr = map.tiles->data->palette;\r
        /* data */\r
 //0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
-       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+       //++++ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
 \r
        /* create the planar buffer */\r
 //0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
-       p = planar_buf_from_bitmap(&ptmp);
+//++++ p = planar_buf_from_bitmap(&ptmp);
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());\r
 \r
        /*if(isEMS())\r