From dbe4234e5d5dcbd556968d0b36fcd2d0062bfd0c Mon Sep 17 00:00:00 2001 From: Lucas GAUTHERON Date: Sat, 14 May 2011 14:42:35 +0000 Subject: [PATCH] minor simplification git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6430 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 6a051398..acdfe81f 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -1523,19 +1523,17 @@ COMMAND(whois, ARG_1INT); void findcn(char *name) { - bool found = false; - loopv(players) { if(players[i]) { if(!strcmp(name, players[i]->name)) { found = true; intret(players[i]->clientnum); } } } - if(!found) if(!strcmp(name, player1->name)) { found = true; intret(player1->clientnum); } - if(!found) intret(-1); + loopv(players) { if(players[i]) { if(!strcmp(name, players[i]->name)) { intret(players[i]->clientnum); return; } } } + if(!strcmp(name, player1->name)) { intret(player1->clientnum); return; } + intret(-1); } COMMAND(findcn, ARG_1STR); void findpn(int cn) { - bool found = false; - loopv(players) { if(players[i]) { if( players[i]->clientnum == cn) { found = true; result(players[i]->name); } } } - if(!found) if(player1->clientnum == cn) { found = true; result(player1->name); } - if(!found) result(""); + loopv(players) { if(players[i]) { if( players[i]->clientnum == cn) { result(players[i]->name); return; } } } + if(player1->clientnum == cn) { result(player1->name); return; } + result(""); } COMMAND(findpn, ARG_1INT);