mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fixed few bugs reported by FG

Browse Source
This commit is contained in:
bluma4862 2008-07-08 05:24:39 +00:00
parent 3086c09146
commit 76ed684573
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Client/PseuWoW.cpp
View File

@ -177,6 +177,13 @@ bool PseuInstance::InitGUI(void)
logerror("GUI: Aborting init, GUI already exists!"); logerror("GUI: Aborting init, GUI already exists!");
return false; return false;
} }
if (!GetConf()->enablegui)
{
logdebug("GUI: Can't start, gui disabled in config");
return false;
}
uint16 x,y,depth; uint16 x,y,depth;
uint8 driver; uint8 driver;
bool shadows,vsync,win; bool shadows,vsync,win;

1
src/Client/SCPDatabase.cpp
View File

@ -479,7 +479,6 @@ bool SCPDatabaseMgr::Compact(char *dbname, char *outfile, uint32 compression)
else else
{ {
logdebug("SCP Compact: Unable to compress '%s' (too small?)",outfile); logdebug("SCP Compact: Unable to compress '%s' (too small?)",outfile);
return false;
} }
} }

5
src/Client/World/WorldSession.cpp
View File

@ -946,7 +946,7 @@ void WorldSession::_HandleMovementOpcode(WorldPacket& recvPacket)
uint8 unk8; uint8 unk8;
guid = recvPacket.GetPackedGuid(); guid = recvPacket.GetPackedGuid();
recvPacket >> flags >> unk8 >> time >> x >> y >> z >> o >> unk32; recvPacket >> flags >> unk8 >> time >> x >> y >> z >> o >> unk32;
DEBUG(logdebug("MOVE: "I64FMT" -> time=%u flags=%u x=%.4f y=%.4f z=%.4f o=%.4f",guid,time,flags,x,y,z,o)); DEBUG(logdebug("MOVE: "I64FMT" -> time=%u flags=0x%X x=%.4f y=%.4f z=%.4f o=%.4f",guid,time,flags,x,y,z,o));
Object *obj = objmgr.GetObj(guid); Object *obj = objmgr.GetObj(guid);
if(obj && obj->IsWorldObject()) if(obj && obj->IsWorldObject())
{ {
@ -1274,7 +1274,8 @@ void WorldSession::_HandleLoginVerifyWorldOpcode(WorldPacket& recvPacket)
ByteBuffer& operator>>(ByteBuffer& bb, WhoListEntry& e) ByteBuffer& operator>>(ByteBuffer& bb, WhoListEntry& e)
{ {
bb >> e.name >> e.gname >> e.level >> e.classId >> e.raceId >> e.zoneId; uint8 dummy;
bb >> e.name >> e.gname >> e.level >> e.classId >> e.raceId >> dummy >> e.zoneId;
return bb; return bb;
} }

10
src/shared/ZCompressor.cpp
View File

@ -23,7 +23,7 @@ void ZCompressor::_compress(void* dst, uint32 *dst_size, void* src, uint32 src_s
// default Z_BEST_SPEED (1) // default Z_BEST_SPEED (1)
if (Z_OK != deflateInit(&c_stream, level)) if (Z_OK != deflateInit(&c_stream, level))
{ {
logerror("ZLIB: Can't compress (zlib: deflateInit).\n"); logdebug("ZLIB: Can't compress (zlib: deflateInit).\n");
*dst_size = 0; *dst_size = 0;
return; return;
} }
@ -35,28 +35,28 @@ void ZCompressor::_compress(void* dst, uint32 *dst_size, void* src, uint32 src_s
if (Z_OK != deflate(&c_stream, Z_NO_FLUSH)) if (Z_OK != deflate(&c_stream, Z_NO_FLUSH))
{ {
logerror("ZLIB: Can't compress (zlib: deflate)\n"); logdebug("ZLIB: Can't compress (zlib: deflate)\n");
*dst_size = 0; *dst_size = 0;
return; return;
} }
if (c_stream.avail_in != 0) if (c_stream.avail_in != 0)
{ {
logerror("Can't compress (zlib: deflate not greedy)\n"); logdebug("Can't compress (zlib: deflate not greedy)\n");
*dst_size = 0; *dst_size = 0;
return; return;
} }
if (Z_STREAM_END != deflate(&c_stream, Z_FINISH)) if (Z_STREAM_END != deflate(&c_stream, Z_FINISH))
{ {
logerror("Can't compress (zlib: deflate should report Z_STREAM_END)\n"); logdebug("Can't compress (zlib: deflate should report Z_STREAM_END)\n");
*dst_size = 0; *dst_size = 0;
return; return;
} }
if (Z_OK != deflateEnd(&c_stream)) if (Z_OK != deflateEnd(&c_stream))
{ {
logerror("Can't compress (zlib: deflateEnd)\n"); logdebug("Can't compress (zlib: deflateEnd)\n");
*dst_size = 0; *dst_size = 0;
return; return;
} }