diff options
| author | Haru <haru@dotalux.com> | 2018-02-07 03:56:01 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2018-02-10 01:23:15 +0100 |
| commit | ba28b56a6b3180c7d13c196ecb44fddd3d63a4f6 (patch) | |
| tree | f049fca67c4490950a86de3d3675384b3f142f57 /src/map | |
| parent | 6f85e399942facc69555d078c82588f95b198711 (diff) | |
| download | hercules-ba28b56a6b3180c7d13c196ecb44fddd3d63a4f6.tar.gz hercules-ba28b56a6b3180c7d13c196ecb44fddd3d63a4f6.tar.bz2 hercules-ba28b56a6b3180c7d13c196ecb44fddd3d63a4f6.tar.xz hercules-ba28b56a6b3180c7d13c196ecb44fddd3d63a4f6.zip | |
Fix some minor issues in the clan system, as reported by coverity
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 10 | ||||
| -rw-r--r-- | src/map/clan.c | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 29e8bf4f8..6b7606cb4 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9545,9 +9545,6 @@ ACMD(claninfo) for (i = 0; i < VECTOR_LENGTH(c->allies); i++) { struct clan_relationship *ally = &VECTOR_INDEX(c->allies, i); - if (ally == NULL) - continue; - safesnprintf(atcmd_output, sizeof(atcmd_output), "- - Ally #%d (Id: %d): %s", i + 1, ally->clan_id, ally->constant); clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output); count++; @@ -9559,14 +9556,11 @@ ACMD(claninfo) safesnprintf(atcmd_output, sizeof(atcmd_output), "- Antagonists: %d", VECTOR_LENGTH(c->antagonists)); clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output); - + count = 0; for (i = 0; i < VECTOR_LENGTH(c->antagonists); i++) { struct clan_relationship *antagonist = &VECTOR_INDEX(c->antagonists, i); - if (antagonist == NULL) - continue; - safesnprintf(atcmd_output, sizeof(atcmd_output), "- - Antagonist #%d (Id: %d): %s", i + 1, antagonist->clan_id, antagonist->constant); clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output); count++; @@ -9575,7 +9569,7 @@ ACMD(claninfo) if (count == 0) { clif->messagecolor_self(fd, COLOR_DEFAULT, "- - No Antagonists Found!"); } - + clif->messagecolor_self(fd, COLOR_DEFAULT, "============================"); } dbi_destroy(iter); diff --git a/src/map/clan.c b/src/map/clan.c index 6855e449d..2c12df492 100644 --- a/src/map/clan.c +++ b/src/map/clan.c @@ -523,7 +523,7 @@ int clan_inactivity_kick(int tid, int64 tick, int id, intptr_t data) if ((c = clan->search(id)) != NULL) { if (!c->kick_time || c->tid != tid || tid == INVALID_TIMER || c->tid == INVALID_TIMER) { ShowError("Timer Mismatch (Time: %d seconds) %d != %d", c->kick_time, c->tid, tid); - Assert_retr(0, 0); + Assert_report(0); return 0; } for (i = 0; i < VECTOR_LENGTH(c->members); i++) { |