}
else
hours = 0;
- print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v.frags, hours, minutes, seconds);
+ print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v->frags, hours, minutes, seconds);
print (" %s\n", client->netconnection->address);
}
}
if (pr_global_struct->deathmatch)
return;
- sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE;
- if (!((int)sv_player->v.flags & FL_GODMODE) )
+ sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE;
+ if (!((int)sv_player->v->flags & FL_GODMODE) )
SV_ClientPrintf ("godmode OFF\n");
else
SV_ClientPrintf ("godmode ON\n");
if (pr_global_struct->deathmatch)
return;
- sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET;
- if (!((int)sv_player->v.flags & FL_NOTARGET) )
+ sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET;
+ if (!((int)sv_player->v->flags & FL_NOTARGET) )
SV_ClientPrintf ("notarget OFF\n");
else
SV_ClientPrintf ("notarget ON\n");
if (pr_global_struct->deathmatch)
return;
- if (sv_player->v.movetype != MOVETYPE_NOCLIP)
+ if (sv_player->v->movetype != MOVETYPE_NOCLIP)
{
noclip_anglehack = true;
- sv_player->v.movetype = MOVETYPE_NOCLIP;
+ sv_player->v->movetype = MOVETYPE_NOCLIP;
SV_ClientPrintf ("noclip ON\n");
}
else
{
noclip_anglehack = false;
- sv_player->v.movetype = MOVETYPE_WALK;
+ sv_player->v->movetype = MOVETYPE_WALK;
SV_ClientPrintf ("noclip OFF\n");
}
}
if (pr_global_struct->deathmatch)
return;
- if (sv_player->v.movetype != MOVETYPE_FLY)
+ if (sv_player->v->movetype != MOVETYPE_FLY)
{
- sv_player->v.movetype = MOVETYPE_FLY;
+ sv_player->v->movetype = MOVETYPE_FLY;
SV_ClientPrintf ("flymode ON\n");
}
else
{
- sv_player->v.movetype = MOVETYPE_WALK;
+ sv_player->v->movetype = MOVETYPE_WALK;
SV_ClientPrintf ("flymode OFF\n");
}
}
int i, j;
float total;
client_t *client;
-
+
if (cmd_source == src_command)
{
Cmd_ForwardToServer ();
for (i=0 ; i<svs.maxclients ; i++)
{
- if (svs.clients[i].active && (svs.clients[i].edict->v.health <= 0) )
+ if (svs.clients[i].active && (svs.clients[i].edict->v->health <= 0) )
{
Con_Printf ("Can't savegame with a dead player\n");
return;
entnum = -1;
while (!Qeof(f))
{
- for (i = 0;i < sizeof(buf) - 1;i++)
+ for (i = 0;i < (int)sizeof(buf) - 1;i++)
{
r = Qgetc (f);
if (r == EOF || !r)
{
// parse an edict
ent = EDICT_NUM(entnum);
- memset (&ent->v, 0, progs->entityfields * 4);
+ memset (ent->v, 0, progs->entityfields * 4);
ent->free = false;
ED_ParseEdict (start, ent);
if (strcmp(host_client->name, newName) != 0)
Con_Printf ("%s renamed to %s\n", host_client->name, newName);
strcpy (host_client->name, newName);
- host_client->edict->v.netname = host_client->name - pr_strings;
+ host_client->edict->v->netname = PR_SetString(host_client->name);
// send notification to all clients
}
while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
p2--;
- for (j = strlen(text);j < (sizeof(text) - 2) && p1 < p2;)
+ for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
text[j++] = *p1++;
text[j++] = '\n';
text[j++] = 0;
{
if (!client || !client->active || !client->spawned)
continue;
- if (teamplay.integer && teamonly && client->edict->v.team != save->edict->v.team)
+ if (teamplay.integer && teamonly && client->edict->v->team != save->edict->v->team)
continue;
host_client = client;
SV_ClientPrintf("%s", text);
}
while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
p2--;
- for (j = strlen(text);j < (sizeof(text) - 2) && p1 < p2;)
+ for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
text[j++] = *p1++;
text[j++] = '\n';
text[j++] = 0;
else
{
host_client->colors = playercolor;
- host_client->edict->v.team = bottom + 1;
+ host_client->edict->v->team = bottom + 1;
// send notification to all clients
MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
return;
}
- if (sv_player->v.health <= 0)
+ if (sv_player->v->health <= 0)
{
SV_ClientPrintf ("Can't suicide -- already dead!\n");
return;
*/
void Host_Pause_f (void)
{
-
+
if (cmd_source == src_command)
{
Cmd_ForwardToServer ();
if (sv.paused)
{
- SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname);
+ SV_BroadcastPrintf ("%s paused the game\n", PR_GetString(sv_player->v->netname));
}
else
{
- SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + sv_player->v.netname);
+ SV_BroadcastPrintf ("%s unpaused the game\n", PR_GetString(sv_player->v->netname));
}
// send notification to all clients
Con_Printf ("prespawn not valid -- already spawned\n");
return;
}
-
+
SZ_Write (&host_client->message, sv.signon.data, sv.signon.cursize);
MSG_WriteByte (&host_client->message, svc_signonnum);
MSG_WriteByte (&host_client->message, 2);
// set up the edict
ent = host_client->edict;
- memset (&ent->v, 0, progs->entityfields * 4);
- ent->v.colormap = NUM_FOR_EDICT(ent);
- ent->v.team = (host_client->colors & 15) + 1;
- ent->v.netname = host_client->name - pr_strings;
+ memset (ent->v, 0, progs->entityfields * 4);
+ ent->v->colormap = NUM_FOR_EDICT(ent);
+ ent->v->team = (host_client->colors & 15) + 1;
+ ent->v->netname = PR_SetString(host_client->name);
if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
val->_float = host_client->pmodel;
ent = EDICT_NUM( 1 + (host_client - svs.clients) );
MSG_WriteByte (&host_client->message, svc_setangle);
for (i=0 ; i < 2 ; i++)
- MSG_WriteAngle (&host_client->message, ent->v.angles[i] );
+ MSG_WriteAngle (&host_client->message, ent->v->angles[i] );
MSG_WriteAngle (&host_client->message, 0 );
SV_WriteClientdataToMessage (sv_player, &host_client->message);
if (t[0] == '6')
{
if (t[1] == 'a')
- sv_player->v.items = (int)sv_player->v.items | HIT_PROXIMITY_GUN;
+ sv_player->v->items = (int)sv_player->v->items | HIT_PROXIMITY_GUN;
else
- sv_player->v.items = (int)sv_player->v.items | IT_GRENADE_LAUNCHER;
+ sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER;
}
else if (t[0] == '9')
- sv_player->v.items = (int)sv_player->v.items | HIT_LASER_CANNON;
+ sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON;
else if (t[0] == '0')
- sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR;
+ sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR;
else if (t[0] >= '2')
- sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
+ sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
}
else
{
if (t[0] >= '2')
- sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
+ sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
}
break;
val->_float = v;
}
- sv_player->v.ammo_shells = v;
+ sv_player->v->ammo_shells = v;
break;
case 'n':
if (gamemode == GAME_ROGUE)
if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
{
val->_float = v;
- if (sv_player->v.weapon <= IT_LIGHTNING)
- sv_player->v.ammo_nails = v;
+ if (sv_player->v->weapon <= IT_LIGHTNING)
+ sv_player->v->ammo_nails = v;
}
}
else
{
- sv_player->v.ammo_nails = v;
+ sv_player->v->ammo_nails = v;
}
break;
case 'l':
if (val)
{
val->_float = v;
- if (sv_player->v.weapon > IT_LIGHTNING)
- sv_player->v.ammo_nails = v;
+ if (sv_player->v->weapon > IT_LIGHTNING)
+ sv_player->v->ammo_nails = v;
}
}
break;
if (val)
{
val->_float = v;
- if (sv_player->v.weapon <= IT_LIGHTNING)
- sv_player->v.ammo_rockets = v;
+ if (sv_player->v->weapon <= IT_LIGHTNING)
+ sv_player->v->ammo_rockets = v;
}
}
else
{
- sv_player->v.ammo_rockets = v;
+ sv_player->v->ammo_rockets = v;
}
break;
case 'm':
if (val)
{
val->_float = v;
- if (sv_player->v.weapon > IT_LIGHTNING)
- sv_player->v.ammo_rockets = v;
+ if (sv_player->v->weapon > IT_LIGHTNING)
+ sv_player->v->ammo_rockets = v;
}
}
break;
case 'h':
- sv_player->v.health = v;
+ sv_player->v->health = v;
break;
case 'c':
if (gamemode == GAME_ROGUE)
if (val)
{
val->_float = v;
- if (sv_player->v.weapon <= IT_LIGHTNING)
- sv_player->v.ammo_cells = v;
+ if (sv_player->v->weapon <= IT_LIGHTNING)
+ sv_player->v->ammo_cells = v;
}
}
else
{
- sv_player->v.ammo_cells = v;
+ sv_player->v->ammo_cells = v;
}
break;
case 'p':
if (val)
{
val->_float = v;
- if (sv_player->v.weapon > IT_LIGHTNING)
- sv_player->v.ammo_cells = v;
+ if (sv_player->v->weapon > IT_LIGHTNING)
+ sv_player->v->ammo_cells = v;
}
}
break;
for (i=0 ; i<sv.num_edicts ; i++)
{
e = EDICT_NUM(i);
- if ( !strcmp (pr_strings + e->v.classname, "viewthing") )
+ if (!strcmp (PR_GetString(e->v->classname), "viewthing"))
return e;
}
Con_Printf ("No viewthing on map\n");
Con_Printf ("Can't load %s\n", Cmd_Argv(1));
return;
}
-
- e->v.frame = 0;
- cl.model_precache[(int)e->v.modelindex] = m;
+
+ e->v->frame = 0;
+ cl.model_precache[(int)e->v->modelindex] = m;
}
/*
e = FindViewthing ();
if (!e)
return;
- m = cl.model_precache[(int)e->v.modelindex];
+ m = cl.model_precache[(int)e->v->modelindex];
f = atoi(Cmd_Argv(1));
if (f >= m->numframes)
f = m->numframes-1;
- e->v.frame = f;
+ e->v->frame = f;
}
{
edict_t *e;
model_t *m;
-
+
e = FindViewthing ();
if (!e)
return;
- m = cl.model_precache[(int)e->v.modelindex];
+ m = cl.model_precache[(int)e->v->modelindex];
- e->v.frame = e->v.frame + 1;
- if (e->v.frame >= m->numframes)
- e->v.frame = m->numframes - 1;
+ e->v->frame = e->v->frame + 1;
+ if (e->v->frame >= m->numframes)
+ e->v->frame = m->numframes - 1;
- PrintFrameName (m, e->v.frame);
+ PrintFrameName (m, e->v->frame);
}
/*
if (!e)
return;
- m = cl.model_precache[(int)e->v.modelindex];
+ m = cl.model_precache[(int)e->v->modelindex];
- e->v.frame = e->v.frame - 1;
- if (e->v.frame < 0)
- e->v.frame = 0;
+ e->v->frame = e->v->frame - 1;
+ if (e->v->frame < 0)
+ e->v->frame = 0;
- PrintFrameName (m, e->v.frame);
+ PrintFrameName (m, e->v->frame);
}
/*
if (cls.state == ca_dedicated)
{
- if (!sv.active)
- Cbuf_AddText ("map start\n");
+ if (!sv.active && !sv_spawnmap[0])
+ {
+ if (gamemode == GAME_TRANSFUSION)
+ Cbuf_AddText ("map bb1\n");
+ else
+ Cbuf_AddText ("map start\n");
+ }
return;
}
if (sv_loadgame[0])
Host_PerformLoadGame(sv_loadgame);
else if (sv_spawnmap[0])
- {
SV_SpawnServer(sv_spawnmap);
- if (sv.active && cls.state == ca_disconnected)
- Cmd_ExecuteString ("connect local", src_command);
- }
+ if (sv.active && cls.state == ca_disconnected)
+ Cmd_ExecuteString ("connect local", src_command);
sv_loadgame[0] = 0;
sv_spawnmap[0] = 0;
}