From: sparky4 Date: Tue, 18 Apr 2017 14:23:24 +0000 (-0500) Subject: p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=34ee293d7681967f7852b26a89e38908333e7479;p=16.git p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] p16 needs much help now. --- diff --git a/0croll.oob b/0croll.oob new file mode 100755 index 00000000..ebac807f Binary files /dev/null and b/0croll.oob differ diff --git a/16/src/lib/bitmap.c b/16/src/lib/bitmap.c index 4e48cab2..caeb0111 100755 --- a/16/src/lib/bitmap.c +++ b/16/src/lib/bitmap.c @@ -184,7 +184,7 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) { ts.palette = result.palette; /* allocate the pixel storage for the tiles */ - ts.data = _fmalloc(sizeof(byte*) * ts.ntiles); + ts.data = malloc(sizeof(byte*) * ts.ntiles); //ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight); for(i=1; i < ts.ntiles; i++) { ts.data[i] = ts.data[i-1] + twidth * theight; diff --git a/16_in.oob b/16_in.oob new file mode 100755 index 00000000..70b72b52 Binary files /dev/null and b/16_in.oob differ diff --git a/README.md b/README.md index 38455eff..d154b11f 100755 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ Open watcom to compile the code of project 16 ### Directory Structure! -16.exe = actual planned game executable! -/ = root of project where executables are at -16/ = experimental branch and example codes -16/modex16/ = pngwen's code archived~ -src/ = source of project~ -doc/ = documentation of the project~ +16.exe = actual planned game executable! +/ = root of project where executables are at +16/ = experimental branch and example codes +16/modex16/ = pngwen's code archived~ +src/ = source of project~ +doc/ = documentation of the project~ doc/faq.txt = frequently asked questions file! ### To compile: @@ -19,3 +19,7 @@ You need Open Watcom stable to compile and just run wmake ###TODO https://github.com/sparky4/16/blob/master/TODO.md + + project 16 is in deep dump right now + it is leaving the pre alpha state and heading into alpha state www + which means cache manager work but... it needs much rewriting for the new file formats diff --git a/bitmap.oob b/bitmap.oob new file mode 100755 index 00000000..22efeea1 Binary files /dev/null and b/bitmap.oob differ diff --git a/makefile b/makefile index 62f3ad5d..75fc0af8 100755 --- a/makefile +++ b/makefile @@ -512,7 +512,7 @@ www: .symbolic @wmake -s -h wwwext wwwext: .symbolic -# @wmake -s -h wwwext1 + @wmake -s -h wwwext1 @wmake -s -h wwwext2 wwwext1: .symbolic diff --git a/mk0croll.wat b/mk0croll.wat new file mode 100755 index 00000000..bfda6ec0 --- /dev/null +++ b/mk0croll.wat @@ -0,0 +1,22 @@ +OBJ=obj +FLAGS=-0 -i"src/lib/doslib" -fo=.$(OBJ) + +all: 0croll.exe + +0croll.exe: 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_in.$(OBJ) + wcl $(FLAGS) 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_in.$(OBJ) +0croll.$(OBJ): src/0croll.c + wcl $(FLAGS) -c src/0croll.c + +16_in.$(OBJ): src/lib/16_in.h src/lib/16_in.c + wcl $(FLAGS) -c src/lib/16_in.c + +omodex16.$(OBJ): 16/src/lib/omodex16.h 16/src/lib/omodex16.c + wcl $(FLAGS) -c 16/src/lib/omodex16.c + +bitmap.$(OBJ): 16/src/lib/bitmap.h 16/src/lib/bitmap.c + wcl $(FLAGS) -c 16/src/lib/bitmap.c + +clean: + rm *.$(OBJ) + rm *.exe diff --git a/omodex16.oob b/omodex16.oob new file mode 100755 index 00000000..977525a6 Binary files /dev/null and b/omodex16.oob differ diff --git a/src/0croll.c b/src/0croll.c index fd30dbb1..151a0bf4 100755 --- a/src/0croll.c +++ b/src/0croll.c @@ -105,7 +105,7 @@ void main() { //TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since omapS are actually square //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map - while(!gvar.in.inst->Keyboard[77]){ + while(gvar.in.inst->Keyboard[77]){ // for(q=0; qpage); @@ -114,7 +114,7 @@ void main() { // } } - while(!gvar.in.inst->Keyboard[75]){ + while(gvar.in.inst->Keyboard[75]){ // for(q=0; qpage); @@ -123,7 +123,7 @@ void main() { // } } - while(!gvar.in.inst->Keyboard[80]){ + while(gvar.in.inst->Keyboard[80]){ // for(q=0; qpage); @@ -132,7 +132,7 @@ void main() { // } } - while(!gvar.in.inst->Keyboard[72]){ + while(gvar.in.inst->Keyboard[72]){ // for(q=0; qpage); @@ -159,7 +159,7 @@ allocMap(int w, int h) { result.width =w; result.height=h; - result.data = _fmalloc(sizeof(byte) * w * h); + result.data = malloc(sizeof(byte) * w * h); return result; } @@ -171,13 +171,13 @@ oinitMap(omap_t *map) { int x, y; int i; int tile = 1; - map->tiles = _fmalloc(sizeof(otiles_t)); + map->tiles = malloc(sizeof(otiles_t)); /* create the tile set */ - map->tiles->data = _fmalloc(sizeof(bitmap_t)); + map->tiles->data = malloc(sizeof(bitmap_t)); map->tiles->data->width = (TILEWH*2); map->tiles->data->height= TILEWH; - map->tiles->data->data = _fmalloc((TILEWH*2)*TILEWH); + map->tiles->data->data = malloc((TILEWH*2)*TILEWH); map->tiles->tileHeight = TILEWH; map->tiles->tileWidth =TILEWH; map->tiles->rows = 1; diff --git a/src/lib/16_head.h b/src/lib/16_head.h index 0f0c74f7..6f6f7885 100755 --- a/src/lib/16_head.h +++ b/src/lib/16_head.h @@ -20,9 +20,9 @@ * */ -#if !defined(__LARGE__) && !defined(__COMPACT__) && !defined(__HUGE__) -#error Invalid memory model for compiling project 16 -#endif +//#if !defined(__LARGE__) && !defined(__COMPACT__) && !defined(__HUGE__) +//#error Invalid memory model for compiling project 16 +//#endif #if !defined(__i86__) && defined(__i386__) #error i8088 only diff --git a/src/lib/doslib b/src/lib/doslib index 69400af6..2388e6cd 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit 69400af6d68a7c20510cf00374e3f27ba261ebbc +Subproject commit 2388e6cde6d3bda5bb253198a853506e4f27d0bd diff --git a/src/util/shbat/boop.sh b/src/util/shbat/boop.sh index 0ef32da5..c0348e30 100755 --- a/src/util/shbat/boop.sh +++ b/src/util/shbat/boop.sh @@ -1,6 +1,6 @@ #!/bin/bash git commit -a -m "$1" -#git push x4 master +git push x4 master git push origin master git push jp master git push sf master