diff --git a/src/saland.cpp b/src/saland.cpp index fc0a401..7467398 100644 --- a/src/saland.cpp +++ b/src/saland.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include "Libs/NFont.h" @@ -37,11 +36,11 @@ class TitleScreen : public sago::GameStateInterface { virtual bool IsActive() override { return isActive; } - + virtual void Draw(SDL_Renderer* target) override { NFont_Write(target, 10, 10, "Saland Adventures"); - circleRGBA(target, - 150, 150, 75, + circleRGBA(target, + 150, 150, 75, 0, 0, 255, 255); const sago::SagoSprite& s = globalData.spriteHolder->GetSprite("male_walkcycle_E"); s.Draw(globalData.screen, SDL_GetTicks(), 100, 100); @@ -50,7 +49,7 @@ class TitleScreen : public sago::GameStateInterface { const sago::SagoSprite& bee = globalData.spriteHolder->GetSprite("bee_E"); bee.Draw(globalData.screen, SDL_GetTicks(), 100, 200); } - + virtual void ProcessInput(const SDL_Event& event, bool &processed) override { if ( event.type == SDL_KEYDOWN ) { if (event.key.keysym.sym == SDLK_RETURN) { @@ -59,9 +58,9 @@ class TitleScreen : public sago::GameStateInterface { } } } - + virtual void Update() override { - + } private: bool isActive = true; @@ -91,7 +90,7 @@ void RunGameState(sago::GameStateInterface& state ) { state.Update(); SDL_RenderPresent(globalData.screen); - + if (!state.IsActive()) { done = true; @@ -106,19 +105,19 @@ void runGame() { IMG_Init(IMG_INIT_PNG); TTF_Init(); Mix_Init(MIX_INIT_OGG); - + win = SDL_CreateWindow("Hello World", posX, posY, width, height, 0); globalData.screen = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED); sago::SagoDataHolder holder(globalData.screen); globalData.spriteHolder.reset(new sago::SagoSpriteHolder(holder)); globalData.nf_standard_font.load(globalData.screen, holder.getFontPtr("freeserif", 30),NFont::Color(255,255,255)); - + TitleScreen ts; RunGameState(ts); - + Game g; RunGameState(g); - + SDL_DestroyRenderer(globalData.screen); SDL_DestroyWindow(win); diff --git a/src/saland/Game.cpp b/src/saland/Game.cpp index f341761..442ebec 100644 --- a/src/saland/Game.cpp +++ b/src/saland/Game.cpp @@ -6,6 +6,7 @@ #include "globals.hpp" #include "model/placeables.hpp" #include "SDL.h" +#include static void Draw(SDL_Renderer* target, SDL_Texture* t, int x, int y, const SDL_Rect& part) { SDL_Rect pos = {}; @@ -170,7 +171,7 @@ static void UpdateHuman(Human *entity, float fDeltaTime) { if (entity->castTimeRemaining == 0) { MoveHumanEntity(entity, entity->moveX, entity->moveY, fDeltaTime); } -} +} void Game::Update() { Uint32 nowTime = SDL_GetTicks();