X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_dbg.c;h=321388c91b4270e8ef3113ec61186abb63d44a94;hb=28b1be191222717943878f024cddac30b026318e;hp=576f492b1f47df9f1b8521dbca583b04f5278eff;hpb=c1e6a21feec58f3f68bbc02253443e6865762a3e;p=16.git

diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
index 576f492b..321388c9 100755
--- a/src/lib/16_dbg.c
+++ b/src/lib/16_dbg.c
@@ -17,82 +17,15 @@ boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0,dbg_nointest=0;
 boolean dbg_maptext=0;
 byte *dbg_mapdata;
 #endif
+#ifdef __DEBUG_RF__
+boolean dbg_pagenorendermap=0,dbg_pagedelayrendermap=0;
+#endif
+#ifdef __DEBUG_SPRI__
+boolean dbg_delayanimation=0;
+#endif
 #endif	//debug
 
-#ifdef __WATCOMC__
-// TODO: Could we also provide a build mode to emit debug to the "Bochs E9 hack?"
-#ifdef DEBUGSERIAL
-# include <stdarg.h>
-# include <stdlib.h>
-# include <stdio.h>
-
-unsigned char _DEBUG_INITed = 0;
-struct info_8250 *_DEBUG_uart = NULL;
-
-int _DEBUG_INIT() {
-	if (!_DEBUG_INITed) {
-		unsigned int i;
-		uint16_t port;
-
-		if (!init_8250()) return 0;
-
-		// what does the BIOS say the serial ports are?
-		probe_8250_bios_ports();
-		for (i=0;i < bios_8250_ports;i++) {
-			port = get_8250_bios_port(i);
-			if (port == 0) continue;
-			probe_8250(port);
-		}
-
-		// what about the standard serial ports?
-		for (i=0;i < (sizeof(standard_8250_ports)/sizeof(standard_8250_ports[0]));i++) {
-			port = standard_8250_ports[i];
-			if (port == 0) continue;
-			probe_8250(port);
-		}
-
-		// pick the first port, which is probably COM1
-		if (base_8250_ports == 0) return 0; // FIXME: You know "base_8250_ports" is probably a bad variable name for the max entries in info_8250_port[]
-		_DEBUG_uart = &info_8250_port[0];
-		_DEBUG_INITed = 1;
-
-		// init the COM port.
-		// in DOSBox-X, the "log" mode will receive our text and print it into the log file
-		// on real hardware, our text will likely go over a null modem cable to another PC running a serial terminal program like PuTTY or minicom.
-		// if nothing is connected, then the bytes go off into the ether to get lost and life goes on.
-		uart_8250_enable_interrupt(_DEBUG_uart,0);	// disable interrupts
-		uart_8250_set_FIFO(_DEBUG_uart,0x07);		// enable FIFO (why not?), also clear xmit/recv FIFO buffers, set threshhold to 1 byte
-		uart_8250_set_MCR(_DEBUG_uart,3);		// RTS and DTS on
-		uart_8250_set_line_control(_DEBUG_uart,UART_8250_LCR_8BIT | UART_8250_LCR_PARITY); // 8 bit 1 stop bit odd parity
-		uart_8250_set_baudrate(_DEBUG_uart,uart_8250_baud_to_divisor(_DEBUG_uart,9600)); // 9600 baud
-	}
-
-	return _DEBUG_INITed;
-}
 
-void _DEBUG(const char *msg) {
-	if (_DEBUG_uart != NULL) {
-		char c;
-
-		while ((c=(*msg++)) != 0/*NUL*/) {
-			while (!uart_8250_can_write(_DEBUG_uart)); // wait for the UART to indicate readiness for our output
-			uart_8250_write(_DEBUG_uart,(uint8_t)c); // then write it
-		}
-	}
-}
-
-static char _DEBUGF_TMP[256];
-
-void _DEBUGF(const char *fmt,...) {
-	va_list va;
-
-	va_start(va,fmt);
-	vsnprintf(_DEBUGF_TMP,sizeof(_DEBUGF_TMP),fmt,va);
-	_DEBUG(_DEBUGF_TMP);
-	va_end(va);
-}
-#endif	//serial
-#endif	//watcomc
 /*
 ================
 =
@@ -102,7 +35,7 @@ void _DEBUGF(const char *fmt,...) {
 */
 
 #pragma warn -pia
-void ShapeTest (global_game_variables_t *gvar)
+void ShapeTest_(global_game_variables_t *gvar)
 {
 extern	word	NumDigi;
 extern	word	_seg *DigiList;
@@ -126,9 +59,9 @@ static	char	buf[10];
 //		US_Print(" Page #");
 //		US_PrintUnsigned(i);
 		printf(" Page #%u", i);
-		if (i < (gvar->pm.fi.PMSpriteStart))
+//++		if (i < (gvar->pm.fi.PMSpriteStart))
 //			US_Print(" (Wall)");
-			printf(" (Wall)");
+//++			printf(" (Wall)");
 /*		else if (i < (gvar->pm.fi.PMSoundStart))
 //			US_Print(" (Sprite)");
 			printf(" (Sprite)");
@@ -256,8 +189,8 @@ static	char	buf[10];
 
 //		VW_UpdateScreen();
 
-//		while (!(scan = IN_GetLastScan()))
-			scan = *IN_GetScanName(scan);
+		while (!(scan = gvar->in.inst->LastScan))
+		{}
 //			SD_Poll();
 
 		IN_ClearKey(scan);