diff options
| author | neodarz <neodarz@neodarz.net> | 2018-08-11 20:21:34 +0200 |
|---|---|---|
| committer | neodarz <neodarz@neodarz.net> | 2018-08-11 20:21:34 +0200 |
| commit | 0ea5fc66924303d1bf73ba283a383e2aadee02f2 (patch) | |
| tree | 2568e71a7ccc44ec23b8bb3f0ff97fb6bf2ed709 /cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.8&r2=1.9&hideattic=0&sortby=date | |
| download | nevrax-website-self-hostable-0ea5fc66924303d1bf73ba283a383e2aadee02f2.tar.xz nevrax-website-self-hostable-0ea5fc66924303d1bf73ba283a383e2aadee02f2.zip | |
Initial commit
Diffstat (limited to 'cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.8&r2=1.9&hideattic=0&sortby=date')
| -rw-r--r-- | cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.8&r2=1.9&hideattic=0&sortby=date | 177 |
1 files changed, 177 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.8&r2=1.9&hideattic=0&sortby=date b/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.8&r2=1.9&hideattic=0&sortby=date new file mode 100644 index 00000000..eeb34901 --- /dev/null +++ b/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff?r1=1.8&r2=1.9&hideattic=0&sortby=date @@ -0,0 +1,177 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML> +<HEAD><style> A { color:black }</style> +<!-- hennerik CVSweb $Revision: 1.93 $ --> +<TITLE>code/client/client.cpp - diff - 1.9</TITLE></HEAD> +<BODY BGCOLOR="#eeeeee"> +<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="#aaaaaa"><tr valign=bottom><td><a href="/cvs/cvsweb.cgi/code/client/Attic/client.cpp?hideattic=0&sortby=date"><IMG SRC="http://www.nevrax.org/inc/img/picto-up.gif" ALT="[BACK]" BORDER="0" WIDTH="14" HEIGHT="13"></a> <b>Return to <A HREF="/cvs/cvsweb.cgi/code/client/Attic/client.cpp?hideattic=0&sortby=date">client.cpp</A> + CVS log</b> <IMG SRC="http://www.nevrax.org/inc/img/picto-news.gif" ALT="[TXT]" BORDER="0" WIDTH="13" HEIGHT="15"></td><td align=right><IMG SRC="http://www.nevrax.org/inc/img/picto-dir.gif" ALT="[DIR]" BORDER="0" WIDTH="15" HEIGHT="13"> <b>Up to <a href="/cvs/cvsweb.cgi/?hideattic=0&sortby=date">Nevrax</a> / <a href="/cvs/cvsweb.cgi/code/?hideattic=0&sortby=date">code</a> / <a href="/cvs/cvsweb.cgi/code/client/?hideattic=0&sortby=date">client</a></b></td></tr></table><h3 align=center>Diff for /code/client/Attic/client.cpp between version 1.8 and 1.9</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.8, 2000/11/24 14:17:35</th> +<th width="50%" valign=TOP>version 1.9, 2000/11/28 13:21:23</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 55</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 55</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> /**</font></td><td><font face="Helvetica,Arial" size="-1"> /**</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> * login</font></td><td><font face="Helvetica,Arial" size="-1"> * login</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> */</font></td><td><font face="Helvetica,Arial" size="-1"> */</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CLogUserId login(NL3D::CScene * scene,</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> sint8 login(NL3D::CScene * scene,</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> NL3D::CFontGenerator * fontGenerator, </font></td><td><font face="Helvetica,Arial" size="-1"> NL3D::CFontGenerator * fontGenerator, </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint w, uint h)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint w, uint h, vector<string>& shards)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CLoginInterface logscreen(scene, fontGenerator, w, h);</font></td><td><font face="Helvetica,Arial" size="-1"> CLoginInterface logscreen(scene, fontGenerator, w, h);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> return logscreen.log();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> return logscreen.log(shards);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> /**</font></td><td><font face="Helvetica,Arial" size="-1"> /**</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> * connectToLS</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> */</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> bool connectToLS (CLogUserId &luid, vector<string>& shards)</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CInetAddress servaddr("vianneyl", 49999);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CSocket server;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> try</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> server.connect(servaddr);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> catch(Exception)</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> return false;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CMessage msgout("");</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgout.setType(0); // we don't listen for incoming replies, therefore we must not use a type as string. 0 is the default action for CLogService : "LOG"</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> string l = luid.Login.toString(), p = luid.Password.toString();</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgout.serial(l);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgout.serial(p);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // send the message</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> server.send(msgout);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> // receive the answer</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CMessage msgin("", true);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> server.receive(msgin);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> uint8 ok;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgin.serial (ok);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> nlinfo ("res=%d", ok);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> if (ok)</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> uint32 nbshard, id;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgin.serial (id);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgin.serial (nbshard);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> for (uint i = 0; i < nbshard; i++)</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> string shardip, shardname;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgin.serial (shardip);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgin.serial (shardname);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> shards.push_back (shardip);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> server.close();</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> return ok==1;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> /**</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> * chooseLanguage</font></td><td><font face="Helvetica,Arial" size="-1"> * chooseLanguage</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> */</font></td><td><font face="Helvetica,Arial" size="-1"> */</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> sint chooseLanguage(NL3D::CScene * scene, </font></td><td><font face="Helvetica,Arial" size="-1"> sint chooseLanguage(NL3D::CScene * scene, </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 150</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 95</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> LANGUAGE,</font></td><td><font face="Helvetica,Arial" size="-1"> LANGUAGE,</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> LOGIN,</font></td><td><font face="Helvetica,Arial" size="-1"> LOGIN,</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CONNECT,</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> SHARD</font></td><td><font face="Helvetica,Arial" size="-1"> SHARD</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> };</font></td><td><font face="Helvetica,Arial" size="-1"> };</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 166</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 110</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> uint w = 800;</font></td><td><font face="Helvetica,Arial" size="-1"> uint w = 800;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> uint h = 600;</font></td><td><font face="Helvetica,Arial" size="-1"> uint h = 600;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> uint bpp = 32;</font></td><td><font face="Helvetica,Arial" size="-1"> uint bpp = 32;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> bool windowed = true;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> bool windowed = false;//true;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> NL3D::CScene scene;</font></td><td><font face="Helvetica,Arial" size="-1"> NL3D::CScene scene;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> NL3D::CSceneUt::init3d(scene, w, h, bpp, windowed); </font></td><td><font face="Helvetica,Arial" size="-1"> NL3D::CSceneUt::init3d(scene, w, h, bpp, windowed); </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 182</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 126</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> // index of chard in the list</font></td><td><font face="Helvetica,Arial" size="-1"> // index of chard in the list</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> sint shardIndex;</font></td><td><font face="Helvetica,Arial" size="-1"> sint shardIndex;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> TState clientSate = LANGUAGE;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> TState clientState = LANGUAGE;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> bool quit = false;</font></td><td><font face="Helvetica,Arial" size="-1"> bool quit = false;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> while(!quit)</font></td><td><font face="Helvetica,Arial" size="-1"> while(!quit)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> switch(clientSate)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> switch(clientState)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // language choice</font></td><td><font face="Helvetica,Arial" size="-1"> // language choice</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> case LANGUAGE: </font></td><td><font face="Helvetica,Arial" size="-1"> case LANGUAGE: </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 197</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 142</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CI18N::load(languageIndex);</font></td><td><font face="Helvetica,Arial" size="-1"> CI18N::load(languageIndex);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = LOGIN;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientState = LOGIN;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> break;</font></td><td><font face="Helvetica,Arial" size="-1"> break;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 205</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 150</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> // get user's login and password</font></td><td><font face="Helvetica,Arial" size="-1"> // get user's login and password</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> case LOGIN: </font></td><td><font face="Helvetica,Arial" size="-1"> case LOGIN: </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> id = login(&scene, &fontGen, w, h);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if(login(&scene, &fontGen, w, h, shards))</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if(id.Login.size()==0) // happens only if return back is asked</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientState = SHARD;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = LANGUAGE;</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = CONNECT;</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> break;</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // connection</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> case CONNECT:</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> bool connected = connectToLS (id,shards);</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if(!connected)</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if(windowed)</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> IDriver::TMessageBoxId answer = </font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> scene.getDriver()->systemMessageBox("Can't establish connection",</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> "user connection", IDriver::retryCancelType, IDriver::errorIcon);</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if(answer==IDriver::cancelId) </font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = LOGIN;</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = CONNECT;</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = LOGIN;</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = SHARD;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientState = LANGUAGE;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> break;</font></td><td><font face="Helvetica,Arial" size="-1"> break;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 242</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 162</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> shardIndex = chooseShard(&scene, &fontGen, w, h, shards);</font></td><td><font face="Helvetica,Arial" size="-1"> shardIndex = chooseShard(&scene, &fontGen, w, h, shards);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if(shardIndex==-1)</font></td><td><font face="Helvetica,Arial" size="-1"> if(shardIndex==-1)</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientSate = LOGIN;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> clientState = LOGIN;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> quit = true;</font></td><td><font face="Helvetica,Arial" size="-1"> quit = true;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +</table><br><hr noshade width="100%"> +<table border=0><tr><td><table border=1><tr><td>Legend:<br><table border=0 cellspacing=0 cellpadding=1> +<tr><td align=center bgcolor="#ff9999">Removed from v.1.8</td><td bgcolor="#cccccc"> </td></tr><tr bgcolor="#99ff99"><td align=center colspan=2>changed lines</td></tr><tr><td bgcolor="#cccccc"> </td><td align=center bgcolor="#ccccff">Added in v.1.9</td></tr></table></td></tr></table> +<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/client/Attic/client.cpp.diff"> +<INPUT TYPE=HIDDEN NAME="sortby" VALUE="date"> +<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.8"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.9"> +<INPUT TYPE=HIDDEN NAME="hideattic" VALUE="0"> +<SELECT NAME="f" onchange="submit()"> +<OPTION VALUE=h SELECTED>Colored Diff<OPTION VALUE=H>Long Colored Diff<OPTION VALUE=u>Unidiff<OPTION VALUE=c>Context Diff<OPTION VALUE=s>Side by Side</SELECT><INPUT TYPE=SUBMIT VALUE="Show"> +</FORM> +</td></tr></table>
\ No newline at end of file |