fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-02 14:01:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge /u/smcvittie/quakespasm/ branch spelling into master

Browse source 
https://sourceforge.net/p/quakespasm/quakespasm/merge-requests/1/
This commit is contained in:
Ozkan Sezer 2021-01-07 14:55:04 +00:00
commit 5186260d11
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Quake/cmd.c
View file

@ -334,7 +334,7 @@ void Cmd_Alias_f (void)
return;
}
// if the alias allready exists, reuse it
// if the alias already exists, reuse it
for (a = cmd_alias ; a ; a=a->next)
{
if (!strcmp(s, a->name))

2
Quake/gl_model.c
View file

@ -611,7 +611,7 @@ void Mod_LoadTextures (lump_t *l)
if (!tx || tx->name[0] != '+')
continue;
if (tx->anim_next)
continue; // allready sequenced
continue; // already sequenced
// find the number of frames in the animation
memset (anims, 0, sizeof(anims));

8
Quake/host_cmd.c
View file

@ -1542,7 +1542,7 @@ void Host_Kill_f (void)
if (sv_player->v.health <= 0)
{
SV_ClientPrintf ("Can't suicide -- allready dead!\n");
SV_ClientPrintf ("Can't suicide -- already dead!\n");
return;
}
@ -1611,7 +1611,7 @@ void Host_PreSpawn_f (void)
if (host_client->spawned)
{
Con_Printf ("prespawn not valid -- allready spawned\n");
Con_Printf ("prespawn not valid -- already spawned\n");
return;
}
@ -1640,13 +1640,13 @@ void Host_Spawn_f (void)
if (host_client->spawned)
{
Con_Printf ("Spawn not valid -- allready spawned\n");
Con_Printf ("Spawn not valid -- already spawned\n");
return;
}
// run the entrance script
if (sv.loadgame)
{ // loaded games are fully inited allready
{ // loaded games are fully inited already
// if this is the last client to be connected, unpause
sv.paused = false;
}

4
Quake/net_dgrm.c
View file

@ -554,7 +554,7 @@ static void Test_Poll (void *unused)
break;
if (MSG_ReadByte() != CCREP_PLAYER_INFO)
Sys_Error("Unexpected repsonse to Player Info request\n");
Sys_Error("Unexpected response to Player Info request\n");
MSG_ReadByte(); /* playerNumber */
Q_strcpy(name, MSG_ReadString());
@ -706,7 +706,7 @@ Reschedule:
return;
Error:
Con_Printf("Unexpected repsonse to Rule Info request\n");
Con_Printf("Unexpected response to Rule Info request\n");
Done:
dfunc.Close_Socket(test2Socket);
test2InProgress = false;

4
Quake/sv_main.c
View file

@ -178,7 +178,7 @@ Each entity can have eight independant sound sources, like voice,
weapon, feet, etc.
Channel 0 is an auto-allocate channel, the others override anything
allready running on that entity/channel pair.
already running on that entity/channel pair.
An attenuation of 0 will play full volume everywhere in the level.
Larger attenuations will drop off. (max 4 attenuation)
@ -211,7 +211,7 @@ void SV_StartSound (edict_t *entity, int channel, const char *sample, int volume
if (sound_num == MAX_SOUNDS || !sv.sound_precache[sound_num])
{
Con_Printf ("SV_StartSound: %s not precacheed\n", sample);
Con_Printf ("SV_StartSound: %s not precached\n", sample);
return;
}

20
Quake/zone.c
View file

@ -284,12 +284,12 @@ void Z_Print (memzone_t *zone)
//============================================================================
#define HUNK_SENTINAL 0x1df001ed
#define HUNK_SENTINEL 0x1df001ed
#define HUNKNAME_LEN 24
typedef struct
{
int sentinal;
int sentinel;
int size; // including sizeof(hunk_t), -1 = not allocated
char name[HUNKNAME_LEN];
} hunk_t;
@ -307,7 +307,7 @@ int hunk_tempmark;
==============
Hunk_Check
Run consistancy and sentinal trahing checks
Run consistancy and sentinel trahing checks
==============
*/
void Hunk_Check (void)
@ -316,8 +316,8 @@ void Hunk_Check (void)
for (h = (hunk_t *)hunk_base ; (byte *)h != hunk_base + hunk_low_used ; )
{
if (h->sentinal != HUNK_SENTINAL)
Sys_Error ("Hunk_Check: trahsed sentinal");
if (h->sentinel != HUNK_SENTINEL)
Sys_Error ("Hunk_Check: trashed sentinel");
if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size)
Sys_Error ("Hunk_Check: bad size");
h = (hunk_t *)((byte *)h+h->size);
@ -373,8 +373,8 @@ void Hunk_Print (qboolean all)
//
// run consistancy checks
//
if (h->sentinal != HUNK_SENTINAL)
Sys_Error ("Hunk_Check: trahsed sentinal");
if (h->sentinel != HUNK_SENTINEL)
Sys_Error ("Hunk_Check: trashed sentinel");
if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size)
Sys_Error ("Hunk_Check: bad size");
@ -449,7 +449,7 @@ void *Hunk_AllocName (int size, const char *name)
memset (h, 0, size);
h->size = size;
h->sentinal = HUNK_SENTINAL;
h->sentinel = HUNK_SENTINEL;
q_strlcpy (h->name, name, HUNKNAME_LEN);
return (void *)(h+1);
@ -540,7 +540,7 @@ void *Hunk_HighAllocName (int size, const char *name)
memset (h, 0, size);
h->size = size;
h->sentinal = HUNK_SENTINAL;
h->sentinel = HUNK_SENTINEL;
q_strlcpy (h->name, name, HUNKNAME_LEN);
return (void *)(h+1);
@ -906,7 +906,7 @@ void *Cache_Alloc (cache_user_t *c, int size, const char *name)
cache_system_t *cs;
if (c->data)
Sys_Error ("Cache_Alloc: allready allocated");
Sys_Error ("Cache_Alloc: already allocated");
if (size <= 0)
Sys_Error ("Cache_Alloc: size %i", size);