Voomra/lwjake2
0
Fork 0
Code Activity

Com.sprintf(String, Vargs) -> String.format(String, Object...)

Browse Source
This commit is contained in:
DmitriyMX
2018-12-18 21:04:26 +03:00
parent 24062631df
commit 2db1970376
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/lwjake2/client/CL_inv.java
View File

@@ -120,8 +120,10 @@ public class CL_inv {
break; break;
} }
string = Com.sprintf("%6s %3i %s", new Vargs(3).add(bind).add(Globals.cl.inventory[item]).add( string = String.format("%s %d %s",
Globals.cl.configstrings[Defines.CS_ITEMS + item])); bind,
Globals.cl.inventory[item],
Globals.cl.configstrings[Defines.CS_ITEMS + item]);
if (item != selected) if (item != selected)
string = getHighBitString(string); string = getHighBitString(string);
else // draw a blinky cursor by the selected item else // draw a blinky cursor by the selected item

2
src/main/java/lwjake2/client/Console.java
View File

@@ -507,7 +507,7 @@ public final class Console extends Globals {
SCR.AddDirtyPoint(0, 0); SCR.AddDirtyPoint(0, 0);
SCR.AddDirtyPoint(viddef.width - 1, lines - 1); SCR.AddDirtyPoint(viddef.width - 1, lines - 1);
version = Com.sprintf("v%4.2f", new Vargs(1).add(VERSION)); version = String.format("v%4.2f", VERSION);
for (x = 0; x < 5; x++) for (x = 0; x < 5; x++)
re.DrawChar(viddef.width - 44 + x * 8, lines - 12, 128 + version re.DrawChar(viddef.width - 44 + x * 8, lines - 12, 128 + version
.charAt(x)); .charAt(x));

3
src/main/java/lwjake2/client/SCR.java
View File

@@ -980,8 +980,7 @@ public final class SCR extends Globals {
ping = 999; ping = 999;
// sprintf(block, "%3d %3d %-12.12s", score, ping, ci->name); // sprintf(block, "%3d %3d %-12.12s", score, ping, ci->name);
String block = Com.sprintf("%3d %3d %-12.12s", new Vargs(3) String block = String.format("%d %d %s", score, ping, ci.name);
.add(score).add(ping).add(ci.name));
if (value == cl.playernum) if (value == cl.playernum)
Console.DrawAltString(x, y, block); Console.DrawAltString(x, y, block);

14
src/main/java/lwjake2/game/PlayerHud.java
View File

@@ -516,13 +516,13 @@ public class PlayerHud {
.append("\" "); // help 2 .append("\" "); // help 2
sb.append("xv 50 yv 164 string2 \" kills goals secrets\" "); sb.append("xv 50 yv 164 string2 \" kills goals secrets\" ");
sb.append("xv 50 yv 172 string2 \""); sb.append("xv 50 yv 172 string2 \"");
sb.append(Com.sprintf("%3i/%3i %i/%i %i/%i\" ", new Vargs(6) sb.append(String.format("%d/%d %d/%d %d/%d\" ",
.add(GameBase.level.killed_monsters).add( GameBase.level.killed_monsters,
GameBase.level.total_monsters).add( GameBase.level.total_monsters,
GameBase.level.found_goals).add( GameBase.level.found_goals,
GameBase.level.total_goals).add( GameBase.level.total_goals,
GameBase.level.found_secrets).add( GameBase.level.found_secrets,
GameBase.level.total_secrets))); GameBase.level.total_secrets));
GameBase.gi.WriteByte(Defines.svc_layout); GameBase.gi.WriteByte(Defines.svc_layout);
GameBase.gi.WriteString(sb.toString()); GameBase.gi.WriteString(sb.toString());

12
src/main/java/lwjake2/qcommon/Qcommon.java
View File

@@ -93,12 +93,12 @@ public final class Qcommon extends Globals {
Globals.logfile_active= Cvar.Get("logfile", "0", 0); Globals.logfile_active= Cvar.Get("logfile", "0", 0);
Globals.showtrace= Cvar.Get("showtrace", "0", 0); Globals.showtrace= Cvar.Get("showtrace", "0", 0);
Globals.dedicated= Cvar.Get("dedicated", "0", CVAR_NOSET); Globals.dedicated= Cvar.Get("dedicated", "0", CVAR_NOSET);
String s = Com.sprintf("%4.2f %s %s %s", String s = String.format("%4.2f %s %s %s",
new Vargs(4) Globals.VERSION,
.add(Globals.VERSION) CPUSTRING,
.add(CPUSTRING) Globals.__DATE__,
.add(Globals.__DATE__) BUILDSTRING
.add(BUILDSTRING)); );
Cvar.Get("version", s, CVAR_SERVERINFO | CVAR_NOSET); Cvar.Get("version", s, CVAR_SERVERINFO | CVAR_NOSET);

11
src/main/java/lwjake2/server/SV_CCMDS.java
View File

@@ -396,12 +396,11 @@ public class SV_CCMDS {
if (!autosave) { if (!autosave) {
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
comment = comment = String.format("%d:%d %d/%d ",
Com.sprintf( c.get(Calendar.HOUR_OF_DAY),
"%2i:%2i %2i/%2i ", c.get(Calendar.MINUTE),
new Vargs().add(c.get(Calendar.HOUR_OF_DAY)).add(c.get(Calendar.MINUTE)).add( c.get(Calendar.MONTH) + 1,
c.get(Calendar.MONTH) + 1).add( c.get(Calendar.DAY_OF_MONTH));
c.get(Calendar.DAY_OF_MONTH)));
comment += SV_INIT.sv.configstrings[Defines.CS_NAME]; comment += SV_INIT.sv.configstrings[Defines.CS_NAME];
} }
else { else {

2
src/main/java/lwjake2/util/Lib.java
View File

@@ -48,7 +48,7 @@ public class Lib {
/** Converts a vector to a beatiful string. */ /** Converts a vector to a beatiful string. */
public static String vtofsbeaty(float[] v) { public static String vtofsbeaty(float[] v) {
return Com.sprintf("%8.2f %8.2f %8.2f", new Vargs().add(v[0]).add(v[1]).add(v[2])); return String.format("%8.2f %8.2f %8.2f", v[0], v[1], v[2]);
} }
/** Like in libc. */ /** Like in libc. */