From: sparky4 <sparky4@cock.li>
Date: Wed, 3 Dec 2014 07:22:28 +0000 (-0600)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=1d2a893c2a3f83e4a0916667e89c7659bda55b9b

wwww
	modified:   Project 16.bfproject
	modified:   scroll.exe
	modified:   src/scroll.c
---

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 6ffde1c1..e260eb4d 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -1,26 +1,26 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
-openfiles: /dos/z/16/16.c:25:0:0:
-openfiles: /dos/z/16/src/scroll.c:1:0:1:
-openfiles: /dos/z/16/src/lib/scroll.c:1178:1022:0:
-openfiles: /dos/z/16/src/lib/scroll.h:1961:598:0:
-openfiles: /dos/z/16/src/lib/modex16.c:136:0:0:
-openfiles: /dos/z/16/src/lib/modex16.h:3194:2077:0:
+openfiles: /dos/z/16/16.c:0:0:0:
+openfiles: /dos/z/16/src/scroll.c:2242:1394:0:
+openfiles: /dos/z/16/src/lib/scroll.c:1666:0:0:
+openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0:
+openfiles: /dos/z/16/src/lib/modex16.c:13778:13598:0:
+openfiles: /dos/z/16/src/lib/modex16.h:2059:913:0:
 openfiles: /dos/z/16/src/pcxtest.c:68:0:0:
 openfiles: /dos/z/16/src/lib/dos_kb.c:107:0:0:
 openfiles: /dos/z/16/src/lib/dos_kb.h:62:0:0:
 openfiles: /dos/z/16/src/lib/lib_head.h:165:0:0:
 openfiles: /dos/z/16/src/palettec.c:176:0:0:
-openfiles: /dos/z/16/src/test.c:18:0:0:
+openfiles: /dos/z/16/src/test.c:415:52:1:
 openfiles: /dos/z/16/src/test2.c:18:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.c:59:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.h:125:0:0:
 openfiles: /dos/z/16/src/lib/lib_head.cpp:0:0:0:
-openfiles: /dos/z/16/src/lib/types.h:0:0:0:
+openfiles: /dos/z/16/src/lib/types.h:98:0:0:
 openfiles: /dos/z/16/makefile:22:0:0:
 openfiles: /dos/z/16/16/dos_gfx.cpp:6388:0:0:
-openfiles: /dos/z/16/16/dos_gfx.h:175:0:0:
+openfiles: /dos/z/16/16/dos_gfx.h:175:597:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -35,7 +35,7 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/16/16
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: wWrow
+ssearch_text: modexPalUpdate
 snr_casesens: 1
 view_blocks: 1
 name: project 16
@@ -53,7 +53,7 @@ replacelist: TRIGGY
 replacelist: TRIGGX
 replacelist: $(SRCLIB)
 replacelist: $(SRC)
-replacelist: SPEED);
+replacelist: play->
 fb_show_hidden_f: 0
 editor_tab_width: 4
 show_visible_spacing: 1
@@ -97,26 +97,26 @@ recent_files: file:///dos/z/keen-src/id_rf_a.asm
 recent_files: file:///dos/z/keen-src/id_rf.c
 recent_files: file:///dos/z/16/gfx.pal
 recent_files: file:///dos/z/16/src/scroll.c
-recent_files: file:///dos/z/16/src/lib/scroll.c
-recent_files: file:///dos/z/16/src/lib/modex16.h
 recent_files: file:///dos/z/16/doc/project.txt
-recent_files: file:///dos/z/16/src/lib/dos_kb.h
+recent_files: file:///dos/z/16/src/lib/modex16.h
 recent_files: file:///dos/z/16/src/lib/scroll.h
-recent_files: file:///dos/z/16/src/lib/dos_kb.c
+recent_files: file:///dos/z/16/src/lib/scroll.c
 recent_files: file:///dos/z/16/src/pcxtest.c
-recent_files: file:///dos/z/16/16.c
 recent_files: file:///dos/z/16/src/lib/modex16.c
-recent_files: file:///dos/z/16/src/lib/lib_head.h
+recent_files: file:///dos/z/16/16.c
+recent_files: file:///dos/z/16/src/lib/dos_kb.c
+recent_files: file:///dos/z/16/src/lib/dos_kb.h
 recent_files: file:///dos/z/16/src/palettec.c
-recent_files: file:///dos/z/16/src/test.c
 recent_files: file:///dos/z/16/src/test2.c
+recent_files: file:///dos/z/16/src/lib/lib_head.h
+recent_files: file:///dos/z/16/src/test.c
+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/lib/lib_head.cpp
 recent_files: file:///dos/z/16/src/lib/types.h
 recent_files: file:///dos/z/16/makefile
 recent_files: file:///dos/z/16/16/dos_gfx.h
 recent_files: file:///dos/z/16/16/dos_gfx.cpp
-recent_files: file:///dos/z/16/src/lib/bitmap.c
-recent_files: file:///dos/z/16/src/lib/lib_head.cpp
 snr_replacetype: 0
 savedir: file:///dos/z/16/src
 spell_check_default: 1
@@ -128,21 +128,21 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: UpdateTiles
-searchlist: dyThresh
-searchlist: screen.width
-searchlist: width
-searchlist: cols
-searchlist: MAPY/2
 searchlist: MAPX/2
 searchlist: mapDrawTile
 searchlist: dxThresh
 searchlist: PalFile
 searchlist: src\\lib\\
+searchlist: player.
 searchlist: src\\
-searchlist: SPEED, q);
-searchlist: Wrow
-searchlist: wWrow
+searchlist: void modexPalBlack();
+searchlist: oid modexPalBlack(
+searchlist: id modexPalBlack(
+searchlist: d modexPalBlack(
+searchlist:  modexPalBlack(
+searchlist: fadePalette(
+searchlist: modexPalBlack(
+searchlist: modexPalUpdate
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
diff --git a/scroll.exe b/scroll.exe
index 9e9f0cdf..5f3c5004 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/scroll.c b/src/scroll.c
index 6533b67c..67545a66 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -75,8 +75,15 @@ void main() {
 	map_t map;
 	map_view_t mv, mv2, mv3;
 	map_view_t *bg, *spri, *mask;//, *tmp;
+	byte *pal;
 	byte *ptr;
 
+	/* save the palette */
+	pal  = modexNewPal();
+	modexPalSave(pal);
+	modexFadeOff(4, pal);
+	modexPalBlack();
+
 	/* create the map */
 	map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	initMap(&map);
@@ -90,7 +97,9 @@ void main() {
 	ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
 	setkb(1);
 	modexEnter();
+	modexPalBlack();
 	modexPalUpdate(ptmp.palette);
+	modexFadeOn(4, ptmp.palette);
 	screen = modexDefaultPage();
 	screen.width += (TILEWH*2);
 	screen.height += (TILEWH*2)+QUADWH;
@@ -124,13 +133,13 @@ void main() {
 	modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
 	modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
 	modexShowPage(spri->page);
-	while(!keyp(1))//!keyp(1))
+	while(!keyp(1))
 	{
 	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
 	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
 	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
-	#define INC_PER_FRAME if(q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;	
+	#define INC_PER_FRAME if(q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
 
 	if(keyp(77) && !keyp(75))
 	{
@@ -296,7 +305,10 @@ void main() {
 	}
 	}
 
-	modexLeave();
+	/* fade back to text mode */
+	modexFadeOff(4, ptmp.palette);
+	modexPalBlack();
+	modexLeave();
 	setkb(0);
 	printf("Project 16 scroll.exe\n");
 	printf("tx: %d\n", bg->tx);
@@ -318,6 +330,8 @@ void main() {
 		default: cpus = "internal error"; break;
 	}
 	printf("detected CPU type: %s\n", cpus);
+	modexPalBlack();
+	modexFadeOn(4, pal);
 }