From f5039deffdf210f4765926dcaf6f8a3dfb591914 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 14 Jan 2016 08:17:43 -0500
Subject: Particles are drawn inside

---
 config/settings.xml | 2 +-
 main.cpp            | 2 +-
 src/world.cpp       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/settings.xml b/config/settings.xml
index 82363a8..c06089b 100644
--- a/config/settings.xml
+++ b/config/settings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 
-<screen width="1024" height="720" />
+<screen width="1280" height="720" />
 <hline value="3" />
diff --git a/main.cpp b/main.cpp
index 7386186..7487e4c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -955,7 +955,7 @@ void logic(){
 	for(auto &b : currentWorld->build){
 		switch(b->bsubtype){
 			case FOUNTAIN:
-				for(int r = 0; r < (rand()%20)+10;r++){
+				for(int r = 0; r < (rand()%25)+10;r++){
 					currentWorld->addParticle(rand()%HLINE*3 + b->loc.x + b->width/2,b->loc.y + b->height, HLINE,HLINE, rand()%2 == 0?-(rand()%7)*.01:(rand()%7)*.01,((4+rand()%6)*.05), {0,0,1.0f}, 2500);
 					currentWorld->particles.back()->fountain = true;
 				}
diff --git a/src/world.cpp b/src/world.cpp
index 6ee7255..cced289 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1360,6 +1360,7 @@ void IndoorWorld::draw(Player *p){
 	 *	Draw all entities.
 	*/
 	
+	for(auto &part : particles) part->draw();
 	for(auto &e : entity) e->draw();
 	p->draw();
 }
-- 
cgit v1.2.3