YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bit more cleanup

Browse Source
This commit is contained in:
Dominic Masters
2024-10-06 21:01:05 -05:00
parent b7987401af
commit b5d7b7e229
14 changed files with 77 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dawn/asset/assetmap.c
View File

@ -67,9 +67,7 @@ void assetMapLoad(
); );
for(int32_t j = 0; j < width * height; j++) { for(int32_t j = 0; j < width * height; j++) {
map->tiles[j] = (tile_t){ map->tiles[j] = (tile_t)tiles->array.value[j]->number;
.id = (uint16_t)tiles->array.value[j]->number
};
} }
} }
@ -90,7 +88,9 @@ void assetMapLoad(
int32_t x = (int32_t)assetJsonGetObjectValue(jEnt, "x")->number; int32_t x = (int32_t)assetJsonGetObjectValue(jEnt, "x")->number;
int32_t y = (int32_t)assetJsonGetObjectValue(jEnt, "y")->number; int32_t y = (int32_t)assetJsonGetObjectValue(jEnt, "y")->number;
uint8_t type = (uint8_t)assetJsonGetObjectValue(jEnt, "type")->number; entitytype_t type = (entitytype_t)assetJsonGetObjectValue(
jEnt, "type"
)->number;
entity_t *ent = mapEntityAdd(map); entity_t *ent = mapEntityAdd(map);
entityInit(ent, type, map); entityInit(ent, type, map);
@ -118,8 +118,12 @@ void assetMapLoad(
int32_t x = (int32_t)assetJsonGetObjectValue(jTrig, "x")->number; int32_t x = (int32_t)assetJsonGetObjectValue(jTrig, "x")->number;
int32_t y = (int32_t)assetJsonGetObjectValue(jTrig, "y")->number; int32_t y = (int32_t)assetJsonGetObjectValue(jTrig, "y")->number;
int32_t width = (int32_t)assetJsonGetObjectValue(jTrig, "width")->number; int32_t width = (int32_t)assetJsonGetObjectValue(jTrig, "width")->number;
int32_t height = (int32_t)assetJsonGetObjectValue(jTrig, "height")->number; int32_t height = (int32_t)assetJsonGetObjectValue(
uint8_t type = (uint8_t)assetJsonGetObjectValue(jTrig, "type")->number; jTrig, "height"
)->number;
triggertype_t type = (triggertype_t)assetJsonGetObjectValue(
jTrig, "type"
)->number;
trigger_t *trigger = mapTriggerAdd(map); trigger_t *trigger = mapTriggerAdd(map);
triggerInit(trigger, type, x, y, width, height); triggerInit(trigger, type, x, y, width, height);

4
src/dawn/display/symbol.c
View File

@ -23,7 +23,7 @@ char_t symbolGetCharByEntity(const entity_t *ent) {
} }
char_t symbolGetCharByTile(const tile_t tile) { char_t symbolGetCharByTile(const tile_t tile) {
switch(tile.id) { switch(tile) {
case TILE_ID_GRASS: case TILE_ID_GRASS:
return '#'; return '#';
@ -56,7 +56,7 @@ uint8_t symbolGetColorByEntity(const entity_t *ent) {
} }
uint8_t symbolGetColorByTile(const tile_t tile) { uint8_t symbolGetColorByTile(const tile_t tile) {
switch(tile.id) { switch(tile) {
case TILE_ID_GRASS: case TILE_ID_GRASS:
return COLOR_GREEN; return COLOR_GREEN;

2
src/dawn/rpg/entity/entity.c
View File

@ -14,7 +14,7 @@
void entityInit( void entityInit(
entity_t *entity, entity_t *entity,
const uint8_t type, const entitytype_t type,
map_t *map map_t *map
) { ) {
assertNotNull(entity, "Entity cannot be NULL."); assertNotNull(entity, "Entity cannot be NULL.");

12
src/dawn/rpg/entity/entity.h
View File

@ -8,9 +8,11 @@
#pragma once #pragma once
#include "player.h" #include "player.h"
#define ENTITY_TYPE_NULL 0 typedef enum {
#define ENTITY_TYPE_PLAYER 1 ENTITY_TYPE_NULL = 0,
#define ENTITY_TYPE_NPC 2 ENTITY_TYPE_PLAYER = 1,
ENTITY_TYPE_NPC = 2
} entitytype_t;
#define ENTITY_STATE_IDLE 0 #define ENTITY_STATE_IDLE 0
#define ENTITY_STATE_WALKING 1 #define ENTITY_STATE_WALKING 1
@ -24,7 +26,7 @@ typedef struct {
typedef struct _entity_t { typedef struct _entity_t {
map_t *map; map_t *map;
uint8_t type; entitytype_t type;
uint16_t x; uint16_t x;
uint16_t y; uint16_t y;
uint8_t layer; uint8_t layer;
@ -50,7 +52,7 @@ typedef struct _entity_t {
*/ */
void entityInit( void entityInit(
entity_t *entity, entity_t *entity,
const uint8_t type, const entitytype_t type,
map_t *map map_t *map
); );

14
src/dawn/rpg/entity/entitydirection.c
View File

@ -8,7 +8,11 @@
#include "entitydirection.h" #include "entitydirection.h"
#include "assert/assert.h" #include "assert/assert.h"
void entityDirectionOffsetGet(const uint8_t dir, uint16_t *x, uint16_t *y) { void entityDirectionOffsetGet(
const entitydirection_t dir,
uint16_t *x,
uint16_t *y
) {
switch(dir) { switch(dir) {
case ENTITY_DIRECTION_SOUTH: case ENTITY_DIRECTION_SOUTH:
*x = 0; *x = 0;
@ -31,7 +35,11 @@ void entityDirectionOffsetGet(const uint8_t dir, uint16_t *x, uint16_t *y) {
} }
} }
void entityDirectionOffsetAdd(const uint8_t dir, uint16_t *x, uint16_t *y) { void entityDirectionOffsetAdd(
const entitydirection_t dir,
uint16_t *x,
uint16_t *y
) {
switch(dir) { switch(dir) {
case ENTITY_DIRECTION_SOUTH: case ENTITY_DIRECTION_SOUTH:
*y += 1; *y += 1;
@ -50,7 +58,7 @@ void entityDirectionOffsetAdd(const uint8_t dir, uint16_t *x, uint16_t *y) {
} }
} }
uint8_t entityDirectionLookAt( entitydirection_t entityDirectionLookAt(
const uint16_t srcX, const uint16_t srcY, const uint16_t srcX, const uint16_t srcY,
const uint16_t trgX, const uint16_t trgY const uint16_t trgX, const uint16_t trgY
) { ) {

24
src/dawn/rpg/entity/entitydirection.h
View File

@ -8,10 +8,12 @@
#pragma once #pragma once
#include "dawn.h" #include "dawn.h"
#define ENTITY_DIRECTION_SOUTH 0 typedef enum {
#define ENTITY_DIRECTION_NORTH 1 ENTITY_DIRECTION_SOUTH = 0,
#define ENTITY_DIRECTION_WEST 2 ENTITY_DIRECTION_NORTH = 1,
#define ENTITY_DIRECTION_EAST 3 ENTITY_DIRECTION_WEST = 2,
ENTITY_DIRECTION_EAST = 3
} entitydirection_t;
/** /**
* Returns the offset for a given direction. * Returns the offset for a given direction.
@ -20,7 +22,11 @@
* @param x Pointer to store x offset. * @param x Pointer to store x offset.
* @param y Pointer to store y offset. * @param y Pointer to store y offset.
*/ */
void entityDirectionOffsetGet(const uint8_t dir, uint16_t *x, uint16_t *y); void entityDirectionOffsetGet(
const entitydirection_t dir,
uint16_t *x,
uint16_t *y
);
/** /**
* Adds the offset for a given direction to the given x and y. * Adds the offset for a given direction to the given x and y.
@ -29,7 +35,11 @@ void entityDirectionOffsetGet(const uint8_t dir, uint16_t *x, uint16_t *y);
* @param x Pointer to add x offset to. * @param x Pointer to add x offset to.
* @param y Pointer to add y offset to. * @param y Pointer to add y offset to.
*/ */
void entityDirectionOffsetAdd(const uint8_t dir, uint16_t *x, uint16_t *y); void entityDirectionOffsetAdd(
const entitydirection_t dir,
uint16_t *x,
uint16_t *y
);
/** /**
* Returns the direction to look at from one point to another. * Returns the direction to look at from one point to another.
@ -40,7 +50,7 @@ void entityDirectionOffsetAdd(const uint8_t dir, uint16_t *x, uint16_t *y);
* @param trgY Target Y position. * @param trgY Target Y position.
* @return Direction to look at. * @return Direction to look at.
*/ */
uint8_t entityDirectionLookAt( entitydirection_t entityDirectionLookAt(
const uint16_t srcX, const uint16_t srcY, const uint16_t srcX, const uint16_t srcY,
const uint16_t trgX, const uint16_t trgY const uint16_t trgX, const uint16_t trgY
); );

2
src/dawn/rpg/entity/player.c
View File

@ -51,7 +51,7 @@ void playerUpdate(entity_t *entity) {
} }
tile_t tile = mapTileGetByPosition(entity->map, x, y, 0); tile_t tile = mapTileGetByPosition(entity->map, x, y, 0);
switch(tile.id) { switch(tile) {
case TILE_ID_WATER: case TILE_ID_WATER:
textboxSetText(NULL, "You cannot swim."); textboxSetText(NULL, "You cannot swim.");
entity->state = ENTITY_STATE_TALKING; entity->state = ENTITY_STATE_TALKING;

2
src/dawn/rpg/world/map.c
View File

@ -84,7 +84,7 @@ entity_t * mapEntityGetByPosition(
entity_t * mapEntityGetByType( entity_t * mapEntityGetByType(
map_t *map, map_t *map,
const uint8_t type const entitytype_t type
) { ) {
for(uint8_t i = 0; i < map->entityCount; i++) { for(uint8_t i = 0; i < map->entityCount; i++) {
entity_t *entity = &map->entities[i]; entity_t *entity = &map->entities[i];

2
src/dawn/rpg/world/map.h
View File

@ -82,7 +82,7 @@ entity_t * mapEntityGetByPosition(
*/ */
entity_t * mapEntityGetByType( entity_t * mapEntityGetByType(
map_t *map, map_t *map,
const uint8_t type const entitytype_t type
); );
/** /**

30
src/dawn/rpg/world/maps/testmap.h
View File

@ -29,25 +29,25 @@ void testMapInit(map_t *map) {
tile_t tiles[TEST_MAP_WIDTH * TEST_MAP_HEIGHT]; tile_t tiles[TEST_MAP_WIDTH * TEST_MAP_HEIGHT];
for(uint32_t i = 0; i < TEST_MAP_WIDTH * TEST_MAP_HEIGHT; i++) { for(uint32_t i = 0; i < TEST_MAP_WIDTH * TEST_MAP_HEIGHT; i++) {
tiles[i].id = TILE_ID_GRASS; tiles[i] = TILE_ID_GRASS;
} }
tiles[10].id = TILE_ID_WATER; tiles[10] = TILE_ID_WATER;
tiles[11].id = TILE_ID_WATER; tiles[11] = TILE_ID_WATER;
tiles[12].id = TILE_ID_WATER; tiles[12] = TILE_ID_WATER;
tiles[13].id = TILE_ID_WATER; tiles[13] = TILE_ID_WATER;
tiles[14].id = TILE_ID_WATER; tiles[14] = TILE_ID_WATER;
tiles[26].id = TILE_ID_WATER; tiles[26] = TILE_ID_WATER;
tiles[27].id = TILE_ID_WATER; tiles[27] = TILE_ID_WATER;
tiles[28].id = TILE_ID_WATER; tiles[28] = TILE_ID_WATER;
tiles[29].id = TILE_ID_WATER; tiles[29] = TILE_ID_WATER;
tiles[41].id = TILE_ID_WATER; tiles[41] = TILE_ID_WATER;
tiles[42].id = TILE_ID_WATER; tiles[42] = TILE_ID_WATER;
tiles[43].id = TILE_ID_WATER; tiles[43] = TILE_ID_WATER;
tiles[44].id = TILE_ID_WATER; tiles[44] = TILE_ID_WATER;
tiles[45].id = TILE_ID_WATER; tiles[45] = TILE_ID_WATER;
mapTilesSet(map, tiles, 0); mapTilesSet(map, tiles, 0);
} }

2
src/dawn/rpg/world/tile.c
View File

@ -8,7 +8,7 @@
#include "tile.h" #include "tile.h"
bool_t tileIsSolid(const tile_t tile) { bool_t tileIsSolid(const tile_t tile) {
switch(tile.id) { switch(tile) {
case TILE_ID_WATER: case TILE_ID_WATER:
return true; return true;

10
src/dawn/rpg/world/tile.h
View File

@ -8,12 +8,10 @@
#pragma once #pragma once
#include "dawn.h" #include "dawn.h"
#define TILE_ID_NULL 0 typedef enum {
#define TILE_ID_GRASS 1 TILE_ID_NULL = 0,
#define TILE_ID_WATER 2 TILE_ID_GRASS = 1,
TILE_ID_WATER = 2
typedef struct {
uint8_t id;
} tile_t; } tile_t;
/** /**

2
src/dawn/rpg/world/trigger.c
View File

@ -10,7 +10,7 @@
void triggerInit( void triggerInit(
trigger_t *trigger, trigger_t *trigger,
const uint8_t type, const triggertype_t type,
const uint16_t x, const uint16_t x,
const uint16_t y, const uint16_t y,
const uint16_t width, const uint16_t width,

7
src/dawn/rpg/world/trigger.h
View File

@ -8,7 +8,10 @@
#pragma once #pragma once
#include "rpg/entity/entity.h" #include "rpg/entity/entity.h"
#define TRIGGER_TYPE_NULL 0
typedef enum {
TRIGGER_TYPE_NULL = 0
} triggertype_t;
typedef struct { typedef struct {
uint16_t x, y; uint16_t x, y;
@ -28,7 +31,7 @@ typedef struct {
*/ */
void triggerInit( void triggerInit(
trigger_t *trigger, trigger_t *trigger,
const uint8_t type, const triggertype_t type,
const uint16_t x, const uint16_t x,
const uint16_t y, const uint16_t y,
const uint16_t width, const uint16_t width,