[Jake2-commits] jake2/src/jake2/client Menu.java,1.17,1.18

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

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

Modified Files:
	Menu.java 
Log Message:
bugfix: 1119453

thank you very much "deathmeat"

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Menu.java	20 Jan 2005 23:15:23 -0000	1.17
--- Menu.java	9 Feb 2005 20:47:30 -0000	1.18
***************
*** 3575,3593 ****
  
      static void AddressBook_MenuInit() {
-         int i;
- 
          s_addressbook_menu.x = viddef.width / 2 - 142;
          s_addressbook_menu.y = viddef.height / 2 - 58;
          s_addressbook_menu.nitems = 0;
  
!         for (i = 0; i < NUM_ADDRESSBOOK_ENTRIES; i++) {
!             cvar_t adr;
!             //char buffer[20];
!             String buffer;
! 
!             //Com_sprintf(buffer, sizeof(buffer), "adr%d", i);
!             buffer = "adr" + i;
! 
!             adr = Cvar.Get(buffer, "", CVAR_ARCHIVE);
  
              s_addressbook_fields[i].type = MTYPE_FIELD;
--- 3575,3584 ----
  
      static void AddressBook_MenuInit() {
          s_addressbook_menu.x = viddef.width / 2 - 142;
          s_addressbook_menu.y = viddef.height / 2 - 58;
          s_addressbook_menu.nitems = 0;
  
!         for (int i = 0; i < NUM_ADDRESSBOOK_ENTRIES; i++) {
!             cvar_t adr = Cvar.Get("adr" + i, "", CVAR_ARCHIVE);
  
              s_addressbook_fields[i].type = MTYPE_FIELD;
***************
*** 3597,3601 ****
              s_addressbook_fields[i].y = i * 18 + 0;
              s_addressbook_fields[i].localdata[0] = i;
!             s_addressbook_fields[i].cursor = 0;
              s_addressbook_fields[i].length = 60;
              s_addressbook_fields[i].visible_length = 30;
--- 3588,3593 ----
              s_addressbook_fields[i].y = i * 18 + 0;
              s_addressbook_fields[i].localdata[0] = i;
!             // put the cursor to the end of text for editing
!             s_addressbook_fields[i].cursor = adr.string.length();
              s_addressbook_fields[i].length = 60;
              s_addressbook_fields[i].visible_length = 30;
***************
*** 3615,3626 ****
      static String AddressBook_MenuKey_f(int key) {
          if (key == K_ESCAPE) {
!             int index;
!             //char buffer[20];
!             String buffer;
! 
!             for (index = 0; index < NUM_ADDRESSBOOK_ENTRIES; index++) {
!                 buffer = "adr" + index;
!                 //Com_sprintf(buffer, sizeof(buffer), "adr%d", index);
!                 Cvar.Set(buffer, s_addressbook_fields[index].buffer.toString());
              }
          }
--- 3607,3612 ----
      static String AddressBook_MenuKey_f(int key) {
          if (key == K_ESCAPE) {
!             for (int index = 0; index < NUM_ADDRESSBOOK_ENTRIES; index++) {
!                 Cvar.Set("adr" + index, s_addressbook_fields[index].buffer.toString());
              }
          }