From: yakui-lover <yakui-lover@yandex.ru>
Date: Fri, 25 Nov 2016 18:12:14 +0000 (+0900)
Subject: Merge branch 'master' of github.com:sparky4/16
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=989f287818c93cf9b1ff96c13e66720571210513;p=16.git

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

989f287818c93cf9b1ff96c13e66720571210513
diff --cc 16/zcroll16.h
index 8e07c2c0,ca730c23..89b4b7b1
--- a/16/zcroll16.h
+++ b/16/zcroll16.h
@@@ -24,9 -24,8 +24,9 @@@
  #define __ZCROLL16_H_
  
  #include "src/lib/16_head.h"
 +#include "src/lib/16_entity.h"
  //#include "src/lib/bakapee.h"
- #include "src/lib/modex16.h"
+ #include "src/lib/16_vl.h"
  //#include "src/lib/16_in.h"
  #include "src/lib/bitmap.h"
  #include "src/lib/16_map.h" //map is loaded here www
diff --cc makefile
index 705665de,36bfef08..47864122
--- a/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 363b588b,72dcadf5..ef0f1fa6
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@@ -815,10 -818,12 +817,12 @@@ IN_ReadCursor(CursorInfo *info
  //
  ///////////////////////////////////////////////////////////////////////////
  void near
 -IN_ReadControl(int pn,player_t *player)
 +IN_ReadControl(player_t *player)
  {
  			boolean		realdelta;
+ #if DEMO0
  			byte		dbyte;
+ #endif
  			word		buttons;
  			int			dx,dy;
  			Motion		mx,my;
diff --cc src/zcroll.c
index f7603e8d,d2786c16..991217ca
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@@ -20,14 -20,18 +20,15 @@@
   *
   */
  
 -#include "src/lib/scroll16.h"
 +#include "src/lib/zcroll16.h"
  #include "src/lib/16_timer.h"
  #include "src/lib/wcpu/wcpu.h"
+ #include "src/lib/16render.h"
  
 -//word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 -//bitmap_t *p;
  global_game_variables_t gvar;
  static map_t map;
 -player_t player[MaxPlayers];
 -map_view_t mv[4];
 -//word pn=0; //i forgot ww
 +player_t *player;
 +map_view_t *mv;
  float t;
  sword bakapee;
  pan_t pan;
@@@ -58,13 -59,9 +56,14 @@@ void main(int argc, char *argv[]
  
  	Startup16(&gvar);
  
 -	pan.pn=1;
 +	pan.pn=0;
++	// OK, this one takes hellova time and needs to be done in farmalloc or MM_...
 +	player = malloc(sizeof(player_t));
 +	player->ent = malloc(sizeof(entity_t));
 +	player->ent->spri = malloc(sizeof(struct sprite));
 +	player->ent->spri->spritesheet = malloc(sizeof(struct vrs_container));
  
 -	/* create the map */
 +	// create the map 
  	fprintf(stderr, "testing map load~	");
  	loadmap("data/test.map", &map);
  	chkmap(&map, 0);