summaryrefslogtreecommitdiff
path: root/src/qcommon
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-07-31 21:35:21 +0000
committerTim Angus <tim@ngus.net>2006-07-31 21:35:21 +0000
commit91d17e135e2c4cc9869ab846f72798f018775c5c (patch)
treedc6c2d4abf58e33ca26fdf4edd30ea0f6b706ce7 /src/qcommon
parentc999c50a24348489e5f705aa4b07bdcdf6b0658e (diff)
* Add otherEntityNum to playerState_t... and don't use it... yet
* Improve ckit tutorial text * Entities.def correction
Diffstat (limited to 'src/qcommon')
-rw-r--r--src/qcommon/msg.c2
-rw-r--r--src/qcommon/q_shared.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qcommon/msg.c b/src/qcommon/msg.c
index e4db4d8e..0fa7385a 100644
--- a/src/qcommon/msg.c
+++ b/src/qcommon/msg.c
@@ -1156,7 +1156,7 @@ netField_t playerStateFields[] =
{ PSF(grapplePoint[0]), 0 },
{ PSF(grapplePoint[1]), 0 },
{ PSF(grapplePoint[2]), 0 },
-{ PSF(jumppad_ent), 10 },
+{ PSF(otherEntityNum), 10 },
{ PSF(loopSound), 16 }
};
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 0127fd90..9ade94b5 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -1077,7 +1077,7 @@ typedef struct playerState_s {
int generic1;
int loopSound;
- int jumppad_ent; // jumppad entity hit this frame
+ int otherEntityNum;
// not communicated over the net at all
int ping; // server to game info for scoreboard