Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend new savegame format to save game messages. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2791 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-11-10 23:26:19 +00:00
parent ae9a987d92
commit dfac006aa5
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/testdata/tagfile_map.def vendored
View File

@ -55,6 +55,11 @@
09 US 01 - # Repair ID - only set if factory type is REPAIR_FLAG
0a BO 01 0 # Do not register flag in flag list (commanders)
FF EN 00 -
04 GR 00 - # MESSAGE GROUP
01 SI 01 -1 # Object ID, if set, use it rather than name below; -1 means unset
02 ST 80 - # Name
03 BO 01 0 # Is message read?
FF EN 00 -
FF EN 00 -
0e GR 00 - # PRODUCTION RUNS GROUP (factory types)
01 GR 00 - # Number of factories

47
src/map.c
View File

@ -898,6 +898,7 @@ BOOL mapSaveTagged(char *pFileName)
STRUCTURE_STATS *psStructStats = asStructureStats;
FLAG_POSITION *psFlag;
FLAG_POSITION *flagList[NUM_FLAG_TYPES * MAX_FACTORY];
MESSAGE *psMessage;
tagWriteEnter(0x01, numResearch); // research group
for (i = 0; i < numResearch; i++, psResearch++)
@ -973,6 +974,45 @@ BOOL mapSaveTagged(char *pFileName)
}
tagWriteLeave(0x03);
// FIXME: Structured after old savegame logic, but surely it must be possible
// to simplify the mess below. It refers to non-saved file containing messages.
for (psMessage = apsMessages[plr], i = 0; psMessage != NULL; psMessage = psMessage->psNext, i++);
tagWriteEnter(0x04, i); // message group
for (psMessage = apsMessages[plr]; psMessage != NULL; psMessage = psMessage->psNext)
{
if (psMessage->type == MSG_PROXIMITY)
{
PROXIMITY_DISPLAY *psProx = apsProxDisp[plr];
// find the matching proximity message
for (; psProx != NULL && psProx->psMessage != psMessage; psProx = psProx->psNext);
ASSERT(psProx != NULL, "Save message; proximity display not found for message");
if (psProx->type == POS_PROXDATA)
{
// message has viewdata so store the name
VIEWDATA *pViewData = (VIEWDATA*)psMessage->pViewData;
tagWriteString(0x02, pViewData->pName);
}
else
{
BASE_OBJECT *psObj = (BASE_OBJECT*)psMessage->pViewData;
tagWrites(0x01, psObj->id);
}
}
else
{
VIEWDATA *pViewData = (VIEWDATA*)psMessage->pViewData;
tagWriteString(0x2, pViewData->pName);
}
tagWriteBool(0x3, psMessage->read);
tagWriteSeparator();
}
tagWriteLeave(0x04);
tagWriteSeparator();
}
debug(LOG_MAP, " * Writing info about %d players", (int)MAX_PLAYERS);
@ -1038,6 +1078,13 @@ BOOL mapSaveTagged(char *pFileName)
}
tagWriteLeave(0x0f);
// REMAINS TO BE DONE?
// * writeCompListFile
// * writeStructTypeListFile
// * writeProductionFile
// * writeCommandLists
// * writeScriptState
tagClose();
return TRUE;
}