[Jake2-commits] jake2/src/jake2/game PlayerHud.java,1.4,1.5

[Holger Z. <hz...@us...>]

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

Modified Files:
	PlayerHud.java 
Log Message:
duplicate functions removed

Index: PlayerHud.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerHud.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PlayerHud.java	20 Jul 2004 16:14:37 -0000	1.4
--- PlayerHud.java	27 Aug 2004 21:59:23 -0000	1.5
***************
*** 310,387 ****
  	}
  
- 	/*
- 	==================
- 	HelpComputer
- 	
- 	Draw help computer.
- 	==================
- 	*/
- 	public static void HelpComputer(edict_t ent) {
- 		//char string[1024];
- 		String string;
- 
- 		String sk;
- 
- 		if (skill.value == 0)
- 			sk = "easy";
- 		else if (skill.value == 1)
- 			sk = "medium";
- 		else if (skill.value == 2)
- 			sk = "hard";
- 		else
- 			sk = "hard+";
- 
- 		// send the layout
- 
- 			string = Com.sprintf("xv 32 yv 8 picn help " + // background
- 		"xv 202 yv 12 string2 \"%s\" " + // skill
- 		"xv 0 yv 24 cstring2 \"%s\" " + // level name
- 		"xv 0 yv 54 cstring2 \"%s\" " + // help 1
- 		"xv 0 yv 110 cstring2 \"%s\" " + // help 2
- 	"xv 50 yv 164 string2 \" kills     goals    secrets\" " + "xv 50 yv 172 string2 \"%3i/%3i     %i/%i       %i/%i\" ",
- 		new Vargs()
- 			.add(sk)
- 			.add(level.level_name)
- 			.add(game.helpmessage1)
- 			.add(game.helpmessage2)
- 			.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(string);
- 		gi.unicast(ent, true);
- 	}
- 
- 	/*
- 	==================
- 	Cmd_Help_f
- 	
- 	Display the current help message
- 	==================
- 	*/
- 	public static void Cmd_Help_f(edict_t ent) {
- 		// this is for backwards compatability
- 		if (deathmatch.value != 0) {
- 			Cmd_Score_f(ent);
- 			return;
- 		}
- 
- 		ent.client.showinventory = false;
- 		ent.client.showscores = false;
- 
- 		if (ent.client.showhelp && (ent.client.pers.game_helpchanged == game.helpchanged)) {
- 			ent.client.showhelp = false;
- 			return;
- 		}
- 
- 		ent.client.showhelp = true;
- 		ent.client.pers.helpchanged = 0;
- 		HelpComputer(ent);
- 	}
- 
  	//=======================================================================
  
--- 310,313 ----