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

Fixed MSVC warning C4197 (top-level volatile in cast is ignored)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@991 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-06-22 20:21:56 +00:00
parent f53a47497d
commit 366f3eab36
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/plangen.c
+3 -3
View File
@@ -1384,7 +1384,7 @@ rotate_planet_task (void *data)
zooming = TRUE; zooming = TRUE;
pSS = pSolarSysState; pSS = pSolarSysState;
while (((PSOLARSYS_STATE volatile)pSS)->MenuState.Initialized < 2 && !Task_ReadState (task, TASK_EXIT)) while (((volatile SOLARSYS_STATE *)pSS)->MenuState.Initialized < 2 && !Task_ReadState (task, TASK_EXIT))
TaskSwitch (); TaskSwitch ();
// SetPlanetTilt ((pSS->SysInfo.PlanetInfo.AxialTilt << 8) / 360); // SetPlanetTilt ((pSS->SysInfo.PlanetInfo.AxialTilt << 8) / 360);
@@ -1419,12 +1419,12 @@ rotate_planet_task (void *data)
// to gaurantee that PauseRotate doesn't change while waiting // to gaurantee that PauseRotate doesn't change while waiting
// to aquire the GraphicsSem // to aquire the GraphicsSem
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
if (((PSOLARSYS_STATE volatile)pSS)->PauseRotate !=1 if (((volatile SOLARSYS_STATE *)pSS)->PauseRotate !=1
// if (((PSOLARSYS_STATE volatile)pSS)->MenuState.Initialized <= 3 // if (((PSOLARSYS_STATE volatile)pSS)->MenuState.Initialized <= 3
&& !(GLOBAL (CurrentActivity) & CHECK_ABORT)) && !(GLOBAL (CurrentActivity) & CHECK_ABORT))
{ {
//PauseRotate == 2 is a single-step //PauseRotate == 2 is a single-step
if (((PSOLARSYS_STATE volatile)pSS)->PauseRotate == 2) if (((volatile SOLARSYS_STATE *)pSS)->PauseRotate == 2)
pSS->PauseRotate = 1; pSS->PauseRotate = 1;
repair = RotatePlanet (x, SIS_SCREEN_WIDTH >> 1, repair = RotatePlanet (x, SIS_SCREEN_WIDTH >> 1,
sc2/src/sc2code/planets/pstarmap.c
+2 -2
View File
@@ -1156,8 +1156,8 @@ DoFlagshipCommands (PMENU_STATE pMS)
{ {
BOOLEAN select = CurrentMenuState.select; BOOLEAN select = CurrentMenuState.select;
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
while (((PMENU_STATE volatile)pMS)->CurState == 0 while (((volatile MENU_STATE *)pMS)->CurState == 0
&& (((PMENU_STATE volatile)pMS)->Initialized & 1) && (((volatile MENU_STATE *)pMS)->Initialized & 1)
&& !(GLOBAL (CurrentActivity) && !(GLOBAL (CurrentActivity)
& (START_ENCOUNTER | END_INTERPLANETARY & (START_ENCOUNTER | END_INTERPLANETARY
| CHECK_ABORT | CHECK_LOAD)) | CHECK_ABORT | CHECK_LOAD))