kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add a map license and comment string to the map header

Browse Source 
Two new string variables, mapinfo_license and mapinfo_comment, are stored
withing the header of a map file.

The variables are automatically read and written during loading and
saving maps. Default values are empty strings. The comment string is
ignored, as long as no license string is set. The license string is meant
to hold an abbreviated name of the license, picked from a list of
known map licenses.

DOCREF mapinfo_license mapinfo_comment
This commit is contained in:
ac-stef
2016-07-26 15:41:40 +02:00
parent 13ec9d692f
commit a860cc58b0
4 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/worldio.cpp
+31
View File
@@ -310,6 +310,13 @@ void parseheaderextra(bool clearnonpersist = true, int ignoretypes = 0) // pars
break;
case HX_MAPINFO:
{
string l, c;
getstring(l, q, MAXSTRLEN - 1);
getstring(c, q, MAXSTRLEN - 1);
setmapinfo(l, c);
break;
}
case HX_MODEINFO:
case HX_ARTIST:
default:
@@ -322,6 +329,18 @@ void parseheaderextra(bool clearnonpersist = true, int ignoretypes = 0) // pars
ucharbuf packheaderextras(int ignoretypes = 0) // serialise all extra data packets to save with the map header
{
vector<uchar> buf, tmp;
// rewrite some headers every time
if(!(ignoretypes & (1 << HX_MAPINFO)))
{
for(int n; (n = findheaderextra(HX_MAPINFO)) >= 0; ) deleteheaderextra(n);
if(mapinfo_license[0])
{
sendstring(mapinfo_license, tmp);
sendstring(mapinfo_comment, tmp);
headerextras.add(new headerextra(tmp.length(), HX_MAPINFO|HX_FLAG_PERSIST, tmp.getbuf()));
tmp.setsize(0);
}
}
loopv(headerextras) if(!(ignoretypes & (1 << (headerextras[i]->flags & HX_TYPEMASK))))
{ // copy existing persistent hx packets
addhxpacket(buf, headerextras[i]->len, headerextras[i]->flags, headerextras[i]->data);
@@ -490,6 +509,18 @@ bool gotovantagepoint()
}
COMMANDF(gotovantagepoint, "", () { if(editmode) gotovantagepoint(); });
void setmapinfo(const char *newlicense, const char *newcomment)
{
string s;
filtertext(s, newlicense ? newlicense : mapinfo_license, FTXT__MAPINFO_LICENSE, 20);
mapinfo_license = exchangestr(mapinfo_license, s);
filtertext(s, newcomment ? newcomment : mapinfo_comment, FTXT__MAPINFO_COMMENT, 60);
mapinfo_comment = exchangestr(mapinfo_comment, s);
}
SVARF(mapinfo_license, "", setmapinfo(); );
SVARF(mapinfo_comment, "", setmapinfo(); );
VAR(advancemaprevision, 1, 1, 100);
VARP(mapbackupsonsave, 0, 1, 1);