diff options
| author | Holger Zickner <[email protected]> | 2004-07-23 10:09:55 +0000 |
|---|---|---|
| committer | Holger Zickner <[email protected]> | 2004-07-23 10:09:55 +0000 |
| commit | a161d9817f1a86aedffb8789e2134c6a29e5fa35 (patch) | |
| tree | 9d5298865c5a7781c099a0f3fca94c2205476610 /src/jake2/client | |
| parent | 4d14584117e56e51ea4fd69de1807a0e3329e7dc (diff) | |
replace Lib functions
Diffstat (limited to 'src/jake2/client')
| -rw-r--r-- | src/jake2/client/Key.java | 8 | ||||
| -rw-r--r-- | src/jake2/client/Menu.java | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/jake2/client/Key.java b/src/jake2/client/Key.java index 5f7d921..6d011cb 100644 --- a/src/jake2/client/Key.java +++ b/src/jake2/client/Key.java @@ -2,7 +2,7 @@ * Key.java * Copyright (C) 2003 * - * $Id: Key.java,v 1.4 2004-07-09 06:50:50 hzi Exp $ + * $Id: Key.java,v 1.5 2004-07-23 10:02:49 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -615,7 +615,8 @@ public class Key extends Globals { while (history_line != Globals.edit_line && Globals.key_lines[history_line][1] == 0); if (history_line == Globals.edit_line) history_line = (Globals.edit_line + 1) & 31; - Lib.strcpy(Globals.key_lines[Globals.edit_line], Globals.key_lines[history_line]); + //Lib.strcpy(Globals.key_lines[Globals.edit_line], Globals.key_lines[history_line]); + System.arraycopy(Globals.key_lines[history_line], 0, Globals.key_lines[Globals.edit_line], 0, Globals.key_lines[Globals.edit_line].length); Globals.key_linepos = Lib.strlen(Globals.key_lines[Globals.edit_line]); return; } @@ -632,7 +633,8 @@ public class Key extends Globals { Globals.key_linepos = 1; } else { - Lib.strcpy(Globals.key_lines[Globals.edit_line], Globals.key_lines[history_line]); + //Lib.strcpy(Globals.key_lines[Globals.edit_line], Globals.key_lines[history_line]); + System.arraycopy(Globals.key_lines[history_line], 0, Globals.key_lines[Globals.edit_line], 0, Globals.key_lines[Globals.edit_line].length); Globals.key_linepos = Lib.strlen(Globals.key_lines[Globals.edit_line]); } return; diff --git a/src/jake2/client/Menu.java b/src/jake2/client/Menu.java index faaf77c..c6c7606 100644 --- a/src/jake2/client/Menu.java +++ b/src/jake2/client/Menu.java @@ -2,7 +2,7 @@ * Menu.java * Copyright (C) 2004 * - * $Id: Menu.java,v 1.4 2004-07-09 06:50:50 hzi Exp $ + * $Id: Menu.java,v 1.5 2004-07-23 10:02:49 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -2531,7 +2531,7 @@ public final class Menu extends Key { // ignore if duplicated for (i = 0; i < m_num_servers; i++) - if (0 == strcmp(x, local_server_names[i])) + if (x.equals(local_server_names[i])) return; local_server_netadr[m_num_servers] = adr; @@ -3924,7 +3924,7 @@ public final class Menu extends Key { // copy the valid skins for (s = 0, k = 0; k < npcxfiles - 1; k++) { - if (!strstr(pcxnames[k], "_i.pcx")) { + if (pcxnames[k].indexOf("_i.pcx") < 0) { if (IconOfSkinExists(pcxnames[k], pcxnames, npcxfiles - 1)) { a = pcxnames[k].lastIndexOf('/'); b = pcxnames[k].lastIndexOf('\\'); |