From 496e140ab5c7f58de649df8a49050f3bab9e61fc Mon Sep 17 00:00:00 2001 From: meep-eep Date: Sun, 3 Nov 2002 06:47:22 +0000 Subject: [PATCH] Renamed variables 'PI' because of conflict on BeOS. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@201 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/galaxy.c | 2 +- sc2/src/sc2code/planets/lander.c | 2 +- sc2/src/sc2code/process.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sc2/src/sc2code/galaxy.c b/sc2/src/sc2code/galaxy.c index 15e4bbc74..f8c363a9a 100644 --- a/sc2/src/sc2code/galaxy.c +++ b/sc2/src/sc2code/galaxy.c @@ -22,7 +22,7 @@ //Added by Chris -void InsertPrim (PRIM_LINKS *pLinks, COUNT PI, COUNT iPI); +void InsertPrim (PRIM_LINKS *pLinks, COUNT primIndex, COUNT iPI); //End Added by Chris diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c index 709e3bad5..b3102eeda 100644 --- a/sc2/src/sc2code/planets/lander.c +++ b/sc2/src/sc2code/planets/lander.c @@ -23,7 +23,7 @@ //Added by Chris -void InsertPrim (PRIM_LINKS *pLinks, COUNT PI, COUNT iPI); +void InsertPrim (PRIM_LINKS *pLinks, COUNT primIndex, COUNT iPI); void DrawPlanet(int x, int y, int dy, unsigned int rgb); diff --git a/sc2/src/sc2code/process.c b/sc2/src/sc2code/process.c index 49c1cf853..2eaf0a3f6 100644 --- a/sc2/src/sc2code/process.c +++ b/sc2/src/sc2code/process.c @@ -763,7 +763,7 @@ PreProcessQueue (PSIZE pscroll_x, PSIZE pscroll_y) } void -InsertPrim (PRIM_LINKS *pLinks, COUNT PI, COUNT iPI) +InsertPrim (PRIM_LINKS *pLinks, COUNT primIndex, COUNT iPI) { COUNT Link; PRIM_LINKS PL; @@ -772,9 +772,9 @@ InsertPrim (PRIM_LINKS *pLinks, COUNT PI, COUNT iPI) { Link = GetSuccLink (*pLinks); /* get tail */ if (Link == END_OF_LIST) - *pLinks = MakeLinks (PI, PI); + *pLinks = MakeLinks (primIndex, primIndex); else - *pLinks = MakeLinks (GetPredLink (*pLinks), PI); + *pLinks = MakeLinks (GetPredLink (*pLinks), primIndex); } else { @@ -784,17 +784,17 @@ InsertPrim (PRIM_LINKS *pLinks, COUNT PI, COUNT iPI) else { Link = END_OF_LIST; - *pLinks = MakeLinks (PI, GetSuccLink (*pLinks)); + *pLinks = MakeLinks (primIndex, GetSuccLink (*pLinks)); } - SetPrimLinks (&DisplayArray[iPI], PI, GetSuccLink (PL)); + SetPrimLinks (&DisplayArray[iPI], primIndex, GetSuccLink (PL)); } if (Link != END_OF_LIST) { PL = GetPrimLinks (&DisplayArray[Link]); - SetPrimLinks (&DisplayArray[Link], GetPredLink (PL), PI); + SetPrimLinks (&DisplayArray[Link], GetPredLink (PL), primIndex); } - SetPrimLinks (&DisplayArray[PI], Link, iPI); + SetPrimLinks (&DisplayArray[primIndex], Link, iPI); } PRIM_LINKS DisplayLinks;