aboutsummaryrefslogtreecommitdiffstats
path: root/src/world.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-02-03 08:43:55 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-02-03 08:43:55 -0500
commit00c312051599729074ff3584a0528c1883e1ff42 (patch)
tree1778fa2382922d7ef50b787e444946a640e9033a /src/world.cpp
parentf00c4bb6b0c4dc1cf2f0c122a4748288ac6ab1a5 (diff)
parent7ab072caaaec09720ad79cfed5738e89bc60c44f (diff)
Mouse
Diffstat (limited to 'src/world.cpp')
-rw-r--r--src/world.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/world.cpp b/src/world.cpp
index c8b4bde..df0f0ac 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -284,9 +284,9 @@ void World::update(Player *p,unsigned int delta){
p->loc.y += p->vel.y * delta;
p->loc.x +=(p->vel.x * p->speed) * delta;
- if(p->inv->usingi){
+ /*if(p->inv->usingi){
p->inv->useItem();
- }
+ }*/
/*
* Update coordinates of all entities except for structures.
@@ -1001,8 +1001,8 @@ void World::addNPC(float x,float y){
entity.push_back(npc.back());
}
-void World::addObject(ITEM_ID i,const char *p, float x, float y){
- object.push_back(new Object(i,p));
+void World::addObject(/*ITEM_ID i*/std::string in,const char *p, float x, float y){
+ object.push_back(new Object(in,p));
object.back()->spawn(x,y);
entity.push_back(object.back());