nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-29 15:22:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

HANDHELD/QUAKESPASM: Remove some platform specific stuff, partial merge

Browse source 
of sysdefs.
This commit is contained in:
Steam Deck User 2023-01-17 18:47:31 -05:00
parent c3093cd8cf
commit 59a880ce09
27 changed files with 1028 additions and 1321 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
progs/handheld.src
View file

@ -8,7 +8,7 @@
../source/server/defs/custom.qc ../source/server/defs/custom.qc
../source/server/clientfuncs.qc ../source/server/clientfuncs.qc
../source/server/psp_specifics.qc ../source/server/non_fte_specifics.qc
../source/server/dummies/generic.qc ../source/server/dummies/generic.qc
../source/server/rounds.qc ../source/server/rounds.qc

2
progs/quakespasm.src
View file

@ -8,7 +8,7 @@
../source/server/defs/custom.qc ../source/server/defs/custom.qc
../source/server/clientfuncs.qc ../source/server/clientfuncs.qc
../source/server/dummies/quakespasm.qc ../source/server/non_fte_specifics.qc
../source/server/dummies/generic.qc ../source/server/dummies/generic.qc
../source/server/rounds.qc ../source/server/rounds.qc

4
source/client/main.qc
View file

@ -1107,11 +1107,13 @@ noref void() CSQC_Parse_Event =
W_CDUAL[wepnum] = isd;*/ W_CDUAL[wepnum] = isd;*/
break; break;
case EVENT_HUDUPDATE: case EVENT_HUDUPDATE:
/*string temps;
float tempf;
G_HUD = readstring(); G_HUD = readstring();
G_HUDHOR = readbyte(); G_HUDHOR = readbyte();
if (G_HUD != "") if (G_HUD != "")
huddir = strcat("gfx/hud/", G_HUD, "/"); huddir = strcat("gfx/hud/", G_HUD, "/");*/
break; break;
} }
} }

167
source/server/clientfuncs.qc
View file

@ -27,8 +27,7 @@
void SetUpdate(entity client, float type, float val1, float val2, float val3) void SetUpdate(entity client, float type, float val1, float val2, float val3)
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
if (type != 2) if (type != 2)
{ {
@ -51,12 +50,11 @@ void SetUpdate(entity client, float type, float val1, float val2, float val3)
WriteByte(MSG_MULTICAST, val3); // misc flags/vars for later if needed WriteByte(MSG_MULTICAST, val3); // misc flags/vars for later if needed
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
} }
#endif
#endif #endif // PC
} }
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
void(entity to, float type, float cost, float weapon) useprint = { void(entity to, float type, float cost, float weapon) useprint = {
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_USEPRINT); WriteByte(MSG_MULTICAST, EVENT_USEPRINT);
@ -66,42 +64,42 @@ void(entity to, float type, float cost, float weapon) useprint = {
msg_entity = to; msg_entity = to;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
} }
#endif #endif // PC
#endif
void(vector org) CallExplosion = { void(vector org) CallExplosion = {
#ifndef PC #ifndef PC
WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
WriteByte (MSG_BROADCAST, TE_EXPLOSION); WriteByte (MSG_BROADCAST, TE_EXPLOSION);
WriteCoord (MSG_BROADCAST, org_x); WriteCoord (MSG_BROADCAST, org_x);
WriteCoord (MSG_BROADCAST, org_y); WriteCoord (MSG_BROADCAST, org_y);
WriteCoord (MSG_BROADCAST, org_z); WriteCoord (MSG_BROADCAST, org_z);
#else
#else
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_EXPLOSION); WriteByte(MSG_MULTICAST, EVENT_EXPLOSION);
WriteCoord(MSG_MULTICAST, org_x); WriteCoord(MSG_MULTICAST, org_x);
WriteCoord(MSG_MULTICAST, org_y); WriteCoord(MSG_MULTICAST, org_y);
WriteCoord(MSG_MULTICAST, org_z); WriteCoord(MSG_MULTICAST, org_z);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif
#endif // PC
} }
void NotifyNewRound(float to) { void NotifyNewRound(float to) {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_NEWROUND); WriteByte(MSG_MULTICAST, EVENT_NEWROUND);
WriteByte(MSG_MULTICAST, to); WriteByte(MSG_MULTICAST, to);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif #endif // PC
#endif
} }
void SetRound(entity client, float to) { void SetRound(entity client, float to) {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_SETROUND); WriteByte(MSG_MULTICAST, EVENT_SETROUND);
@ -109,14 +107,12 @@ void SetRound(entity client, float to) {
msg_entity = client; msg_entity = client;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif #endif // PC
#endif
} }
void SetPerk(entity client, float to) void SetPerk(entity client, float to)
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_PERK); WriteByte(MSG_MULTICAST, EVENT_PERK);
@ -124,14 +120,12 @@ void SetPerk(entity client, float to)
msg_entity = client; msg_entity = client;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif #endif // PC
#endif
} }
void(float to) SwitchWeapon = void(float to) SwitchWeapon =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_WEAPONCHANGE); WriteByte(MSG_MULTICAST, EVENT_WEAPONCHANGE);
@ -142,14 +136,12 @@ void(float to) SwitchWeapon =
// hotfix for weapon2models not reseting // hotfix for weapon2models not reseting
self.weapon2model = GetWeapon2Model(to); self.weapon2model = GetWeapon2Model(to);
#endif #endif // PC
#endif
} }
void(string to, float skin) UpdateVmodel = void(string to, float skin) UpdateVmodel =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_UPDATEVMODEL); WriteByte(MSG_MULTICAST, EVENT_UPDATEVMODEL);
@ -158,14 +150,12 @@ void(string to, float skin) UpdateVmodel =
msg_entity = self; msg_entity = self;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif #endif // PC
#endif
} }
void(string to, float skin) UpdateV2model = void(string to, float skin) UpdateV2model =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_UPDATEV2MODEL); WriteByte(MSG_MULTICAST, EVENT_UPDATEV2MODEL);
@ -173,27 +163,27 @@ void(string to, float skin) UpdateV2model =
WriteByte(MSG_MULTICAST, skin); WriteByte(MSG_MULTICAST, skin);
msg_entity = self; msg_entity = self;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif
#endif #endif // PC
} }
void(float index, float state) ChangeReviveIconState = void(float index, float state) ChangeReviveIconState =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_REVIVECHANGE); WriteByte(MSG_MULTICAST, EVENT_REVIVECHANGE);
WriteByte(MSG_MULTICAST, index); WriteByte(MSG_MULTICAST, index);
WriteByte(MSG_MULTICAST, state); WriteByte(MSG_MULTICAST, state);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif
#endif #endif // PC
} }
void(float index, vector org) EnableReviveIcon = void(float index, vector org) EnableReviveIcon =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_REVIVEON); WriteByte(MSG_MULTICAST, EVENT_REVIVEON);
WriteByte(MSG_MULTICAST, index); WriteByte(MSG_MULTICAST, index);
@ -201,26 +191,26 @@ void(float index, vector org) EnableReviveIcon =
WriteCoord(MSG_MULTICAST, org_y); WriteCoord(MSG_MULTICAST, org_y);
WriteCoord(MSG_MULTICAST, org_z); WriteCoord(MSG_MULTICAST, org_z);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif
#endif #endif // PC
} }
void(float index) DisableReviveIcon = void(float index) DisableReviveIcon =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_REVIVEOFF); WriteByte(MSG_MULTICAST, EVENT_REVIVEOFF);
WriteByte(MSG_MULTICAST, index); WriteByte(MSG_MULTICAST, index);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif
#endif #endif // PC
} }
void(entity who, float broadcast_time, float type, string str) BroadcastMessageToClient = void(entity who, float broadcast_time, float type, string str) BroadcastMessageToClient =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_BROADCAST); WriteByte(MSG_MULTICAST, EVENT_BROADCAST);
WriteByte(MSG_MULTICAST, broadcast_time); WriteByte(MSG_MULTICAST, broadcast_time);
@ -228,28 +218,28 @@ void(entity who, float broadcast_time, float type, string str) BroadcastMessageT
WriteString(MSG_MULTICAST, str); WriteString(MSG_MULTICAST, str);
msg_entity = who; msg_entity = who;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif
#endif #endif // PC
} }
void(float broadcast_time, float type, string str) BroadcastMessage = void(float broadcast_time, float type, string str) BroadcastMessage =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_BROADCAST); WriteByte(MSG_MULTICAST, EVENT_BROADCAST);
WriteByte(MSG_MULTICAST, broadcast_time); WriteByte(MSG_MULTICAST, broadcast_time);
WriteByte(MSG_MULTICAST, type); WriteByte(MSG_MULTICAST, type);
WriteString(MSG_MULTICAST, str); WriteString(MSG_MULTICAST, str);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif
#endif #endif // PC
} }
void(float playernum, float points, float am, float kills, string name, entity person) UpdatePlayerPoints = void(float playernum, float points, float am, float kills, string name, entity person) UpdatePlayerPoints =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
if (player_count == 0) { if (player_count == 0) {
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_POINTUPDATE); WriteByte(MSG_MULTICAST, EVENT_POINTUPDATE);
@ -272,13 +262,11 @@ void(float playernum, float points, float am, float kills, string name, entity p
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
} }
#endif #endif // PC
#endif
} }
void(float count) UpdatePlayerCount = { void(float count) UpdatePlayerCount = {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
if (count == 0) if (count == 0)
return; return;
else { else {
@ -288,14 +276,12 @@ void(float count) UpdatePlayerCount = {
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
} }
#endif #endif // PC
#endif
} }
void(float newtime, float newtype, entity change) PromptLevelChange = void(float newtime, float newtype, entity change) PromptLevelChange =
{ {
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_BLACKOUT); WriteByte(MSG_MULTICAST, EVENT_BLACKOUT);
@ -304,16 +290,14 @@ void(float newtime, float newtype, entity change) PromptLevelChange =
msg_entity = change; msg_entity = change;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif #endif // PC
#endif
} }
void(entity who) UpdatePunchangle = void(entity who) UpdatePunchangle =
{ {
#ifdef PC
// naievil -- shit logic lol...but result looks clean as fuck... // naievil -- shit logic lol...but result looks clean as fuck...
#ifndef HANDHELD
#ifndef QUAKESPASM
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_PUNCHANGLE); WriteByte(MSG_MULTICAST, EVENT_PUNCHANGLE);
WriteCoord(MSG_MULTICAST, who.punchangle_x); WriteCoord(MSG_MULTICAST, who.punchangle_x);
@ -354,12 +338,10 @@ void(entity who) UpdatePunchangle =
} else } else
who.punchangle_z = 0; who.punchangle_z = 0;
#endif #endif // PC
#endif
} }
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
void(string h, float h2, entity who) pushHUD = { void(string h, float h2, entity who) pushHUD = {
if (player_count == 0) { if (player_count == 0) {
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
@ -448,85 +430,116 @@ void(string chaptertitle, string location, string date, string person, entity wh
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
} }
} }
#endif #endif // PC
#endif
#ifndef QUAKESPASM
void (float achievement_id, optional entity who) GiveAchievement = void (float achievement_id, optional entity who) GiveAchievement =
{ {
#ifndef QUAKESPASM
#ifndef PC #ifndef PC
// temp // temp
if (achievement_id > 4) if (achievement_id > 4)
return; return;
#endif // PC #endif // PC
// this is an achievement specific to an individual // this is an achievement specific to an individual
if ((who && who != world) || player_count == 0) { if ((who && who != world) || player_count == 0) {
if (player_count == 0) who = find(world, classname, "player"); if (player_count == 0) who = find(world, classname, "player");
#ifndef PC #ifndef PC
achievement(who, achievement_id); achievement(who, achievement_id);
#else #else
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENT); WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENT);
WriteByte(MSG_MULTICAST, achievement_id); WriteByte(MSG_MULTICAST, achievement_id);
msg_entity = who; msg_entity = who;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif // PC #endif // PC
} else { } else {
#ifndef PC #ifndef PC
entity players; entity players;
players = find(world, classname, "player"); players = find(world, classname, "player");
while(players != world) { while(players != world) {
achievement(players, achievement_id); achievement(players, achievement_id);
players = find(players, classname, "player"); players = find(players, classname, "player");
} }
#else #else
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENT); WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENT);
WriteByte(MSG_MULTICAST, achievement_id); WriteByte(MSG_MULTICAST, achievement_id);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif // PC #endif // PC
} }
#endif // QUAKESPASM
} }
void (float achievement_id, float progress_value, optional entity who) UpdateAchievementProgress = void (float achievement_id, float progress_value, optional entity who) UpdateAchievementProgress =
{ {
#ifndef QUAKESPASM
#ifndef PC #ifndef PC
// temp // temp
if (achievement_id > 4) if (achievement_id > 4)
return; return;
#endif // PC #endif // PC
// this is a progress update specific to an individual // this is a progress update specific to an individual
if ((who && who != world) || player_count == 0) { if ((who && who != world) || player_count == 0) {
if (player_count == 0) who = find(world, classname, "player"); if (player_count == 0) who = find(world, classname, "player");
#ifndef PC #ifndef PC
//achievement_progress(who, achievement_id, progress_value); //achievement_progress(who, achievement_id, progress_value);
#else #else
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENTPROGRESS); WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENTPROGRESS);
WriteByte(MSG_MULTICAST, achievement_id); WriteByte(MSG_MULTICAST, achievement_id);
WriteFloat(MSG_MULTICAST, progress_value); WriteFloat(MSG_MULTICAST, progress_value);
msg_entity = who; msg_entity = who;
multicast('0 0 0', MULTICAST_ONE); multicast('0 0 0', MULTICAST_ONE);
#endif // PC #endif // PC
} else { } else {
#ifndef PC #ifndef PC
entity players; entity players;
players = find(world, classname, "player"); players = find(world, classname, "player");
while(players != world) { while(players != world) {
//achievement_progress(players, achievement_id, progress_value); //achievement_progress(players, achievement_id, progress_value);
players = find(players, classname, "player"); players = find(players, classname, "player");
} }
#else #else
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENTPROGRESS); WriteByte(MSG_MULTICAST, EVENT_ACHIEVEMENTPROGRESS);
WriteByte(MSG_MULTICAST, achievement_id); WriteByte(MSG_MULTICAST, achievement_id);
WriteFloat(MSG_MULTICAST, progress_value); WriteFloat(MSG_MULTICAST, progress_value);
multicast('0 0 0', MULTICAST_ALL); multicast('0 0 0', MULTICAST_ALL);
#endif // PC #endif // PC
} }
}
#endif // QUAKESPASM #endif // QUAKESPASM
}
// ***************************************** // *****************************************
// Unrelated to engine, but custom functions // Unrelated to engine, but custom functions

5
source/server/damage.qc
View file

@ -25,10 +25,7 @@
Boston, MA 02111-1307, USA Boston, MA 02111-1307, USA
*/ */
#ifndef QUAKESPASM
void (float achievement_id, optional entity who) GiveAchievement; void (float achievement_id, optional entity who) GiveAchievement;
#endif // QUAKESPASM
void() Barrel_Hit; void() Barrel_Hit;
@ -429,9 +426,7 @@ void(entity victim,entity attacker, float damage, float d_style) DamageHandler =
if (victim.crawling != TRUE && !(victim.health <= 0) && crawler_num < 5 && victim.classname != "ai_dog") if (victim.crawling != TRUE && !(victim.health <= 0) && crawler_num < 5 && victim.classname != "ai_dog")
{ {
makeCrawler(victim); makeCrawler(victim);
#ifndef QUAKESPASM
GiveAchievement(3, attacker); GiveAchievement(3, attacker);
#endif
} }
else else
{ {

31
source/server/defs/custom.qc
View file

@ -38,6 +38,22 @@
#define STR_NOTENOUGHPOINTS "Not Enough Points\n" // To help aid consistency with these.. #define STR_NOTENOUGHPOINTS "Not Enough Points\n" // To help aid consistency with these..
// Quake assumes these are defined.
string string_null;
.string killtarget;
entity activator;
float framecount;
float deathmatch;
float coop;
#ifndef PC
void(string com) SV_ParseClientCommand;
.float gravity;
.float recoil_delay;
.float mapversion;
.float ammo;
#endif
// achievement tracking // achievement tracking
.float ach_tracker_npnp; .float ach_tracker_npnp;
.float ach_tracker_abst; .float ach_tracker_abst;
@ -47,9 +63,6 @@ float ach_tracker_barr;
float ach_tracker_spin; float ach_tracker_spin;
float ach_tracker_luck; float ach_tracker_luck;
float framecount;
float deathmatch;
float coop;
.vector oldvelocity; .vector oldvelocity;
.float lastsound_time; .float lastsound_time;
.float isspec; .float isspec;
@ -88,7 +101,6 @@ void(entity person, float expamt , float doublepoint) addmoney;
#define STATE_DOWN 3 #define STATE_DOWN 3
.float /*worldtype,*/ delay, wait, lip, /*light_lev,*/ speed, style/*, skill*/; .float /*worldtype,*/ delay, wait, lip, /*light_lev,*/ speed, style/*, skill*/;
entity activator;
.float requirespower; .float requirespower;
//player funcs //player funcs
@ -345,7 +357,6 @@ float crandom();
// Door // Door
.string killtarget;
.void() think1; .void() think1;
.vector finaldest; .vector finaldest;
.vector pos1, pos2/*, mangle*/; .vector pos1, pos2/*, mangle*/;
@ -373,11 +384,11 @@ entity boxLocations[32];
float boxCount; float boxCount;
vector boxOrigin; vector boxOrigin;
#ifndef HANDHELD #ifdef PC
//powerups //powerups
.float x2_icon; .float x2_icon;
.float insta_icon; .float insta_icon;
#endif // HANDHELD #endif // PC
.string powerup_vo; .string powerup_vo;
float instakill_finished; float instakill_finished;
float insta_blink; float insta_blink;
@ -506,22 +517,22 @@ float sndActivCnt;
.entity entities[4]; .entity entities[4];
// GIBBING // GIBBING
#ifdef PC
.entity larm; .entity larm;
.entity rarm; .entity rarm;
.entity head; .entity head;
.vector bbmins, bbmaxs; .vector bbmins, bbmaxs;
.float currentHitBoxSetup; .float currentHitBoxSetup;
#ifdef QUAKESPASM
.float sprintflag;
#endif #endif
// PC Fog force // PC Fog force
.float PC_fog; .float PC_fog;
// hl stuff // hl stuff
#ifdef PC
.float rendermode; .float rendermode;
.float renderamt; .float renderamt;
.vector rendercolor; .vector rendercolor;
#endif
float revive_index; float revive_index;

854
source/server/defs/handheld.qc
View file

@ -16,527 +16,451 @@
#define HANDHELD #define HANDHELD
// These lines CANNOT be altered/moved // These lines CANNOT be altered/moved
entity self; entity self;
entity other; entity other;
entity world; entity world;
float time; float time;
float frametime; float frametime;
float force_retouch; // force all entities to touch triggers float force_retouch; // force all entities to touch triggers
string mapname; string mapname;
float deathmatch; float deathmatch;
float coop; float coop;
float teamplay; float teamplay;
float serverflags; // propagated from level to level, used to float serverflags; // propagated from level to level, used to
float rounds; float rounds;
float rounds_change; float rounds_change;
float parm1, parm2, parm3, parm4, parm5, parm6, parm7, parm8, parm9, parm10, parm11, parm12, parm13, parm14, parm15, parm16; float parm1, parm2, parm3, parm4, parm5, parm6, parm7, parm8, parm9, parm10, parm11, parm12, parm13, parm14, parm15, parm16;
vector v_forward, v_up, v_right; // set by makevectors() vector v_forward, v_up, v_right; // set by makevectors()
float trace_allsolid; float trace_allsolid;
float trace_startsolid; float trace_startsolid;
float trace_fraction; float trace_fraction;
vector trace_endpos; vector trace_endpos;
vector trace_plane_normal; vector trace_plane_normal;
float trace_plane_dist; float trace_plane_dist;
entity trace_ent; entity trace_ent;
float trace_inopen; float trace_inopen;
float trace_inwater; float trace_inwater;
entity msg_entity; // destination of single entity writes
void() main; // only for testing
void() StartFrame;
void() EndFrame;
void() PlayerPreThink;
void() PlayerPostThink;
void() ClientKill;
void() ClientConnect;
void() PutClientInServer; // call after setting the parm1... parms
void() ClientDisconnect;
void() SetNewParms; // called when a client first connects to
void() SetChangeParms; // call to set parms for self so they can
void() ParseClientCommand; // special command calls
string CMD_STRING;
void() Soft_Restart;
void end_sys_globals; // flag for structure dumping
entity msg_entity; // destination of single entity writes .float modelindex; // *** model index in the precached list
void() main; // only for testing .vector absmin, absmax; // *** origin + mins / maxs
void() StartFrame; .float ltime; // local time for entity
void() EndFrame; .float movetype;
void() PlayerPreThink; .float solid;
void() PlayerPostThink; .vector origin; // ***
void() ClientKill; .vector oldorigin; // ***
void() ClientConnect; .vector velocity;
void() PutClientInServer; // call after setting the parm1... parms .vector angles;
void() ClientDisconnect; .vector avelocity;
void() SetNewParms; // called when a client first connects to .vector punchangle; // temp angle adjust from damage or recoil
void() SetChangeParms; // call to set parms for self so they can .string classname; // spawn function
void() ParseClientCommand; // special command calls .string model;
string CMD_STRING; .float frame;
void() Soft_Restart; .float skin;
void end_sys_globals; // flag for structure dumping .float iframetime;
.float effects;
.float modelindex; // *** model index in the precached list .vector mins, maxs; // bounding box extents reletive to origin
.vector absmin, absmax; // *** origin + mins / maxs .vector size; // maxs - mins
.float ltime; // local time for entity .void() touch;
.float movetype; .void() use;
.float solid; .void() think;
.vector origin; // *** .void() blocked; // for doors or plats, called when can't push other
.vector oldorigin; // *** .float nextthink;
.vector velocity; .entity groundentity;
.vector angles; .float health;
.vector avelocity; .float points;
.vector punchangle; // temp angle adjust from damage or recoil .float kills;
.string classname; // spawn function .float weapon; // one of the W_COLT, etc flags
.string model; .string weaponmodel;
.float frame; .string weapon2model;
.float skin; .float weaponframe;
.float iframetime; .float weapon2frame;
.float effects; .float currentammo;
.vector mins, maxs; // bounding box extents reletive to origin .float currentmag;
.vector size; // maxs - mins .float zoom;
.void() touch; .float weaponskin;
.void() use; .float weapon2skin;
.void() think; .float primary_grenades;
.void() blocked; // for doors or plats, called when can't push other .float secondary_grenades;
.float nextthink; .float grenades;
.entity groundentity; .float perks; // bit flags
.float health; .float takedamage;
.float points; .entity chain;
.float kills; .float deadflag;
.float weapon; // one of the W_COLT, etc flags .vector view_ofs; // add to origin to get eye point
.string weaponmodel; .float button0; //
.string weapon2model; .float button1; //
.float weaponframe; .float button2; //
.float weapon2frame; .float button3; //
.float currentammo; .float button4; //
.float currentmag; .float button5; //
.float zoom; .float button6; //
.float weaponskin; .float button7; //
.float weapon2skin; .float button8; //
.float primary_grenades; .float impulse; // weapon changes
.float secondary_grenades; .float fixangle;
.float grenades; .vector v_angle; // view / targeting angle for players
.float perks; // bit flags .float idealpitch; // calculated pitch angle for lookup up slopes
.float takedamage; .string netname;
.entity chain; .entity enemy;
.float deadflag; .float flags;
.vector view_ofs; // add to origin to get eye point .float colormap;
.float button0; // .float team;
.float button1; // .float max_health; // players maximum health is stored here
.float button2; // .float teleport_time; // don't back up
.float button3; // .float waterlevel; // 0 = not in, 1 = feet, 2 = wast, 3 = eyes
.float button4; // .float watertype; // a contents value
.float button5; // .float ideal_yaw;
.float button6; // .float yaw_speed;
.float button7; // .entity aiment;
.float button8; // .entity head;
.float impulse; // weapon changes .entity larm;
.float fixangle; .entity rarm;
.vector v_angle; // view / targeting angle for players .entity goalentity; // a movetarget or an enemy
.float idealpitch; // calculated pitch angle for lookup up slopes //.entity goalorigin; // a movetarget location
.string netname; .float spawnflags;
.entity enemy; .string target;
.float flags; .string targetname;
.float colormap; .float bleed_out;
.float team; .float progress_bar;
.float max_health; // players maximum health is stored here .entity dmg_inflictor;
.float teleport_time; // don't back up .entity owner; // who launched a missile
.float waterlevel; // 0 = not in, 1 = feet, 2 = wast, 3 = eyes .vector movedir; // mostly for doors, but also used for waterjump
.float watertype; // a contents value .string message; // trigger messages
.float ideal_yaw; .float sounds; // either a cd track number or sound number
.float yaw_speed; .string noise, noise1, noise2, noise3; // contains names of wavs to play
.entity aiment; .float x2_icon; // double points icon
.entity head; .float insta_icon;
.entity larm; .vector ADS_Offset;
.entity rarm; .vector Flash_Offset;
.entity goalentity; // a movetarget or an enemy .float Flash_Size;
//.entity goalorigin; // a movetarget location .string Weapon_Name;
.float spawnflags; .string Weapon_Name_Touch;
.string target; .float currentmag2;
.string targetname; .float maxspeed;
.float bleed_out; .float facingenemy;
.float progress_bar; //.float scale;
.entity dmg_inflictor; void end_sys_fields; // flag for structure dumping
.entity owner; // who launched a missile
.vector movedir; // mostly for doors, but also used for waterjump
.string message; // trigger messages
.float sounds; // either a cd track number or sound number
.string noise, noise1, noise2, noise3; // contains names of wavs to play
.float x2_icon; // double points icon
.float insta_icon;
.vector ADS_Offset;
.vector Flash_Offset;
.float Flash_Size;
.string Weapon_Name;
.string Weapon_Name_Touch;
.float currentmag2;
.float maxspeed;
.float facingenemy;
//.float scale;
void end_sys_fields; // flag for structure dumping
// End. Lines below this MAY be altered, to some extent // End. Lines below this MAY be altered, to some extent
// Built In functions // Built In functions
void(vector ang) makevectors = #1; // sets v_forward, etc globals void (vector ang) makevectors = #1; // sets v_forward, etc globals
void(entity e, vector o) setorigin = #2; void (entity e, vector o) setorigin = #2;
void(entity e, string m) setmodel = #3; // set movetype and solid first void (entity e, string m) setmodel = #3; // set movetype and solid first
void(entity e, vector min, vector max) setsize = #4; void (entity e, vector min, vector max) setsize = #4;
void() break = #6; void () break = #6;
float() random = #7; // returns 0 - 1 float () random = #7; // returns 0 - 1
void(entity e, float chan, string samp, float vol, float atten) sound = #8; void (entity e, float chan, string samp, float vol, float atten) sound = #8;
vector(vector v) normalize = #9; vector (vector v) normalize = #9;
void(string e) error = #10; void (string e) error = #10;
void(string e) objerror = #11; void (string e) objerror = #11;
float(vector v) vlen = #12; float (vector v) vlen = #12;
float(vector v) vectoyaw = #13; float (vector v) vectoyaw = #13;
entity() spawn = #14; entity () spawn = #14;
void(entity e) remove = #15; void (entity e) remove = #15;
void(vector v1, vector v2, float nomonsters, entity forent) traceline = #16; void (vector v1, vector v2, float nomonsters, entity forent) traceline = #16;
entity() checkclient = #17; // returns a client to look for entity () checkclient = #17; // returns a client to look for
entity(entity start, .string fld, string match) find = #18; entity (entity start, .string fld, string match) find = #18;
string(string s) precache_sound = #19; string (string s) precache_sound = #19;
string(string s) precache_model = #20; string (string s) precache_model = #20;
void(entity client, string s)stuffcmd = #21; void (entity client, string s) stuffcmd = #21;
entity(vector org, float rad) findradius = #22; entity (vector org, float rad) findradius = #22;
void(string s) dprint = #25; void (string s) bprint_psp = #23;
string(float f) ftos = #26; void (entity client, string s) sprint_psp = #24;
string(vector v) vtos = #27; void (string s) dprint = #25;
void() coredump = #28; // prints all edicts string (float f) ftos = #26;
void() traceon = #29; // turns statment trace on string (vector v) vtos = #27;
void() traceoff = #30; void () coredump = #28; // prints all edicts
void(entity e) eprint = #31; // prints an entire edict void () traceon = #29; // turns statment trace on
float(float yaw, float dist) walkmove = #32; // returns TRUE or FALSE void () traceoff = #30;
float(entity zombie, float which, entity limb) updateLimb = #33; void (entity e) eprint = #31; // prints an entire edict
float(float yaw, float dist) droptofloor = #34; // TRUE if landed on floor float (float yaw, float dist) walkmove = #32; // returns TRUE or FALSE
void(float style, string value) lightstyle = #35; float (entity zombie, float which, entity limb) updateLimb = #33;
float(float v) rint = #36; // round to nearest int float (float yaw, float dist) droptofloor = #34; // TRUE if landed on floor
float(float v) floor = #37; // largest integer <= v void (float style, string value) lightstyle = #35;
float(float v) ceil = #38; // smallest integer >= v float (float v) rint = #36; // round to nearest int
float(entity e) checkbottom = #40; // true if self is on ground float (float v) floor = #37; // largest integer <= v
float(vector v) pointcontents = #41; // returns a CONTENT_* float (float v) ceil = #38; // smallest integer >= v
float(float f) fabs = #43; float (entity e) checkbottom = #40; // true if self is on ground
vector(entity e, float speed) aim = #44; // returns the shooting vector float (vector v) pointcontents = #41; // returns a CONTENT_*
float(string s) cvar = #45; // return cvar.value float (float f) fabs = #43;
void(string s) localcmd = #46; // put string into local que vector (entity e, float speed) aim = #44; // returns the shooting vector
entity(entity e) nextent = #47; // for looping through all ents float (string s) cvar = #45; // return cvar.value
void() ChangeYaw = #49; // turn towards self.ideal_yaw void (string s) localcmd = #46; // put string into local que
float(string name) getSoundLen = #50; entity (entity e) nextent = #47; // for looping through all ents
vector(vector v) vectoangles = #51; void (vector o, vector d, float color, float count) particle = #48; // start a particle effect
void(float to, float f) WriteByte = #52; void () ChangeYaw = #49; // turn towards self.ideal_yaw
void(float to, float f) WriteChar = #53; float (string name) getSoundLen = #50;
void(float to, float f) WriteShort = #54; vector (vector v) vectoangles = #51;
void(float to, float f) WriteLong = #55; void (float to, float f) WriteByte = #52;
void(float to, float f) WriteCoord = #56; void (float to, float f) WriteChar = #53;
void(float to, float f) WriteAngle = #57; void (float to, float f) WriteShort = #54;
void(float to, string s) WriteString = #58; void (float to, float f) WriteLong = #55;
void(float to, entity s) WriteEntity = #59; void (float to, float f) WriteCoord = #56;
string(entity s) etos = #65; void (float to, float f) WriteAngle = #57;
void(float step) movetogoal = #67; void (float to, string s) WriteString = #58;
string(string s) precache_file = #68; // no effect except for -copy void (float to, entity s) WriteEntity = #59;
void(entity e) makestatic = #69; string (entity s) etos = #65;
void(string s) changelevel = #70; void (float step) movetogoal = #67;
void(float step, vector origin) movetoorigin = #71; string (string s) precache_file = #68; // no effect except for -copy
void(string var, string val) cvar_set = #72; // sets cvar.value void (entity e) makestatic = #69;
void(entity client, string s) centerprint = #73; // sprint, but in middle void (string s) changelevel = #70;
void(entity client, string s, string s) centerprint2 = #73; void (float step, vector origin) movetoorigin = #71;
void(entity client, string s, string s, string s) centerprint3 = #73; void (string var, string val) cvar_set = #72; // sets cvar.value
void(entity client, string s, string s, string s, string s) centerprint4 = #73; void (entity client, string s) centerprint = #73; // sprint, but in middle
void(entity client, string s, string s, string s, string s, string s) centerprint5 = #73; void (entity client, string s, string s) centerprint2 = #73;
void(entity client, string s, string s, string s, string s, string s, string s) centerprint6 = #73; void (entity client, string s, string s, string s) centerprint3 = #73;
void(entity client, string s, string s, string s, string s, string s, string s, string s) centerprint7 = #73; void (entity client, string s, string s, string s, string s) centerprint4 = #73;
void(vector pos, string samp, float vol, float atten) ambientsound = #74; void (entity client, string s, string s, string s, string s, string s) centerprint5 = #73;
string(string s) precache_model2 = #75; // registered version only void (entity client, string s, string s, string s, string s, string s, string s) centerprint6 = #73;
string(string s) precache_sound2 = #76; // registered version only void (entity client, string s, string s, string s, string s, string s, string s, string s) centerprint7 = #73;
string(string s) precache_file2 = #77; // registered version only void (vector pos, string samp, float vol, float atten) ambientsound = #74;
void(entity e) setspawnparms = #78; // set parm1... to the string (string s) precache_model2 = #75; // registered version only
void(vector start, vector min, vector max, vector end, float nomonsters, entity forent) tracebox = #90; string (string s) precache_sound2 = #76; // registered version only
float(vector start, vector min, vector max, vector end, float nomonsters, entity forent) tracemove = #99; string (string s) precache_file2 = #77; // registered version only
entity (entity start, .float field, float match) findfloat = #98; void (entity e) setspawnparms = #78; // set parm1... to the
float(string s) stof = #81; // 2001-09-20 QuakeC string manipulation by FrikaC void (entity plr, float achievement) achievement = #79;
vector(entity what) Get_Waypoint_Near = #83; float (string s) stof = #81; // 2001-09-20 QuakeC string manipulation by FrikaC
float(entity zombie, entity target) Do_Pathfind_psp = #84; vector (entity what) Get_Waypoint_Near = #83;
void(string s) Open_Waypoint = #85; float (entity zombie, entity target) Do_Pathfind_psp = #84;
vector(entity zombie,vector start,vector min, vector max) Get_Next_Waypoint = #86; void (string s) Open_Waypoint = #85;
void(entity client, float type, float cost, float weapon) useprint = #87; vector (entity zombie,vector start,vector min, vector max) Get_Next_Waypoint = #86;
vector(entity zombie,vector start,vector min, vector max) Get_First_Waypoint = #88; void (entity client, float type, float cost, float weapon) useprint = #87;
void(string s) Close_Waypoint = #89; vector (entity zombie,vector start,vector min, vector max) Get_First_Waypoint = #88;
void (string s) Close_Waypoint = #89;
void(entity plr, float achievement) achievement = #79; void (vector start, vector min, vector max, vector end, float nomonsters, entity forent) tracebox = #90;
entity (entity start, .float field, float match) findfloat = #98;
void(string trackname) songegg = #500; float (vector start, vector min, vector max, vector end, float nomonsters, entity forent) tracemove = #99;
void() nzp_maxammo = #501;
/*
type 0 = clear
type 1 = buy door
type 2 = buy debris
type 3 = Buy ammo
type 4 = buy weapon
type 5 = repair window
type 6 = use box
type 7 = use trap
type 8 = require power
*/
// 2001-09-20 QuakeC file access by FrikaC start // 2001-09-20 QuakeC file access by FrikaC start
float(string filename, float mode) fopen = #110; float (string filename, float mode) fopen = #110;
void(float fhandle) fclose = #111; void (float fhandle) fclose = #111;
string(float fhandle) fgets = #112; string (float fhandle) fgets = #112;
void(float fhandle, string s) fputs = #113; void (float fhandle, string s) fputs = #113;
float (string s) strlen = #114;
string (string s1, string s2) strcat = #115;
string (string s, float start, float length) substring = #116;
vector (string s) stov = #117;
string (string s) strzone = #118;
string (string s) strunzone = #119;
string (string s) strtrim = #120;
// 2001-09-20 QuakeC file access by FrikaC end // 2001-09-20 QuakeC file access by FrikaC end
// 2001-09-20 QuakeC string manipulation by FrikaC start
float(string s) strlen = #114;
string(string s1, string s2) strcat = #115;
string(string s, float start, float length) substring = #116;
vector(string s) stov = #117;
string(string s) strzone = #118;
string(string s) strunzone = #119;
string(string s) strtrim = #120;
// 2001-09-20 QuakeC string manipulation by FrikaC end
// 2001-11-15 DarkPlaces general builtin functions by Lord Havoc start // 2001-11-15 DarkPlaces general builtin functions by Lord Havoc start
float(string s) tokenize = #441; float(string s) tokenize = #441;
string(float num) argv = #442; string(float num) argv = #442;
// 2001-11-15 DarkPlaces general builtin functions by Lord Havoc end // 2001-11-15 DarkPlaces general builtin functions by Lord Havoc end
void (string trackname) songegg = #500;
void () nzp_maxammo = #501;
// //
// constants // constants
// //
#define FALSE 0 #define FALSE 0
#define TRUE 1 #define TRUE 1
// edict.flags // edict.flags
#define FL_FLY 1 #define FL_FLY 1
#define FL_SWIM 2 #define FL_SWIM 2
#define FL_CLIENT 8 // set for all client edicts #define FL_CLIENT 8 // set for all client edicts
#define FL_INWATER 16 // for enter / leave water splash #define FL_INWATER 16 // for enter / leave water splash
#define FL_MONSTER 32 #define FL_MONSTER 32
#define FL_GODMODE 64 // player cheat #define FL_GODMODE 64 // player cheat
#define FL_NOTARGET 128 // player cheat #define FL_NOTARGET 128 // player cheat
#define FL_ITEM 256 // extra wide size for bonus items #define FL_ITEM 256 // extra wide size for bonus items
#define FL_ONGROUND 512 // standing on something #define FL_ONGROUND 512 // standing on something
#define FL_PARTIALGROUND 1024 // not all corners are valid #define FL_PARTIALGROUND 1024 // not all corners are valid
#define FL_WATERJUMP 2048 // player jumping out of water #define FL_WATERJUMP 2048 // player jumping out of water
//#define FL_JUMPRELEASED 4096 // for jump debouncing
// edict.movetype values // edict.movetype values
#define MOVETYPE_NONE 0 // never moves #define MOVETYPE_NONE 0 // never moves
#define MOVETYPE_ANGLENOCLIP 1 #define MOVETYPE_ANGLENOCLIP 1
#define MOVETYPE_ANGLECLIP 2 #define MOVETYPE_ANGLECLIP 2
#define MOVETYPE_WALK 3 // players only #define MOVETYPE_WALK 3 // players only
#define MOVETYPE_STEP 4 // discrete, not real time unless fall #define MOVETYPE_STEP 4 // discrete, not real time unless fall
#define MOVETYPE_FLY 5 #define MOVETYPE_FLY 5
#define MOVETYPE_TOSS 6 // gravity #define MOVETYPE_TOSS 6 // gravity
#define MOVETYPE_PUSH 7 // no clip to world, push and crush #define MOVETYPE_PUSH 7 // no clip to world, push and crush
#define MOVETYPE_NOCLIP 8 #define MOVETYPE_NOCLIP 8
#define MOVETYPE_FLYMISSILE 9 // fly with extra size against monsters #define MOVETYPE_FLYMISSILE 9 // fly with extra size against monsters
#define MOVETYPE_BOUNCE 10 #define MOVETYPE_BOUNCE 10
#define MOVETYPE_BOUNCEMISSILE 11 // bounce with extra size #define MOVETYPE_BOUNCEMISSILE 11 // bounce with extra size
#define MOVETYPE_FOLLOW 12 #define MOVETYPE_FOLLOW 12
#define MOVE_HITMODEL 0
// edict.solid values // edict.solid values
#define SOLID_NOT 0 // no interaction with other objects #define SOLID_NOT 0 // no interaction with other objects
#define SOLID_TRIGGER 1 // touch on edge, but not blocking #define SOLID_TRIGGER 1 // touch on edge, but not blocking
#define SOLID_BBOX 2 // touch on edge, block #define SOLID_BBOX 2 // touch on edge, block
#define SOLID_SLIDEBOX 3 // touch on edge, but not an onground #define SOLID_SLIDEBOX 3 // touch on edge, but not an onground
#define SOLID_BSP 4 // bsp clip, touch on edge, block #define SOLID_BSP 4 // bsp clip, touch on edge, block
#define SOLID_CORPSE 5 // bsp clip, touch on edge, block #define SOLID_CORPSE 5 // bsp clip, touch on edge, block
// range values // range values
#define RANGE_MELEE 0 #define RANGE_MELEE 0
#define RANGE_NEAR 1 #define RANGE_NEAR 1
#define RANGE_MID 2 #define RANGE_MID 2
#define RANGE_FAR 3 #define RANGE_FAR 3
// deadflag values // deadflag values
#define DEAD_NO 0
#define DEAD_NO 0 #define DEAD_DYING 1
#define DEAD_DYING 1 #define DEAD_DEAD 2
#define DEAD_DEAD 2 #define DEAD_RESPAWNABLE 3
#define DEAD_RESPAWNABLE 3
// takedamage values // takedamage values
#define DAMAGE_NO 0
#define DAMAGE_NO 0 #define DAMAGE_YES 1
#define DAMAGE_YES 1 #define DAMAGE_AIM 2
#define DAMAGE_AIM 2 #define DAMAGE_NOMARKER 3
#define DAMAGE_NOMARKER 3
/*.void() th_stand;
.void() th_walk;
.void() th_run;
.void(entity attacker, float damage) th_pain;*/
.void() th_die;
//.void() th_missile;
.void() th_melee;
// point content values // point content values
#define CONTENT_EMPTY -1
#define CONTENT_SOLID -2
#define CONTENT_WATER -3
#define CONTENT_SLIME -4
#define CONTENT_LAVA -5
#define CONTENT_SKY -6
#define CONTENT_EMPTY -1 //doors
#define CONTENT_SOLID -2 #define STATE_TOP 0
#define CONTENT_WATER -3 #define STATE_BOTTOM 1
#define CONTENT_SLIME -4 #define STATE_UP 2
#define CONTENT_LAVA -5 #define STATE_DOWN 3
#define CONTENT_SKY -6
#define VEC_ORIGIN '0 0 0'
#define VEC_ORIGIN '0 0 0'
//Standard Quake View Offset
//vector VEC_VIEW_OFS = '0 0 22';
//Half Life View Offset is 64
//64 units above ground, for our purposes it's, 64 - (how low bounding box goes)
//vector VEC_VIEW_OFS = '0 0 32';
//Standard Quake Hull
//vector VEC_HULL_MIN = '-16 -16 -24';
//vector VEC_HULL_MAX = '16 16 32';
//Half Life 1 Hull Sizes ADDED BY BLUBS, COMMENTED ORIGINAL QUAKE BBOX SIZS OUT //Half Life 1 Hull Sizes ADDED BY BLUBS, COMMENTED ORIGINAL QUAKE BBOX SIZS OUT
#define VEC_HULL_MIN '-16 -16 -32' #define VEC_HULL_MIN '-16 -16 -32'
#define VEC_HULL_MAX '16 16 40' #define VEC_HULL_MAX '16 16 40'
#define VEC_HULL2_MIN '-32 -32 -24'
#define VEC_HULL2_MIN '-32 -32 -24' #define VEC_HULL2_MAX '32 32 64'
#define VEC_HULL2_MAX '32 32 64'
// protocol bytes // protocol bytes
#define SVC_BAD 0 #define SVC_BAD 0
#define SVC_NOP 1 #define SVC_NOP 1
#define SVC_DISCONNECT 2 #define SVC_DISCONNECT 2
#define SVC_UPDATESTAT 3 #define SVC_UPDATESTAT 3
#define SVC_VERSION 4 #define SVC_VERSION 4
#define SVC_SETVIEW 5 #define SVC_SETVIEW 5
#define SVC_SOUND 6 #define SVC_SOUND 6
#define SVC_TIME 7 #define SVC_TIME 7
#define SVC_PRINT 8 #define SVC_PRINT 8
#define SVC_STUFFTEXT 9 #define SVC_STUFFTEXT 9
#define SVC_SETANGLE 10 #define SVC_SETANGLE 10
#define SVC_SERVERINFO 11 #define SVC_SERVERINFO 11
#define SVC_LIGHTSTYLE 12 #define SVC_LIGHTSTYLE 12
#define SVC_UPDATENAME 13 #define SVC_UPDATENAME 13
#define SVC_UPDATEPOINTS 14 #define SVC_UPDATEPOINTS 14
#define SVC_CLIENTDATA 15 #define SVC_CLIENTDATA 15
#define SVC_STOPSOUND 16 #define SVC_STOPSOUND 16
#define SVC_PARTICLE 18 #define SVC_PARTICLE 18
#define SVC_DAMAGE 19 #define SVC_DAMAGE 19
#define SVC_SPAWNSTATIC 20 #define SVC_SPAWNSTATIC 20
#define SVC_SPAWNBINARY 21 #define SVC_SPAWNBINARY 21
#define SVC_SPAWNBASELINE 22 #define SVC_SPAWNBASELINE 22
#define SVC_TEMPENTITY 23 #define SVC_TEMPENTITY 23
#define SVC_SETPAUSE 24 #define SVC_SETPAUSE 24
#define SVC_SIGNONNUM 25 #define SVC_SIGNONNUM 25
#define SVC_CENTERPRINT 26 #define SVC_CENTERPRINT 26
#define SVC_SPAWNSTATICSOUND 29 // 1998-08-08 Complete SVC list by Zhenga #define SVC_SPAWNSTATICSOUND 29 // 1998-08-08 Complete SVC list by Zhenga
#define SVC_INTERMISSION 30 #define SVC_INTERMISSION 30
#define SVC_FINALE 31 #define SVC_FINALE 31
#define SVC_CDTRACK 32 #define SVC_CDTRACK 32
#define SVC_SELLSCREEN 33 #define SVC_SELLSCREEN 33
#define SVC_CUTSCENE 34 // 1998-08-08 Complete SVC list by Zhenga #define SVC_CUTSCENE 34 // 1998-08-08 Complete SVC list by Zhenga
#define SVC_WEAPONFIRE 35 #define SVC_WEAPONFIRE 35
#define SVC_HITMARK 36 #define SVC_HITMARK 36
#define SVC_USEPRINT 38 #define SVC_USEPRINT 38
#define TE_SPIKE 0 #define TE_SPIKE 0
#define TE_SUPERSPIKE 1 #define TE_SUPERSPIKE 1
#define TE_GUNSHOT 2 #define TE_GUNSHOT 2
#define TE_EXPLOSION 3 #define TE_EXPLOSION 3
#define TE_TAREXPLOSION 4 #define TE_TAREXPLOSION 4
#define TE_LIGHTNING1 5 #define TE_LIGHTNING1 5
#define TE_LIGHTNING2 6 #define TE_LIGHTNING2 6
#define TE_WIZSPIKE 7 #define TE_WIZSPIKE 7
#define TE_KNIGHTSPIKE 8 #define TE_KNIGHTSPIKE 8
#define TE_LIGHTNING3 9 #define TE_LIGHTNING3 9
#define TE_LAVASPLASH 10 #define TE_LAVASPLASH 10
#define TE_TELEPORT 11 #define TE_TELEPORT 11
#define TE_RAYSPLASHGREEN 14 #define TE_RAYSPLASHGREEN 14
#define TE_RAYSPLASHRED 15 #define TE_RAYSPLASHRED 15
// sound channels // sound channels
// channel 0 never willingly overrides // channel 0 never willingly overrides
// other channels (1-7) allways override a playing sound on that channel // other channels (1-7) allways override a playing sound on that channel
#define CHAN_AUTO 0 // Player uses channel 5 for all weapon reload sfx
#define CHAN_WEAPON 1 #define CHAN_AUTO 0
#define CHAN_VOICE 2 #define CHAN_WEAPON 1
#define CHAN_ITEM 3 #define CHAN_VOICE 2
#define CHAN_BODY 4 #define CHAN_ITEM 3
//Player uses channel 5 for all weapon reload sfx #define CHAN_BODY 4
#define ATTN_NONE 0 #define ATTN_NONE 0
#define ATTN_NORM 1 #define ATTN_NORM 1
#define ATTN_IDLE 2 #define ATTN_IDLE 2
#define ATTN_STATIC 3 #define ATTN_STATIC 3
// update types // update types
#define UPDATE_GENERAL 0
#define UPDATE_GENERAL 0 #define UPDATE_STATIC 1
#define UPDATE_STATIC 1 #define UPDATE_BINARY 2
#define UPDATE_BINARY 2 #define UPDATE_TEMP 3
#define UPDATE_TEMP 3
// entity effects // entity effects
#define EF_BLUE 1
#define EF_BLUE 1 #define EF_MUZZLEFLASH 2
#define EF_MUZZLEFLASH 2 #define EF_BRIGHTLIGHT 4
#define EF_BRIGHTLIGHT 4 #define EF_RED 8
#define EF_RED 8 #define EF_ORANGELIGHT 16
#define EF_ORANGELIGHT 16 #define EF_GREEN 32
#define EF_GREEN 32 #define EF_LIGHT 64
#define EF_LIGHT 64 #define EF_NODRAW 128
#define EF_NODRAW 128 #define EF_BRIGHTFIELD 256
#define EF_BRIGHTFIELD 256 #define EF_FULLBRIGHT 512
#define EF_FULLBRIGHT 512 #define EF_DARKLIGHT 1024
#define EF_DARKLIGHT 1024 #define EF_DARKFIELD 2048
#define EF_DARKFIELD 2048 #define EF_PURPLELIGHT 4096
#define EF_PURPLELIGHT 4096 #define EF_RAYRED 8196
#define EF_RAYRED 8196 #define EF_RAYGREEN 16384
#define EF_RAYGREEN 16384
// messages // messages
#define MSG_BROADCAST 0 // unreliable to all #define MSG_BROADCAST 0 // unreliable to all
#define MSG_ONE 1 // reliable to one (msg_entity) #define MSG_ONE 1 // reliable to one (msg_entity)
#define MSG_ALL 2 // reliable to all #define MSG_ALL 2 // reliable to all
#define MSG_INIT 3 // write to the init string #define MSG_INIT 3 // write to the init string
#define AS_STRAIGHT 1 // message levels
#define AS_SLIDING 2 #define PRINT_HIGH 0
#define AS_MELEE 3
#define AS_MISSILE 4
// Quake assumes these are defined. #define AS_STRAIGHT 1
#define AS_SLIDING 2
#define AS_MELEE 3
#define AS_MISSILE 4
//.string wad, map; // file operations
.float /*worldtype,*/ delay, wait, lip, /*light_lev,*/ speed, style/*, skill*/; #define FILE_READ 0
.string killtarget; #define FILE_APPEND 1
.void() think1; #define FILE_WRITE 2
.vector finaldest;
.vector pos1, pos2/*, mangle*/;
void(vector o, vector d, float color, float count) particle = #48;// start a particle effect
void(string s) bprint_psp = #23;
void(entity client, string s) sprint_psp = #24;
// End
void(string s) println = {bprint_psp(s);} //just when brain decided to think this is c void(string s) println = {bprint_psp(s);} //just when brain decided to think this is c
void(float ignore, string s) bprint = {bprint_psp(s);}; void(float ignore, string s) bprint = {bprint_psp(s);};
void(entity client, float type, string s) sprint = {sprint_psp(client, s);}; void(entity client, float type, string s) sprint = {sprint_psp(client, s);};
void(string s) print = {bprint_psp(s);}; void(string s) print = {bprint_psp(s);};
//doors
.float state;
#define STATE_TOP 0
#define STATE_BOTTOM 1
#define STATE_UP 2
#define STATE_DOWN 3
string mappath;
#define PRINT_HIGH 0
.float isspec;
#define FILE_READ 0
#define FILE_APPEND 1
#define FILE_WRITE 2
#define MOVE_HITMODEL 0 // must be different for this engine!
.float recoil_delay;
.float gravity;
.float renderamt;
.float rendermode;
.vector rendercolor;
.string mapversion;
.float ammo;
void(string com) SV_ParseClientCommand;
.float currentHitBoxSetup;
.vector bbmins, bbmaxs; // Used for zombie hitboxes
.float achievements;

896
source/server/defs/quakespasm.qc
View file

File diff suppressed because it is too large Load diff

2
source/server/dummies/generic.qc
View file

@ -77,7 +77,7 @@ void() change_frame =
self.nextthink = time + 1; self.nextthink = time + 1;
} }
#ifdef HANDHELD #ifndef PC
void LoadWaypointData() = {}; void LoadWaypointData() = {};
#endif #endif

3
source/server/dummies/quakespasm.qc
View file

@ -26,11 +26,8 @@
*/ */
// Dummys that should be here // Dummys that should be here
void GiveAchievement(float achievement_id, optional entity who) = {};
void print(string s) = {}; void print(string s) = {};
float (vector start, vector min, vector max, vector end, float nomonsters, entity forent) tracemove = #99; //sB adding tracemove to quakespasm
void(vector o, vector d, float color, float count) particle = {}; void(vector o, vector d, float color, float count) particle = {};
#define MOVE_HITMODEL 0 #define MOVE_HITMODEL 0

5
source/server/entities/doors.qc
View file

@ -44,9 +44,7 @@ float DOOR_SILVER_KEY = 16;
float DOOR_TOGGLE = 32; float DOOR_TOGGLE = 32;
float DOOR_POWER = 64; float DOOR_POWER = 64;
entity activator;
.float delay; .float delay;
.string killtarget;
.void() think1; .void() think1;
.vector finaldest; .vector finaldest;
.float dmg; .float dmg;
@ -55,7 +53,6 @@ entity activator;
.float speed; .float speed;
.vector pos1; .vector pos1;
.vector pos2; .vector pos2;
string string_null;
.float cost; .float cost;
.float attack_delay; .float attack_delay;
.float lip; .float lip;
@ -605,7 +602,7 @@ void() func_door =
void() func_door_nzp = void() func_door_nzp =
{ {
#ifdef HANDHELD #ifndef PC
if (!self.renderamt) if (!self.renderamt)
self.renderamt = 255; self.renderamt = 255;

6
source/server/entities/map_entities.qc
View file

@ -225,10 +225,12 @@ void() place_fire =
void() place_model = void() place_model =
{ {
#ifdef HANDHELD #ifdef HANDHELD
if (self.spawnflags & 2) if (self.spawnflags & 2)
remove(self); remove(self);
#endif
#endif // HANDHELD
self.model = convert_old_asset_path(self.model); self.model = convert_old_asset_path(self.model);

2
source/server/entities/powerups.qc
View file

@ -220,11 +220,9 @@ void() PU_NukeFinalize =
entity players; entity players;
// give 'The F Bomb' // give 'The F Bomb'
#ifndef QUAKESPASM
if (self.kills == 1) { if (self.kills == 1) {
GiveAchievement(4); GiveAchievement(4);
} }
#endif
// award points // award points
players = find(world,classname,"player"); players = find(world,classname,"player");

2
source/server/entities/sounds.qc
View file

@ -69,7 +69,7 @@ void () ambient_generic =
{ {
local string link; local string link;
// moto - FIXME: typically this is set to upper-case but QUAKESPASM and HANDHELD lack strtoupper(); assume lower-case! // moto - FIXME: typically this is set to upper-case but only FTE has strtoupper(); assume lower-case!
link = self.message; link = self.message;
if (link == "nolink") { if (link == "nolink") {

13
source/server/entities/traps.qc
View file

@ -124,10 +124,13 @@ void zapper_play () {
local vector targetorg = zents.origin; local vector targetorg = zents.origin;
if (zents) { if (zents) {
#ifdef PC
#ifdef PC
te_lightning2(self, self.origin, zents.origin); te_lightning2(self, self.origin, zents.origin);
#endif
#ifdef HANDHELD #else
WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
WriteByte (MSG_BROADCAST, TE_LIGHTNING2); WriteByte (MSG_BROADCAST, TE_LIGHTNING2);
WriteEntity (MSG_BROADCAST, self); WriteEntity (MSG_BROADCAST, self);
@ -137,7 +140,9 @@ void zapper_play () {
WriteCoord (MSG_BROADCAST, targetorg_x); WriteCoord (MSG_BROADCAST, targetorg_x);
WriteCoord (MSG_BROADCAST, targetorg_y); WriteCoord (MSG_BROADCAST, targetorg_y);
WriteCoord (MSG_BROADCAST, targetorg_z); WriteCoord (MSG_BROADCAST, targetorg_z);
#endif
#endif // PC
} }
zents.touch = zapper_do_damage; zents.touch = zapper_do_damage;

2
source/server/entities/triggers.qc
View file

@ -133,7 +133,6 @@ void() InitTrigger =
self.model = ""; self.model = "";
}; };
#ifndef HANDHELD
entity last_act_trigger; entity last_act_trigger;
void() trigger_activator_touch = void() trigger_activator_touch =
{ {
@ -240,7 +239,6 @@ void() trigger_activator =
InitTrigger (); InitTrigger ();
self.touch = trigger_activator_touch; self.touch = trigger_activator_touch;
} }
#endif
void() use_wall_weapon = void() use_wall_weapon =
{ {

11
source/server/entities/window.qc
View file

@ -50,13 +50,18 @@ void() screen_shake =
else else
zoom_factor = 1; zoom_factor = 1;
#ifdef HANDHELD #ifndef PC
self.enemy.punchangle_y = r * 8 * zoom_factor; self.enemy.punchangle_y = r * 8 * zoom_factor;
self.enemy.punchangle_x = (4 + (s * 4)) * zoom_factor; self.enemy.punchangle_x = (4 + (s * 4)) * zoom_factor;
#else
#else
self.enemy.punchangle_y = r * 4 * zoom_factor; self.enemy.punchangle_y = r * 4 * zoom_factor;
self.enemy.punchangle_x = (4 + (s * 2)) * zoom_factor; self.enemy.punchangle_x = (4 + (s * 2)) * zoom_factor;
#endif
#endif // PC
}; };
void() Window_repaired = void() Window_repaired =

8
source/server/main.qc
View file

@ -128,12 +128,12 @@ void() precaches =
{ {
precache_model ("models/player.mdl"); precache_model ("models/player.mdl");
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
if (world.song != "") if (world.song != "")
precache_sound (world.song); precache_sound (world.song);
#endif
#endif #endif // PC
// //
// Models // Models

9
source/server/psp_specifics.qc → source/server/non_fte_specifics.qc
View file

@ -1,9 +1,9 @@
/* /*
server/psp_specifics.qc server/non_fte_specifics.qc
stuff only for psp, remove later Some of the misc. non-FTE QC functions.
Copyright (C) 2021 NZ:P Team Copyright (C) 2021-2022 NZ:P Team
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -50,10 +50,7 @@ void () CL_SendWeaponFire =
self.recoil_delay = 60/return_time + time; self.recoil_delay = 60/return_time + time;
} }
void() trigger_activator = {};
void() ParseClientCommand = {SV_ParseClientCommand(CMD_STRING);} void() ParseClientCommand = {SV_ParseClientCommand(CMD_STRING);}
void() PutClientInServer; void() PutClientInServer;
void() InitRounds; void() InitRounds;

130
source/server/nzdparser.qc
View file

@ -244,135 +244,7 @@ void(string weaponFile) nzd_defineweapon = {
fclose(f); fclose(f);
} }
//basically copying the waypoint code.. yikes
void() load_nzd = { void() load_nzd = {
#ifndef QUAKESPASM
float file, point;
string h;
float loop;
float wepdata = 0;
h = strcat(mappath, ".nzd");
file = fopen (h, FILE_READ);
if (file == -1)
{
if (cvar("developer"))
dprint(".NZD file not found, using default settings..\n");
return;
}
point = 0;
loop = 1;
while(loop) {
string line;
line = fgets(file);
if not (line) {
bprint(PRINT_HIGH, "End of file\n");
loop = 0;
break;
}
h = strtrim(line);
//print(h, "\n");
if (h == "") {
continue;
}
switch (point) {
case 0:
//switch-ception!
switch(h) {
case "mech": point = 1; break;
default: bprint(PRINT_HIGH, strcat("Error: unknown variable ", strcat(h, "\n")));
}
break;
case 1:
if (h == "{") {
point = 2;
} else {
bprint(PRINT_HIGH, strcat("Error: unknown variable ", strcat(h, " expected {\n")));
}
break;
case 2:
tokenize(h);
string value, variable;
variable = strtrim(argv(0));
value = strtrim(argv(2));
switch (variable) {
case "proneperkpoints":
G_PRONEPOINTS = stof(value);
break;
case "spawnpoints":
G_STARTPOINTS = stof(value);
break;
case "round":
G_STARTROUND = stof(value);
break;
case "worldtext":
G_WORLDTEXT = stof(value);
break;
case "perkpower":
G_PERKPOWER = stof(value);
break;
case "includeweapon":
nzd_defineweapon(value);
break;
case "hud":
G_HUD = value;
break;
case "hudhor":
G_HUDHOR = stof(value);
break;
case "wep":
point = 3;
break;
case "perk":
point = 5;
break;
case "}":
loop = 0;
break;
default:
bprint(PRINT_HIGH, strcat("Error: unknown variable ", strcat(h, " expected }\n")));
break;
}
break;
case 3:
if (h == "[") {
point = 4;
} else {
bprint(PRINT_HIGH, strcat("Error: unknown variable ", strcat(h, " expected [\n")));
}
break;
case 4:
if (h == "]") {
point = 2;
} else {
G_STARTWEAPON[wepdata] = stof(h);
wepdata++;
}
break;
case 5:
if (h == "[") {
point = 6;
} else {
bprint(PRINT_HIGH, strcat("Error: unknown variable ", strcat(h, " expected [\n")));
}
break;
case 6:
if (h == "]") {
point = 2;
} else {
G_PERKS = G_PERKS | stof(h);
}
break;
}
}
fclose(file);
#endif
} }

21
source/server/player.qc
View file

@ -429,19 +429,25 @@ void() PlayerPostThink =
// Perform a traceline to keep track of entities directly // Perform a traceline to keep track of entities directly
// in front of the player. // in front of the player.
#ifndef QUAKESPASM #ifndef QUAKESPASM
vector source; vector source;
makevectors (self.v_angle); makevectors (self.v_angle);
source = self.origin + self.view_ofs; source = self.origin + self.view_ofs;
#ifdef PC
self.dimension_hit = HITBOX_DIM_LIMBS | HITBOX_DIM_ZOMBIES;
#endif // PC
traceline (source, source + v_forward*800*1.2, 0, self);
#ifdef PC #ifdef PC
self.dimension_hit = HITBOX_DIM_LIMBS | HITBOX_DIM_ZOMBIES;
#endif // PC self.dimension_hit = HITBOX_DIM_ZOMBIES;
traceline (source, source + v_forward*800*1.2, 0, self);
#ifdef PC
self.dimension_hit = HITBOX_DIM_ZOMBIES;
#endif // PC #endif // PC
@ -456,7 +462,8 @@ void() PlayerPostThink =
self.facingenemy = true; self.facingenemy = true;
else else
self.facingenemy = false; self.facingenemy = false;
#endif
#endif // QUAKESPASM
}; };
void() ClientKill = {}; void() ClientKill = {};

16
source/server/rounds.qc
View file

@ -232,26 +232,28 @@ void() NewRound =
roundtype = 1; roundtype = 1;
if (world.fog) { if (world.fog) {
#ifdef HANDHELD
#ifndef PC
localcmd(strcat("fog ", world.fog)); localcmd(strcat("fog ", world.fog));
#else
#ifdef PC #else
localcmd(strcat("fog ", world_fog)); localcmd(strcat("fog ", world_fog));
#endif
#endif #endif // PC
} }
} }
Remaining_Zombies = Total_Zombies = getZombieTotal(); Remaining_Zombies = Total_Zombies = getZombieTotal();
#ifndef QUAKESPASM
switch(rounds) { switch(rounds) {
case 5: GiveAchievement(0); break; case 5: GiveAchievement(0); break;
case 10: GiveAchievement(1); break; case 10: GiveAchievement(1); break;
case 15: GiveAchievement(2); break; case 15: GiveAchievement(2); break;
default: break; default: break;
} }
#endif // QUAKESPASM
// Set up delay for zombie spawning // Set up delay for zombie spawning
local float spawndelay; local float spawndelay;

18
source/server/weapons/ray_gun.qc
View file

@ -159,23 +159,41 @@ void() W_FireRay =
// Prepare trail effects. // Prepare trail effects.
if (IsPapWeapon(porter.weapon)) { if (IsPapWeapon(porter.weapon)) {
#ifdef HANDHELD #ifdef HANDHELD
porter.effects = EF_RAYRED; porter.effects = EF_RAYRED;
#endif // HANDHELD #endif // HANDHELD
#ifdef QUAKESPASM #ifdef QUAKESPASM
porter.effects = EF_RED; porter.effects = EF_RED;
#endif // QUAKESPASM #endif // QUAKESPASM
#ifdef PC #ifdef PC
Light_Custom(porter, false, 75, 2, 0.25, 0.25); Light_Custom(porter, false, 75, 2, 0.25, 0.25);
#endif // PC #endif // PC
} else { } else {
#ifdef HANDHELD #ifdef HANDHELD
porter.effects = EF_RAYGREEN; porter.effects = EF_RAYGREEN;
#endif // HANDHELD #endif // HANDHELD
#ifdef QUAKESPASM #ifdef QUAKESPASM
porter.effects = EF_GREEN; porter.effects = EF_GREEN;
#endif // QUAKESPASM #endif // QUAKESPASM
#ifdef PC #ifdef PC
Light_Custom(porter, false, 75, 0.25, 2, 0.25); Light_Custom(porter, false, 75, 0.25, 2, 0.25);
#endif // PC #endif // PC
} }

102
source/server/weapons/weapon_core.qc
View file

@ -60,18 +60,24 @@ void() W_AimIn =
return; return;
} }
#ifndef PC #ifndef PC
self.ADS_Offset = GetWeaponADSOfs_PSP(self.weapon); self.ADS_Offset = GetWeaponADSOfs_PSP(self.weapon);
#endif #endif // PC
if (self.weapon == W_KAR_SCOPE || self.weapon == W_PTRS || if (self.weapon == W_KAR_SCOPE || self.weapon == W_PTRS ||
self.weapon == W_HEADCRACKER || self.weapon == W_PENETRATOR) { self.weapon == W_HEADCRACKER || self.weapon == W_PENETRATOR) {
SetUpdate(self, UT_ZOOM2, 0, 0, 0); SetUpdate(self, UT_ZOOM2, 0, 0, 0);
#ifdef QUAKESPASM
#ifdef QUAKESPASM
self.zoom = 1; self.zoom = 1;
#else
#else
self.zoom = 2; self.zoom = 2;
#endif
#endif // QUAKESPASM
self.scopetime = time + 0.3; self.scopetime = time + 0.3;
} else { } else {
self.zoom = 1; self.zoom = 1;
@ -79,7 +85,6 @@ void() W_AimIn =
if (!self.downed) if (!self.downed)
playaim(); playaim();
} }
void() W_AimOut = void() W_AimOut =
@ -146,9 +151,11 @@ void W_SprintStart () {
self.sprint_duration -= self.sprint_rest_time; self.sprint_duration -= self.sprint_rest_time;
#ifdef QUAKESPASM #ifdef QUAKESPASM
if (!self.sprintflag) { if (!self.sprintflag) {
return; return;
} }
#endif #endif
if (self.fire_delay > time || if (self.fire_delay > time ||
@ -726,9 +733,13 @@ void Parse_Damage () = // DO NOT TOUCH
body_ent.usedent = self; body_ent.usedent = self;
body_ent.bleedingtime = time + 2; body_ent.bleedingtime = time + 2;
#ifdef HANDHELD
#ifndef PC
updateLimb (body_ent.head.owner, 0, world); updateLimb (body_ent.head.owner, 0, world);
#endif
#endif // PC
} }
} }
@ -750,9 +761,13 @@ void Parse_Damage () = // DO NOT TOUCH
body_ent.larm.solid = SOLID_NOT; body_ent.larm.solid = SOLID_NOT;
setmodel(body_ent.larm,""); setmodel(body_ent.larm,"");
body_ent.larm.frame = 0; body_ent.larm.frame = 0;
#ifdef HANDHELD
#ifndef PC
updateLimb (body_ent.larm.owner, 1, world); updateLimb (body_ent.larm.owner, 1, world);
#endif
#endif // PC
} }
body_ent.larm.washit = 0; body_ent.larm.washit = 0;
@ -772,9 +787,13 @@ void Parse_Damage () = // DO NOT TOUCH
body_ent.rarm.solid = SOLID_NOT; body_ent.rarm.solid = SOLID_NOT;
setmodel(body_ent.rarm,""); setmodel(body_ent.rarm,"");
body_ent.rarm.frame = 0; body_ent.rarm.frame = 0;
#ifdef HANDHELD
#ifndef PC
updateLimb (body_ent.rarm.owner, 2, world); updateLimb (body_ent.rarm.owner, 2, world);
#endif
#endif // PC
} }
body_ent.rarm.washit = 0; body_ent.rarm.washit = 0;
@ -1169,18 +1188,26 @@ void() W_FireTesla =
source = self.origin + self.view_ofs; source = self.origin + self.view_ofs;
#ifdef PC #ifdef PC
self.dimension_hit = HITBOX_DIM_LIMBS | HITBOX_DIM_ZOMBIES;
self.dimension_hit = HITBOX_DIM_LIMBS | HITBOX_DIM_ZOMBIES;
#endif // PC #endif // PC
FireTrace(1, 0, 0, 0); FireTrace(1, 0, 0, 0);
#ifdef PC #ifdef PC
self.dimension_hit = HITBOX_DIM_ZOMBIES;
self.dimension_hit = HITBOX_DIM_ZOMBIES;
#endif // PC #endif // PC
#ifdef PC #ifdef PC
te_lightning2(self, source, trace_endpos); te_lightning2(self, source, trace_endpos);
#endif
#ifdef HANDHELD #else
WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
WriteByte (MSG_BROADCAST, TE_LIGHTNING2); WriteByte (MSG_BROADCAST, TE_LIGHTNING2);
WriteEntity (MSG_BROADCAST, self); WriteEntity (MSG_BROADCAST, self);
@ -1190,7 +1217,8 @@ void() W_FireTesla =
WriteCoord (MSG_BROADCAST, trace_endpos_x); WriteCoord (MSG_BROADCAST, trace_endpos_x);
WriteCoord (MSG_BROADCAST, trace_endpos_y); WriteCoord (MSG_BROADCAST, trace_endpos_y);
WriteCoord (MSG_BROADCAST, trace_endpos_z); WriteCoord (MSG_BROADCAST, trace_endpos_z);
#endif
#endif // PC
LightningDamage (self.origin, trace_endpos + v_forward*4, self, 30); LightningDamage (self.origin, trace_endpos + v_forward*4, self, 30);
} }
@ -2057,11 +2085,17 @@ void () Impulse_Functions =
W_SprintStop(); W_SprintStop();
break; break;
case 25: case 25:
#ifdef HANDHELD
#ifdef HANDHELD
switch_nade(); switch_nade();
#else
#else
W_Betty(); W_Betty();
#endif
#endif // HANDHELD
break; break;
case 26: case 26:
case 30: case 30:
@ -2070,14 +2104,16 @@ void () Impulse_Functions =
else else
Change_Stance(); Change_Stance();
break; break;
#ifdef QUAKESPASM #ifdef QUAKESPASM
case 31: case 31:
self.sprintflag = 0; self.sprintflag = 0;
break; break;
case 32: case 32:
self.sprintflag = 1; self.sprintflag = 1;
break; break;
#endif
#endif // QUAKESPASM
case 110: case 110:
case 111: case 111:
W_PutOut(); W_PutOut();
@ -2187,9 +2223,11 @@ void() CheckPlayer =
CheckRevive(self); CheckRevive(self);
#ifdef QUAKESPASM #ifdef QUAKESPASM
if (!self.sprintflag && self.sprinting) { if (!self.sprintflag && self.sprinting) {
W_SprintStop(); W_SprintStop();
} }
#endif #endif
// FIXME - can't do frame independent stance changing.. ofs starts spazzing.. // FIXME - can't do frame independent stance changing.. ofs starts spazzing..
@ -2310,17 +2348,21 @@ void () Weapon_Logic =
W_Frame_Update (); W_Frame_Update ();
Impulse_Functions(); Impulse_Functions();
#ifndef PC #ifndef PC
// For HANDHELD only to tell our engine to display the scope
// For HANDHELD/QUAKESPASM only to tell our engine to display the scope
if ((self.scopetime < time) && self.scopetime) { if ((self.scopetime < time) && self.scopetime) {
self.scopetime = 0; self.scopetime = 0;
self.zoom = 2; self.zoom = 2;
self.weapon2model = ""; self.weapon2model = "";
self.weaponmodel = ""; self.weaponmodel = "";
} }
#else
#else
UpdatePunchangle(self); UpdatePunchangle(self);
#endif
#endif // PC
// //
// Fire Button Logic // Fire Button Logic
@ -2469,12 +2511,14 @@ void () Weapon_Logic =
if (self.button6 && !self.semiknife) if (self.button6 && !self.semiknife)
{ {
#ifdef HANDHELD #ifdef HANDHELD
if (self.sprinting) { if (self.sprinting) {
dolphin_dive(); dolphin_dive();
return; return;
} }
#endif
#endif // HANDHELD
W_Knife(); W_Knife();
self.semiknife = true; self.semiknife = true;
} }

6
source/shared/defs/custom.qc
View file

@ -230,12 +230,6 @@ float invertfloat(float input) {
return (1 - input); return (1 - input);
} }
//elements
#ifndef QUAKESPASM
string G_HUD;
float G_HUDHOR;
#endif
// custom weapon defs // custom weapon defs
// now 90% slimmed down // now 90% slimmed down
float currentWeaponTracker; float currentWeaponTracker;

6
source/shared/sound_enhanced.qc
View file

@ -29,8 +29,7 @@
#define CHAN_MUSIC 1 #define CHAN_MUSIC 1
#define CHAN_SFX 2 #define CHAN_SFX 2
#ifndef HANDHELD #ifdef PC
#ifndef QUAKESPASM
void(string soundname, optional float channel, optional float volume) localsound_enhanced = void(string soundname, optional float channel, optional float volume) localsound_enhanced =
{ {
if (!volume) if (!volume)
@ -48,5 +47,4 @@ void(string soundname, optional float channel, optional float volume) localsound
localsound(soundname, channel, volume); localsound(soundname, channel, volume);
} }
#endif #endif // PC
#endif

6
source/shared/weapon_defines.qc
View file

@ -4006,21 +4006,21 @@ vector(float wep) GetWeaponRecoil =
temp1 = change_1 + change_2; temp1 = change_1 + change_2;
temp2 = change_1 + change_2 + change_3; temp2 = change_1 + change_2 + change_3;
#ifndef HANDHELD #ifdef PC
if (r < change_1) if (r < change_1)
final_kick_y = kick_change_x*0.25; final_kick_y = kick_change_x*0.25;
else if (r < temp1) else if (r < temp1)
final_kick_x = kick_change_y*-1*.25; final_kick_x = kick_change_y*-1*.25;
else if (r < temp2) else if (r < temp2)
final_kick_y = kick_change_z*-1*0.25; final_kick_y = kick_change_z*-1*0.25;
#else #else
if (r < change_1) if (r < change_1)
final_kick_y = kick_change_x; final_kick_y = kick_change_x;
else if (r < temp1) else if (r < temp1)
final_kick_x = kick_change_y*-1; final_kick_x = kick_change_y*-1;
else if (r < temp2) else if (r < temp2)
final_kick_y = kick_change_z*-1; final_kick_y = kick_change_z*-1;
#endif #endif // PC
final_kick_y = final_kick_y + guaranteed_x; final_kick_y = final_kick_y + guaranteed_x;
final_kick_x = final_kick_x - guaranteed_y; final_kick_x = final_kick_x - guaranteed_y;