From: Alexander Monakov Date: Sat, 18 Dec 2010 12:53:30 +0000 (+0300) Subject: Slightly squash unpack stuff X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=commitdiff_plain;h=14a1f983de1723c52b252c161997651cecbef2e1 Slightly squash unpack stuff --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e2f866..632dc73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,6 @@ set(LUGARU_SRCS ${SRCDIR}/Text.cpp ${SRCDIR}/TGALoader.cpp ${SRCDIR}/unpack.c - ${SRCDIR}/unpack_private.c ${SRCDIR}/Weapons.cpp ${SRCDIR}/OpenGL_Windows.cpp ${SRCDIR}/openal_wrapper.cpp @@ -111,7 +110,6 @@ set(LUGARU_H ${SRCDIR}/glstubs.h ${SRCDIR}/pack_private.h ${SRCDIR}/private.h - ${SRCDIR}/unpack_private.h ${SRCDIR}/Settings.h ${SRCDIR}/Stereo.h ${SRCDIR}/Animation.h diff --git a/Source/unpack.c b/Source/unpack.c index 7715cc0..c40c5b7 100644 --- a/Source/unpack.c +++ b/Source/unpack.c @@ -23,7 +23,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "binio.h" #include "private.h" -#include "unpack_private.h" + +struct BinIOUnpackContext +{ + const uint8_t *data; + va_list args; +}; + +static void BinIOUnpack(void *context, int type, int byte_order, int count) +{ + struct BinIOUnpackContext *ctx = (struct BinIOUnpackContext*)context; + if (count == -1) + { + count = 1; + } + + switch (type) + { + case BinIO_TYPE_IGNORE_BYTE: ctx->data += 1 * count; break; + case BinIO_TYPE_BYTE: BinIOConvert1(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 1 * count; break; + case BinIO_TYPE_INT16: BinIOConvert2(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 2 * count; break; + case BinIO_TYPE_INT32: BinIOConvert4(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 4 * count; break; + case BinIO_TYPE_INT64: BinIOConvert8(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 8 * count; break; + case BinIO_TYPE_FLOAT32: BinIOConvert4(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 4 * count; break; + case BinIO_TYPE_FLOAT64: BinIOConvert8(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 8 * count; break; + } +} void unpackf(const char *format, ...) { diff --git a/Source/unpack_private.c b/Source/unpack_private.c deleted file mode 100644 index 45ed1dd..0000000 --- a/Source/unpack_private.c +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright (C) 2003, 2010 - Wolfire Games - -This file is part of Lugaru. - -Lugaru is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "unpack_private.h" - -extern void BinIOUnpack(void *context, int type, int byte_order, int count) -{ - struct BinIOUnpackContext *ctx = (struct BinIOUnpackContext*)context; - if (count == -1) - { - count = 1; - } - - switch (type) - { - case BinIO_TYPE_IGNORE_BYTE: ctx->data += 1 * count; break; - case BinIO_TYPE_BYTE: BinIOConvert1(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 1 * count; break; - case BinIO_TYPE_INT16: BinIOConvert2(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 2 * count; break; - case BinIO_TYPE_INT32: BinIOConvert4(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 4 * count; break; - case BinIO_TYPE_INT64: BinIOConvert8(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 8 * count; break; - case BinIO_TYPE_FLOAT32: BinIOConvert4(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 4 * count; break; - case BinIO_TYPE_FLOAT64: BinIOConvert8(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 8 * count; break; - } -} diff --git a/Source/unpack_private.h b/Source/unpack_private.h deleted file mode 100644 index d30969f..0000000 --- a/Source/unpack_private.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright (C) 2003, 2010 - Wolfire Games - -This file is part of Lugaru. - -Lugaru is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef unpack_private_h -#define unpack_private_h - -#include "private.h" - -struct BinIOUnpackContext -{ - const uint8_t *data; - va_list args; -}; - -extern void BinIOUnpack(void *context, int type, int byte_order, int count); - -#endif -