From: sparky4 <sparky4@cock.li>
Date: Fri, 14 Apr 2017 22:47:46 +0000 (-0500)
Subject: p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=23633a34e93bf04d2865738e98804a9005948a34;p=proj16%2F16.git

p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] MM_ShowMemory is quite buggy on real machines. i need to debug it and fix added a struct printer[gvar.mm is FUCKING HUGE 14402 bytes FAT\!]16_rf now compiles BT UNKNOWN ON WHAT IT DOSE\! text box creates a ghost because page 1 do not have bg info thus it is stored and saved.... wwww fizzfade being worked on and no idea how to make it work...[xcroll is fixed resuming fizzfade testings] also imf to xcroll is not work
---

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index 3e4cfc00..a058a320 100755
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -226,7 +226,7 @@ void SD_Initimf(global_game_variables_t *gvar)
 
 void SD_imf_free_music(global_game_variables_t *gvar)
 {
-	if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);
+//	if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);
 	MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar);	//TODO make behave like id engine
 	gvar->ca.sd.imf_music = gvar->ca.sd.imf_play_ptr = gvar->ca.sd.imf_music_end = NULL;
 	gvar->ca.sd.imf_delay_countdown = 0;
diff --git a/src/xcroll.c b/src/xcroll.c
index c371b40f..542301c1 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,7 +24,6 @@
 #include "src/lib/16_timer.h"
 #include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
-#include "src/lib/16_sd.h"
 
 #define FADE
 //#define NOMAPLOAD
@@ -38,7 +37,6 @@ boolean panswitch=0,baka=0;
 //extern boolean pageflipflop=1;
 extern boolean pagenorendermap;	//default: 0
 unsigned int i;
-struct glob_game_vars *ggvv;
 
 #ifdef FADE
 //static word paloffset=0;
@@ -51,26 +49,10 @@ memptr pal;
 #define FILENAME_2	"data/spri/me.vrs"
 #define FILENAME_2P	"data/spri/me.pal"
 
-static void (interrupt *old_irq0)();
-// WARNING: subroutine call in interrupt handler. make sure you compile with -zu flag for large/compact memory models
-void interrupt irq0()
-{
-	ggvv->ca.sd.irq0_ticks++;
-	if ((ggvv->ca.sd.irq0_cnt += ggvv->ca.sd.irq0_add) >= ggvv->ca.sd.irq0_max) {
-		ggvv->ca.sd.irq0_cnt -= ggvv->ca.sd.irq0_max;
-		old_irq0();
-	}
-	else {
-		p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);
-	}
-}
-
 void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	unsigned long tickrate = 700;
-	unsigned long ptick;
-	unsigned long adv;
+	struct glob_game_vars *ggvv;
 //	sword bakapee;
 // 	if(argv[1]) bakapee = atoi(argv[1]);
 // 	else bakapee = 1;
@@ -79,7 +61,6 @@ void main(int argc, char *argv[])
 	char bakapee1p[64] = FILENAME_1P;
 
 	Startup16(&gvar);
-	if (!SD_imf_load_music("data/02.imf", &gvar)){ printf("Failed to load IMF Music\n"); return; }
 
 //	bakapee1=mALLoc(64);
 //	bakapee1p=mALLoc(64);
@@ -104,7 +85,6 @@ void main(int argc, char *argv[])
 
 	// create the map
 //	fprintf(stderr, "testing map load~	");
-
 	CA_loadmap("data/test.map", &map, &gvar);
 #ifndef NOMAPLOAD
 	chkmap(&map, 0);
@@ -151,15 +131,18 @@ void main(int argc, char *argv[])
 	// setup camera and screen~
 	modexHiganbanaPageSetup(&gvar);
 	ZC_MVSetup(&gvar.mv, &map, &gvar);
-/*
+
 #ifdef FADE
 	modexFadeOn(4, &gvar.video.palette);
 #endif
-	IN_StartAck (&gvar); MM_ShowMemory(&gvar); while (!IN_CheckAck (&gvar)){}
+
+	IN_StartAck (&gvar);
+	MM_ShowMemory(&gvar);
+	while (!IN_CheckAck (&gvar)){}
 #ifdef FADE
 	modexPalBlack();	//so player will not see loadings~
 #endif
-*/
+
 	// set up paging
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(&gvar.mv, 0, 0);
@@ -167,15 +150,6 @@ void main(int argc, char *argv[])
 	ZC_PlayerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);
 	EN_initPlayer(&gvar.player[0], &gvar.video);
 	//print_anim_ids(gvar.player[0].enti.spri);
-	SD_Initimf(&gvar);
-
-	write_8254_system_timer(T8254_REF_CLOCK_HZ / tickrate);
-	old_irq0 = _dos_getvect(8);/*IRQ0*/
-	_dos_setvect(8,irq0);
-
-//	_cli();
-	gvar.ca.sd.irq0_ticks = ptick = 0;
-//	_sti();
 	if (gvar.video.sprifilei == -1)
 	{
 #ifdef FADE
@@ -198,15 +172,6 @@ void main(int argc, char *argv[])
 #endif
 	while(!gvar.in.inst->Keyboard[sc_Escape] && gvar.player[0].enti.hp>0)
 	{
-//		_cli();
-		adv = gvar.ca.sd.irq0_ticks - ptick;
-		if (adv >= 100UL) adv = 100UL;
-		ptick = gvar.ca.sd.irq0_ticks;
-//		_sti();
-		while (adv != 0) {
-			SD_imf_tick(&gvar);
-			adv--;
-		}
 		gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
 		gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
 		shinku(&gvar);
@@ -281,11 +246,6 @@ void main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", &gvar.video.palette);
 	modexFadeOff(4, &gvar.video.palette);
 #endif
-	SD_imf_free_music(&gvar);
-	SD_adlib_shut_up();
-	shutdown_adlib();
-	_dos_setvect(8,old_irq0);
-	write_8254_system_timer(0);/* back to normal 18.2Hz */
 	Shutdown16(&gvar);
 	printf("\nProject 16 xcroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);