Quake 2 Oop Conversion Project - Source Diff 3.14 vs Ctf 1.02 - p_weapon.c
diff -s -r q2_314/p_weapon.c q2_314_ctf/p_weapon.c
Left File < - 3.14 : p_weapon.c
Right File > - Ctf 1.02 : p_weapon.c
Back to Index
14c14
< static void P_ProjectSource (gclient_t *client, vec3_t point, vec3_t distance, vec3_t forward, vec3_t right, vec3_t result)
---
> void P_ProjectSource (gclient_t *client, vec3_t point, vec3_t distance, vec3_t forward, vec3_t right, vec3_t result)
337c337
< void Weapon_Generic (edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST, int FRAME_IDLE_LAST, int FRAME_DEACTIVATE_LAST, int *pause_frames, int *fire_frames, void (*fire)(edict_t *ent))
---
> static void Weapon_Generic2 (edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST, int FRAME_IDLE_LAST, int FRAME_DEACTIVATE_LAST, int *pause_frames, int *fire_frames, void (*fire)(edict_t *ent))
437a438,440
> //ZOID
> if (!CTFApplyStrengthSound(ent))
> //ZOID
439a443,445
> //ZOID
> CTFApplyHasteSound(ent);
> //ZOID
453a460,483
> //ZOID
> void Weapon_Generic (edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST, int FRAME_IDLE_LAST, int FRAME_DEACTIVATE_LAST, int *pause_frames, int *fire_frames, void (*fire)(edict_t *ent))
> {
> int oldstate = ent->client->weaponstate;
>
> Weapon_Generic2 (ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST,
> FRAME_IDLE_LAST, FRAME_DEACTIVATE_LAST, pause_frames,
> fire_frames, fire);
>
> // run the weapon frame again if hasted
> if (stricmp(ent->client->pers.weapon->pickup_name, "Grapple") == 0 &&
> ent->client->weaponstate == WEAPON_FIRING)
> return;
>
> if ((CTFApplyHaste(ent) ||
> (Q_stricmp(ent->client->pers.weapon->pickup_name, "Grapple") == 0 &&
> ent->client->weaponstate != WEAPON_FIRING))
> && oldstate == ent->client->weaponstate) {
> Weapon_Generic2 (ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST,
> FRAME_IDLE_LAST, FRAME_DEACTIVATE_LAST, pause_frames,
> fire_frames, fire);
> }
> }
> //ZOID