X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_head.h;h=81af81c5f04fcf1ed80ddba48840afc9e720896f;hb=7e8071d0d71afdaff03a87e4ff7afb153088fbaf;hp=6b189d875fcd864c0cb1107332c937739a47bd27;hpb=fb97121f7d0be4408d8e2ed98a2f7b10b852a915;p=16.git

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 6b189d87..81af81c5 100755
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -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.
  *
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <conio.h> // just for wait
 #include <time.h> // just for wait
-#include <malloc.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <io.h>
@@ -56,10 +55,10 @@
 #include <dir.h>
 #define TILEWH	16
 #endif
+#include "src/lib/16_t.h"
+#include "src/lib/16_tdef.h"
 #include "src/lib/nyan/kitten.h"
-#include "src/lib/types.h"
-#include "src/lib/typdefst.h"
-#include "src/lib/16_in.h"
+#include "src/lib/16_dbg.h"
 
 #define VERSION __DATE__ " " __TIME__
 
@@ -155,21 +154,21 @@
 #define KEY_MENU		(0x75)
 */
 
-static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
+//static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
 extern	int			profilehandle,debughandle;	//make it into game global
 
-#define __DEBUG__
-//#define __DEBUG_PM__
-//#define __DEBUG_MM__
+//#define OLD16_VL
 
 #define	nil	((void *)0)
 #ifdef __BORLANDC__
-#define _FCORELEFT 0x90000UL-16UL
+//#define _FCORELEFT 0x90000UL-16UL
+#define _FCORELEFT HC_farcoreleft()
 #define sprite
 #endif
 #ifdef __WATCOMC__
-#define _FCORELEFT 0x90000UL+16UL
-static union REGS CPURegs;
+//#define _FCORELEFT 0x90000UL+16UL
+#define _FCORELEFT HC_farcoreleft()
+/*static union REGS CPURegs;
 
 #define _AX CPURegs.x.ax
 #define _BX CPURegs.x.bx
@@ -187,7 +186,7 @@ static union REGS CPURegs;
 #define _DH CPURegs.h.dh
 #define _DL CPURegs.h.dl
 
-#define geninterrupt(n) int86(n,&CPURegs,&CPURegs);
+#define geninterrupt(n) int86(n,&CPURegs,&CPURegs);*/
 #define peekb(segm,ofs) (*(byte far*)MK_FP((segm),(ofs)))
 #define peekw(segm,ofs) (*(word far*)MK_FP((segm),(ofs)))
 #define pokeb(segm,ofs,value) (peekb((segm),(ofs)) = (byte)(value))
@@ -200,11 +199,11 @@ typedef union REGPACK	regs_t;
 
 /* local function */
 long int filesize(FILE *fp);
+char *remove_ext(char* mystr, char dot, char sep);
+void rotateR(byte arr[], byte n);
+void rotateL(byte arr[], byte n);
 void printmeminfoline(byte *strc, const byte *pee, size_t h_total, size_t h_used, size_t h_free);
 int US_CheckParm(char *parm,char **strings);
-#ifdef __BORLANDC__
-void Quit (char *error);
-#endif
 byte dirchar(byte in);
 
 #endif/*__16_HEAD_H__*/