Some more progress
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
#include "../util/util.h"
|
||||
#include "tile.h"
|
||||
#include "../player/player.h"
|
||||
#include "../items/item.h"
|
||||
|
||||
static int scrollFrame = 0;
|
||||
unsigned long beltFrames = 0;
|
||||
@@ -17,7 +18,7 @@ void renderBelt(int x, int y, int w, int h, OrientDirection dir, SDL_Renderer *r
|
||||
int px = x * TILE_SIZE;
|
||||
int py = y * TILE_SIZE;
|
||||
|
||||
uint16_t tileType = tileMap[y][x].type - 1;
|
||||
uint16_t tileType = tileMap[y][x].type;
|
||||
|
||||
SDL_Rect src1, src2, dst1, dst2;
|
||||
|
||||
|
13
tiles/tile.c
13
tiles/tile.c
@@ -4,12 +4,10 @@
|
||||
|
||||
#include <dirent.h>
|
||||
#include "tile.h"
|
||||
#include "../player/player.h"
|
||||
#include "../util/util.h"
|
||||
|
||||
Tile tileMap[MAP_HEIGHT][MAP_WIDTH];
|
||||
|
||||
uint16_t tileTypeIndex = 0;
|
||||
uint16_t tileTypeIndex = 1;
|
||||
|
||||
TileType TileRegistry[TILEREGISTRY_SIZE];
|
||||
|
||||
@@ -47,7 +45,7 @@ void registerTile(char name[20], SDL_Renderer *renderer) {
|
||||
TileRegistry[tileTypeIndex].textures[ORIENT_UP] = createRotatedTexture(renderer, texture, 90);
|
||||
TileRegistry[tileTypeIndex].textures[ORIENT_DOWN] = createRotatedTexture(renderer, texture, 270);
|
||||
TileRegistry[tileTypeIndex].type = tileTypeIndex;
|
||||
TileRegistry[tileTypeIndex].breakTime = 60;
|
||||
TileRegistry[tileTypeIndex].breakTime = 30;
|
||||
|
||||
tileTypeIndex++;
|
||||
}
|
||||
@@ -64,4 +62,11 @@ void loadTiles(SDL_Renderer *renderer) {
|
||||
registerTile(entry->d_name, renderer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t getBreakTime(int type) {
|
||||
if (type >= tileTypeIndex) {
|
||||
return 0;
|
||||
}
|
||||
return TileRegistry[type].breakTime;
|
||||
}
|
@@ -6,8 +6,8 @@
|
||||
#define FACTORYGAME_TILE_H
|
||||
|
||||
#include "belt.h"
|
||||
#include "../items/item.h"
|
||||
#include "../util/util.h"
|
||||
#include "../items/item.h"
|
||||
|
||||
#define MAP_WIDTH 600
|
||||
#define MAP_HEIGHT 340
|
||||
@@ -50,4 +50,6 @@ void loadTiles(SDL_Renderer *renderer);
|
||||
|
||||
extern uint16_t tileTypeIndex;
|
||||
|
||||
uint16_t getBreakTime(int type);
|
||||
|
||||
#endif //FACTORYGAME_TILE_H
|
||||
|
Reference in New Issue
Block a user