|
@@ -1,6 +1,7 @@
|
|
|
#include <graphx.h>
|
|
|
#include <keypadc.h>
|
|
|
#include <compression.h>
|
|
|
+#include <debug.h>
|
|
|
|
|
|
#include "gfx/main_gfx.h"
|
|
|
#include "main.h"
|
|
@@ -10,7 +11,7 @@ int main(void){
|
|
|
size_t i;
|
|
|
Scene* scene = new_Scene("Main");
|
|
|
Sprite* sprite;
|
|
|
- Object* player;
|
|
|
+ Object* player = new_Player();
|
|
|
Vector* objects = scene->objects;
|
|
|
Vector* sprites = scene->sprites;
|
|
|
if(!sprites->consume(sprites, new_Sprite(bm1_width, bm1_height, bm1_compressed)) ||
|
|
@@ -40,15 +41,14 @@ int main(void){
|
|
|
free_Scene(scene);
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
- if(!objects->consume(objects, new_Player())){
|
|
|
- log("Unable to add player to stack");
|
|
|
+ if(!objects->consume(objects, player)){
|
|
|
+ log("Unable to load objects");
|
|
|
free_Scene(scene);
|
|
|
return 1;
|
|
|
}
|
|
|
player = objects->get(objects, 0);
|
|
|
if(player == NULL){
|
|
|
- log("Unable to get player from stack");
|
|
|
+ log("Unable to get player");
|
|
|
free_Scene(scene);
|
|
|
return 1;
|
|
|
}
|
|
@@ -59,28 +59,10 @@ int main(void){
|
|
|
return 1;
|
|
|
}
|
|
|
player->sprite = sprite;
|
|
|
- log("Get max sizes");
|
|
|
-
|
|
|
- #ifdef RESIZE_SPRITES
|
|
|
- log("Resizing sprites");
|
|
|
- dbg_sprintf(dbgout, "[Player] %d x %d\n", sprite->data->width, sprite->data->height);
|
|
|
- for(i = 0; i < sprites->count(sprites); i++){
|
|
|
- sprite = sprites->get(sprites, i);
|
|
|
- sprite->resize(sprite, sprite->data->width * SCALE, sprite->data->height * SCALE);
|
|
|
- }
|
|
|
- dbg_sprintf(dbgout, "[Player] %d x %d\n", player->sprite->data->width, player->sprite->data->height);
|
|
|
- #else
|
|
|
- player->scale.x = SCALE;
|
|
|
- player->scale.y = SCALE;
|
|
|
- MAX_WIDTH -= player->width(player);
|
|
|
- MAX_HEIGHT -= player->height(player);
|
|
|
- #endif
|
|
|
|
|
|
- log("Start graphics");
|
|
|
gfx_Begin();
|
|
|
gfx_SetPalette(main_palette, sizeof_main_palette, 0);
|
|
|
gfx_SetDrawBuffer();
|
|
|
-
|
|
|
log("Main loop");
|
|
|
scene->load(scene);
|
|
|
do{
|