From eae7ca1df344ab28f451d2e8cab3e409d6d13c90 Mon Sep 17 00:00:00 2001 From: johannes Date: Sun, 11 Feb 2024 02:01:40 +0100 Subject: format all --- inc/args.h | 2 +- src/args.c | 12 ++++++------ src/commands.c | 14 +++++++------- src/demo.c | 5 ++--- src/main.c | 30 +++++++++++++++--------------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/inc/args.h b/inc/args.h index 6c06fb2..8c88e22 100644 --- a/inc/args.h +++ b/inc/args.h @@ -5,7 +5,7 @@ #define MAX_COMMANDS 64 -typedef struct +typedef struct { char *demopath; char *mappath; diff --git a/src/args.c b/src/args.c index 9544e39..1b756d5 100644 --- a/src/args.c +++ b/src/args.c @@ -40,7 +40,7 @@ void parseargs(input *in, int argc, char *argv[]) in->outpath = NULL; in->print = 0; in->extractmap = 0; - + in->numcmds = 0; int argi; @@ -77,7 +77,7 @@ void parseargs(input *in, int argc, char *argv[]) break; case 'o': if (argi + 1 >= argc) - { + { fprintf(stderr, "ERROR: Flag 'o' requires additional argument\n"); exit(EXIT_FAILURE); } @@ -89,7 +89,7 @@ void parseargs(input *in, int argc, char *argv[]) break; case 'e': if (argi + 1 >= argc) - { + { fprintf(stderr, "ERROR: Flag 'e' requires additional argument\n"); exit(EXIT_FAILURE); } @@ -98,7 +98,7 @@ void parseargs(input *in, int argc, char *argv[]) break; case 'm': if (argi + 1 >= argc) - { + { fprintf(stderr, "ERROR: Flag 'm' requires additional argument\n"); exit(EXIT_FAILURE); } @@ -109,9 +109,9 @@ void parseargs(input *in, int argc, char *argv[]) fprintf(stderr, "ERROR: Unknown flag '%c'\n", argv[argi][1]); exit(EXIT_FAILURE); break; - } + } } - else + else { if (in->demopath) { diff --git a/src/commands.c b/src/commands.c index e2353d8..752b451 100644 --- a/src/commands.c +++ b/src/commands.c @@ -1,6 +1,6 @@ +#include "../inc/commands.h" #include "../inc/demo.h" #include "../inc/pack.h" -#include "../inc/commands.h" #include #include @@ -142,7 +142,7 @@ int changemap(FILE *map, char *mapname, demo *demo) fseek(map, 0, SEEK_END); long mapsize = ftell(map); fseek(map, 0, SEEK_SET); - + if (mapsize < 4) return -1; @@ -151,7 +151,7 @@ int changemap(FILE *map, char *mapname, demo *demo) return -1; fread(mapbuff, 1, mapsize, map); - + if (memcmp(mapbuff, "DATA", 4) != 0) { free(mapbuff); @@ -160,7 +160,7 @@ int changemap(FILE *map, char *mapname, demo *demo) free(demo->map.data); demo->map.data = mapbuff; - + if (demo->header.version >= 6) demo->header.version = 5; @@ -173,10 +173,10 @@ int changemap(FILE *map, char *mapname, demo *demo) void runcommand(cmdinput *cmd, demo *demo) { - switch(cmd->cmdtype) + switch (cmd->cmdtype) { case 'n': - switch(cmd->settype) + switch (cmd->settype) { case 'i': if (setnamebyid(cmd->id, cmd->to, demo) < 0) @@ -191,7 +191,7 @@ void runcommand(cmdinput *cmd, demo *demo) } break; case 's': - switch(cmd->settype) + switch (cmd->settype) { case 'i': if (setskinbyid(cmd->id, cmd->to, demo) < 0) diff --git a/src/demo.c b/src/demo.c index 57ce8d1..ff89e50 100644 --- a/src/demo.c +++ b/src/demo.c @@ -21,8 +21,8 @@ const unsigned char mapmagic[] = {0x6b, 0xe6, 0xda, 0x4a, 0xce, 0xbd, 0x38, 0x0c void freedemo(demo *demo) { free(demo->map.data); - - for(int i = 0; i < demo->data.numchunks; i++) + + for (int i = 0; i < demo->data.numchunks; i++) { demochunk *chunk = &demo->data.chunks[i]; switch (chunk->type) @@ -50,7 +50,6 @@ void freedemo(demo *demo) } } free(demo->data.chunks); - } /* readers */ diff --git a/src/main.c b/src/main.c index b344f3d..ddc5813 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ +#include "../inc/args.h" #include "../inc/commands.h" #include "../inc/demo.h" #include "../inc/huffman.h" -#include "../inc/args.h" #include #include @@ -127,7 +127,7 @@ int mapname(char *mappath, char *out) } i++; } - + if ((end - start) > 31) return 0; @@ -146,20 +146,20 @@ void run(input *in) { if (!in->demopath) exit(EXIT_FAILURE); - + FILE *demofile, *outfile, *mapfile, *exmapfile; demofile = NULL; outfile = NULL; mapfile = NULL; exmapfile = NULL; - + demofile = fopen(in->demopath, "r"); if (!demofile) { perror("ERROR: Failed to open demo file, reason"); exit(EXIT_FAILURE); } - + if (in->outpath) { outfile = fopen(in->outpath, "w"); @@ -169,7 +169,7 @@ void run(input *in) exit(EXIT_FAILURE); } } - + if (in->mappath) { mapfile = fopen(in->mappath, "r"); @@ -201,7 +201,7 @@ void run(input *in) if (in->print) printdemo(&dmo, 0); - + if (mapfile) { char mname[32]; @@ -248,21 +248,22 @@ int main(int argc, char *argv[]) input in; parseargs(&in, argc, argv); - + /* printf("demopath: %s\n", in.demopath); printf("outpath: %s\n", in.outpath); printf("mappath: %s\n", in.mappath); printf("extractpath: %s\n", in.extractmap); printf("print: %d\n", in.print); - + printf("\ncommands:\n"); for (int i = 0; i < in.numcmds; i++) { cmdinput *c = &in.commands[i]; - printf("command: {cmd: %c, type: %c, id: %d, from: %s, to: %s}\n", c->cmdtype, c->settype, c->id, c->from, c->to); + printf("command: {cmd: %c, type: %c, id: %d, from: %s, to: %s}\n", c->cmdtype, c->settype, c->id, c->from, + c->to); } - + printf("\nEXITING SUCCESS\n"); */ @@ -282,12 +283,12 @@ int main(int argc, char *argv[]) // printdemo(&d, 1); int retid = setnamebyid(1, "NamedByID", &d); - + setnamebyid(8, "Elf Two", &d); setnamebyid(3, "Elf One", &d); - + setnamebyid(7, "Santas Cat", &d); - + setskinbyname("Elf One", "santa_default", &d); setskinbyname("Elf Two", "santa_default", &d); @@ -299,7 +300,6 @@ int main(int argc, char *argv[]) int retmap = changemap(mp, "pepeg", &d); - printf("id: %d name: %d\n", retid, retname); printf("skin: %d, map: %d\n", retskin, retmap); -- cgit v1.2.3