Update of /cvsroot/jake2/jake2/src/jake2/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2095/src/jake2/game
Modified Files:
Tag: RST
Cmd.java entity_state_t.java
Log Message:
merged from head
Index: Cmd.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/Cmd.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** Cmd.java 23 Jan 2005 21:31:46 -0000 1.8.2.2
--- Cmd.java 30 Jan 2005 19:47:31 -0000 1.8.2.3
***************
*** 267,271 ****
while (true) {
- cmd_argv[cmd_argc] = null;
// skip whitespace up to a /n
char c = ph.skipwhitestoeol();
--- 267,270 ----
***************
*** 287,291 ****
com_token = Com.Parse(ph);
! if (com_token.length() == 0)
return;
--- 286,290 ----
com_token = Com.Parse(ph);
! if (ph.data == null)
return;
***************
*** 392,401 ****
TokenizeString(text.toCharArray(), true);
! // if (Argc() > 0) {
! // Com.DPrintf("tokenized:");
! // for (int xxx = 0; xxx < Argc(); xxx++)
! // Com.dprintln("<" + Argv(xxx) + ">");
! // }
!
// execute the command line
if (Argc() == 0)
--- 391,401 ----
TokenizeString(text.toCharArray(), true);
! // if (Argc() > 0) {
! // Com.DPrintf("tokenized:");
! // for (int xxx = 0; xxx < Argc(); xxx++)
! // Com.DPrintf("[" + Argv(xxx) + "]");
! //
! // Com.DPrintf("\n");
! // }
// execute the command line
if (Argc() == 0)
Index: entity_state_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/entity_state_t.java,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** entity_state_t.java 20 Aug 2004 21:29:58 -0000 1.3
--- entity_state_t.java 30 Jan 2005 19:47:32 -0000 1.3.6.1
***************
*** 146,148 ****
--- 146,166 ----
event = from.event;
}
+
+ public void clear()
+ {
+ number = -99999;
+ surrounding_ent = null;
+ Math3D.VectorClear(origin);
+ Math3D.VectorClear(angles);
+ Math3D.VectorClear(old_origin);
+ modelindex = 0;
+ modelindex2 = modelindex3 = modelindex4 = 0;
+ frame = 0;
+ skinnum = 0;
+ effects = 0;
+ renderfx = 0;
+ solid = 0;
+ sound = 0;
+ event = 0;
+ }
}
\ No newline at end of file
|
