From 2accbf2668001e82a8fec1e75f37c195996186b0 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 22 Jul 2016 08:48:16 -0500 Subject: [PATCH] polished 16_vrs.h and put into make file AND! updated copyright to add yakui lover wwww --- makefile | 5 +++- src/16.c | 2 +- src/16.h | 2 +- src/bakapi.c | 2 +- src/bakapi.h | 2 +- src/emsdump.c | 2 +- src/exmmtest.c | 2 +- src/fmemtest.c | 2 +- src/fontgfx.c | 2 +- src/fonttes0.c | 2 +- src/fonttest.c | 2 +- src/inputest.c | 2 +- src/lib/16_hc.c | 2 +- src/lib/16_hc.h | 2 +- src/lib/16_head.c | 2 +- src/lib/16_head.h | 3 ++- src/lib/16_snd.c | 2 +- src/lib/16_snd.h | 2 +- src/lib/16_timer.c | 2 +- src/lib/16_timer.h | 2 +- src/lib/16_vrs.c | 42 ++++++++++++++++++++++------------ src/lib/16_vrs.h | 47 ++++++++++++++++++++++++++++---------- src/lib/16text.c | 2 +- src/lib/16text.h | 2 +- src/lib/bakapee.c | 2 +- src/lib/bakapee.h | 21 +++++++++++++++++ src/lib/bitmap.c | 2 +- src/lib/bitmap.h | 2 +- src/lib/mapread.c | 22 ++++++++++++++++++ src/lib/mapread.h | 22 ++++++++++++++++++ src/lib/modex16.c | 4 ++-- src/lib/modex16.h | 3 ++- src/lib/modex16/160x120.h | 2 +- src/lib/modex16/16planar.c | 2 +- src/lib/modex16/16planar.h | 2 +- src/lib/modex16/16render.c | 2 +- src/lib/modex16/16render.h | 2 +- src/lib/modex16/192x144.h | 2 +- src/lib/modex16/192x144_.h | 2 +- src/lib/modex16/256x192.h | 2 +- src/lib/modex16/320x200.h | 2 +- src/lib/modex16/320x240.h | 2 +- src/lib/planar.c | 2 +- src/lib/planar.h | 2 +- src/lib/scroll16.c | 2 +- src/lib/scroll16.h | 2 +- src/lib/typdefst.h | 2 +- src/lib/types.h | 4 ++-- src/lib/wcpu/wcpu.c | 2 +- src/lib/wcpu/wcpu.h | 2 +- src/maptest.c | 2 +- src/maptest0.c | 2 +- src/palettec.c | 2 +- src/palettel.c | 2 +- src/pcxtest.c | 2 +- src/pcxtest2.c | 2 +- src/planrpcx.c | 2 +- src/scroll.c | 2 +- src/sountest.c | 2 +- src/test.c | 2 +- src/test2.c | 2 +- src/vgmtest.c | 2 +- 62 files changed, 192 insertions(+), 85 deletions(-) diff --git a/makefile b/makefile index fee444b8..8d2a0a32 100755 --- a/makefile +++ b/makefile @@ -91,7 +91,7 @@ VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ) -GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS) +GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) 16_vrs.$(OBJ) $(DOSLIBLIBS) DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib @@ -326,6 +326,9 @@ bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c 16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c wcl $(FLAGS) -c $(MODEXLIB)16planar.c +16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c + wcl $(FLAGS) -c $(SRCLIB)16_vrs.c + bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c wcl $(FLAGS) -c $(SRCLIB)bitmap.c diff --git a/src/16.c b/src/16.c index f570a7ba..5e512422 100755 --- a/src/16.c +++ b/src/16.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/16.h b/src/16.h index cb3cbbf4..7f792bbb 100755 --- a/src/16.h +++ b/src/16.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/bakapi.c b/src/bakapi.c index 5378794a..a74e7711 100755 --- a/src/bakapi.c +++ b/src/bakapi.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/bakapi.h b/src/bakapi.h index 9a3821fa..1270fab7 100755 --- a/src/bakapi.h +++ b/src/bakapi.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/emsdump.c b/src/emsdump.c index 8be2c2c7..b07f7c66 100755 --- a/src/emsdump.c +++ b/src/emsdump.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/exmmtest.c b/src/exmmtest.c index 280cbf91..fb8a1ee1 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/fmemtest.c b/src/fmemtest.c index d666ac76..4726e9a3 100755 --- a/src/fmemtest.c +++ b/src/fmemtest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/fontgfx.c b/src/fontgfx.c index 4c4c0443..354a897b 100755 --- a/src/fontgfx.c +++ b/src/fontgfx.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/fonttes0.c b/src/fonttes0.c index 30229dae..c5242f21 100755 --- a/src/fonttes0.c +++ b/src/fonttes0.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/fonttest.c b/src/fonttest.c index fcfd4d2d..a7757e47 100755 --- a/src/fonttest.c +++ b/src/fonttest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/inputest.c b/src/inputest.c index 199dc90b..1ecd09d6 100755 --- a/src/inputest.c +++ b/src/inputest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c index 316b86b9..8743a38d 100755 --- a/src/lib/16_hc.c +++ b/src/lib/16_hc.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_hc.h b/src/lib/16_hc.h index 86c6ff12..4d0375e2 100755 --- a/src/lib/16_hc.h +++ b/src/lib/16_hc.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_head.c b/src/lib/16_head.c index 656057fb..027693d5 100755 --- a/src/lib/16_head.c +++ b/src/lib/16_head.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_head.h b/src/lib/16_head.h index 4b9972f1..273cc60f 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 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -33,6 +33,7 @@ #include #include #include +#include //16_vrs.h #include // just for wait #include // just for wait #include diff --git a/src/lib/16_snd.c b/src/lib/16_snd.c index e85fdf9b..544b4944 100755 --- a/src/lib/16_snd.c +++ b/src/lib/16_snd.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_snd.h b/src/lib/16_snd.h index 583077de..7b0d04ec 100755 --- a/src/lib/16_snd.h +++ b/src/lib/16_snd.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_timer.c b/src/lib/16_timer.c index e45ee948..9b73b887 100755 --- a/src/lib/16_timer.c +++ b/src/lib/16_timer.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_timer.h b/src/lib/16_timer.h index ffe08a43..d6e491db 100755 --- a/src/lib/16_timer.h +++ b/src/lib/16_timer.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c index abd43c43..b42d80c6 100755 --- a/src/lib/16_vrs.c +++ b/src/lib/16_vrs.c @@ -1,19 +1,33 @@ -#include -#include -#include -#include -#include -#include +/* Project 16 Source Code~ + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ +#include "src/lib/16_vrs.h" -#include "16_vrs.h" - -// Read .vrs file into memory +// Read .vrs file into memory int read_vrs(char *filename, struct vrs_container *vrs_cont){ // Initialise a local copy of becessary variables // so vrs_cont won't be dirty on error int fd; - unsigned long size; - unsigned char *buffer; + dword size; + byte *buffer; // Open filename, get size of file, // populate the vrs_container if all tests pass fd = open(filename, O_RDONLY|O_BINARY); @@ -31,9 +45,9 @@ int read_vrs(char *filename, struct vrs_container *vrs_cont){ return 0; } -// Seek and return a specified .vrl blob from .vrs blob in memory +// Seek and return a specified .vrl blob from .vrs blob in memory struct vrl_container* get_vrl_by_id(struct vrs_container *vrs_cont, uint16_t id){ - uint16_t *ids; + uint16_t *ids; uint32_t *vrl_list; struct vrl_container *vrl_cont; int counter = 0; @@ -43,7 +57,7 @@ struct vrl_container* get_vrl_by_id(struct vrs_container *vrs_cont, uint16_t id) return 0; } // Get id list from .vrs blob (base + offset) - ids = (uint16_t*)vrs_cont->buffer + (unsigned long)vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]; + ids = (uint16_t*)vrs_cont->buffer + (dword)vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]; // Loop through the id list until we found the right one or hit the end of the list // Counter is keeping track of the offset(in ids/vrl blobs) while(ids[counter] != id && ids[counter]){ diff --git a/src/lib/16_vrs.h b/src/lib/16_vrs.h index a0f30620..7b240a77 100755 --- a/src/lib/16_vrs.h +++ b/src/lib/16_vrs.h @@ -1,12 +1,35 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ #ifndef __16_VRS__ #define __16_VRS__ -#include -#include "hw/vga/vrl.h" -#include "hw/vga/vrs.h" +#include "src/lib/16_head.h" +#include "src/lib/modex16.h" +//#include +//#include +//#include // Container for .vrs files loaded in memory with useful info -// Includes: +// Includes: // + size of the .vrs blob in memory // + pointer to the blob/vrs header // + id of the curent (shown) animation @@ -14,13 +37,13 @@ // + id of the current (shown) sprite struct vrs_container{ - unsigned long size; + dword size; union{ - unsigned char *buffer; + byte *buffer; struct vrs_header *vrs_hdr; }; uint16_t anchor_sprite_id; - uint16_t current_sprite_id; + uint16_t current_sprite_id; }; // Container for .vrl files loaded in memory with useful info @@ -28,9 +51,9 @@ struct vrs_container{ // + size of the .vrl blob in memory // + pointer to the blob/vrl header struct vrl_container{ - unsigned long size; + dword size; union{ - unsigned char *buffer; + byte *buffer; struct vrl1_vgax_header *vrl_header; }; }; @@ -38,7 +61,7 @@ struct vrl_container{ // Read .vrs file into memory // In: // + char *filename - name of the file to load -// + struct vrs_container *vrs_cont - pointer to the vrs_container +// + struct vrs_container *vrs_cont - pointer to the vrs_container // to load the file into // Out: // + int - 0 on succes, 1 on failure @@ -46,7 +69,7 @@ int read_vrs(char *filename, struct vrs_container *vrs_cont); // Seek and return a specified .vrl blob from .vrs blob in memory // In: -// + struct vrs_container *vrs_cont - pointer to the vrs_container +// + struct vrs_container *vrs_cont - pointer to the vrs_container // with a loaded .vrs file // + uint16_t id - id of the vrl to retrive // Out: @@ -54,4 +77,4 @@ int read_vrs(char *filename, struct vrs_container *vrs_cont); // to the requested .vrl blob struct vrl_container* get_vrl_by_id(struct vrs_container *vrs_cont, uint16_t id); -#endif +#endif diff --git a/src/lib/16text.c b/src/lib/16text.c index 81b71d98..7f725992 100755 --- a/src/lib/16text.c +++ b/src/lib/16text.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/16text.h b/src/lib/16text.h index 47325e02..d7bceb86 100755 --- a/src/lib/16text.h +++ b/src/lib/16text.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c index dfc47681..3f8ab3e5 100755 --- a/src/lib/bakapee.c +++ b/src/lib/bakapee.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/bakapee.h b/src/lib/bakapee.h index a6076daf..7ae770a1 100755 --- a/src/lib/bakapee.h +++ b/src/lib/bakapee.h @@ -23,6 +23,27 @@ #ifndef __BAKAPEE_H_ #define __BAKAPEE_H_ +/* Project 16 Source Code~ + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ #include "src/lib/16_head.h" #include "src/lib/modex16.h" #include diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c index d2480baf..7696cc34 100755 --- a/src/lib/bitmap.c +++ b/src/lib/bitmap.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h index 06570a9a..1d0154b1 100755 --- a/src/lib/bitmap.h +++ b/src/lib/bitmap.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 23cbfa0d..8d98c766 100755 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -1,3 +1,25 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + #include "src/lib/mapread.h" int jsoneq(const char *json, jsmntok_t *tok, const char *s) { diff --git a/src/lib/mapread.h b/src/lib/mapread.h index b2bf0fd4..d7e6328e 100755 --- a/src/lib/mapread.h +++ b/src/lib/mapread.h @@ -1,3 +1,25 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + #ifndef _LIBMAPREAD_H_ #define _LIBMAPREAD_H_ //#include diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 900914e1..b8f733be 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -1,11 +1,11 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * * Project 16 is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either verson 3 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * Project 16 is distributed in the hope that it will be useful, diff --git a/src/lib/modex16.h b/src/lib/modex16.h index 55e0be87..ab58d757 100755 --- a/src/lib/modex16.h +++ b/src/lib/modex16.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -42,6 +42,7 @@ #include #include #include +#include #endif static struct pcxHeader { diff --git a/src/lib/modex16/160x120.h b/src/lib/modex16/160x120.h index 735909ec..c811d1f9 100755 --- a/src/lib/modex16/160x120.h +++ b/src/lib/modex16/160x120.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/16planar.c b/src/lib/modex16/16planar.c index f29c92d5..cd528e46 100755 --- a/src/lib/modex16/16planar.c +++ b/src/lib/modex16/16planar.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/16planar.h b/src/lib/modex16/16planar.h index 51777811..2ff43e46 100755 --- a/src/lib/modex16/16planar.h +++ b/src/lib/modex16/16planar.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c index 77598fa5..051e94f9 100755 --- a/src/lib/modex16/16render.c +++ b/src/lib/modex16/16render.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/16render.h b/src/lib/modex16/16render.h index f45fd76d..9edce937 100755 --- a/src/lib/modex16/16render.h +++ b/src/lib/modex16/16render.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/192x144.h b/src/lib/modex16/192x144.h index 69ccc81f..49535ba2 100755 --- a/src/lib/modex16/192x144.h +++ b/src/lib/modex16/192x144.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/192x144_.h b/src/lib/modex16/192x144_.h index 89221ad5..0072d4b3 100755 --- a/src/lib/modex16/192x144_.h +++ b/src/lib/modex16/192x144_.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/256x192.h b/src/lib/modex16/256x192.h index 2f946e61..f7263a33 100755 --- a/src/lib/modex16/256x192.h +++ b/src/lib/modex16/256x192.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/320x200.h b/src/lib/modex16/320x200.h index 0a2d0a69..b9c1dc8e 100755 --- a/src/lib/modex16/320x200.h +++ b/src/lib/modex16/320x200.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/modex16/320x240.h b/src/lib/modex16/320x240.h index 5655254a..5395907b 100755 --- a/src/lib/modex16/320x240.h +++ b/src/lib/modex16/320x240.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/planar.c b/src/lib/planar.c index 3fd1c5ed..d947bee8 100755 --- a/src/lib/planar.c +++ b/src/lib/planar.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/planar.h b/src/lib/planar.h index 6e580665..60b5dbad 100755 --- a/src/lib/planar.h +++ b/src/lib/planar.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index eb83157e..d4acb8a9 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index c8e4a1a8..2b7b5232 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h index 07f09736..cc174f31 100755 --- a/src/lib/typdefst.h +++ b/src/lib/typdefst.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/types.h b/src/lib/types.h index 69291248..cf6b4e9e 100755 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -29,7 +29,7 @@ typedef unsigned char byte; typedef unsigned short word; -typedef unsigned long dword; +typedef unsigned long dword; typedef signed char sbyte; typedef signed short sword; typedef signed long sdword; diff --git a/src/lib/wcpu/wcpu.c b/src/lib/wcpu/wcpu.c index a5cdd665..8a0be98c 100755 --- a/src/lib/wcpu/wcpu.c +++ b/src/lib/wcpu/wcpu.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/lib/wcpu/wcpu.h b/src/lib/wcpu/wcpu.h index 9409a8b0..3a43c252 100755 --- a/src/lib/wcpu/wcpu.h +++ b/src/lib/wcpu/wcpu.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/maptest.c b/src/maptest.c index 972d7db6..2e6ae7cf 100755 --- a/src/maptest.c +++ b/src/maptest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/maptest0.c b/src/maptest0.c index 3a05abdd..9c8cdf0f 100755 --- a/src/maptest0.c +++ b/src/maptest0.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/palettec.c b/src/palettec.c index a1e387dc..25437fcb 100755 --- a/src/palettec.c +++ b/src/palettec.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/palettel.c b/src/palettel.c index 5ce5c809..04beeff6 100755 --- a/src/palettel.c +++ b/src/palettel.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/pcxtest.c b/src/pcxtest.c index 99e2669e..d73171e7 100755 --- a/src/pcxtest.c +++ b/src/pcxtest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/pcxtest2.c b/src/pcxtest2.c index aea2eb9a..c6706448 100755 --- a/src/pcxtest2.c +++ b/src/pcxtest2.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/planrpcx.c b/src/planrpcx.c index d3ac3bef..319e33c3 100755 --- a/src/planrpcx.c +++ b/src/planrpcx.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/scroll.c b/src/scroll.c index b496aea7..6f70915b 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/sountest.c b/src/sountest.c index 5bcdccf6..f2726fcf 100755 --- a/src/sountest.c +++ b/src/sountest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/test.c b/src/test.c index 098c12a7..cb75a0fa 100755 --- a/src/test.c +++ b/src/test.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/test2.c b/src/test2.c index 8fa3a4e2..4fb6f173 100755 --- a/src/test2.c +++ b/src/test2.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * diff --git a/src/vgmtest.c b/src/vgmtest.c index 49752222..c3a3c176 100755 --- a/src/vgmtest.c +++ b/src/vgmtest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * -- 2.39.2