Merge branch 'master' of github.com:sparky4/16

diff --cc 16/zcroll16.c
Simple merge

diff --cc 16/zcroll16.h
index 8e07c2c0d3ff4f89281880aa5cc0701c926742ee,ca730c232684357da36f425f214c23a4e2167b16..89b4b7b1b952018502038979813ef151d2cda258
--- 1/src/lib/zcroll16.h
--- 2/16/zcroll16.h
+++ b/16/zcroll16.h
@@@ -24,9 -24,8 +24,9 @@@
  #define __ZCROLL16_H_\r
  \r
  #include "src/lib/16_head.h"\r
 +#include "src/lib/16_entity.h"\r
  //#include "src/lib/bakapee.h"\r
- #include "src/lib/modex16.h"\r
+ #include "src/lib/16_vl.h"\r
  //#include "src/lib/16_in.h"\r
  #include "src/lib/bitmap.h"\r
  #include "src/lib/16_map.h" //map is loaded here www\r

diff --cc makefile
index 705665de297a860b06fefed850a2c59fddb1b0b3,36bfef081f510ea52abdfd01a2ff4a85bc62b8e1..478641222e156f807288f5eb315aa8bb58dd30b3
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -106,8 -106,10 +106,9 @@@ LIBFLAGS=$(WLIBQ) -b -
  # objects
  #
  VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
- GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) zcroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ)
- 16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ)
+ OLDLIBOBJS=bitmap.$(OBJ) mapread.$(OBJ) 16render.$(OBJ)
+ GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
+ 16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ)
 -####++++ 16_map.$(OBJ)
  #16planar.$(OBJ) planar.$(OBJ)
  DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
  !ifeq DEBUGSERIAL 1

diff --cc src/lib/16_in.c
index 363b588b2e30254c7bd54bef28dd1b6688ba1b81,72dcadf54b6bcb5f74e5f214bd01bf2cf0b87ec1..ef0f1fa65660ae238dd057c88b82054a60736e53
--- 1/src/lib/16_in.c
--- 2/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@@ -815,10 -818,12 +817,12 @@@ IN_ReadCursor(CursorInfo *info
  //\r
  ///////////////////////////////////////////////////////////////////////////\r
  void near\r
 -IN_ReadControl(int pn,player_t *player)\r
 +IN_ReadControl(player_t *player)\r
  {\r
                        boolean         realdelta;\r
+ #if DEMO0\r
                        byte            dbyte;\r
+ #endif\r
                        word            buttons;\r
                        int                     dx,dy;\r
                        Motion          mx,my;\r

diff --cc src/lib/16_in.h
Simple merge

diff --cc src/lib/16_map.h
Simple merge

diff --cc src/lib/typdefst.h
Simple merge

diff --cc src/zcroll.c
index f7603e8d2c31d3454a4ea86ba46d5b175a032e1c,d2786c16357f4f0a1efce6b4889d1ec0c17cdde8..991217ca4c438c40c32566d77ed43c984b79cdf8
--- 1/src/zcroll.c
--- 2/src/zcroll.c
+++ b/src/zcroll.c
@@@ -20,14 -20,18 +20,15 @@@
   *\r
   */\r
  \r
 -#include "src/lib/scroll16.h"\r
 +#include "src/lib/zcroll16.h"\r
  #include "src/lib/16_timer.h"\r
  #include "src/lib/wcpu/wcpu.h"\r
+ #include "src/lib/16render.h"\r
  \r
 -//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 -//bitmap_t *p;\r
  global_game_variables_t gvar;\r
  static map_t map;\r
 -player_t player[MaxPlayers];\r
 -map_view_t mv[4];\r
 -//word pn=0; //i forgot ww\r
 +player_t *player;\r
 +map_view_t *mv;\r
  float t;\r
  sword bakapee;\r
  pan_t pan;\r
@@@ -58,13 -59,9 +56,14 @@@ void main(int argc, char *argv[]
  \r
        Startup16(&gvar);\r
  \r
 -      pan.pn=1;\r
 +      pan.pn=0;\r
++      // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
 +      player = malloc(sizeof(player_t));\r
 +      player->ent = malloc(sizeof(entity_t));\r
 +      player->ent->spri = malloc(sizeof(struct sprite));\r
 +      player->ent->spri->spritesheet = malloc(sizeof(struct vrs_container));\r
  \r
 -      /* create the map */\r
 +      // create the map \r
        fprintf(stderr, "testing map load~      ");\r
        loadmap("data/test.map", &map);\r
        chkmap(&map, 0);\r