walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Draw inventory items on HUD.

This commit is contained in:
Steve 2018-02-07 07:51:25 +00:00
parent 4558ea366d
commit b27b3dd2f8
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/world/hud.c
View File

@ -31,6 +31,7 @@ static char message[MAX_DESCRIPTION_LENGTH];
static int messageType; static int messageType;
static SDL_Color messageColor; static SDL_Color messageColor;
static char infoMessage[MAX_DESCRIPTION_LENGTH]; static char infoMessage[MAX_DESCRIPTION_LENGTH];
static Texture *atlasTexture;
void initHud(void) void initHud(void)
{ {
@ -38,6 +39,8 @@ void initHud(void)
messageType = MSG_STANDARD; messageType = MSG_STANDARD;
strcpy(message, ""); strcpy(message, "");
messageColor = colors.white; messageColor = colors.white;
atlasTexture = getTexture("gfx/atlas/atlas.png");
} }
void doHud(void) void doHud(void)
@ -153,11 +156,14 @@ static void drawOxygen(void)
static void drawInventory(void) static void drawInventory(void)
{ {
int x, y, i, size; int x, y, i, size, mid;
float w, h, d;
SDL_Rect r;
size = 45; size = 45;
mid = size / 2;
x = SCREEN_WIDTH - (size + 5); x = 930;
y = 5; y = 5;
for (i = 0 ; i < MAX_ITEMS ; i++) for (i = 0 ; i < MAX_ITEMS ; i++)
@ -165,14 +171,31 @@ static void drawInventory(void)
if (i > 0 && i % (MAX_ITEMS / 2) == 0) if (i > 0 && i % (MAX_ITEMS / 2) == 0)
{ {
y += (size + 5); y += (size + 5);
x = SCREEN_WIDTH - (size + 5); x = 930;
} }
drawRect(x, y, size, size, 0, 0, 0, 128); drawRect(x, y, size, size, 0, 0, 0, 128);
drawOutlineRect(x, y, size, size, 255, 255, 255, 255); drawOutlineRect(x, y, size, size, 255, 255, 255, 255);
x -= (size + 5); if (world.bob->items[i] != NULL)
{
r = getCurrentFrame(world.bob->items[i]->sprite[0]);
w = r.w;
h = r.h;
d = 40;
d /= (w > h) ? w : h;
w *= d;
h *= d;
blitRectScaled(atlasTexture->texture, x + mid, y + mid, w, h, &r, 1);
drawText(x + size - 5, y, 14, TA_RIGHT, colors.white, "%d", world.bob->items[i]->value);
}
x += (size + 5);
} }
} }

5
src/world/hud.h
View File

@ -26,8 +26,13 @@ const char *getWeaponName(int i);
extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a);
extern void limitTextWidth(int width); extern void limitTextWidth(int width);
extern int getWrappedTextHeight(const char *text, int size); extern int getWrappedTextHeight(const char *text, int size);
extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center);
extern Sprite *getSprite(char *name);
extern Texture *getTexture(const char *filename);
extern SDL_Rect getCurrentFrame(Sprite *s);
extern Dev dev; extern Dev dev;
extern Camera camera; extern Camera camera;
extern Colors colors; extern Colors colors;
extern Game game;
extern World world; extern World world;