p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / lib / 16_head.h

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index ef63aaf33a91d35d9cf3cf83e63cd8ce110f989b..9fcf36682d3683cf9b91fd9cd1b66716aa0e5881 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -35,7 +35,6 @@
 #include <stdlib.h>\r
 #include <conio.h> // just for wait\r
 #include <time.h> // just for wait\r
-#include <malloc.h>\r
 #include <ctype.h>\r
 #include <fcntl.h>\r
 #include <io.h>\r
@@ -56,10 +55,10 @@
 #include <dir.h>\r
 #define TILEWH 16\r
 #endif\r
+#include "src/lib/16_t.h"\r
+#include "src/lib/16_tdef.h"\r
 #include "src/lib/nyan/kitten.h"\r
-#include "src/lib/types.h"\r
-#include "src/lib/typdefst.h"\r
-#include "src/lib/16_in.h"\r
+#include "src/lib/16_dbg.h"\r
 \r
 #define VERSION __DATE__ " " __TIME__\r
 \r
@@ -158,19 +157,17 @@
 //static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 extern int                     profilehandle,debughandle;      //make it into game global\r
 \r
-#define __DEBUG__\r
-//#define __DEBUG_PM__\r
-//#define __DEBUG_MM__\r
-\r
 //#define OLD16_VL\r
 \r
 #define        nil     ((void *)0)\r
 #ifdef __BORLANDC__\r
-#define _FCORELEFT 0x90000UL-16UL\r
+//#define _FCORELEFT 0x90000UL-16UL\r
+#define _FCORELEFT HC_farcoreleft()\r
 #define sprite\r
 #endif\r
 #ifdef __WATCOMC__\r
-#define _FCORELEFT 0x90000UL+16UL\r
+//#define _FCORELEFT 0x90000UL+16UL\r
+#define _FCORELEFT HC_farcoreleft()\r
 /*static union REGS CPURegs;\r
 \r
 #define _AX CPURegs.x.ax\r
@@ -202,11 +199,14 @@ typedef union REGPACK     regs_t;
 \r
 /* local function */\r
 long int filesize(FILE *fp);\r
+char *remove_ext(char* mystr, char dot, char sep);\r
+void rotateR(byte arr[], byte n);\r
+void rotateL(byte arr[], byte n);\r
 void printmeminfoline(byte *strc, const byte *pee, size_t h_total, size_t h_used, size_t h_free);\r
 int US_CheckParm(char *parm,char **strings);\r
-#ifdef __BORLANDC__\r
-void Quit (char *error);\r
-#endif\r
 byte dirchar(byte in);\r
+void print_mem(void const *vp, size_t n);\r
+\r
+#define PRINT_OPAQUE_STRUCT(p)  print_mem((p), sizeof(*(p)))\r
 \r
 #endif/*__16_HEAD_H__*/\r