jake2-commits

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

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

Modified Files:
	VID.java CL_view.java CL_inv.java Console.java Menu.java 
	SCR.java 
Log Message:
use getters and setters of modified viddef_t

Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** VID.java	13 Jan 2007 18:36:23 -0000	1.20
--- VID.java	2 Mar 2008 14:56:22 -0000	1.21
***************
*** 148,153 ****
  	*/
  	public static void NewWindow(int width, int height) {
! 		Globals.viddef.width = width;
! 		Globals.viddef.height = height;
  	}
  
--- 148,152 ----
  	*/
  	public static void NewWindow(int width, int height) {
! 		Globals.viddef.setSize(width, height);
  	}
  
***************
*** 239,244 ****
  	public static void CheckChanges()
  	{
! 		cvar_t gl_mode;
! 
  		if ( vid_ref.modified )
  		{
--- 238,243 ----
  	public static void CheckChanges()
  	{
! 	    Globals.viddef.update();
! 	    
  		if ( vid_ref.modified )
  		{
***************
*** 566,570 ****
  		}
  
! 		s_opengl_menu.x = (int)(viddef.width * 0.50f);
  		s_opengl_menu.nitems = 0;
  		
--- 565,569 ----
  		}
  
! 		s_opengl_menu.x = (int)(viddef.getWidth() * 0.50f);
  		s_opengl_menu.nitems = 0;
  		
***************
*** 706,710 ****
  		Dimension dim = new Dimension();
  		re.DrawGetPicSize( dim, "m_banner_video" );
! 		re.DrawPic( viddef.width / 2 - dim.width / 2, viddef.height /2 - 110, "m_banner_video" );
  
  		/*
--- 705,709 ----
  		Dimension dim = new Dimension();
  		re.DrawGetPicSize( dim, "m_banner_video" );
! 		re.DrawPic( viddef.getWidth() / 2 - dim.width / 2, viddef.getHeight() /2 - 110, "m_banner_video" );
  
  		/*

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Menu.java	2 Mar 2008 08:35:30 -0000	1.22
--- Menu.java	2 Mar 2008 14:56:22 -0000	1.23
***************
*** 178,183 ****
          Globals.re.DrawGetPicSize(dim, name);
  
!         Globals.re.DrawPic(viddef.width / 2 - dim.width / 2,
!                 viddef.height / 2 - 110, name);
      }
  
--- 178,183 ----
          Globals.re.DrawGetPicSize(dim, name);
  
!         Globals.re.DrawPic(viddef.getWidth() / 2 - dim.width / 2,
!                 viddef.getHeight() / 2 - 110, name);
      }
  
***************
*** 327,332 ****
       */
      public static void DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.width - 320) >> 1), cy
!                 + ((viddef.height - 240) >> 1), num);
      }
  
--- 327,332 ----
       */
      public static void DrawCharacter(int cx, int cy, int num) {
!         re.DrawChar(cx + ((viddef.getWidth() - 320) >> 1), cy
!                 + ((viddef.getHeight() - 240) >> 1), num);
      }
  
***************
*** 349,354 ****
  
      public static void DrawPic(int x, int y, String pic) {
!         re.DrawPic(x + ((viddef.width - 320) >> 1), y
!                 + ((viddef.height - 240) >> 1), pic);
      }
  
--- 349,354 ----
  
      public static void DrawPic(int x, int y, String pic) {
!         re.DrawPic(x + ((viddef.getWidth() - 320) >> 1), y
!                 + ((viddef.getHeight() - 240) >> 1), pic);
      }
  
***************
*** 455,460 ****
          }
  
!         ystart = (Globals.viddef.height / 2 - 110);
!         xoffset = (Globals.viddef.width - widest + 70) / 2;
  
          for (i = 0; i < names.length; i++) {
--- 455,460 ----
          }
  
!         ystart = (Globals.viddef.getHeight() / 2 - 110);
!         xoffset = (Globals.viddef.getWidth() - widest + 70) / 2;
  
          for (i = 0; i < names.length; i++) {
***************
*** 587,591 ****
  
      static void Multiplayer_MenuInit() {
!         s_multiplayer_menu.x = (int) (viddef.width * 0.50f - 64);
          s_multiplayer_menu.nitems = 0;
  
--- 587,591 ----
  
      static void Multiplayer_MenuInit() {
!         s_multiplayer_menu.x = (int) (viddef.getWidth() * 0.50f - 64);
          s_multiplayer_menu.nitems = 0;
  
***************
*** 818,822 ****
          int i = 0;
  
!         s_keys_menu.x = (int) (viddef.width * 0.50);
          s_keys_menu.nitems = 0;
          s_keys_menu.cursordraw = new mcallback() {
--- 818,822 ----
          int i = 0;
  
!         s_keys_menu.x = (int) (viddef.getWidth() * 0.50);
          s_keys_menu.nitems = 0;
          s_keys_menu.cursordraw = new mcallback() {
***************
*** 1447,1452 ****
           * * configure controls menu and menu items
           */
!         s_options_menu.x = viddef.width / 2;
!         s_options_menu.y = viddef.height / 2 - 58;
          s_options_menu.nitems = 0;
  
--- 1447,1452 ----
           * * configure controls menu and menu items
           */
!         s_options_menu.x = viddef.getWidth() / 2;
!         s_options_menu.y = viddef.getHeight() / 2 - 58;
          s_options_menu.nitems = 0;
  
***************
*** 1842,1847 ****
           * * draw the credits
           */
!         for (i = 0, y = (int) (viddef.height - ((cls.realtime - credits_start_time) / 40.0F)); credits[i] != null
!                 && y < viddef.height; y += 10, i++) {
              int j, stringoffset = 0;
              boolean bold = false;
--- 1842,1847 ----
           * * draw the credits
           */
!         for (i = 0, y = (int) (viddef.getHeight() - ((cls.realtime - credits_start_time) / 40.0F)); credits[i] != null
!                 && y < viddef.getHeight(); y += 10, i++) {
              int j, stringoffset = 0;
              boolean bold = false;
***************
*** 1861,1865 ****
                  int x;
  
!                 x = (viddef.width - credits[i].length() * 8 - stringoffset * 8)
                          / 2 + (j + stringoffset) * 8;
  
--- 1861,1865 ----
                  int x;
  
!                 x = (viddef.getWidth() - credits[i].length() * 8 - stringoffset * 8)
                          / 2 + (j + stringoffset) * 8;
  
***************
*** 2009,2013 ****
      static void Game_MenuInit() {
  
!         s_game_menu.x = (int) (viddef.width * 0.50);
          s_game_menu.nitems = 0;
  
--- 2009,2013 ----
      static void Game_MenuInit() {
  
!         s_game_menu.x = (int) (viddef.getWidth() * 0.50);
          s_game_menu.nitems = 0;
  
***************
*** 2195,2200 ****
          int i;
  
!         s_loadgame_menu.x = viddef.width / 2 - 120;
!         s_loadgame_menu.y = viddef.height / 2 - 58;
          s_loadgame_menu.nitems = 0;
  
--- 2195,2200 ----
          int i;
  
!         s_loadgame_menu.x = viddef.getWidth() / 2 - 120;
!         s_loadgame_menu.y = viddef.getHeight() / 2 - 58;
          s_loadgame_menu.nitems = 0;
  
***************
*** 2288,2293 ****
          int i;
  
!         s_savegame_menu.x = viddef.width / 2 - 120;
!         s_savegame_menu.y = viddef.height / 2 - 58;
          s_savegame_menu.nitems = 0;
  
--- 2288,2293 ----
          int i;
  
!         s_savegame_menu.x = viddef.getWidth() / 2 - 120;
!         s_savegame_menu.y = viddef.getHeight() / 2 - 58;
          s_savegame_menu.nitems = 0;
  
***************
*** 2452,2456 ****
          int i;
  
!         s_joinserver_menu.x = (int) (viddef.width * 0.50 - 120);
          s_joinserver_menu.nitems = 0;
  
--- 2452,2456 ----
          int i;
  
!         s_joinserver_menu.x = (int) (viddef.getWidth() * 0.50 - 120);
          s_joinserver_menu.nitems = 0;
  
***************
*** 2749,2753 ****
           * * initialize the menu stuff
           */
!         s_startserver_menu.x = (int) (viddef.width * 0.50);
          s_startserver_menu.nitems = 0;
  
--- 2749,2753 ----
           * * initialize the menu stuff
           */
!         s_startserver_menu.x = (int) (viddef.getWidth() * 0.50);
          s_startserver_menu.nitems = 0;
  
***************
*** 3082,3086 ****
          int y = 0;
  
!         s_dmoptions_menu.x = (int) (viddef.width * 0.50);
          s_dmoptions_menu.nitems = 0;
  
--- 3082,3086 ----
          int y = 0;
  
!         s_dmoptions_menu.x = (int) (viddef.getWidth() * 0.50);
          s_dmoptions_menu.nitems = 0;
  
***************
*** 3436,3440 ****
          int y = 0;
  
!         s_downloadoptions_menu.x = (int) (viddef.width * 0.50);
          s_downloadoptions_menu.nitems = 0;
  
--- 3436,3440 ----
          int y = 0;
  
!         s_downloadoptions_menu.x = (int) (viddef.getWidth() * 0.50);
          s_downloadoptions_menu.nitems = 0;
  
***************
*** 3567,3572 ****
  
      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;
  
--- 3567,3572 ----
  
      static void AddressBook_MenuInit() {
!         s_addressbook_menu.x = viddef.getWidth() / 2 - 142;
!         s_addressbook_menu.y = viddef.getHeight() / 2 - 58;
          s_addressbook_menu.nitems = 0;
  
***************
*** 3959,3964 ****
          }
  
!         s_player_config_menu.x = viddef.width / 2 - 95;
!         s_player_config_menu.y = viddef.height / 2 - 97;
          s_player_config_menu.nitems = 0;
  
--- 3959,3964 ----
          }
  
!         s_player_config_menu.x = viddef.getWidth() / 2 - 95;
!         s_player_config_menu.y = viddef.getHeight() / 2 - 97;
          s_player_config_menu.nitems = 0;
  
***************
*** 4084,4089 ****
          //memset(refdef, 0, sizeof(refdef));
  
!         refdef.x = viddef.width / 2;
!         refdef.y = viddef.height / 2 - 72;
          refdef.width = 144;
          refdef.height = 168;
--- 4084,4089 ----
          //memset(refdef, 0, sizeof(refdef));
  
!         refdef.x = viddef.getWidth() / 2;
!         refdef.y = viddef.getHeight() / 2 - 72;
          refdef.width = 144;
          refdef.height = 168;
***************
*** 4130,4135 ****
  
              DrawTextBox(
!                     (int) ((refdef.x) * (320.0F / viddef.width) - 8),
!                     (int) ((viddef.height / 2) * (240.0F / viddef.height) - 77),
                      refdef.width / 8, refdef.height / 8);
              refdef.height += 4;
--- 4130,4135 ----
  
              DrawTextBox(
!                     (int) ((refdef.x) * (320.0F / viddef.getWidth()) - 8),
!                     (int) ((viddef.getHeight() / 2) * (240.0F / viddef.getHeight()) - 77),
                      refdef.width / 8, refdef.height / 8);
              refdef.height += 4;
***************
*** 4235,4239 ****
          w = d.width;
          h = d.height;
!         re.DrawPic((viddef.width - w) / 2, (viddef.height - h) / 2, "quit");
      }
  
--- 4235,4239 ----
          w = d.width;
          h = d.height;
!         re.DrawPic((viddef.getWidth() - w) / 2, (viddef.getHeight() - h) / 2, "quit");
      }
  
***************
*** 4297,4301 ****
          // dim everything behind it down
          if (cl.cinematictime > 0)
!             re.DrawFill(0, 0, viddef.width, viddef.height, 0);
          else
              re.DrawFadeScreen();
--- 4297,4301 ----
          // dim everything behind it down
          if (cl.cinematictime > 0)
!             re.DrawFill(0, 0, viddef.getWidth(), viddef.getHeight(), 0);
          else
              re.DrawFadeScreen();
***************
*** 4596,4600 ****
          height += 10;
  
!         menu.y = (viddef.height - height) / 2;
      }
  
--- 4596,4600 ----
          height += 10;
  
!         menu.y = (viddef.getHeight() - height) / 2;
      }
  
***************
*** 4661,4672 ****
          if (string != null) {
              int l = string.length();
!             int maxrow = viddef.height / 8;
!             int maxcol = viddef.width / 8;
              int col = maxcol / 2 - l / 2;
  
!             re.DrawFill(0, viddef.height - 8, viddef.width, 8, 4);
!             Menu_DrawString(col * 8, viddef.height - 8, string);
          } else {
!             re.DrawFill(0, viddef.height - 8, viddef.width, 8, 0);
          }
      }
--- 4661,4672 ----
          if (string != null) {
              int l = string.length();
!             int maxrow = viddef.getHeight() / 8;
!             int maxcol = viddef.getWidth() / 8;
              int col = maxcol / 2 - l / 2;
  
!             re.DrawFill(0, viddef.getHeight() - 8, viddef.getWidth(), 8, 4);
!             Menu_DrawString(col * 8, viddef.getHeight() - 8, string);
          } else {
!             re.DrawFill(0, viddef.getHeight() - 8, viddef.getWidth(), 8, 0);
          }
      }

Index: Console.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Console.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Console.java	30 Jun 2005 08:36:22 -0000	1.7
--- Console.java	2 Mar 2008 14:56:22 -0000	1.8
***************
*** 43,169 ****
  
      public static xcommand_t ToggleConsole_f = new xcommand_t() {
!         public void execute() {
!             SCR.EndLoadingPlaque(); // get rid of loading plaque
  
!             if (Globals.cl.attractloop) {
!                 Cbuf.AddText("killserver\n");
!                 return;
!             }
  
[...1053 lines suppressed...]
! 		if (j == n)
! 		    dlbar.append((char) 0x83);
! 		else
! 		    dlbar.append((char) 0x81);
! 	    }
! 	    dlbar.append((char) 0x82);
! 	    dlbar.append((cls.downloadpercent < 10) ? " 0" : " ");
! 	    dlbar.append(cls.downloadpercent).append('%');
! 	    // draw it
! 	    y = con.vislines - 12;
! 	    for (i = 0; i < dlbar.length(); i++)
! 		re.DrawChar((i + 1) << 3, y, dlbar.charAt(i));
! 	}
! 	// ZOID
! 
! 	// draw the input prompt, user text, and cursor if desired
! 	DrawInput();
      }
  }
\ No newline at end of file

Index: CL_view.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_view.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CL_view.java	22 Sep 2004 19:22:07 -0000	1.4
--- CL_view.java	2 Mar 2008 14:56:22 -0000	1.5
***************
*** 58,62 ****
  
          SCR.AddDirtyPoint(0, 0);
!         SCR.AddDirtyPoint(Globals.viddef.width - 1, Globals.viddef.height - 1);
  
          // let the render dll load the map
--- 58,62 ----
  
          SCR.AddDirtyPoint(0, 0);
!         SCR.AddDirtyPoint(Globals.viddef.getWidth() - 1, Globals.viddef.getHeight() - 1);
  
          // let the render dll load the map

Index: SCR.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** SCR.java	13 May 2007 00:07:34 -0000	1.20
--- SCR.java	2 Mar 2008 14:56:22 -0000	1.21
***************
*** 298,302 ****
  
          if (scr_center_lines <= 4)
!             y = (int) (viddef.height * 0.35);
          else
              y = 48;
--- 298,302 ----
  
          if (scr_center_lines <= 4)
!             y = (int) (viddef.getHeight() * 0.35);
          else
              y = 48;
***************
*** 308,312 ****
                          || cs.charAt(start + l) == '\n')
                      break;
!             x = (viddef.width - l * 8) / 2;
              SCR.AddDirtyPoint(x, y);
              for (j = 0; j < l; j++, x += 8) {
--- 308,312 ----
                          || cs.charAt(start + l) == '\n')
                      break;
!             x = (viddef.getWidth() - l * 8) / 2;
              SCR.AddDirtyPoint(x, y);
              for (j = 0; j < l; j++, x += 8) {
***************
*** 356,367 ****
          size = (int) scr_viewsize.value;
  
!         scr_vrect.width = viddef.width * size / 100;
          scr_vrect.width &= ~7;
  
!         scr_vrect.height = viddef.height * size / 100;
          scr_vrect.height &= ~1;
  
!         scr_vrect.x = (viddef.width - scr_vrect.width) / 2;
!         scr_vrect.y = (viddef.height - scr_vrect.height) / 2;
      }
  
--- 356,367 ----
          size = (int) scr_viewsize.value;
  
!         scr_vrect.width = viddef.getWidth() * size / 100;
          scr_vrect.width &= ~7;
  
!         scr_vrect.height = viddef.getHeight() * size / 100;
          scr_vrect.height &= ~1;
  
!         scr_vrect.x = (viddef.getWidth() - scr_vrect.width) / 2;
!         scr_vrect.y = (viddef.getHeight() - scr_vrect.height) / 2;
      }
  
***************
*** 490,494 ****
  
          re.DrawGetPicSize(dim, "pause");
!         re.DrawPic((viddef.width - dim.width) / 2, viddef.height / 2 + 8,
                  "pause");
      }
--- 490,494 ----
  
          re.DrawGetPicSize(dim, "pause");
!         re.DrawPic((viddef.getWidth() - dim.width) / 2, viddef.getHeight() / 2 + 8,
                  "pause");
      }
***************
*** 505,510 ****
          scr_draw_loading = 0;
          re.DrawGetPicSize(dim, "loading");
!         re.DrawPic((viddef.width - dim.width) / 2,
!                 (viddef.height - dim.height) / 2, "loading");
      }
  
--- 505,510 ----
          scr_draw_loading = 0;
          re.DrawGetPicSize(dim, "loading");
!         re.DrawPic((viddef.getWidth() - dim.width) / 2,
!                 (viddef.getHeight() - dim.height) / 2, "loading");
      }
  
***************
*** 552,556 ****
                                                               // can't render
              Console.DrawConsole(0.5f);
!             re.DrawFill(0, viddef.height / 2, viddef.width, viddef.height / 2,
                      0);
              return;
--- 552,556 ----
                                                               // can't render
              Console.DrawConsole(0.5f);
!             re.DrawFill(0, viddef.getHeight() / 2, viddef.getWidth(), viddef.getHeight() / 2,
                      0);
              return;
***************
*** 645,649 ****
      static void DirtyScreen() {
          AddDirtyPoint(0, 0);
!         AddDirtyPoint(viddef.width - 1, viddef.height - 1);
      }
  
--- 645,649 ----
      static void DirtyScreen() {
          AddDirtyPoint(0, 0);
!         AddDirtyPoint(viddef.getWidth() - 1, viddef.getHeight() - 1);
      }
  
***************
*** 695,699 ****
  
          // don't bother with anything convered by the console)
!         top = (int) (scr_con_current * viddef.height);
          if (top >= clear.y1)
              clear.y1 = top;
--- 695,699 ----
  
          // don't bother with anything convered by the console)
!         top = (int) (scr_con_current * viddef.getHeight());
          if (top >= clear.y1)
              clear.y1 = top;
***************
*** 903,912 ****
              if (parser.tokenEquals("xr")) {
                  parser.next();
!                 x = viddef.width + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("xv")) {
                  parser.next();
!                 x = viddef.width / 2 - 160 + parser.tokenAsInt();
                  continue;
              }
--- 903,912 ----
              if (parser.tokenEquals("xr")) {
                  parser.next();
!                 x = viddef.getWidth() + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("xv")) {
                  parser.next();
!                 x = viddef.getWidth() / 2 - 160 + parser.tokenAsInt();
                  continue;
              }
***************
*** 919,928 ****
              if (parser.tokenEquals("yb")) {
                  parser.next();
!                 y = viddef.height + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("yv")) {
                  parser.next();
!                 y = viddef.height / 2 - 120 + parser.tokenAsInt();
                  continue;
              }
--- 919,928 ----
              if (parser.tokenEquals("yb")) {
                  parser.next();
!                 y = viddef.getHeight() + parser.tokenAsInt();
                  continue;
              }
              if (parser.tokenEquals("yv")) {
                  parser.next();
!                 y = viddef.getHeight() / 2 - 120 + parser.tokenAsInt();
                  continue;
              }
***************
*** 945,951 ****
  
                  parser.next();
!                 x = viddef.width / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.height / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
--- 945,951 ----
  
                  parser.next();
!                 x = viddef.getWidth() / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.getHeight() / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
***************
*** 982,988 ****
  
                  parser.next();
!                 x = viddef.width / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.height / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
--- 982,988 ----
  
                  parser.next();
!                 x = viddef.getWidth() / 2 - 160 + parser.tokenAsInt();
                  parser.next();
!                 y = viddef.getHeight() / 2 - 120 + parser.tokenAsInt();
                  AddDirtyPoint(x, y);
                  AddDirtyPoint(x + 159, y + 31);
***************
*** 1215,1220 ****
                  scr_draw_loading = 0; // false
                  re.DrawGetPicSize(dim, "loading");
!                 re.DrawPic((viddef.width - dim.width) / 2,
!                         (viddef.height - dim.height) / 2, "loading");
              }
              // if a cinematic is supposed to be running, handle menus
--- 1215,1220 ----
                  scr_draw_loading = 0; // false
                  re.DrawGetPicSize(dim, "loading");
!                 re.DrawPic((viddef.getWidth() - dim.width) / 2,
!                         (viddef.getHeight() - dim.height) / 2, "loading");
              }
              // if a cinematic is supposed to be running, handle menus
***************
*** 1346,1350 ****
                  lasttime = cls.realtime;
              }
!             int x = viddef.width - 8 * fpsvalue.length() - 2;
              for (int i = 0; i < fpsvalue.length(); i++) {
                  re.DrawChar(x, 2, fpsvalue.charAt(i));
--- 1346,1350 ----
                  lasttime = cls.realtime;
              }
!             int x = viddef.getWidth() - 8 * fpsvalue.length() - 2;
              for (int i = 0; i < fpsvalue.length(); i++) {
                  re.DrawChar(x, 2, fpsvalue.charAt(i));
***************
*** 1804,1808 ****
              return true;
          
!         Globals.re.DrawStretchRaw(0, 0, viddef.width, viddef.height, cin.width, cin.height, cin.pic);
          
          return true;
--- 1804,1808 ----
              return true;
          
!         Globals.re.DrawStretchRaw(0, 0, viddef.getWidth(), viddef.getHeight(), cin.width, cin.height, cin.pic);
          
          return true;

Index: CL_inv.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_inv.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CL_inv.java	18 Dec 2005 22:10:10 -0000	1.3
--- CL_inv.java	2 Mar 2008 14:56:22 -0000	1.4
***************
*** 104,109 ****
  			top = 0;
  
! 		x = (Globals.viddef.width - 256) / 2;
! 		y = (Globals.viddef.height - 240) / 2;
  
  		// repaint everything next frame
--- 104,109 ----
  			top = 0;
  
! 		x = (Globals.viddef.getWidth() - 256) / 2;
! 		y = (Globals.viddef.getHeight() - 240) / 2;
  
  		// repaint everything next frame