diff --git a/README.md b/README.md index d5d6b6f..b2904f8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is an elemental combination game written in C, with optional multi-player s ## Clients - [PenguinMod client](https://studio.penguinmod.com/?fps=200&clones=Infinity&offscreen&size=850x480#7218964246) for playing the game online with a fancy interface - [Discord client](https://discord.gg/DKZTWyWH3B) for playing the game publicly with other Discord members -- [Web client](https://elem.dervland.net/index.html) for a demo of the multiplayer version +- [Web client](https://elem.dervland.net/) for a demo of the multiplayer version - [Original client](https://git.dervland.net/elemental/elemental-on-terminal/releases) for developers, administrators, and command line fans ## Single-player diff --git a/src/command.c b/src/command.c index 749cbdc..c89104e 100644 --- a/src/command.c +++ b/src/command.c @@ -1,5 +1,4 @@ #include "map.h" -#include <time.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -143,13 +142,8 @@ int success_handler(const void *key, size_t size, uintptr_t val, void *usr) { } char *handle_pages(char *command, char *invs) { - char *data; - char *data2; if (strncmp(command, invs, strlen(invs)) == 0) { - data = &command[strlen(invs)]; - data2 = malloc(strlen(data) + 1); - memcpy(data2,data,strlen(data) + 1); - return data2; + return &command[strlen(invs)]; } else { return 0; } @@ -183,8 +177,6 @@ int suggest_command(char *command, char *command_re, hashmap *polls, hashmap *co char *val = calloc(MAX_BUF_LENGTH, sizeof(char)); sprintf(val, "%s;%s", page, command_re); - srand(time(NULL)); - char *key = calloc(MAX_BUF_LENGTH, sizeof(char)); sprintf(key, "%s_%i", name, (int)rand()); diff --git a/src/loader.c b/src/loader.c index a41a19d..28668f5 100644 --- a/src/loader.c +++ b/src/loader.c @@ -26,9 +26,7 @@ int entry_handler(const void *key, size_t size, uintptr_t val, void *usr) { } } else if (usr2->mode == 1) { fwrite(key2, sizeof(char), strlen(key2), usr2->fptr); - if (key2[strlen(key2) - 1] != '\n') { - fwrite("\n", sizeof(char), 1, usr2->fptr); - } + fwrite("\n", sizeof(char), 1, usr2->fptr); } else { fwrite(key2, sizeof(char), strlen(key2), usr2->fptr); fwrite(";", sizeof(char), 1, usr2->fptr); diff --git a/src/main.c b/src/main.c index 0028bb7..67e3c96 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,5 @@ #include "command.h" #include "loader.h" -#include "map.h" #include <ctype.h> #include <stdint.h> #include <stdio.h> @@ -88,11 +87,8 @@ int main(int argc, char *argv[]) { was_combination = 0; if (help_command(command)) continue; - if (polls_command(command, polls, elements)) { - hashmap_free(polls); - polls = hashmap_create(); - init_tables(elements, inv, polls, elements_rev, 0); - } + if (polls_command(command, polls, elements)) + continue; if (slash_command(command, inv)) continue;