aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2
diff options
context:
space:
mode:
authorRene Stoeckel <[email protected]>2005-02-19 21:21:46 +0000
committerRene Stoeckel <[email protected]>2005-02-19 21:21:46 +0000
commite8fe61aaf5b09c76a354828ce103b0190844cc84 (patch)
tree2c951b7547577a1df6fff4fa1524cf8c01e5d69f /src/jake2
parentfacf7c3f16803cb410a313dc0e8715f1e0d569c0 (diff)
cosmetic
Diffstat (limited to 'src/jake2')
-rw-r--r--src/jake2/game/GamePWeapon.java3
-rw-r--r--src/jake2/server/SV_INIT.java12
2 files changed, 6 insertions, 9 deletions
diff --git a/src/jake2/game/GamePWeapon.java b/src/jake2/game/GamePWeapon.java
index ee1ace5..500282e 100644
--- a/src/jake2/game/GamePWeapon.java
+++ b/src/jake2/game/GamePWeapon.java
@@ -19,7 +19,7 @@
*/
// Created on 16.11.2003 by RST.
-// $Id: GamePWeapon.java,v 1.7 2005-02-06 19:01:45 salomo Exp $
+// $Id: GamePWeapon.java,v 1.8 2005-02-19 21:18:15 salomo Exp $
package jake2.game;
import jake2.Defines;
@@ -1210,7 +1210,6 @@ public class GamePWeapon {
} else {
ent.s.frame = M_Player.FRAME_pain304 + 1;
ent.client.anim_end = M_Player.FRAME_pain301;
-
}
}
diff --git a/src/jake2/server/SV_INIT.java b/src/jake2/server/SV_INIT.java
index 525bd03..3f2a106 100644
--- a/src/jake2/server/SV_INIT.java
+++ b/src/jake2/server/SV_INIT.java
@@ -19,7 +19,7 @@
*/
// Created on 14.01.2004 by RST.
-// $Id: SV_INIT.java,v 1.12 2005-02-12 21:43:48 salomo Exp $
+// $Id: SV_INIT.java,v 1.13 2005-02-19 21:21:46 salomo Exp $
package jake2.server;
import jake2.Defines;
@@ -59,11 +59,10 @@ public class SV_INIT {
if (i == max)
Com.Error(Defines.ERR_DROP, "*Index: overflow");
- //strncpy (sv.configstrings[start+i], name,
- // sizeof(sv.configstrings[i]));
sv.configstrings[start + i] = name;
- if (sv.state != Defines.ss_loading) { // send the update to everyone
+ if (sv.state != Defines.ss_loading) {
+ // send the update to everyone
SZ.Clear(sv.multicast);
MSG.WriteChar(sv.multicast, Defines.svc_configstring);
MSG.WriteShort(sv.multicast, start + i);
@@ -108,9 +107,7 @@ public class SV_INIT {
continue;
svent.s.number = entnum;
- //
// take current state as baseline
- //
Math3D.VectorCopy(svent.s.origin, svent.s.old_origin);
// rst: bugfix
sv.baselines[entnum].set(svent.s); // = svent.s.getClone();
@@ -153,7 +150,8 @@ public class SV_INIT {
// get configstrings and areaportals
SV_CCMDS.SV_ReadLevelFile();
- if (!sv.loadgame) { // coming back to a level after being in a different
+ if (!sv.loadgame) {
+ // coming back to a level after being in a different
// level, so run it for ten seconds
// rlava2 was sending too many lightstyles, and overflowing the