adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make use of GAME_STATE_FILE consistently.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3697 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2011-10-01 14:54:18 +00:00
parent e37fd2c51f
commit e2c6926c7b
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.8:
- Make use of GAME_STATE_FILE consistently, from Scott A. Colcord
- Fixed unconst(), from Scott A. Colcord
- Fixes to a few small bugs in UIO which shouldn't have had an impact on
UQM, but would in the future, from Alex
sc2/src/uqm/grpinfo.c
+10 -10
View File
@@ -71,7 +71,7 @@ typedef struct
} GROUP_HEADER;
static void
ReadGroupHeader (void *fp, GROUP_HEADER *pGH)
ReadGroupHeader (GAME_STATE_FILE *fp, GROUP_HEADER *pGH)
{
sread_8 (fp, &pGH->NumGroups);
sread_8 (fp, &pGH->day_index);
@@ -83,7 +83,7 @@ ReadGroupHeader (void *fp, GROUP_HEADER *pGH)
}
static void
WriteGroupHeader (void *fp, const GROUP_HEADER *pGH)
WriteGroupHeader (GAME_STATE_FILE *fp, const GROUP_HEADER *pGH)
{
swrite_8 (fp, pGH->NumGroups);
swrite_8 (fp, pGH->day_index);
@@ -95,7 +95,7 @@ WriteGroupHeader (void *fp, const GROUP_HEADER *pGH)
}
static void
ReadShipFragment (void *fp, SHIP_FRAGMENT *FragPtr)
ReadShipFragment (GAME_STATE_FILE *fp, SHIP_FRAGMENT *FragPtr)
{
BYTE tmpb;
@@ -117,7 +117,7 @@ ReadShipFragment (void *fp, SHIP_FRAGMENT *FragPtr)
}
static void
WriteShipFragment (void *fp, const SHIP_FRAGMENT *FragPtr)
WriteShipFragment (GAME_STATE_FILE *fp, const SHIP_FRAGMENT *FragPtr)
{
swrite_16 (fp, 0); /* unused: was which_side */
swrite_8 (fp, FragPtr->captains_name_index);
@@ -135,7 +135,7 @@ WriteShipFragment (void *fp, const SHIP_FRAGMENT *FragPtr)
}
static void
ReadIpGroup (void *fp, IP_GROUP *GroupPtr)
ReadIpGroup (GAME_STATE_FILE *fp, IP_GROUP *GroupPtr)
{
BYTE tmpb;
@@ -158,7 +158,7 @@ ReadIpGroup (void *fp, IP_GROUP *GroupPtr)
}
static void
WriteIpGroup (void *fp, const IP_GROUP *GroupPtr)
WriteIpGroup (GAME_STATE_FILE *fp, const IP_GROUP *GroupPtr)
{
swrite_16 (fp, 0); /* unused; was which_side */
swrite_8 (fp, 0); /* unused; was captains_name_index */
@@ -181,7 +181,7 @@ WriteIpGroup (void *fp, const IP_GROUP *GroupPtr)
void
InitGroupInfo (BOOLEAN FirstTime)
{
void *fp;
GAME_STATE_FILE *fp;
assert (NUM_SAVED_BATTLE_GROUPS >= MAX_BATTLE_GROUPS);
@@ -413,7 +413,7 @@ FoundHome:
}
static void
FlushGroupInfo (GROUP_HEADER* pGH, DWORD offset, BYTE which_group, void *fp)
FlushGroupInfo (GROUP_HEADER* pGH, DWORD offset, BYTE which_group, GAME_STATE_FILE *fp)
{
if (which_group == GROUP_LIST)
{
@@ -549,7 +549,7 @@ FlushGroupInfo (GROUP_HEADER* pGH, DWORD offset, BYTE which_group, void *fp)
BOOLEAN
GetGroupInfo (DWORD offset, BYTE which_group)
{
void *fp;
GAME_STATE_FILE *fp;
GROUP_HEADER GH;
if (offset != GROUPS_RANDOM && which_group != GROUP_LIST)
@@ -828,7 +828,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
DWORD
PutGroupInfo (DWORD offset, BYTE which_group)
{
void *fp;
GAME_STATE_FILE *fp;
GROUP_HEADER GH;
if (offset != GROUPS_RANDOM && which_group != GROUP_LIST)
sc2/src/uqm/state.c
+2 -2
View File
@@ -239,7 +239,7 @@ UninitPlanetInfo (void)
void
GetPlanetInfo (void)
{
void *fp;
GAME_STATE_FILE *fp;
pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[BIOLOGICAL_SCAN] = 0;
pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[MINERAL_SCAN] = 0;
@@ -287,7 +287,7 @@ GetPlanetInfo (void)
void
PutPlanetInfo (void)
{
void *fp;
GAME_STATE_FILE *fp;
fp = OpenStateFile (STARINFO_FILE, "r+b");
if (fp)
sc2/src/uqm/state.h
+9 -9
View File
@@ -79,7 +79,7 @@ int WriteStateFile (const void *lpBuf, COUNT size, COUNT count, GAME_STATE_FILE
int SeekStateFile (GAME_STATE_FILE *fp, long offset, int whence);
static inline COUNT
sread_8 (void *fp, BYTE *v)
sread_8 (GAME_STATE_FILE *fp, BYTE *v)
{
BYTE t;
if (!v) /* read value ignored */
@@ -88,7 +88,7 @@ sread_8 (void *fp, BYTE *v)
}
static inline COUNT
sread_16 (void *fp, UWORD *v)
sread_16 (GAME_STATE_FILE *fp, UWORD *v)
{
UWORD t;
if (!v) /* read value ignored */
@@ -97,7 +97,7 @@ sread_16 (void *fp, UWORD *v)
}
static inline COUNT
sread_16s (void *fp, SWORD *v)
sread_16s (GAME_STATE_FILE *fp, SWORD *v)
{
UWORD t;
COUNT ret;
@@ -109,7 +109,7 @@ sread_16s (void *fp, SWORD *v)
}
static inline COUNT
sread_32 (void *fp, DWORD *v)
sread_32 (GAME_STATE_FILE *fp, DWORD *v)
{
DWORD t;
if (!v) /* read value ignored */
@@ -118,7 +118,7 @@ sread_32 (void *fp, DWORD *v)
}
static inline COUNT
sread_a32 (void *fp, DWORD *ar, COUNT count)
sread_a32 (GAME_STATE_FILE *fp, DWORD *ar, COUNT count)
{
assert (ar != NULL);
@@ -131,25 +131,25 @@ sread_a32 (void *fp, DWORD *ar, COUNT count)
}
static inline COUNT
swrite_8 (void *fp, BYTE v)
swrite_8 (GAME_STATE_FILE *fp, BYTE v)
{
return WriteStateFile (&v, 1, 1, fp);
}
static inline COUNT
swrite_16 (void *fp, UWORD v)
swrite_16 (GAME_STATE_FILE *fp, UWORD v)
{
return WriteStateFile (&v, 2, 1, fp);
}
static inline COUNT
swrite_32 (void *fp, DWORD v)
swrite_32 (GAME_STATE_FILE *fp, DWORD v)
{
return WriteStateFile (&v, 4, 1, fp);
}
static inline COUNT
swrite_a32 (void *fp, const DWORD *ar, COUNT count)
swrite_a32 (GAME_STATE_FILE *fp, const DWORD *ar, COUNT count)
{
for ( ; count > 0; --count, ++ar)
{