From: Andrew C. <ac...@us...> - 2005-08-31 23:19:42
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25528/src/server Modified Files: adminmanager.cpp Log Message: Fixed -Wall warnings Index: adminmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v retrieving revision 1.189 retrieving revision 1.190 diff -C2 -d -r1.189 -r1.190 *** adminmanager.cpp 18 Aug 2005 12:29:39 -0000 1.189 --- adminmanager.cpp 31 Aug 2005 23:19:33 -0000 1.190 *************** *** 360,364 **** { Client *target; ! if (target = FindPlayerClient(msg.player, me->clientnum)) MutePlayer(me,msg,client,target); } --- 360,364 ---- { Client *target; ! if ( (target = FindPlayerClient(msg.player, me->clientnum)) ) MutePlayer(me,msg,client,target); } *************** *** 366,370 **** { Client *target; ! if (target = FindPlayerClient(msg.player, me->clientnum)) UnmutePlayer(me,msg,client,target); } --- 366,370 ---- { Client *target; ! if ( (target = FindPlayerClient(msg.player, me->clientnum)) ) UnmutePlayer(me,msg,client,target); } *************** *** 382,386 **** if (msg.player == "me") SlideTarget(me,msg,client,client); ! else if (target = FindPlayerClient(msg.player,me->clientnum)) SlideTarget(me,msg,client,target); } else if (msg.command == "/petition") --- 382,387 ---- if (msg.player == "me") SlideTarget(me,msg,client,client); ! else if ( (target = FindPlayerClient(msg.player,me->clientnum)) ) ! SlideTarget(me,msg,client,target); } else if (msg.command == "/petition") *************** *** 391,395 **** { Client *target; ! if (target = FindPlayerClient(msg.player, me->clientnum)) KickPlayer(me,msg,client,target); } --- 392,396 ---- { Client *target; ! if ( (target = FindPlayerClient(msg.player, me->clientnum)) ) KickPlayer(me,msg,client,target); } *************** *** 792,796 **** subject = tempclient->GetActor(); // if not found search an NPC by ID ! if (subject == NULL && msg.player.FindFirst(':')!=-1) { csString id = msg.player.Slice(3); gemObject* npc = psserver->GetEntityManager()->GetGEM()->FindPlayerEntity(atoi(id.GetData())); --- 793,798 ---- subject = tempclient->GetActor(); // if not found search an NPC by ID ! if (subject == NULL && msg.player.FindFirst(':')!=(size_t)-1) ! { csString id = msg.player.Slice(3); gemObject* npc = psserver->GetEntityManager()->GetGEM()->FindPlayerEntity(atoi(id.GetData())); *************** *** 853,857 **** } ! if (subject->GetClientID() != client->GetClientNum()) { psserver->SendSystemResult(client->GetClientNum(), "Teleported player " + (csString)subject->GetName() + " to " + msg.target); --- 855,859 ---- } ! if (subject->GetClientID() != (int)client->GetClientNum()) { psserver->SendSystemResult(client->GetClientNum(), "Teleported player " + (csString)subject->GetName() + " to " + msg.target); |