git repos / saland

commit bfa0684c

sago007 · 2017-05-07 08:57
bfa0684c8c5de82b16321367ea14e6339cdd7291 patch · browse files
parent c38a12042ee3989d4126c5a41b4838e2235882ee 

Added a bee monster
'

Changed files

A data/sprites/monsters.sprite
A data/textures/bat.png
A data/textures/bee.png
M src/saland.cpp before
diff --git a/data/sprites/monsters.sprite b/data/sprites/monsters.sprite new file mode 100644 index 0000000..0e37f62 --- /dev/null +++ b/data/sprites/monsters.sprite
@@ -0,0 +1,51 @@
+{
+
+"bee_N" : {
+ "texture" : "bee",
+ "topx" : 0,
+ "topy" : 0,
+ "height" : 32,
+ "width" : 32,
+ "number_of_frames" : 3,
+ "frame_time" : 150,
+ "originx" : 16,
+ "originy" : 40
+},
+
+"bee_W" : {
+ "texture" : "bee",
+ "topx" : 0,
+ "topy" : 32,
+ "height" : 32,
+ "width" : 32,
+ "number_of_frames" : 3,
+ "frame_time" : 150,
+ "originx" : 16,
+ "originy" : 40
+},
+
+"bee_S" : {
+ "texture" : "bee",
+ "topx" : 0,
+ "topy" : 64,
+ "height" : 32,
+ "width" : 32,
+ "number_of_frames" : 3,
+ "frame_time" : 150,
+ "originx" : 16,
+ "originy" : 40
+},
+
+"bee_E" : {
+ "texture" : "bee",
+ "topx" : 0,
+ "topy" : 96,
+ "height" : 32,
+ "width" : 32,
+ "number_of_frames" : 3,
+ "frame_time" : 150,
+ "originx" : 16,
+ "originy" : 40
+}
+
+}
diff --git a/data/textures/bat.png b/data/textures/bat.png new file mode 100644 index 0000000..ce34760
Binary files /dev/null and b/data/textures/bat.png differ
diff --git a/data/textures/bee.png b/data/textures/bee.png new file mode 100644 index 0000000..f494671
Binary files /dev/null and b/data/textures/bee.png differ
diff --git a/src/saland.cpp b/src/saland.cpp index 1f67788..fc0a401 100644 --- a/src/saland.cpp +++ b/src/saland.cpp
@@ -13,6 +13,7 @@
#include <SDL2/SDL2_gfxPrimitives.h>
#include <SDL/SDL_timer.h>
#include <SDL2/SDL_events.h>
+#include <SDL2/SDL_timer.h>
#include "Libs/NFont.h"
#include "saland/globals.hpp"
#include "saland/Game.hpp"
@@ -46,6 +47,8 @@ class TitleScreen : public sago::GameStateInterface {
s.Draw(globalData.screen, SDL_GetTicks(), 100, 100);
const sago::SagoSprite& sc = globalData.spriteHolder->GetSprite("male_spellcast_E");
sc.Draw(globalData.screen, SDL_GetTicks(), 200, 100);
+ 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 {