summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-05-05 23:02:54 -0600
committerJared Adams <jaxad0127@gmail.com>2009-05-05 23:02:54 -0600
commita1f5bf3b2d6fe9cfb3106d2da798a62cda546f92 (patch)
treecd64fe465730d1e4a9bc3a2e7dab1fb1fda0a732
parent61f7c4269472c806e63b1061cd4e4b8c831c3b59 (diff)
downloadmana-client-a1f5bf3b2d6fe9cfb3106d2da798a62cda546f92.tar.gz
mana-client-a1f5bf3b2d6fe9cfb3106d2da798a62cda546f92.tar.bz2
mana-client-a1f5bf3b2d6fe9cfb3106d2da798a62cda546f92.tar.xz
mana-client-a1f5bf3b2d6fe9cfb3106d2da798a62cda546f92.zip
Remove debug code that was accidentally committed
-rw-r--r--src/being.cpp37
-rw-r--r--src/npc.cpp25
-rw-r--r--src/npc.h2
3 files changed, 0 insertions, 64 deletions
diff --git a/src/being.cpp b/src/being.cpp
index e24dee21..843f7da6 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -718,34 +718,10 @@ void Being::logic()
if (mUsedTargetCursor)
mUsedTargetCursor->update(tick_time * 10);
- if (getType() == NPC)
- {
- for (int i = 0; i < VECTOREND_SPRITE; i++)
- {
- if (mSprites[i])
- printf("Has sprite %d\n", i);
- else
- printf("Has not sprite %d\n", i);
- }
- }
-
for (int i = 0; i < VECTOREND_SPRITE; i++)
{
if (mSprites[i])
mSprites[i]->update(tick_time * 10);
- }////
-
- if (getType() == NPC)
- {
- for (int i = 0; i < VECTOREND_SPRITE; i++)
- {
- if (mSprites[i])
- printf("Has sprite %d\n", i);
- else
- printf("Has not sprite %d\n", i);
- }
-
- assert(false);
}
// Restart status/particle effects, if needed
@@ -781,19 +757,6 @@ void Being::draw(Graphics *graphics, int offsetX, int offsetY) const
mSprites[i]->draw(graphics, px, py);
}
}
-
- if (getType() == NPC)
- {
- for (int i = 0; i < VECTOREND_SPRITE; i++)
- {
- if (mSprites[i])
- printf("Has sprite %d\n", i);
- else
- printf("Has not sprite %d\n", i);
- }
-
- assert(false);
- }
}
void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
diff --git a/src/npc.cpp b/src/npc.cpp
index 89b92ffe..a49ef406 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -52,10 +52,6 @@ NPC::NPC(int id, int job, Map *map):
std::string file = "graphics/sprites/" + (*i)->sprite;
int variant = (*i)->variant;
mSprites[c] = AnimatedSprite::load(file, variant);
- if (mSprites[c])
- printf("Placed sprite '%s'(%d) at %d\n", file.c_str(), variant, c);
- else
- printf("Placed nonsprite '%s'(%d) at %d\n", file.c_str(), variant, c);
c++;
}
@@ -73,14 +69,6 @@ NPC::NPC(int id, int job, Map *map):
mName = 0;
mNameColor = &guiPalette->getColor(Palette::NPC);
-
- for (int i = 0; i < VECTOREND_SPRITE; i++)
- {
- if (mSprites[i])
- printf("Has sprite %d\n", i);
- else
- printf("Has not sprite %d\n", i);
- }
}
NPC::~NPC()
@@ -124,8 +112,6 @@ void NPC::talk()
isTalking = true;
- checkSprites();
-
Net::getNpcHandler()->talk(mId);
}
@@ -136,14 +122,3 @@ void NPC::updateCoords()
mName->adviseXY(getPixelX(), getPixelY());
}
}
-
-void NPC::checkSprites()
-{
- for (int i = 0; i < VECTOREND_SPRITE; i++)
- {
- if (mSprites[i])
- printf("Has sprite %d\n", i);
- else
- printf("Has not sprite %d\n", i);
- }
-}
diff --git a/src/npc.h b/src/npc.h
index cd31e060..57e6d5a8 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -48,8 +48,6 @@ class NPC : public Player
virtual unsigned char getWalkMask() const
{ return 0x83; } // blocked like a monster by walls, monsters and characters ( bin 1000 0011)
- void checkSprites();
-
static bool isTalking;
protected: