ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-04-22 08:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved and renamed some functions

Browse source
This commit is contained in:
Walter Julius Hennecke 2014-03-19 00:54:26 +01:00
parent c40e76e9b4
commit fe7adc43c9
5 changed files with 78 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
code/game/g_local.h
View file

@ -1242,61 +1242,6 @@ int G_GetEntityByBmodel(char* bmodel,list_p entities);
*/
void AddRemap(const char* oldShader, const char* newShader, float timeOffset);
//
// g_missile.c
//
/**
* Run a missile.
*
* \param ent the missile
*/
void G_Missile_Run( gentity_t* ent );
/**
* Fire alient plasma projectile.
*
* \param The shooter.
* \param start Start point.
* \param aimdir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* fire_plasma (gentity_t* self, vec3_t start, vec3_t aimdir);
/**
* Fire torpedo projectile.
*
* \param The shooter.
* \param start Start point.
* \param aimdir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* fire_quantum (gentity_t* self, vec3_t start, vec3_t aimdir);
/**
* Fire grenade.
*
* \param The shooter.
* \param start Start point.
* \param aimdir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* fire_grenade (gentity_t* self, vec3_t start, vec3_t aimdir);
/**
* Fire a rocket.
*
* \param The shooter.
* \param start Start point.
* \param dir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* fire_rocket (gentity_t* self, vec3_t start, vec3_t dir);
/**
* Fire a compression rifle projectile.
*
* \param The shooter.
* \param start Start point.
* \param dir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* fire_comprifle (gentity_t* self, vec3_t start, vec3_t dir);
//
// g_mover.c
//

1
code/game/g_main.c
View file

@ -13,6 +13,7 @@
#include "g_logger.h"
#include "g_usable.h"
#include "g_lua.h"
#include "g_missile.h"
extern void BG_LoadItemNames(void);
extern qboolean BG_ParseRankNames(char* fileName, rankNames_t rankNames[], size_t size);

11
code/game/g_misc.c
View file

@ -6,6 +6,7 @@
#include "g_client.h"
#include "g_spawn.h"
#include "g_items.h"
#include "g_missile.h"
/*QUAKED func_group (0 0 0) ?
@ -593,19 +594,19 @@ void Use_Shooter( gentity_t *ent, gentity_t *other, gentity_t *activator ) {
switch ( ent->s.weapon ) {
case WP_8:
fire_grenade( ent, ent->s.origin, dir );
G_Missile_FireGrenade( ent, ent->s.origin, dir );
break;
case WP_10:
fire_rocket( ent, ent->s.origin, dir );
G_Missile_FirerRocket( ent, ent->s.origin, dir );
break;
case WP_4:
fire_plasma( ent, ent->s.origin, dir );
G_Missile_FirePlasma( ent, ent->s.origin, dir );
break;
case WP_9:
fire_quantum( ent, ent->s.origin, dir );
G_Missile_FireQuantum( ent, ent->s.origin, dir );
break;
case WP_6:
fire_comprifle( ent, ent->s.origin, dir );
G_Missile_FireComprifle( ent, ent->s.origin, dir );
break;
}
}

10
code/game/g_missile.c
View file

@ -486,7 +486,7 @@ void G_Missile_Run( gentity_t* ent ) {
//=============================================================================
gentity_t* fire_plasma (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* G_Missile_FirePlasma (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* bolt = NULL;
G_LogFuncBegin();
@ -526,7 +526,7 @@ gentity_t* fire_plasma (gentity_t* self, vec3_t start, vec3_t dir) {
return bolt;
}
gentity_t* fire_comprifle(gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* G_Missile_FireComprifle(gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* bolt = NULL;
G_LogFuncBegin();
@ -570,7 +570,7 @@ gentity_t* fire_comprifle(gentity_t* self, vec3_t start, vec3_t dir) {
//=============================================================================
gentity_t* fire_quantum (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* G_Missile_FireQuantum (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* bolt = NULL;
G_LogFuncBegin();
@ -614,7 +614,7 @@ gentity_t* fire_quantum (gentity_t* self, vec3_t start, vec3_t dir) {
//=============================================================================
gentity_t* fire_grenade (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* G_Missile_FireGrenade (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* bolt = NULL;
G_LogFuncBegin();
@ -660,7 +660,7 @@ gentity_t* fire_grenade (gentity_t* self, vec3_t start, vec3_t dir) {
//=============================================================================
gentity_t* fire_rocket (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* G_Missile_FirerRocket (gentity_t* self, vec3_t start, vec3_t dir) {
gentity_t* bolt = NULL;
G_LogFuncBegin();

67
code/game/g_missile.h
View file

@ -3,7 +3,72 @@
#include "g_local.h"
void G_Missile_Impact( gentity_t *ent, trace_t *trace);
/**
* \brief Missile impact function.
*
* \param ent the missile.
* \param trace A trace.
*/
void G_Missile_Impact(gentity_t* ent, trace_t* trace);
/**
* \brief Tripwire think function.
*
* \param ent The tripwire.
* \todo This does not seem to fit to g_missile
*/
void tripwireThink(gentity_t* ent);
/**
* \brief Run a missile.
*
* \param ent the missile
*/
void G_Missile_Run(gentity_t* ent);
/**
* \brief Fire alient plasma projectile.
*
* \param The shooter.
* \param start Start point.
* \param aimdir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* G_Missile_FirePlasma(gentity_t* self, vec3_t start, vec3_t aimdir);
/**
* \brief Fire torpedo projectile.
*
* \param The shooter.
* \param start Start point.
* \param aimdir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* G_Missile_FireQuantum(gentity_t* self, vec3_t start, vec3_t aimdir);
/**
* \brief Fire grenade.
*
* \param The shooter.
* \param start Start point.
* \param aimdir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* G_Missile_FireGrenade(gentity_t* self, vec3_t start, vec3_t aimdir);
/**
* \brief Fire a rocket.
*
* \param The shooter.
* \param start Start point.
* \param dir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* G_Missile_FirerRocket(gentity_t* self, vec3_t start, vec3_t dir);
/**
* \brief Fire a compression rifle projectile.
*
* \param The shooter.
* \param start Start point.
* \param dir Direction.
*/
/*@shared@*/ /*@null@*/ gentity_t* G_Missile_FireComprifle(gentity_t* self, vec3_t start, vec3_t dir);
#endif /* G_MISSILE_H_ */