ubergames/rpg-x2-rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2-rpgxEF.git synced 2024-11-15 00:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reformatting and function descriptions

Browse source 
Reformated some code in:
- game/g_turrets.c
- game/g_ui.c
Added function descriptions in:
- game/g_turrets.c
This commit is contained in:
Walter Julius Hennecke 2012-05-09 19:14:59 +02:00
parent 927a1d8d83
commit 5d0ee597ed
2 changed files with 322 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

474
game/g_turrets.c
View file

File diff suppressed because it is too large Load diff

20
game/g_ui.c
View file

@ -1,8 +1,8 @@
//======================================================= /*=======================================================
// *
// This file contains entities that are used to call UIs * This file contains entities that are used to call UIs
// *
//======================================================= =======================================================*/
#include "g_local.h" #include "g_local.h"
@ -23,7 +23,7 @@ DISABLED Entity is disabled
* \author Ubergames - GSIO01 * \author Ubergames - GSIO01
*/ */
void ui_transporter_think(gentity_t *ent) { void ui_transporter_think(gentity_t *ent) {
if(!ent->activator || ent->sound1to2 >= 10000) { //player disconnect or was idle more than 10 seconds if(!ent->activator || ent->sound1to2 >= 10000) { /* player disconnect or was idle more than 10 seconds */
ent->sound1to2 = 0; ent->sound1to2 = 0;
ent->count = 0; ent->count = 0;
ent->nextthink = -1; ent->nextthink = -1;
@ -51,7 +51,7 @@ void ui_transporter_use(gentity_t *ent, gentity_t *other, gentity_t *activator)
} else { } else {
if(ent->flags & FL_LOCKED || ent->count) return; if(ent->flags & FL_LOCKED || ent->count) return;
target = ent->target_ent; target = ent->target_ent;
ent->count = 1; // in use indicator ent->count = 1; /* in use indicator */
ent->touched = activator; ent->touched = activator;
trap_SendServerCommand(activator-g_entities, va("ui_transporter %i", target-g_entities)); trap_SendServerCommand(activator-g_entities, va("ui_transporter %i", target-g_entities));
ent->nextthink = level.time + 2500; ent->nextthink = level.time + 2500;
@ -66,7 +66,6 @@ void ui_transporter_use(gentity_t *ent, gentity_t *other, gentity_t *activator)
* \author Ubergames - GSIO01 * \author Ubergames - GSIO01
*/ */
void ui_transporter_setup(gentity_t *ent) { void ui_transporter_setup(gentity_t *ent) {
//int i;
gentity_t *target = NULL; gentity_t *target = NULL;
target = G_Find(target, FOFS(targetname), ent->target); target = G_Find(target, FOFS(targetname), ent->target);
@ -118,7 +117,7 @@ DISABLED Entity is disabled
"target" trigger_holodeck to use with this ui_holodeck "target" trigger_holodeck to use with this ui_holodeck
*/ */
void ui_holodeck_think(gentity_t *ent) { void ui_holodeck_think(gentity_t *ent) {
if(!ent->activator || ent->sound1to2 >= 10000) { //player disconnect or was idle more than 10 seconds if(!ent->activator || ent->sound1to2 >= 10000) { /* player disconnect or was idle more than 10 seconds */
ent->sound1to2 = 0; ent->sound1to2 = 0;
ent->count = 0; ent->count = 0;
ent->nextthink = -1; ent->nextthink = -1;
@ -135,7 +134,7 @@ void ui_holodeck_use(gentity_t *ent, gentity_t *other, gentity_t *activator) {
} else { } else {
if(ent->flags & FL_LOCKED || ent->count) return; if(ent->flags & FL_LOCKED || ent->count) return;
target = ent->target_ent; target = ent->target_ent;
ent->count = 1; // in use indicator ent->count = 1; /* in use indicator */
ent->touched = activator; ent->touched = activator;
trap_SendServerCommand(activator-g_entities, va("ui_holodeck %i", target-g_entities)); trap_SendServerCommand(activator-g_entities, va("ui_holodeck %i", target-g_entities));
ent->nextthink = level.time + 2500; ent->nextthink = level.time + 2500;
@ -143,7 +142,6 @@ void ui_holodeck_use(gentity_t *ent, gentity_t *other, gentity_t *activator) {
} }
void ui_holodeck_setup(gentity_t *ent) { void ui_holodeck_setup(gentity_t *ent) {
//int i;
gentity_t *target; gentity_t *target;
target = G_Find(NULL, FOFS(targetname), ent->target); target = G_Find(NULL, FOFS(targetname), ent->target);