[Jake2-commits] jake2/src/jake2/render/jogl Surf.java,1.3,1.4

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

Update of /cvsroot/jake2/jake2/src/jake2/render/jogl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12605/src/jake2/render/jogl

Modified Files:
	Surf.java 
Log Message:
fix nullpointer exception when first starting with:
r_drawworld 0
r_drawentities 0

Index: Surf.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Surf.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Surf.java	9 Jul 2004 06:50:48 -0000	1.3
--- Surf.java	12 Jul 2004 18:19:42 -0000	1.4
***************
*** 1205,1209 ****
  	{
  		entity_t	ent = new entity_t();
! 
  		if (r_drawworld.value == 0)
  			return;
--- 1205,1212 ----
  	{
  		entity_t	ent = new entity_t();
! 		// auto cycle the world frame for texture animation
! 		ent.frame = (int)(r_newrefdef.time*2);
! 		currententity = ent;
! 		
  		if (r_drawworld.value == 0)
  			return;
***************
*** 1216,1224 ****
  		Math3D.VectorCopy(r_newrefdef.vieworg, modelorg);
  
- 		// auto cycle the world frame for texture animation
- 		// memset (&ent, 0, sizeof(ent));
- 		ent.frame = (int)(r_newrefdef.time*2);
- 		currententity = ent;
- 
  		gl_state.currenttextures[0] = gl_state.currenttextures[1] = -1;
  
--- 1219,1222 ----