Fixed buffer overflowing because of mouse input
This commit is contained in:
@ -7,6 +7,9 @@
|
||||
|
||||
#include "pokergame.h"
|
||||
|
||||
menu_t menu;
|
||||
frame_t frame;
|
||||
|
||||
bool pokerGameInit(game_t *game) {
|
||||
pokergame_t *pokerGame = &game->pokerGame;
|
||||
|
||||
@ -29,6 +32,19 @@ bool pokerGameInit(game_t *game) {
|
||||
pokerGameActionStartAdd(pokerGame);
|
||||
queueNext(&pokerGame->scene.conversation.actionQueue);
|
||||
|
||||
frameInit(&frame);
|
||||
frame.texture = &pokerGame->assets.testTexture;
|
||||
|
||||
menuitem_t *item;
|
||||
menuInit(&menu);
|
||||
item = menuAdd(&menu);
|
||||
item->x = 0;
|
||||
item->y = 0;
|
||||
|
||||
item = menuAdd(&menu);
|
||||
item->x = 1;
|
||||
item->y = 0;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -51,6 +67,22 @@ void pokerGameUpdate(game_t *game) {
|
||||
// Render the UI
|
||||
vnSceneRenderGui(&pokerGame->scene, &game->engine, &pokerGame->assets.shader);
|
||||
pokerUiRender(pokerGame);
|
||||
|
||||
|
||||
|
||||
uint8_t i;
|
||||
menuUpdate(&menu, &game->engine);
|
||||
for(i = 0; i < menu.itemCount; i++) {
|
||||
menuitem_t *item = menu.items + i;
|
||||
frame.x = item->x * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE);
|
||||
frame.y = item->y * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE);
|
||||
if(menu.selected == i) frame.y -= FRAME_BORDER_SIZE;
|
||||
frameSetSize(&frame,
|
||||
item->width * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE),
|
||||
item->height * (FRAME_BORDER_SIZE + FRAME_BORDER_SIZE)
|
||||
);
|
||||
frameRender(&frame, &pokerGame->assets.shader);
|
||||
}
|
||||
}
|
||||
|
||||
void pokerGameDispose(game_t *game) {
|
||||
|
@ -17,6 +17,9 @@
|
||||
#include "pokerworld.h"
|
||||
#include "actions/start.h"
|
||||
|
||||
#include "../../ui/menu.h"
|
||||
#include "../../ui/frame.h"
|
||||
|
||||
/**
|
||||
* Initializes the game state for the poker game.
|
||||
*
|
||||
|
@ -20,7 +20,7 @@ bool pokerGameAssetsInit(pokergameassets_t *assets) {
|
||||
|
||||
// Load the world textures.
|
||||
assetTextureLoad(&assets->testTexture, "test_texture.png");
|
||||
assetTextureLoad(&assets->roomTexture, "world/pub/pub_skywall_low.png");
|
||||
assetTextureLoad(&assets->roomTexture, "world/pub/pub_skywall.png");
|
||||
|
||||
// Load the character textures.
|
||||
assetTextureLoad(&assets->pennyTexture, "characters/penny/sprites/sheet.png");
|
||||
|
Reference in New Issue
Block a user