A little cleaner.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1611 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
7e108c5a71
commit
ba12a35dca
1 changed files with 30 additions and 7 deletions
|
@ -1,5 +1,7 @@
|
||||||
#include "../plugin.h"
|
#include "../plugin.h"
|
||||||
|
|
||||||
|
#define DEFAULTHUDNAME "ftehud.hud"
|
||||||
|
|
||||||
#define MAX_ELEMENTS 128
|
#define MAX_ELEMENTS 128
|
||||||
|
|
||||||
int K_UPARROW;
|
int K_UPARROW;
|
||||||
|
@ -937,6 +939,8 @@ void Hud_Save(char *fname)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int handle;
|
int handle;
|
||||||
|
if (!fname)
|
||||||
|
fname = DEFAULTHUDNAME;
|
||||||
if (FS_Open(fname, &handle, 1)<0)
|
if (FS_Open(fname, &handle, 1)<0)
|
||||||
{
|
{
|
||||||
Con_Printf("Couldn't open %s\n", fname);
|
Con_Printf("Couldn't open %s\n", fname);
|
||||||
|
@ -951,7 +955,9 @@ void Hud_Save(char *fname)
|
||||||
PutFloat(element[i].y, ' ', handle);
|
PutFloat(element[i].y, ' ', handle);
|
||||||
PutFloat(element[i].scalex, ' ', handle);
|
PutFloat(element[i].scalex, ' ', handle);
|
||||||
PutFloat(element[i].scaley, ' ', handle);
|
PutFloat(element[i].scaley, ' ', handle);
|
||||||
PutInteger(element[i].type, '\n', handle);
|
PutInteger(element[i].type, ' ', handle);
|
||||||
|
PutInteger(element[i].subtype, ' ', handle);
|
||||||
|
PutFloat(element[i].alpha, '\n', handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
FS_Close(handle);
|
FS_Close(handle);
|
||||||
|
@ -999,6 +1005,12 @@ void Hud_Load(char *fname)
|
||||||
int len;
|
int len;
|
||||||
int i;
|
int i;
|
||||||
int handle;
|
int handle;
|
||||||
|
|
||||||
|
float x, y, sx, sy, a;
|
||||||
|
int type, subtype;
|
||||||
|
|
||||||
|
if (!fname)
|
||||||
|
fname = DEFAULTHUDNAME;
|
||||||
len = FS_Open(fname, &handle, 0);
|
len = FS_Open(fname, &handle, 0);
|
||||||
if (len < 0)
|
if (len < 0)
|
||||||
{
|
{
|
||||||
|
@ -1027,17 +1039,28 @@ void Hud_Load(char *fname)
|
||||||
}
|
}
|
||||||
for (i = 0; i < numelements; i++)
|
for (i = 0; i < numelements; i++)
|
||||||
{
|
{
|
||||||
element[i].x = GetFloat(&p, handle);
|
x = GetFloat(&p, handle);
|
||||||
element[i].y = GetFloat(&p, handle);
|
y = GetFloat(&p, handle);
|
||||||
element[i].scalex = GetFloat(&p, handle);
|
sx = GetFloat(&p, handle);
|
||||||
element[i].scaley = GetFloat(&p, handle);
|
sy = GetFloat(&p, handle);
|
||||||
|
a = GetFloat(&p, handle);
|
||||||
|
type = GetInteger(&p, handle);
|
||||||
|
subtype = GetInteger(&p, handle);
|
||||||
|
|
||||||
element[i].type = GetInteger(&p, handle);
|
if (type<0 || type>=sizeof(drawelement)/sizeof(drawelement[0]))
|
||||||
if (element[i].type<0 || element[i].type>=sizeof(drawelement)/sizeof(drawelement[0]))
|
|
||||||
{
|
{
|
||||||
numelements--;
|
numelements--;
|
||||||
i--;
|
i--;
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
element[i].x = x;
|
||||||
|
element[i].y = y;
|
||||||
|
element[i].scalex = sx;
|
||||||
|
element[i].scaley = sy;
|
||||||
|
element[i].alpha = a;
|
||||||
|
element[i].type = type;
|
||||||
|
element[i].subtype = subtype;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue