mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-23 17:43:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix tab list entries getting duplicated (thanks fam0r)

Browse source 
e.g. you hold down tab list, then another player spams /afk
This commit is contained in:
UnknownShadow200 2019-01-17 08:59:59 +11:00
parent 6d7ad3b7cc
commit ce39c6ab93
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Entity.c
View file

@ -442,7 +442,7 @@ void TabList_Set(EntityID id, const String* player, const String* list, const St
TabList.GroupNames[id] = TabList.Buffer.Count; StringsBuffer_Add(&TabList.Buffer, group);
TabList.GroupRanks[id] = rank;
Event_RaiseInt(&TabListEvents.Added, id);
Event_RaiseInt(events, id);
}
static void TabList_Free(void) { StringsBuffer_Clear(&TabList.Buffer); }

14
src/Model.c
View file

@ -753,15 +753,14 @@ static void SittingModel_Draw(struct Entity* entity) {
HumanModel_Draw(entity);
}
static float SittingModel_GetNameY(struct Entity* e) { return 32.5f/16.0f; }
static float SittingModel_GetEyeY(struct Entity* e) { return (26.0f - SIT_OFFSET) / 16.0f; }
static void SittingModel_GetSize(struct Entity* e) { Model_RetSize(8.6f,28.1f - SIT_OFFSET,8.6f); }
static void SittingModel_GetBounds(struct Entity* e) { Model_RetAABB(-8,0,-4, 8,32 - SIT_OFFSET,4); }
static struct Model sitting_model = { "sit", human_vertices, &human_tex,
Model_NoParts, SittingModel_Draw,
SittingModel_GetNameY, SittingModel_GetEyeY,
SittingModel_GetSize, SittingModel_GetBounds
Model_NoParts, SittingModel_Draw,
HumanModel_GetNameY, SittingModel_GetEyeY,
SittingModel_GetSize, SittingModel_GetBounds
};
static struct Model* SittingModel_GetInstance(void) {
@ -816,15 +815,14 @@ static void HeadModel_Draw(struct Entity* entity) {
Model_UpdateVB();
}
static float HeadModel_GetNameY(struct Entity* e) { return 32.5f/16.0f; }
static float HeadModel_GetEyeY(struct Entity* e) { return 6.0f/16.0f; }
static void HeadModel_GetSize(struct Entity* e) { Model_RetSize(7.9f,7.9f,7.9f); }
static void HeadModel_GetBounds(struct Entity* e) { Model_RetAABB(-4,0,-4, 4,8,4); }
static struct Model head_model = { "head", human_vertices, &human_tex,
Model_NoParts, HeadModel_Draw,
HeadModel_GetNameY, HeadModel_GetEyeY,
HeadModel_GetSize, HeadModel_GetBounds
Model_NoParts, HeadModel_Draw,
HumanModel_GetNameY, HeadModel_GetEyeY,
HeadModel_GetSize, HeadModel_GetBounds
};
static struct Model* HeadModel_GetInstance(void) {