X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tail.c;h=3b1cb42c3b0c9c76887689bd9dccc4f97aed0d17;hb=52fab2ff9ef6a39ed9303b0df1ce0ad9c9180ef1;hp=81b1d5953af0cedf849baa559ff48bb7186a7a72;hpb=61e40b1cbfaa14b29277ae274f0bc5cbedef3758;p=16.git

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 81b1d595..3b1cb42c 100755
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -46,9 +46,9 @@ void Startup16(global_game_variables_t *gvar)
 
 	// DOSLIB: what CPU are we using?
 	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
-	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
-	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
-	//      the CPU to carry out tasks. --J.C.
+	//	  So this code by itself shouldn't care too much what CPU it's running on. Except that other
+	//	  parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
+	//	  the CPU to carry out tasks. --J.C.
 	cpu_probe();
 
 	// DOSLIB: check for VGA
@@ -81,8 +81,11 @@ void Startup16(global_game_variables_t *gvar)
 #endif
 	IN_Startup(gvar);
 #endif
+#ifdef __16_PM__
 	PM_Startup(gvar);
+	PM_CheckMainMem(gvar);
 	PM_UnlockMainMem(gvar);
+#endif
 	CA_Startup(gvar);
 }
 
@@ -100,7 +103,9 @@ void Startup16(global_game_variables_t *gvar)
 
 void Shutdown16(global_game_variables_t *gvar)
 {
+#ifdef __16_PM__
 	PM_Shutdown(gvar);
+#endif
 #ifdef __WATCOMC__
 #ifdef __DEBUG_InputMgr__
 	if(!dbg_nointest)
@@ -109,6 +114,9 @@ void Shutdown16(global_game_variables_t *gvar)
 #endif
 	CA_Shutdown(gvar);
 	MM_Shutdown(gvar);
+#ifdef __WATCOMC__
+	VGAmodeX(0, 1, gvar);
+#endif
 }
 
 
@@ -124,10 +132,10 @@ void Shutdown16(global_game_variables_t *gvar)
 
 /*void ReadConfig(void)
 {
-	int                     file;
-	SDMode          sd;
-	SMMode          sm;
-	SDSMode         sds;
+	int					 file;
+	SDMode		  sd;
+	SMMode		  sm;
+	SDSMode		 sds;
 
 
 	if ( (file = open(configname,O_BINARY | O_RDONLY)) != -1)
@@ -226,7 +234,7 @@ void Shutdown16(global_game_variables_t *gvar)
 
 /*void WriteConfig(void)
 {
-	int                     file;
+	int					 file;
 
 	file = open(configname,O_CREAT | O_BINARY | O_WRONLY,
 				S_IREAD | S_IWRITE | S_IFREG);
@@ -274,9 +282,9 @@ void DebugMemory_(global_game_variables_t *gvar, boolean q)
 
 	US_CPrint ("Memory Usage");
 	US_CPrint ("------------");
-	US_Print ("Total     :");
+	US_Print ("Total	 :");
 	US_PrintUnsigned (mminfo.mainmem/1024);
-	US_Print ("k\nFree      :");
+	US_Print ("k\nFree	  :");
 	US_PrintUnsigned (MM_UnusedMemory()/1024);
 	US_Print ("k\nWith purge:");
 	US_PrintUnsigned (MM_TotalFree()/1024);
@@ -310,7 +318,9 @@ void DebugMemory_(global_game_variables_t *gvar, boolean q)
 
 void ClearMemory (global_game_variables_t *gvar)
 {
+#ifdef __16_PM__
 	PM_UnlockMainMem(gvar);
+#endif
 	//snd
 	MM_SortMem (gvar);
 }
@@ -325,7 +335,7 @@ void ClearMemory (global_game_variables_t *gvar)
 
 void Quit (global_game_variables_t *gvar, char *error)
 {
-	//unsigned        finscreen;
+	//unsigned		finscreen;
 	memptr	screen=0;
 
 	ClearMemory (gvar);
@@ -346,7 +356,7 @@ void Quit (global_game_variables_t *gvar, char *error)
 
 	if (error && *error)
 	{
-		movedata((unsigned)screen,7,0xb800,0,7*160);
+		//movedata((unsigned)screen,7,0xb800,0,7*160);
 		gotoxy (10,4);
 		fprintf(stderr, "%s\n", error);
 		gotoxy (1,8);
@@ -372,22 +382,10 @@ void Quit (global_game_variables_t *gvar, char *error)
 
 //===========================================================================
 
-void walktypeinfo(player_t *player, word pn)
-{
-	switch(player[pn].walktype)
-	{
-		case 0:	//bump
-			sprintf(global_temp_status_text, "%s", "b");
-		break;
-		case 1:	//walk no scroll
-			sprintf(global_temp_status_text, "%s", "w");
-		break;
-		case 2:	//scrolling walk
-			sprintf(global_temp_status_text, "%s", "s");
-		break;
-	}
-}
-
+#ifndef __WATCOMC__
+char global_temp_status_text[512];
+char global_temp_status_text2[512];
+#else
 //
 // for mary4 (XT)
 // this is from my XT's BIOS
@@ -395,41 +393,54 @@ void walktypeinfo(player_t *player, word pn)
 //
 void turboXT(byte bakapee)
 {
-	//byte bakapee = 12;
 	__asm {
-	push	ax
-	push	bx
-	push	cx
-	in	al, 61h 			; Read equipment flags
-	xor	al, bakapee			;   toggle speed
-	out	61h, al 			; Write new flags back
-
-	mov	bx, 0F89h			; low pitch blip
-	and	al, 4				; Is turbo mode set?
-	jz	@@do_beep
-	mov	bx, 52Eh			; high pitch blip
-
-@@do_beep:
-	mov	al, 10110110b		; Timer IC 8253 square waves
-	out	43h, al 			;   channel 2, speaker
-	mov	ax, bx
-	out	42h, al 			;   send low order
-	mov	al, ah				;   load high order
-	out	42h, al 			;   send high order
-	in	al, 61h 			; Read IC 8255 machine status
-	push	ax
-	or	al, 00000011b
-	out	61h, al 			; Turn speaker on
-	mov	cx, 2000h
-@@delay:
-	loop    @@delay
-	pop	ax
-	out	61h, al 			; Turn speaker off
-	pop	cx
-	pop	bx
-	pop	ax
+		push	ax
+		push	bx
+		push	cx
+		in	al, 61h 			//; Read equipment flags
+		xor	al, bakapee			//;   toggle speed
+		out	61h, al 			//; Write new flags back
+
+		mov	bx, 0F89h			//; low pitch blip
+		and	al, 4				//; Is turbo mode set?
+		jz	@@do_beep
+		mov	bx, 52Eh			//; high pitch blip
+
+	@@do_beep:
+		mov	al, 10110110b		//; Timer IC 8253 square waves
+		out	43h, al 			//;   channel 2, speaker
+		mov	ax, bx
+		out	42h, al 			//;   send low order
+		mov	al, ah				//;   load high order
+		out	42h, al 			//;   send high order
+		in	al, 61h 			//; Read IC 8255 machine status
+		push	ax
+		or	al, 00000011b
+		out	61h, al 			//; Turn speaker on
+		mov	cx, 2000h
+	@@delay:
+		loop	@@delay
+		pop	ax
+		out	61h, al 			//; Turn speaker off
+		pop	cx
+		pop	bx
+		pop	ax
 	}
 }
+#endif
+
+const char *word_to_binary(word x)
+{
+	static char b[17];
+	int z;
+
+	b[0] = '\0';
+	for (z = 16; z > 0; z >>= 1)
+	{
+		strcat(b, ((x & z) == z) ? "1" : "0");
+	}
+	return b;
+}
 
 const char *nibble_to_binary(nibble x)
 {