aboutsummaryrefslogtreecommitdiff
path: root/src/game/Transports.cpp
diff options
context:
space:
mode:
authorParadox <none@none>2009-02-09 08:16:34 -0500
committerParadox <none@none>2009-02-09 08:16:34 -0500
commitd230302b16474ff22a35243ffed6236ef4fc7fb9 (patch)
treee3679ad841a47b275756f2721f9aa24a3ee548a6 /src/game/Transports.cpp
parentb0694d7e5e794b361fa178d55fefdb98cf47e9ca (diff)
Replace tabs with spaces in more files.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Transports.cpp')
-rw-r--r--src/game/Transports.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp
index 42130a6d0de..b2ed69fe251 100644
--- a/src/game/Transports.cpp
+++ b/src/game/Transports.cpp
@@ -402,8 +402,8 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
// sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport);
/*
- if(keyFrames[i+1].delay > 5)
- pos.delayed = true;
+ if(keyFrames[i+1].delay > 5)
+ pos.delayed = true;
*/
//if (teleport)
m_WayPoints[t] = pos;
@@ -489,9 +489,9 @@ bool Transport::RemovePassenger(Player* passenger)
void Transport::CheckForEvent(uint32 entry, uint32 wp_id)
{
- uint32 key = entry*100+wp_id;
- if(objmgr.TransportEventMap.find(key) != objmgr.TransportEventMap.end())
- sWorld.ScriptsStart(sEventScripts, objmgr.TransportEventMap[key], this, NULL);
+ uint32 key = entry*100+wp_id;
+ if(objmgr.TransportEventMap.find(key) != objmgr.TransportEventMap.end())
+ sWorld.ScriptsStart(sEventScripts, objmgr.TransportEventMap[key], this, NULL);
}
void Transport::Update(uint32 /*p_time*/)
@@ -516,25 +516,25 @@ void Transport::Update(uint32 /*p_time*/)
Relocate(m_curr->second.x, m_curr->second.y, m_curr->second.z);
}
/*
- if(m_curr->second.delayed)
- {
- switch (GetEntry())
- {
- case 176495:
- case 164871:
- case 175080:
- SendPlaySound(11804, false); break; // ZeppelinDocked
- case 20808:
- case 181646:
- case 176231:
- case 176244:
- case 176310:
- case 177233:
- SendPlaySound(5495, false);break; // BoatDockingWarning
- default:
- SendPlaySound(5154, false); break; // ShipDocked
- }
- }
+ if(m_curr->second.delayed)
+ {
+ switch (GetEntry())
+ {
+ case 176495:
+ case 164871:
+ case 175080:
+ SendPlaySound(11804, false); break; // ZeppelinDocked
+ case 20808:
+ case 181646:
+ case 176231:
+ case 176244:
+ case 176310:
+ case 177233:
+ SendPlaySound(5495, false);break; // BoatDockingWarning
+ default:
+ SendPlaySound(5154, false); break; // ShipDocked
+ }
+ }
*/
/*
for(PlayerSet::iterator itr = m_passengers.begin(); itr != m_passengers.end();)
@@ -557,8 +557,8 @@ void Transport::Update(uint32 /*p_time*/)
if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES)==0)
sLog.outDetail("%s moved to %f %f %f %d", this->m_name.c_str(), m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid);
- //Transport Event System
- CheckForEvent(this->GetEntry(), m_curr->second.id);
- sLog.outDetail("%s is at wp id: %u", this->m_name.c_str(), m_curr->second.id);
- }
+ //Transport Event System
+ CheckForEvent(this->GetEntry(), m_curr->second.id);
+ sLog.outDetail("%s is at wp id: %u", this->m_name.c_str(), m_curr->second.id);
+ }
}