summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demo.c14
-rw-r--r--src/main.c75
2 files changed, 2 insertions, 87 deletions
diff --git a/src/demo.c b/src/demo.c
index ff940b6..7e49a7d 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -135,15 +135,7 @@ int readdemosnap(FILE *fp, demosnap *snap, int size)
fread(data, 1, size, fp);
- int ret = decompresshuff((char *)data, size, (char *)unpacked, 1034 * 8);
- /*
- printf("READ={compressed size = %d, ret: %d, data: [ ", size, ret);
- for (int i = 0; i < ret; i++)
- printf("%x ", unpacked[i] & 0xff);
- printf("]}\n");
- */
-
- if (ret < 0)
+ if (decompresshuff((char *)data, size, (char *)unpacked, 1034 * 8) < 0)
{
printf("[ ERROR ] error while decompressing snap cunk!\n");
return 0;
@@ -163,7 +155,6 @@ int readdemosnap(FILE *fp, demosnap *snap, int size)
for (int i = 0; i < snap->numitems; i++)
{
unsigned int item_key = (unsigned int)readint(&cp);
- // printf("READKEY: %u\n", item_key);
snap->items[i].type = (item_key >> 16) & 0xffff;
snap->items[i].id = (item_key & 0xffff);
@@ -218,7 +209,6 @@ int readdemochunk(FILE *fp, demochunk *chunk, unsigned char ver)
if (chunkhead & CHUNK_TICK_MASK)
{
- // printf("TICKHEAD={%2X}",(unsigned char) chunkhead);
demotick *tick = (demotick *)malloc(sizeof(demotick));
memset(tick, 0, sizeof(demotick)); // TODO idk if necessary
@@ -226,7 +216,6 @@ int readdemochunk(FILE *fp, demochunk *chunk, unsigned char ver)
{
chunk->type = DEMOTICK;
chunk->data.tick = tick;
- printf("TICK={keyframe: %d, innline: %d, delta: %d}\n", tick->keyframe, tick->innline, tick->delta);
}
else
{
@@ -452,7 +441,6 @@ int writedemosnap(FILE *fp, demosnap *snap, unsigned char ver)
for (int i = 0; i < snap->numitems; i++)
{
unsigned int key = (snap->items[i].type << 16) | snap->items[i].id;
- // printf("WRITEKEY: %u\n", key);
writeint((int)key, &cp);
for (int y = 0; y < snap->items[i].numdata; y++)
diff --git a/src/main.c b/src/main.c
index 5408903..b4e7abb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -110,43 +110,8 @@ int testdecompress(char *line)
return 1;
}
-void dumbtestpacker()
-{
- char b[] = {0xe0, 0xce, 0xf0, 0xaf, 0x09, 0xb7};
- char *c = b;
- printf("test: %d\n", readint(&c));
-
- char buf[16] = {0};
- int in = 196618;
- int in2 = 8763289;
-
- printf("input: %d\n", in);
-
- for (int i = 0; i < 16; i++)
- printf("%2X ", buf[i]);
- printf("\n");
- char *cp = buf;
-
- writeint(in, &cp);
- writeint(in2, &cp);
-
- for (int i = 0; i < 16; i++)
- printf("%2X ", buf[i]);
- printf("\n");
-
- cp = buf;
- int res = readint(&cp);
- int res2 = readint(&cp);
-
- printf("res: %d\n", res);
- printf("res2: %d\n", res2);
-}
-
int main()
{
- dumbtestpacker();
- // exit(0);
-
inithuff(NULL);
FILE *fp = fopen("data/test.demo", "r");
@@ -183,45 +148,7 @@ int main()
fclose(fp);
fclose(op);
- /*
- demoheader dh;
- demotimeline dt;
- demomap dm;
-
- int ret = readdemoheader(fp, &dh);
-
- dm.data = (unsigned char *)malloc(dh.mapsize);
-
- printf("\nheader: %i\n", ret);
-
- if (dh.version >= 4)
- ret = readdemotimeline(fp, &dt);
-
- printf("timeline: %i\n", ret);
-
- ret = readdemomap(fp, &dm, dh.mapsize, dh.version);
- printf("readdemomap ret: %d\n\n", ret);
-
- demochunk dc;
- int i = 0;
- while (readdemochunk(fp, &dc, dh.version) > 0)
- {
- i++;
- }
- printf("i: %d\n", i);
- char c;
- do
- {
- c = getc(fp);
- // printf("%x\n", c & 0xff);
- if (c != EOF)
- {
- putc(c, op);
- }
- } while (c != EOF);
- */
- return EXIT_SUCCESS;
-
+ // Testing
/*
inithuff(NULL);