/*
* 2ooM: The Master of Orion II Reverse Engineering Project
* Simple command-line tool to convert an LBX image to a set of PNGs.
- * Copyright (C) 2006-2008 Nick Bowler
+ * Copyright (C) 2006-2010 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
{
- LBX_IMG *overimg = lbximg_open(f, &lbx_default_fops, NULL);
+ LBXimg *overimg = lbximg_open(f, &lbx_default_fops, NULL);
struct lbx_imginfo info;
if (!overimg) {
return 0;
}
-static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
+static int loadpalette(LBXimg *img, struct lbx_imginfo *info,
FILE *palf, FILE *override,
struct lbx_colour palette[static 256])
{
return 0;
}
-int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
+int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
{
unsigned char *framebits;
struct lbx_colour palette[256];
struct lbx_pipe_state stdin_handle = { .f = stdin };
FILE *palf = NULL, *overf = NULL;
const char *file = NULL;
- LBX_IMG *img;
+ LBXimg *img;
- static const char *sopts = "idvf:p:O:V";
+ static const char *sopts = "idnvf:p:O:V";
static const struct option lopts[] = {
- { "ident", 0, NULL, 'i' },
- { "decode", 0, NULL, 'd' },
- { "verbose", 0, NULL, 'v' },
- { "file", 1, NULL, 'f' },
- { "palette", 1, NULL, 'p' },
- { "override", 1, NULL, 'p' },
+ { "ident", 0, NULL, 'i' },
+ { "decode", 0, NULL, 'd' },
+ { "verbose", 0, NULL, 'v' },
+ { "file", 1, NULL, 'f' },
+ { "palette", 1, NULL, 'p' },
+ { "override", 1, NULL, 'p' },
- { "version", 0, NULL, 'V' },
- { "usage", 0, NULL, 'U' },
- { "help", 0, NULL, 'H' },
+ { "version", 0, NULL, 'V' },
+ { "usage", 0, NULL, 'U' },
+ { "help", 0, NULL, 'H' },
- { "nopalette", 0, &usepalette, 0 },
+ { "no-palette", 0, NULL, 'n' },
{ 0 }
};
case 'f':
file = optarg;
break;
+ case 'n':
+ usepalette = 0;
+ break;
case 'p':
palf = fopen(optarg, "rb");
if (!palf) {