Menu
▾
▴
[Sc2-cvs] SF.net SVN: sc2:[3697] trunk/sc2
|
From: <Mee...@us...> - 2011-10-01 14:54:24
|
Revision: 3697
http://sc2.svn.sourceforge.net/sc2/?rev=3697&view=rev
Author: Meep-Eep
Date: 2011-10-01 14:54:18 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
Make use of GAME_STATE_FILE consistently.
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/src/uqm/grpinfo.c
trunk/sc2/src/uqm/state.c
trunk/sc2/src/uqm/state.h
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-10-01 14:15:35 UTC (rev 3696)
+++ trunk/sc2/ChangeLog 2011-10-01 14:54:18 UTC (rev 3697)
@@ -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
Modified: trunk/sc2/src/uqm/grpinfo.c
===================================================================
--- trunk/sc2/src/uqm/grpinfo.c 2011-10-01 14:15:35 UTC (rev 3696)
+++ trunk/sc2/src/uqm/grpinfo.c 2011-10-01 14:54:18 UTC (rev 3697)
@@ -71,7 +71,7 @@
} 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 @@
}
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 @@
}
static void
-ReadShipFragment (void *fp, SHIP_FRAGMENT *FragPtr)
+ReadShipFragment (GAME_STATE_FILE *fp, SHIP_FRAGMENT *FragPtr)
{
BYTE tmpb;
@@ -117,7 +117,7 @@
}
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 @@
}
static void
-ReadIpGroup (void *fp, IP_GROUP *GroupPtr)
+ReadIpGroup (GAME_STATE_FILE *fp, IP_GROUP *GroupPtr)
{
BYTE tmpb;
@@ -158,7 +158,7 @@
}
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 @@
void
InitGroupInfo (BOOLEAN FirstTime)
{
- void *fp;
+ GAME_STATE_FILE *fp;
assert (NUM_SAVED_BATTLE_GROUPS >= MAX_BATTLE_GROUPS);
@@ -413,7 +413,7 @@
}
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 @@
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 @@
DWORD
PutGroupInfo (DWORD offset, BYTE which_group)
{
- void *fp;
+ GAME_STATE_FILE *fp;
GROUP_HEADER GH;
if (offset != GROUPS_RANDOM && which_group != GROUP_LIST)
Modified: trunk/sc2/src/uqm/state.c
===================================================================
--- trunk/sc2/src/uqm/state.c 2011-10-01 14:15:35 UTC (rev 3696)
+++ trunk/sc2/src/uqm/state.c 2011-10-01 14:54:18 UTC (rev 3697)
@@ -239,7 +239,7 @@
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 @@
void
PutPlanetInfo (void)
{
- void *fp;
+ GAME_STATE_FILE *fp;
fp = OpenStateFile (STARINFO_FILE, "r+b");
if (fp)
Modified: trunk/sc2/src/uqm/state.h
===================================================================
--- trunk/sc2/src/uqm/state.h 2011-10-01 14:15:35 UTC (rev 3696)
+++ trunk/sc2/src/uqm/state.h 2011-10-01 14:54:18 UTC (rev 3697)
@@ -79,7 +79,7 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
