aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2/game/PlayerClient.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/jake2/game/PlayerClient.java')
-rw-r--r--src/jake2/game/PlayerClient.java176
1 files changed, 29 insertions, 147 deletions
diff --git a/src/jake2/game/PlayerClient.java b/src/jake2/game/PlayerClient.java
index 5cf627d..ba75cde 100644
--- a/src/jake2/game/PlayerClient.java
+++ b/src/jake2/game/PlayerClient.java
@@ -19,98 +19,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 28.12.2003 by RST.
-// $Id: PlayerClient.java,v 1.1 2004-07-07 19:59:22 hzi Exp $
+// $Id: PlayerClient.java,v 1.2 2004-07-08 15:58:43 hzi Exp $
package jake2.game;
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.Defines;
+import jake2.util.Lib;
+import jake2.util.Math3D;
public class PlayerClient extends PlayerHud {
- //
- // Gross, ugly, disgustuing hack section
- //
-
- // this function is an ugly as hell hack to fix some map flaws
- //
- // the coop spawn spots on some maps are SNAFU. There are coop spots
- // with the wrong targetname as well as spots with no name at all
- //
- // we use carnal knowledge of the maps to fix the coop spot targetnames to match
- // that of the nearest named single player spot
-
- static EntThinkAdapter SP_FixCoopSpots = new EntThinkAdapter() {
- public boolean think(edict_t self) {
-
- edict_t spot;
- float[] d = { 0, 0, 0 };
-
- spot = null;
- EdictIterator es = null;
-
- while (true) {
- es = G_Find(es, findByClass, "info_player_start");
- spot = es.o;
- if (spot == null)
- return true;
- if (spot.targetname == null)
- continue;
- VectorSubtract(self.s.origin, spot.s.origin, d);
- if (VectorLength(d) < 384) {
- if ((self.targetname == null) || Q_stricmp(self.targetname, spot.targetname) != 0) {
- // gi.dprintf("FixCoopSpots changed %s at %s targetname from %s to %s\n", self.classname, vtos(self.s.origin), self.targetname, spot.targetname);
- self.targetname = spot.targetname;
- }
- return true;
- }
- }
- return true;
- }
- };
-
- // now if that one wasn't ugly enough for you then try this one on for size
- // some maps don't have any coop spots at all, so we need to create them
- // where they should have been
-
- static EntThinkAdapter SP_CreateCoopSpots = new EntThinkAdapter() {
- public boolean think(edict_t self) {
-
- edict_t spot;
-
- if (Q_stricmp(level.mapname, "security") == 0) {
- spot = G_Spawn();
- spot.classname = "info_player_coop";
- spot.s.origin[0] = 188 - 64;
- spot.s.origin[1] = -164;
- spot.s.origin[2] = 80;
- spot.targetname = "jail3";
- spot.s.angles[1] = 90;
-
- spot = G_Spawn();
- spot.classname = "info_player_coop";
- spot.s.origin[0] = 188 + 64;
- spot.s.origin[1] = -164;
- spot.s.origin[2] = 80;
- spot.targetname = "jail3";
- spot.s.angles[1] = 90;
-
- spot = G_Spawn();
- spot.classname = "info_player_coop";
- spot.s.origin[0] = 188 + 128;
- spot.s.origin[1] = -164;
- spot.s.origin[2] = 80;
- spot.targetname = "jail3";
- spot.s.angles[1] = 90;
- }
- return true;
- }
- };
-
/*QUAKED info_player_start (1 0 0) (-16 -16 -24) (16 16 32)
The normal starting point for a level.
*/
@@ -119,7 +37,7 @@ public class PlayerClient extends PlayerHud {
return;
if (Q_stricmp(level.mapname, "security") == 0) {
// invoke one of our gross, ugly, disgusting hacks
- self.think = SP_CreateCoopSpots;
+ self.think = PlayerClientAdapters.SP_CreateCoopSpots;
self.nextthink = level.time + FRAMETIME;
}
}
@@ -132,7 +50,7 @@ public class PlayerClient extends PlayerHud {
G_FreeEdict(self);
return;
}
- SP_misc_teleporter_dest.think(self);
+ GameMiscAdapters.SP_misc_teleporter_dest.think(self);
}
/*QUAKED info_player_coop (1 0 1) (-16 -16 -24) (16 16 32)
@@ -160,7 +78,7 @@ public class PlayerClient extends PlayerHud {
|| (Q_stricmp(level.mapname, "power2") == 0)
|| (Q_stricmp(level.mapname, "strike") == 0)) {
// invoke one of our gross, ugly, disgusting hacks
- self.think = SP_FixCoopSpots;
+ self.think = PlayerClientAdapters.SP_FixCoopSpots;
self.nextthink = level.time + FRAMETIME;
}
}
@@ -172,14 +90,6 @@ public class PlayerClient extends PlayerHud {
public static void SP_info_player_intermission() {
}
- //=======================================================================
-
- static EntPainAdapter player_pain = new EntPainAdapter() {
- public void pain(edict_t self, edict_t other, float kick, int damage) {
- // player pain is handled at the end of the frame in P_DamageFeedback
- }
- };
-
public static void ClientObituary(edict_t self, edict_t inflictor, edict_t attacker) {
int mod;
String message;
@@ -400,6 +310,10 @@ public class PlayerClient extends PlayerHud {
item = FindItem("Blaster");
client.pers.selected_item = ITEM_INDEX(item);
client.pers.inventory[client.pers.selected_item] = 1;
+
+ item = FindItem("Shotgun");
+ client.pers.selected_item = ITEM_INDEX(item);
+ client.pers.inventory[client.pers.selected_item] = 1;
client.pers.weapon = item;
@@ -634,7 +548,6 @@ public class PlayerClient extends PlayerHud {
}
}
- return spot;
}
/*
@@ -695,22 +608,6 @@ public class PlayerClient extends PlayerHud {
}
}
- static EntDieAdapter body_die = new EntDieAdapter() {
- public void die(edict_t self, edict_t inflictor, edict_t attacker, int damage, float[] point) {
-
- int n;
-
- if (self.health < -40) {
- gi.sound(self, CHAN_BODY, gi.soundindex("misc/udeath.wav"), 1, ATTN_NORM, 0);
- for (n = 0; n < 4; n++)
- ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", damage, GIB_ORGANIC);
- self.s.origin[2] -= 48;
- ThrowClientHead(self, damage);
- self.takedamage = DAMAGE_NO;
- }
- }
- };
-
public static void CopyToBodyQue(edict_t ent) {
edict_t body;
@@ -739,7 +636,7 @@ public class PlayerClient extends PlayerHud {
body.owner = ent.owner;
body.movetype = ent.movetype;
- body.die = body_die;
+ body.die = PlayerClientAdapters.body_die;
body.takedamage = DAMAGE_YES;
gi.linkentity(body);
@@ -872,7 +769,7 @@ public class PlayerClient extends PlayerHud {
float[] spawn_origin = { 0, 0, 0 }, spawn_angles = { 0, 0, 0 };
gclient_t client;
int i;
- client_persistant_t saved;
+ client_persistant_t saved = new client_persistant_t();
client_respawn_t resp = new client_respawn_t();
// find a spawn point
@@ -888,7 +785,7 @@ public class PlayerClient extends PlayerHud {
String userinfo;
//char userinfo[MAX_INFO_STRING];
- resp = client.resp;
+ resp.set(client.resp);
userinfo = client.pers.userinfo;
//memcpy(userinfo, client.pers.userinfo, sizeof(userinfo));
@@ -900,7 +797,7 @@ public class PlayerClient extends PlayerHud {
//char userinfo[MAX_INFO_STRING];
String userinfo;
- resp = client.resp;
+ resp.set(client.resp);
//memcpy(userinfo, client.pers.userinfo, sizeof(userinfo));
userinfo = client.pers.userinfo;
// this is kind of ugly, but it's how we want to handle keys in coop
@@ -911,7 +808,7 @@ public class PlayerClient extends PlayerHud {
// }
resp.coop_respawn.game_helpchanged = client.pers.game_helpchanged;
resp.coop_respawn.helpchanged = client.pers.helpchanged;
- client.pers = resp.coop_respawn;
+ client.pers.set(resp.coop_respawn);
userinfo = ClientUserinfoChanged(ent, userinfo);
if (resp.score > client.pers.score)
client.pers.score = resp.score;
@@ -922,13 +819,14 @@ public class PlayerClient extends PlayerHud {
}
// clear everything but the persistant data
- saved = client.pers;
+ saved.set(client.pers);
//memset(client, 0, sizeof(* client));
client.clear();
- client.pers = saved;
+ client.pers.set(saved);
if (client.pers.health <= 0)
InitClientPersistant(client);
- client.resp = resp;
+
+ client.resp.set(resp);
// copy some data from the client to the entity
FetchClientEntData(ent);
@@ -947,8 +845,8 @@ public class PlayerClient extends PlayerHud {
ent.air_finished = level.time + 12;
ent.clipmask = MASK_PLAYERSOLID;
ent.model = "players/male/tris.md2";
- ent.pain = player_pain;
- ent.die = player_die;
+ ent.pain = PlayerClientAdapters.player_pain;
+ ent.die = GameAIAdapters.player_die;
ent.waterlevel = 0;
ent.watertype = 0;
ent.flags &= ~FL_NO_KNOCKBACK;
@@ -1026,7 +924,7 @@ public class PlayerClient extends PlayerHud {
// force the current weapon up
client.newweapon = client.pers.weapon;
- ChangeWeapon(ent);
+ GamePWeapon.ChangeWeapon(ent);
}
/*
@@ -1178,7 +1076,7 @@ public class PlayerClient extends PlayerHud {
// handedness
s = Info.Info_ValueForKey(userinfo, "hand");
- if (strlen(s) > 0) {
+ if (s.length() > 0) {
ent.client.pers.hand = atoi(s);
}
@@ -1295,22 +1193,6 @@ public class PlayerClient extends PlayerHud {
gi.configstring(CS_PLAYERSKINS + playernum, "");
}
- //==============================================================
-
- private static edict_t pm_passent;
-
- // pmove doesn't need to know about passent and contentmask
- public static pmove_t.TraceAdapter PM_trace = new pmove_t.TraceAdapter() {
-
- public trace_t trace(float[] start, float[] mins, float[] maxs, float[] end) {
- if (pm_passent.health > 0)
- return gi.trace(start, mins, maxs, end, pm_passent, MASK_PLAYERSOLID);
- else
- return gi.trace(start, mins, maxs, end, pm_passent, MASK_DEADSOLID);
- }
-
- };
-
/*
static int CheckBlock(, int c) {
int v, i;
@@ -1354,7 +1236,7 @@ public class PlayerClient extends PlayerHud {
return;
}
- pm_passent = ent;
+ PlayerClientAdapters.pm_passent = ent;
if (ent.client.chase_target != null) {
@@ -1394,7 +1276,7 @@ public class PlayerClient extends PlayerHud {
// this should be a copy
pm.cmd.set(ucmd);
- pm.trace = PM_trace; // adds default parms
+ pm.trace = PlayerClientAdapters.PM_trace; // adds default parms
pm.pointcontents = gi.pointcontents;
// perform a pmove
@@ -1453,7 +1335,7 @@ public class PlayerClient extends PlayerHud {
continue; // duplicated
if (other.touch == null)
continue;
- other.touch.touch(other, ent, null, null);
+ other.touch.touch(other, ent, GameBase.dummyplane, null);
}
}
@@ -1482,7 +1364,7 @@ public class PlayerClient extends PlayerHud {
}
else if (!client.weapon_thunk) {
client.weapon_thunk = true;
- Think_Weapon(ent);
+ GamePWeapon.Think_Weapon(ent);
}
}
@@ -1534,7 +1416,7 @@ public class PlayerClient extends PlayerHud {
// run weapon animations if it hasn't been done by a ucmd_t
if (!client.weapon_thunk && !client.resp.spectator)
- Think_Weapon(ent);
+ GamePWeapon.Think_Weapon(ent);
else
client.weapon_thunk = false;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 20:25:52 +0000