X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_sprit.c;h=c59590cefe640158f0ac0ee4455574506b971d8d;hb=5965823c934f177a5ef1cd30ae9ee5dda2a95154;hp=ab6e33785ba4f27bf55df60722dfff5b7c429e5a;hpb=398c90d2a35006614f99b38ea112803015d97d33;p=16.git

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index ab6e3378..c59590ce 100755
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -1,134 +1,118 @@
-/* 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 <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#include "src/lib/16_sprit.h"
-
-char* get_curr_anim_name(struct sprite *spri)
-{
-	// Retrive animation name list
-	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
-	uint32_t huge *anim_names_offsets = 	(uint32_t huge *)
-						((byte huge *)vrs +
-						 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_NAME_LIST]);
-
-	return (char *)(vrs + anim_names_offsets[spri->curr_anim]);
-}
-
-void init_anim(struct sprite *spri, int anim_index)
-{
-	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
-	uint32_t huge *anim_lists_offsets = 	(uint32_t huge *)
-						((byte huge *)vrs +
-						 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_LIST]);
-	struct vrs_animation_list_entry_t *anim_list =	(struct vrs_animation_list_entry_t huge *)
-							((byte huge *)vrs +
-							 anim_lists_offsets[anim_index]);
-
-	// Upon new animation, start from the first sprite in it
-	spri->curr_anim = anim_index;
-	spri->curr_anim_spri = 0;
-	spri->curr_spri_id = anim_list[0].sprite_id;
-	spri->delay = anim_list[0].delay;
-
-	spri->curr_anim_list = anim_list;
-}
-
-
-int set_anim_by_id(struct sprite *spri, int anim_id)
-{
-	int new_anim_index = 0;
-	int iter_id;
-	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
-	// Retruve animation ids list
-        uint16_t huge *anim_ids =	(uint16_t huge *)
-					((byte huge *)vrs +
-					 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_ID_LIST]);
-
-	// Loop through animation id untill match or end of list
-	while(iter_id = anim_ids[new_anim_index])
-	{
-		// Return on successful match
-		if (iter_id == anim_id)
-		{
-			init_anim(spri, new_anim_index);
-			return 0;
-		}
-		new_anim_index++;
-	}
-	return -1;
-}
-
-void print_anim_ids(struct sprite *spri)
-{
-	int new_anim_index = 0;
-	int iter_id;
-	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
-	// Retruve animation ids list
-        uint16_t huge *anim_ids =	(uint16_t huge *)
-					((byte huge *)vrs +
-					 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_ID_LIST]);
-
-	if(!anim_ids[new_anim_index])
-		exit(3);
-	// Loop through animation id untill match or end of list
-	while(iter_id = anim_ids[new_anim_index])
-	{
-		// Return on successful match
-		new_anim_index++;
-		printf("%d, ", iter_id);
-	}
-}
-
-
-void animate_spri(struct sprite *spri)
-{
-	// Events go here
-
-	// Draw sprite
-	get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);
-	draw_vrl1_vgax_modex(	spri->x, spri->y,
-				spri->sprite_vrl_cont->vrl_header, spri->sprite_vrl_cont->line_offsets,
-				spri->sprite_vrl_cont->buffer + sizeof(struct vrl1_vgax_header),
-				spri->sprite_vrl_cont->data_size);
-
-	// Depending on delay, update indices
-	switch(spri->delay){
-		// Delay = 0 means that sprite should loop. Nothing to change here
-		case 0:
-			break;
-
-		// Delay = 1 means that on next time unit sprite should be changed
-		case 1:
-			spri->curr_anim_spri++;
-
-			// If we hit the end of an animation sequence, restart it
-			if(!(spri->curr_spri_id = spri->curr_anim_list[spri->curr_anim_spri].sprite_id)){
-				spri->curr_anim_spri = 0;
-				spri->curr_spri_id = spri->curr_anim_list[spri->curr_anim_spri].sprite_id;
-			}
-			spri->delay = spri->curr_anim_list[spri->curr_anim_spri].delay;
-
-		// Delay > 1 means that we should not change sprite yet. Decrease delay
-		default:
-			spri->delay--;
-			break;
-	}
-}
+#include "src/lib/16_sprit.h"
+
+char* get_curr_anim_name(struct sprite *spri)
+{
+	// Retrive animation name list
+	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
+	uint32_t huge *anim_names_offsets = 	(uint32_t huge *)
+						((byte huge *)vrs +
+						 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_NAME_LIST]);
+
+	return (char *)(vrs + anim_names_offsets[spri->curr_anim]);
+}
+
+void init_anim(struct sprite *spri, int anim_index)
+{
+	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
+	uint32_t huge *anim_lists_offsets = 	(uint32_t huge *)
+						((byte huge *)vrs +
+						 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_LIST]);
+	struct vrs_animation_list_entry_t huge *anim_list =	(struct vrs_animation_list_entry_t huge *)
+								((byte huge *)vrs +
+								 anim_lists_offsets[anim_index]);
+
+	// Upon new animation, start from the first sprite in it
+	spri->curr_anim = anim_index;
+	spri->curr_anim_spri = 0;
+	spri->curr_spri_id = anim_list[0].sprite_id;
+	spri->delay = anim_list[0].delay;
+
+	spri->curr_anim_list = anim_list;
+}
+
+
+int set_anim_by_id(struct sprite *spri, int anim_id)
+{
+	int new_anim_index = 0;
+	int iter_id;
+	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
+	// Retruve animation ids list
+        uint16_t huge *anim_ids =	(uint16_t huge *)
+					((byte huge *)vrs +
+					 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_ID_LIST]);
+
+	// Loop through animation id untill match or end of list
+	while(iter_id = anim_ids[new_anim_index])
+	{
+		// Return on successful match
+		if (iter_id == anim_id)
+		{
+			init_anim(spri, new_anim_index);
+			return 0;
+		}
+		new_anim_index++;
+	}
+	return -1;
+}
+
+void print_anim_ids(struct sprite *spri)
+{
+	int new_anim_index = 0;
+	int iter_id;
+	struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;
+	// Retruve animation ids list
+        uint16_t huge *anim_ids =	(uint16_t huge *)
+					((byte huge *)vrs +
+					 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_ID_LIST]);
+
+	if(!anim_ids[new_anim_index])
+		exit(3);
+	// Loop through animation id untill match or end of list
+	while(iter_id = anim_ids[new_anim_index])
+	{
+		// Return on successful match
+		new_anim_index++;
+	}
+}
+
+
+void animate_spri(struct sprite *spri)
+{
+	int i;
+	// Events go here
+
+	// Draw sprite
+	i = get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);
+	if(i < 0)
+	{
+		printf("Error retriving required sprite");
+		exit(-1);
+	}
+	draw_vrl1_vgax_modex(	spri->x, spri->y,
+				spri->sprite_vrl_cont->vrl_header, spri->sprite_vrl_cont->line_offsets,
+				spri->sprite_vrl_cont->buffer + sizeof(struct vrl1_vgax_header),
+				spri->sprite_vrl_cont->data_size);
+
+	// Depending on delay, update indices
+	switch(spri->delay){
+		// Delay = 0 means that sprite should loop. Nothing to change here
+		case 0:
+			break;
+
+		// Delay = 1 means that on next time unit sprite should be changed
+		case 1:
+			spri->curr_anim_spri++;
+
+			// If we hit the end of an animation sequence, restart it
+			if(!(spri->curr_spri_id = spri->curr_anim_list[spri->curr_anim_spri].sprite_id)){
+				spri->curr_anim_spri = 0;
+				spri->curr_spri_id = spri->curr_anim_list[spri->curr_anim_spri].sprite_id;
+			}
+			spri->delay = spri->curr_anim_list[spri->curr_anim_spri].delay;
+
+		// Delay > 1 means that we should not change sprite yet. Decrease delay
+		default:
+			spri->delay--;
+			break;
+	}
+}