[Jake2-commits] jake2/src/jake2/game GameAI.java,1.2,1.3

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2821/src/jake2/game

Modified Files:
	GameAI.java 
Log Message:
layout string for the helpcomputer is now correct

Index: GameAI.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GameAI.java	8 Jul 2004 15:58:44 -0000	1.2
--- GameAI.java	28 Aug 2004 16:40:12 -0000	1.3
***************
*** 26,31 ****
--- 26,33 ----
  import jake2.Defines;
  import jake2.client.M;
+ import jake2.qcommon.Com;
  import jake2.util.Lib;
  import jake2.util.Math3D;
+ import jake2.util.Vargs;
  
  import java.util.StringTokenizer;
***************
*** 1519,1523 ****
  	public static void HelpComputer(edict_t ent)
  	{
! 		String string;
  		String sk;
  
--- 1521,1525 ----
  	public static void HelpComputer(edict_t ent)
  	{
! 		StringBuffer sb = new StringBuffer(256);
  		String sk;
  
***************
*** 1532,1557 ****
  
  		// send the layout
! 			string = "xv 32 yv 8 picn help " + // background
! 		"xv 202 yv 12 string2 \"" + sk + "\" " + // skill
! 		"xv 0 yv 24 cstring2 \"" + level.level_name + "\" " + // level name
! 		"xv 0 yv 54 cstring2 \"" + game.helpmessage1 + "\" " + // help 1
! 		"xv 0 yv 110 cstring2 \"" + game.helpmessage2 + "\" " + // help 2
! 	"xv 50 yv 164 string2 \" kills     goals    secrets\" "
! 		+ "xv 50 yv 172 string2 \""
! 		+ level.killed_monsters
! 		+ "/"
! 		+ level.total_monsters
! 		+ "       "
! 		+ level.found_goals
! 		+ "/"
! 		+ level.total_goals
! 		+ "       "
! 		+ level.found_secrets
! 		+ "/"
! 		+ level.total_secrets
! 		+ "\" ";
  
  		gi.WriteByte(svc_layout);
! 		gi.WriteString(string);
  		gi.unicast(ent, true);
  	}
--- 1534,1556 ----
  
  		// send the layout
! 		sb.append("xv 32 yv 8 picn help "); // background
! 		sb.append("xv 202 yv 12 string2 \"").append(sk).append("\" "); // skill
! 		sb.append("xv 0 yv 24 cstring2 \"").append(level.level_name).append("\" "); // level name
! 		sb.append("xv 0 yv 54 cstring2 \"").append(game.helpmessage1).append("\" "); // help 1
! 		sb.append("xv 0 yv 110 cstring2 \"").append(game.helpmessage2).append("\" "); // help 2
! 		sb.append("xv 50 yv 164 string2 \" kills     goals    secrets\" ");
! 		sb.append("xv 50 yv 172 string2 \"");
! 		sb.append(Com.sprintf("%3i/%3i     %i/%i       %i/%i\" ", 
! 			new Vargs(6).add(level.killed_monsters)
! 				.add(level.total_monsters)
! 				.add(level.found_goals)
! 				.add(level.total_goals)
! 				.add(level.found_secrets)
! 				.add(level.total_secrets)
! 			)
! 		);
  
  		gi.WriteByte(svc_layout);
! 		gi.WriteString(sb.toString());
  		gi.unicast(ent, true);
  	}