aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2017-01-06 08:51:53 -0500
committerClyne Sullivan <tullivan99@gmail.com>2017-01-06 08:51:53 -0500
commitefcf1a88cd0d0bee3973705b5975827be97f5a3a (patch)
treef458ac0c456e09ed236c7c93379a371617325ead /main.cpp
parentcbd154a4834f56146dbe744ee2d2c6dccc04c5cb (diff)
particles, rain
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/main.cpp b/main.cpp
index 17499f7..2e33a83 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,6 +25,7 @@ using namespace tinyxml2;
#include <world.hpp>
#include <render.hpp>
#include <ui.hpp>
+#include <particle.hpp>
/**
* The currently used folder to look for XML files in.
@@ -311,6 +312,7 @@ void render() {
// draw the world and player
game::engine.getSystem<WorldSystem>()->render();
+ game::engine.getSystem<ParticleSystem>()->render();
// draw the player's inventory
//player->inv->draw();
@@ -327,9 +329,10 @@ void render() {
if (ui::debug) {
auto pos = game::engine.getSystem<PlayerSystem>()->getPosition();
ui::putText(offset.x - SCREEN_WIDTH2, (offset.y + SCREEN_HEIGHT2) - ui::fontSize,
- "loc: %s\noffset: %s\nfps: %d\nticks: %d\nxml: %s",
- pos.toString().c_str(), offset.toString().c_str(), fps,
- game::time::getTickCount(), game::engine.getSystem<WorldSystem>()->getXMLFile().c_str());
+ "loc: %s\noffset: %s\nfps: %d\nticks: %d\npcount: %d\nxml: %s",
+ pos.toString().c_str(), offset.toString().c_str(), fps,
+ game::time::getTickCount(), game::engine.getSystem<ParticleSystem>()->getCount(),
+ game::engine.getSystem<WorldSystem>()->getXMLFile().c_str());
}
// draw the menu