Some symbol renames to avoid conflicts with Carbon on OSX.

The naming isn't very consistant now, but all this code will be redone
anyway with the new resource system.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@546 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/sc2code/demo.c

@@ -89,10 +89,10 @@ OpenJournal (void)
 	{
 		FILE *fp;
 
-		if (fp = OpenResFile ("starcon.jnl", "rb"))
+		if (fp = res_OpenResFile ("starcon.jnl", "rb"))
 		{
 			ReadResFile (journal_buf, 1, sizeof (journal_buf), fp);
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 
 			if (journal_fh = copen (journal_buf, MEMORY_STREAM, STREAM_READ))
 			{
@@ -125,10 +125,10 @@ CloseJournal (void)
 			return (FALSE);
 		}
 #if CREATE_JOURNAL
-		else if (fp = OpenResFile ("starcon.jnl", "wb"))
+		else if (fp = res_OpenResFile ("starcon.jnl", "wb"))
 		{
 			WriteResFile (journal_buf, 1, sizeof (journal_buf), fp);
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 		}
 #endif /* CREATE_JOURNAL */
 	}

sc2/src/sc2code/dummy.c

@@ -315,9 +315,9 @@ LoadCodeResInstance (DWORD res)
 {
 	MEM_HANDLE hData;
 
-	hData = GetResource (res);
+	hData = res_GetResource (res);
 	if (hData)
-		DetachResource (res);
+		res_DetachResource (res);
 
 	return (hData);
 }

sc2/src/sc2code/grpinfo.c

@@ -36,7 +36,7 @@ InitGroupInfo (BOOLEAN FirstTime)
 {
 	PVOID fp;
 
-	fp = OpenResFile (tempFilePath (RANDGRPINFO_FILE), "wb");
+	fp = res_OpenResFile (tempFilePath (RANDGRPINFO_FILE), "wb");
 	if (fp)
 	{
 		GROUP_HEADER GH;
@@ -46,15 +46,15 @@ InitGroupInfo (BOOLEAN FirstTime)
 		GH.GroupOffset[0] = 0;
 		WriteResFile (&GH, sizeof (GH), 1, fp);
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 	}
 
-	if (FirstTime && (fp = OpenResFile (tempFilePath (DEFGRPINFO_FILE),
+	if (FirstTime && (fp = res_OpenResFile (tempFilePath (DEFGRPINFO_FILE),
 			"wb")))
 	{
 		PutResFileChar (0, fp);
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 	}
 }
 
@@ -349,7 +349,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
 {
 	PVOID fp;
 
-	fp = OpenResFile (tempFilePath (
+	fp = res_OpenResFile (tempFilePath (
 			offset && which_group ? DEFGRPINFO_FILE : RANDGRPINFO_FILE),
 			"r+b");
 	if (fp)
@@ -380,14 +380,14 @@ GetGroupInfo (DWORD offset, BYTE which_group)
 					|| !ValidateEvent (ABSOLUTE_EVENT,
 					&month_index, &day_index, &year_index)))
 			{
-				CloseResFile (fp);
+				res_CloseResFile (fp);
 
 #ifdef DEBUG
 			if (GH.star_index == (COUNT)(CurStarDescPtr - star_array))
 				fprintf (stderr, "GetGroupInfo: battle groups out of date %u/%u/%u!\n",
 						month_index, day_index, year_index);
 #endif /* DEBUG */
-				fp = OpenResFile (tempFilePath (RANDGRPINFO_FILE), "wb");
+				fp = res_OpenResFile (tempFilePath (RANDGRPINFO_FILE), "wb");
 				GH.NumGroups = 0;
 				GH.star_index = (COUNT)~0;
 				GH.GroupOffset[0] = 0;
@@ -495,7 +495,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
 				else if (ValidateEvent (ABSOLUTE_EVENT, /* still fresh */
 						&month_index, &day_index, &year_index))
 				{
-					CloseResFile (fp);
+					res_CloseResFile (fp);
 					return (TRUE);
 				}
 			}
@@ -605,7 +605,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
 			}
 		}
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 	}
 
 	return (GetHeadLink (&GLOBAL (npc_built_ship_q)) != 0);
@@ -616,7 +616,7 @@ PutGroupInfo (DWORD offset, BYTE which_group)
 {
 	PVOID fp;
 
-	fp = OpenResFile (tempFilePath (
+	fp = res_OpenResFile (tempFilePath (
 			offset && which_group ? DEFGRPINFO_FILE : RANDGRPINFO_FILE),
 			"r+b");
 	if (fp)
@@ -667,7 +667,7 @@ GH.month_index, GH.day_index, GH.year_index);
 
 		FlushGroupInfo (&GH, offset, which_group, fp);
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 	}
 
 	return (offset);

sc2/src/sc2code/libs/graphics/filegfx.c

@@ -23,12 +23,12 @@ LoadCelFile (PVOID pStr)
 {
 	FILE *fp;
 
-	if ((fp = OpenResFile (pStr, "rb")) != NULL)
+	if ((fp = res_OpenResFile (pStr, "rb")) != NULL)
 	{
 		MEM_HANDLE hData;
 
 		hData = _GetCelData (fp, LengthResFile (fp));
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 		return ((DWORD)hData);
 	}
 
@@ -40,12 +40,12 @@ LoadFontFile (PVOID pStr)
 {
 	FILE *fp;
 
-	if ((fp = OpenResFile (pStr, "rb")) != NULL)
+	if ((fp = res_OpenResFile (pStr, "rb")) != NULL)
 	{
 		MEM_HANDLE hData;
 
 		hData = _GetFontData (fp, LengthResFile (fp));
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 		return ((DWORD)hData);
 	}
 

sc2/src/sc2code/libs/graphics/resgfx.c

@@ -34,9 +34,9 @@ LoadGraphicInstance (DWORD res)
 {
 	MEM_HANDLE hData;
 
-	hData = GetResource (res);
+	hData = res_GetResource (res);
 	if (hData)
-		DetachResource (res);
+		res_DetachResource (res);
 
 	return ((DWORD)hData);
 }

sc2/src/sc2code/libs/reslib.h

@@ -49,7 +49,7 @@ typedef COUNT RES_PACKAGE;
 		((RESOURCE)(i) << TYPE_BITS) | \
 		((RESOURCE)(t)))
 
-extern FILE *OpenResFile (PVOID filename, const char *mode);
+extern FILE *res_OpenResFile (PVOID filename, const char *mode);
 extern int ReadResFile (PVOID lpBuf, COUNT size, COUNT count, FILE *fp);
 extern int WriteResFile (PVOID lpBuf, COUNT size, COUNT count, FILE
 		*fp);
@@ -58,7 +58,7 @@ extern int PutResFileChar (char ch, FILE *fp);
 extern long SeekResFile (FILE *fp, long offset, int whence);
 extern long TellResFile (FILE *fp);
 extern long LengthResFile (FILE *fp);
-extern BOOLEAN CloseResFile (FILE *fp);
+extern BOOLEAN res_CloseResFile (FILE *fp);
 extern BOOLEAN DeleteResFile (PVOID filename);
 
 extern MEM_HANDLE InitResourceSystem (PVOID resfile, COUNT resindex_type,
@@ -68,8 +68,8 @@ extern BOOLEAN InstallResTypeVectors (
 		COUNT res_type, 
 		MEM_HANDLE (*load_func) (FILE *fp, DWORD len),
 		BOOLEAN (*free_func) (MEM_HANDLE handle));
-extern MEM_HANDLE GetResource (RESOURCE res);
+extern MEM_HANDLE res_GetResource (RESOURCE res);
-extern MEM_HANDLE DetachResource (RESOURCE res);
+extern MEM_HANDLE res_DetachResource (RESOURCE res);
 extern BOOLEAN FreeResource (RESOURCE res);
 extern COUNT CountResourceTypes (void);
 

sc2/src/sc2code/libs/resource/filecntl.c

@@ -27,7 +27,7 @@
 #include "resintrn.h"
 
 FILE *
-OpenResFile (PVOID filename, const char *mode)
+res_OpenResFile (PVOID filename, const char *mode)
 {
 	FILE *fp;
 	struct stat sb;
@@ -45,7 +45,7 @@ OpenResFile (PVOID filename, const char *mode)
 }
 
 BOOLEAN
-CloseResFile (FILE *fp)
+res_CloseResFile (FILE *fp)
 {
 	if (fp)
 	{

sc2/src/sc2code/libs/resource/getres.c

@@ -221,7 +221,7 @@ load_package (INDEX_HEADERPTR ResHeaderPtr, RES_PACKAGE res_package)
 			fp = ResHeaderPtr->res_fp;
 		else
 		{
-			fp = OpenResFile (file_buf, "rb");
+			fp = res_OpenResFile (file_buf, "rb");
 			if (fp)
 				DanglingOpen = TRUE;
 		}
@@ -298,7 +298,7 @@ load_package (INDEX_HEADERPTR ResHeaderPtr, RES_PACKAGE res_package)
 			{
 				get_resource_filename (ResHeaderPtr, file_buf, (COUNT)data_len);
 
-				fp = OpenResFile (file_buf, "rb");
+				fp = res_OpenResFile (file_buf, "rb");
 				if (fp == NULL)
 				{
 #if 1 // def DEBUG
@@ -317,7 +317,7 @@ load_package (INDEX_HEADERPTR ResHeaderPtr, RES_PACKAGE res_package)
 					else
 						hData = DoLoad (ResHeaderPtr, type, fp, data_len);
 					if (hData == 0 || !IsIndexType (ResHeaderPtr, type))
-						CloseResFile (fp);
+						res_CloseResFile (fp);
 				}
 			}
 #ifdef DEBUG
@@ -339,7 +339,7 @@ load_package (INDEX_HEADERPTR ResHeaderPtr, RES_PACKAGE res_package)
 	}
 
 	if (DanglingOpen)
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 
 	num_instances = ResourceHandleListPtr->num_valid_handles;
 	UnlockResourceHandleList (hList);
@@ -357,7 +357,7 @@ load_package (INDEX_HEADERPTR ResHeaderPtr, RES_PACKAGE res_package)
 }
 
 MEM_HANDLE
-GetResource (RESOURCE res)
+res_GetResource (RESOURCE res)
 {
 	MEM_HANDLE hData, hList;
 	RES_PACKAGE res_package;
@@ -504,7 +504,7 @@ FreeResource (RESOURCE res)
 }
 
 MEM_HANDLE
-DetachResource (RESOURCE res)
+res_DetachResource (RESOURCE res)
 {
 	return (get_res_handle (res, TRUE));
 }

sc2/src/sc2code/libs/resource/resinit.c

@@ -254,13 +254,13 @@ OpenResourceIndexFile (PVOID resfile)
 	char fullname[256];
 
 	strcpy (fullname, resfile);
-	if ((res_fp = OpenResFile (fullname, "rb")) == 0)
+	if ((res_fp = res_OpenResFile (fullname, "rb")) == 0)
 	{
 		sprintf (fullname, "%s.pkg", (char *) resfile);
-		if ((res_fp = OpenResFile (fullname, "rb")) == 0)
+		if ((res_fp = res_OpenResFile (fullname, "rb")) == 0)
 		{
 			sprintf (fullname, "%s.ndx", (char *) resfile);
-			res_fp = OpenResFile (fullname, "rb");
+			res_fp = res_OpenResFile (fullname, "rb");
 		}
 	}
 
@@ -271,7 +271,7 @@ OpenResourceIndexFile (PVOID resfile)
 		_cur_resfile_name = fullname;
 
 		hRH = _GetResFileData (res_fp, LengthResFile (res_fp));
-		/* DO NOT CloseResFile!!! */
+		/* DO NOT res_CloseResFile!!! */
 
 		return (hRH);
 	}
@@ -284,9 +284,9 @@ OpenResourceIndexInstance (DWORD res)
 {
 	MEM_HANDLE hRH;
 
-	hRH = GetResource (res);
+	hRH = res_GetResource (res);
 	if (hRH)
-		DetachResource (res);
+		res_DetachResource (res);
 
 	return (hRH);
 }
@@ -368,7 +368,7 @@ CloseResourceIndex (MEM_HANDLE hRH)
 			}
 
 			if (res_fp)
-				CloseResFile (res_fp);
+				res_CloseResFile (res_fp);
 		}
 
 		return (TRUE);

sc2/src/sc2code/libs/sound/fileinst.c

@@ -23,14 +23,14 @@ LoadSoundFile (PVOID pStr)
 {
 	FILE *fp;
 
-	fp = OpenResFile (pStr, "rb");
+	fp = res_OpenResFile (pStr, "rb");
 	if (fp)
 	{
 		MEM_HANDLE hData;
 
 		hData = _GetSoundBankData (fp, LengthResFile (fp));
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 
 		return ((SOUND_REF)hData);
 	}
@@ -43,14 +43,14 @@ LoadMusicFile (PVOID pStr)
 {
 	FILE *fp;
 
-	fp = OpenResFile (pStr, "rb");
+	fp = res_OpenResFile (pStr, "rb");
 	if (fp)
 	{
 		MEM_HANDLE hData;
 
 		hData = _GetMusicData (fp, LengthResFile (fp));
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 
 		return ((MUSIC_REF)hData);
 	}

sc2/src/sc2code/libs/sound/resinst.c

@@ -31,9 +31,9 @@ LoadSoundInstance (DWORD res)
 {
 	MEM_HANDLE hData;
 
-	hData = GetResource (res);
+	hData = res_GetResource (res);
 	if (hData)
-		DetachResource (res);
+		res_DetachResource (res);
 
 	return ((SOUND_REF)hData);
 }
@@ -43,9 +43,9 @@ LoadMusicInstance (DWORD res)
 {
 	MEM_HANDLE hData;
 
-	hData = GetResource (res);
+	hData = res_GetResource (res);
 	if (hData)
-		DetachResource (res);
+		res_DetachResource (res);
 
 	return ((MUSIC_REF)hData);
 }

sc2/src/sc2code/libs/strings/sfileins.c

@@ -23,13 +23,13 @@ LoadStringTableFile (PVOID pStr)
 {
 	FILE *fp;
 
-	fp = OpenResFile (pStr, "rb");
+	fp = res_OpenResFile (pStr, "rb");
 	if (fp)
 	{
 		MEM_HANDLE hData;
 
 		hData = _GetStringData (fp, LengthResFile (fp));
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 
 		return (BUILD_STRING_TABLE (hData));
 	}

sc2/src/sc2code/libs/strings/sresins.c

@@ -30,10 +30,10 @@ LoadStringTableInstance (DWORD res)
 {
 	MEM_HANDLE hData;
 
-	hData = GetResource (res);
+	hData = res_GetResource (res);
 	if (hData)
 	{
-		DetachResource (res);
+		res_DetachResource (res);
 	}
 
 	return (BUILD_STRING_TABLE (hData));

sc2/src/sc2code/load.c

@@ -90,7 +90,7 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc)
 	char buf[256], file[PATH_MAX];
 
 	sprintf (file, "%sstarcon2.%02u", saveDir, which_game);
-	in_fp = OpenResFile (file, "rb");
+	in_fp = res_OpenResFile (file, "rb");
 	if (in_fp)
 	{
 		FILE *fp;
@@ -109,7 +109,7 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc)
 		else
 		{
 			memcpy (summary_desc, buf, sizeof (*summary_desc));
-			CloseResFile (in_fp);
+			res_CloseResFile (in_fp);
 			return (TRUE);
 		}
 
@@ -117,7 +117,7 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc)
 
 		if ((fh = copen (in_fp, FILE_STREAM, STREAM_READ)) == 0)
 		{
-			CloseResFile (in_fp);
+			res_CloseResFile (in_fp);
 			return (FALSE);
 		}
 
@@ -229,7 +229,7 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc)
 			}
 		}
 
-		fp = OpenResFile (tempFilePath (STARINFO_FILE), "wb");
+		fp = res_OpenResFile (tempFilePath (STARINFO_FILE), "wb");
 		if (fp)
 		{
 			DWORD flen;
@@ -245,10 +245,10 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc)
 
 				flen -= num_bytes;
 			}
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 		}
 
-		fp = OpenResFile (tempFilePath (DEFGRPINFO_FILE), "wb");
+		fp = res_OpenResFile (tempFilePath (DEFGRPINFO_FILE), "wb");
 		if (fp)
 		{
 			DWORD flen;
@@ -264,10 +264,10 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc)
 
 				flen -= num_bytes;
 			}
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 		}
 
-		fp = OpenResFile (tempFilePath (RANDGRPINFO_FILE), "wb");
+		fp = res_OpenResFile (tempFilePath (RANDGRPINFO_FILE), "wb");
 		if (fp)
 		{
 			DWORD flen;
@@ -283,13 +283,13 @@ LoadGame (COUNT which_game, SUMMARY_DESC *summary_desc)
 
 				flen -= num_bytes;
 			}
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 		}
 
 		cread ((PBYTE)&SD, sizeof (SD), 1, fh);
 
 		cclose (fh);
-		CloseResFile (in_fp);
+		res_CloseResFile (in_fp);
 
 		battle_counter = 0;
 		ReinitQueue (&race_q[0]);

sc2/src/sc2code/melee.c

@@ -679,7 +679,7 @@ LoadTeamImage(DIRENTRY DirEntry, TEAM_IMAGE* pTI,
 	loc_buf = pfile + strlen (pfile);
 
 	GetDirEntryContents (DirEntry, (STRINGPTR)loc_buf, FALSE);
-	if ((load_fp = OpenResFile (pfile, "rb")) == 0)
+	if ((load_fp = res_OpenResFile (pfile, "rb")) == 0)
 		status = -1;
 	else
 	{
@@ -687,7 +687,7 @@ LoadTeamImage(DIRENTRY DirEntry, TEAM_IMAGE* pTI,
 			status = -1;
 		else
 			status = ReadTeamImage (pTI, load_fp);
-		CloseResFile (load_fp);
+		res_CloseResFile (load_fp);
 	}
 
 	if (pFilePath != NULL_PTR && ppFileName != NULL_PTR)
@@ -1097,13 +1097,13 @@ RetrySave:
 	SetSemaphore (GraphicsSem);
 	OldContext = SetContext (ScreenContext);
 	ConfirmSaveLoad (&MsgStamp);
-	save_fp = OpenResFile (buf, "wb");
+	save_fp = res_OpenResFile (buf, "wb");
 	if (save_fp)
 	{
 		BOOLEAN err;
 
 		err = (BOOLEAN)(WriteTeamImage (&pMS->TeamImage[pMS->side], save_fp) == 0);
-		if (CloseResFile (save_fp) == 0)
+		if (res_CloseResFile (save_fp) == 0)
 			err = TRUE;
 		if (err)
 			save_fp = 0;
@@ -1784,7 +1784,7 @@ Melee (void)
 		{
 			FILE *load_fp;
 
-			load_fp = OpenResFile ("melee.cfg", "rb");
+			load_fp = res_OpenResFile ("melee.cfg", "rb");
 			if (load_fp)
 			{
 				int status;
@@ -1804,7 +1804,7 @@ Melee (void)
 						}
 					}
 				}
-				CloseResFile (load_fp);
+				res_CloseResFile (load_fp);
 				if (status == -1)
 					load_fp = 0;
 			}
@@ -1832,7 +1832,7 @@ Melee (void)
 			BOOLEAN err;
 				
 			err = FALSE;
-			save_fp = OpenResFile ("melee.cfg", "wb");
+			save_fp = res_OpenResFile ("melee.cfg", "wb");
 			if (save_fp)
 			{
 				if (PutResFileChar (PlayerControl[0], save_fp) == -1)
@@ -1843,7 +1843,7 @@ Melee (void)
 					err = TRUE;
 				if (!err && WriteTeamImage (&MenuState.TeamImage[1], save_fp) == 0)
 					err = TRUE;
-				if (CloseResFile (save_fp) == 0)
+				if (res_CloseResFile (save_fp) == 0)
 					err = TRUE;
 			}
 			else

sc2/src/sc2code/save.c

@@ -381,7 +381,7 @@ RetrySave:
 			}
 		}
 
-		fp = OpenResFile (tempFilePath (STARINFO_FILE), "rb");
+		fp = res_OpenResFile (tempFilePath (STARINFO_FILE), "rb");
 		if (fp)
 		{
 			flen = LengthResFile (fp);
@@ -396,10 +396,10 @@ RetrySave:
 
 				flen -= num_bytes;
 			}
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 		}
 
-		fp = OpenResFile (tempFilePath (DEFGRPINFO_FILE), "rb");
+		fp = res_OpenResFile (tempFilePath (DEFGRPINFO_FILE), "rb");
 		if (fp)
 		{
 			flen = LengthResFile (fp);
@@ -414,10 +414,10 @@ RetrySave:
 
 				flen -= num_bytes;
 			}
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 		}
 
-		fp = OpenResFile (tempFilePath (RANDGRPINFO_FILE), "rb");
+		fp = res_OpenResFile (tempFilePath (RANDGRPINFO_FILE), "rb");
 		if (fp)
 		{
 			flen = LengthResFile (fp);
@@ -432,7 +432,7 @@ RetrySave:
 
 				flen -= num_bytes;
 			}
-			CloseResFile (fp);
+			res_CloseResFile (fp);
 		}
 
 		cwrite ((PBYTE)&SD, sizeof (SD), 1, fh);
@@ -441,7 +441,7 @@ RetrySave:
 
 		sprintf (file, "%sstarcon2.%02u", saveDir, which_game);
 //		fprintf (stderr, "'%s' is %lu bytes long\n", file, flen + sizeof (*summary_desc));
-		if (flen && (out_fp = (PVOID)OpenResFile (file, "wb")))
+		if (flen && (out_fp = (PVOID)res_OpenResFile (file, "wb")))
 		{
 			PrepareSummary (summary_desc);
 
@@ -452,7 +452,7 @@ RetrySave:
 				success = FALSE;
 
 			mem_unlock (h);
-			if (CloseResFile ((FILE *)out_fp) == 0)
+			if (res_CloseResFile ((FILE *)out_fp) == 0)
 				success = FALSE;
 
 		}

sc2/src/sc2code/setup.c

@@ -333,7 +333,7 @@ LoadKernel (int argc, char *argv[])
 	INIT_INSTANCES ();
 
 	InstallResTypeVectors (KEY_CONFIG, LoadKeyConfig, NULL_PTR);
-	GetResource (JOYSTICK_KEYS);
+	res_GetResource (JOYSTICK_KEYS);
 
 	{
 		COLORMAP ColorMapTab;

sc2/src/sc2code/state.c

@@ -27,7 +27,7 @@ InitPlanetInfo (void)
 {
 	PVOID fp;
 
-	fp = OpenResFile (tempFilePath (STARINFO_FILE), "wb");
+	fp = res_OpenResFile (tempFilePath (STARINFO_FILE), "wb");
 	if (fp)
 	{
 		DWORD offset;
@@ -42,7 +42,7 @@ InitPlanetInfo (void)
 		} while (pSD->star_pt.x <= MAX_X_UNIVERSE
 				&& pSD->star_pt.y <= MAX_Y_UNIVERSE);
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 	}
 }
 
@@ -60,7 +60,7 @@ GetPlanetInfo (void)
 	pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[BIOLOGICAL_SCAN] =
 			pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[MINERAL_SCAN] =
 			pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[ENERGY_SCAN] = 0;
-	fp = OpenResFile (tempFilePath (STARINFO_FILE), "rb");
+	fp = res_OpenResFile (tempFilePath (STARINFO_FILE), "rb");
 	if (fp)
 	{
 		COUNT star_index, planet_index, moon_index;
@@ -98,7 +98,7 @@ GetPlanetInfo (void)
 						), 1, fp);
 		}
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 	}
 }
 
@@ -107,7 +107,7 @@ PutPlanetInfo (void)
 {
 	PVOID fp;
 
-	fp = OpenResFile (tempFilePath (STARINFO_FILE), "r+b");
+	fp = res_OpenResFile (tempFilePath (STARINFO_FILE), "r+b");
 	if (fp)
 	{
 		COUNT i;
@@ -164,7 +164,7 @@ PutPlanetInfo (void)
 				pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask
 				), 1, fp);
 
-		CloseResFile (fp);
+		res_CloseResFile (fp);
 	}
 }