diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 47f5a72ed..9089b9a0c 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,3 +1,6 @@ +Changes towards version 0.4: +- Obsolete "register" keywords removed -Michael + Changes towards version 0.3: - Dirty hack to avoid a warning about the "ignored.key" hack - Svdb - Typo 'natually' fixed in Arilou speech - SvdB diff --git a/sc2/src/getopt/getopt.c b/sc2/src/getopt/getopt.c index 08d13d4aa..510d22189 100644 --- a/sc2/src/getopt/getopt.c +++ b/sc2/src/getopt/getopt.c @@ -340,7 +340,7 @@ exchange (argv) { /* Bottom segment is the short one. */ int len = middle - bottom; - register int i; + int i; /* Swap it with the top part of the top segment. */ for (i = 0; i < len; i++) @@ -357,7 +357,7 @@ exchange (argv) { /* Top segment is the short one. */ int len = top - middle; - register int i; + int i; /* Swap it with the bottom part of the bottom segment. */ for (i = 0; i < len; i++) diff --git a/sc2/src/sc2code/cyborg.c b/sc2/src/sc2code/cyborg.c index 36c2689bc..02e42859d 100644 --- a/sc2/src/sc2code/cyborg.c +++ b/sc2/src/sc2code/cyborg.c @@ -22,8 +22,8 @@ COUNT PlotIntercept (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, COUNT max_turns, COUNT margin_of_error) { - register SIZE dy; - register SIZE time_y_0, time_y_1; + SIZE dy; + SIZE time_y_0, time_y_1; POINT dst[2]; RECT r0, r1; SIZE dx_0, dy_0, dx_1, dy_1; @@ -89,8 +89,8 @@ PlotIntercept (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, COUNT || (time_y_0 > 0 && dy >= time_y_0) || (time_y_1 < 0 && dy <= time_y_1)) { - register SIZE dx; - register SIZE time_x_0, time_x_1; + SIZE dx; + SIZE time_x_0, time_x_1; if (margin_of_error) { diff --git a/sc2/src/sc2code/element.h b/sc2/src/sc2code/element.h index e973cc697..8fb47390e 100644 --- a/sc2/src/sc2code/element.h +++ b/sc2/src/sc2code/element.h @@ -194,17 +194,17 @@ extern void FreeKernel (void); extern void InitDisplayList (void); extern void InitGalaxy (void); -extern void MoveGalaxy (VIEW_STATE view_state, register - SIZE dx, register SIZE dy); +extern void MoveGalaxy (VIEW_STATE view_state, + SIZE dx, SIZE dy); extern void ship_preprocess (PELEMENT ElementPtr); -extern void ship_postprocess (register PELEMENT +extern void ship_postprocess (PELEMENT ElementPtr); extern void ship_death (PELEMENT ShipPtr); extern BOOLEAN hyper_transition (PELEMENT ElementPtr); extern BOOLEAN CalculateGravity (PELEMENT ElementPtr); extern UWORD inertial_thrust (ELEMENTPTR ElementPtr); -extern void SetUpElement (register ELEMENTPTR +extern void SetUpElement (ELEMENTPTR ElementPtr); extern void BattleSong (BOOLEAN DoPlay); diff --git a/sc2/src/sc2code/galaxy.c b/sc2/src/sc2code/galaxy.c index 24f6ac151..efe3a44d6 100644 --- a/sc2/src/sc2code/galaxy.c +++ b/sc2/src/sc2code/galaxy.c @@ -94,13 +94,13 @@ SortStarBlock (PSTAR_BLOCK pStarBlock) } static void -WrapStarBlock (SIZE plane, register SIZE dx, register SIZE dy) +WrapStarBlock (SIZE plane, SIZE dx, SIZE dy) { - register COUNT i; - register PPOINT ppt; - register SIZE offs_y; - register COUNT num_stars; - register PSTAR_BLOCK pStarBlock; + COUNT i; + PPOINT ppt; + SIZE offs_y; + COUNT num_stars; + PSTAR_BLOCK pStarBlock; pStarBlock = &StarBlock[plane]; @@ -109,7 +109,7 @@ WrapStarBlock (SIZE plane, register SIZE dx, register SIZE dy) num_stars = pStarBlock->num_stars; if (dy < 0) { - register COUNT first; + COUNT first; first = i; @@ -159,7 +159,7 @@ WrapStarBlock (SIZE plane, register SIZE dx, register SIZE dy) } else { - register COUNT last; + COUNT last; --ppt; if (i-- == 0) @@ -277,19 +277,19 @@ InitGalaxy (void) } void -MoveGalaxy (VIEW_STATE view_state, register SIZE dx, register SIZE dy) +MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy) { - register PPRIMITIVE pprim; + PPRIMITIVE pprim; if (view_state != VIEW_STABLE) { #ifdef OLD_ZOOM - register BYTE reduction; + BYTE reduction; #else - register COUNT reduction; + COUNT reduction; #endif - register COUNT i; - register PPOINT ppt; + COUNT i; + PPOINT ppt; #ifdef OLD_ZOOM reduction = GLOBAL (cur_state); diff --git a/sc2/src/sc2code/ipdisp.c b/sc2/src/sc2code/ipdisp.c index 06d0979f7..70feb7668 100644 --- a/sc2/src/sc2code/ipdisp.c +++ b/sc2/src/sc2code/ipdisp.c @@ -86,7 +86,7 @@ ip_group_preprocess (PELEMENT ElementPtr) SIZE radius; POINT dest_pt; SIZE vdx, vdy; - register ELEMENTPTR EPtr; + ELEMENTPTR EPtr; SHIP_FRAGMENTPTR StarShipPtr; EPtr = (ELEMENTPTR)ElementPtr; diff --git a/sc2/src/sc2code/libs/decomp/lzdecode.c b/sc2/src/sc2code/libs/decomp/lzdecode.c index 0b90282ac..8223cbd71 100644 --- a/sc2/src/sc2code/libs/decomp/lzdecode.c +++ b/sc2/src/sc2code/libs/decomp/lzdecode.c @@ -292,7 +292,7 @@ static const BYTE d_len[256] = } COUNT -cread (PVOID buf, COUNT size, COUNT count, register PLZHCODE_DESC +cread (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC lpCodeDesc) { COUNT r, j, i; diff --git a/sc2/src/sc2code/libs/decomp/lzencode.c b/sc2/src/sc2code/libs/decomp/lzencode.c index 2ba8ff5ad..276ea2554 100644 --- a/sc2/src/sc2code/libs/decomp/lzencode.c +++ b/sc2/src/sc2code/libs/decomp/lzencode.c @@ -113,7 +113,7 @@ InsertNode (SWORD r) i = F; { - register SWORD _r, _p; + SWORD _r, _p; _r = r; _p = p; @@ -375,7 +375,7 @@ _encode_cleanup (void) } COUNT -cwrite (PVOID buf, COUNT size, COUNT count, register PLZHCODE_DESC +cwrite (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC lpCodeDesc) { UWORD r, s, last_match_length; diff --git a/sc2/src/sc2code/libs/decomp/update.c b/sc2/src/sc2code/libs/decomp/update.c index 5ce3651cc..6507d7b8e 100644 --- a/sc2/src/sc2code/libs/decomp/update.c +++ b/sc2/src/sc2code/libs/decomp/update.c @@ -71,7 +71,7 @@ reconst (void) void _update (COUNT c) { - register PLZHCODE_DESC lpCD; + PLZHCODE_DESC lpCD; if ((lpCD = _lpCurCodeDesc)->freq[R] == MAX_FREQ) reconst (); diff --git a/sc2/src/sc2code/libs/graphics/boxint.c b/sc2/src/sc2code/libs/graphics/boxint.c index f3c08e16a..2e1845327 100644 --- a/sc2/src/sc2code/libs/graphics/boxint.c +++ b/sc2/src/sc2code/libs/graphics/boxint.c @@ -26,9 +26,9 @@ INTERSECT_CODE BoxIntersect (PRECT pr1, PRECT pr2, PRECT pinter) { - register INTERSECT_CODE intersect_code; - register COORD x1; - register SIZE w1, w2, delta; + INTERSECT_CODE intersect_code; + COORD x1; + SIZE w1, w2, delta; intersect_code = INTERSECT_NOCLIP; @@ -59,8 +59,8 @@ BoxIntersect (PRECT pr1, PRECT pr2, PRECT pinter) if (w1 > 0) { #define h2 w2 - register COORD y1; - register SIZE h1; + COORD y1; + SIZE h1; y1 = pr1->corner.y - pr2->corner.y; diff --git a/sc2/src/sc2code/libs/graphics/font.c b/sc2/src/sc2code/libs/graphics/font.c index 34c9174cc..991f488ae 100644 --- a/sc2/src/sc2code/libs/graphics/font.c +++ b/sc2/src/sc2code/libs/graphics/font.c @@ -121,7 +121,7 @@ GetContextFontLeading (PSIZE pheight) } BOOLEAN -TextRect (PTEXT lpText, register PRECT pRect, PBYTE pdelta) +TextRect (PTEXT lpText, PRECT pRect, PBYTE pdelta) { COUNT num_chars; FONTPTR FontPtr; @@ -158,7 +158,7 @@ TextRect (PTEXT lpText, register PRECT pRect, PBYTE pdelta) next_ch -= FIRST_CHAR; if (ch < MAX_CHARS && GetFrameWidth (&FontPtr->CharDesc[ch])) { - register COORD y; + COORD y; y = -(FontPtr->CharDesc[ch]).HotSpot.y; if (y < top_y) diff --git a/sc2/src/sc2code/libs/graphics/frame.c b/sc2/src/sc2code/libs/graphics/frame.c index 445191e14..007fa50ad 100644 --- a/sc2/src/sc2code/libs/graphics/frame.c +++ b/sc2/src/sc2code/libs/graphics/frame.c @@ -97,7 +97,7 @@ ClearBackGround (PRECT pClipRect) } void -DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, register +DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, BATCH_FLAGS BatchFlags) { RECT ValidRect; @@ -107,7 +107,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, register { COUNT CurIndex; PRIM_LINKS OldLinks; - register PPRIMITIVE lpPrim; + PPRIMITIVE lpPrim; BatchFlags &= BATCH_SINGLE | BATCH_BUILD_PAGE @@ -139,7 +139,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, register for (; CurIndex != END_OF_LIST; CurIndex = GetSuccLink (GetPrimLinks (lpPrim))) { - register GRAPHICS_PRIM PrimType; + GRAPHICS_PRIM PrimType; PPRIMITIVE lpWorkPrim; RECT ClipRect; TFB_Palette color; diff --git a/sc2/src/sc2code/libs/graphics/intersec.c b/sc2/src/sc2code/libs/graphics/intersec.c index e5fcc90a6..aa66ef9b1 100644 --- a/sc2/src/sc2code/libs/graphics/intersec.c +++ b/sc2/src/sc2code/libs/graphics/intersec.c @@ -23,8 +23,8 @@ frame_intersect (PINTERSECT_CONTROL pControl0, PRECT pr0, PINTERSECT_CONTROL pControl1, PRECT pr1, TIME_VALUE t0, TIME_VALUE t1) { - register SIZE time_error0, time_error1; - register SIZE cycle0, cycle1; + SIZE time_error0, time_error1; + SIZE cycle0, cycle1; SIZE dx_0, dy_0, dx_1, dy_1; SIZE xincr0, yincr0, xincr1, yincr1; SIZE xerror0, xerror1, yerror0, yerror1; @@ -229,8 +229,8 @@ DrawablesIntersect (PINTERSECT_CONTROL pControl0, PINTERSECT_CONTROL pControl1, TIME_VALUE max_time_val) { - register SIZE dy; - register SIZE time_y_0, time_y_1; + SIZE dy; + SIZE time_y_0, time_y_1; RECT r0, r1; FRAMEPTR FramePtr0, FramePtr1; @@ -270,8 +270,8 @@ DrawablesIntersect (PINTERSECT_CONTROL pControl0, || (time_y_0 > 0 && dy >= time_y_0) || (time_y_1 < 0 && dy <= time_y_1)) { - register SIZE dx; - register SIZE time_x_0, time_x_1; + SIZE dx; + SIZE time_x_0, time_x_1; dx = r1.corner.x - r0.corner.x; time_x_0 = dx - GetFrameWidth (FramePtr0) + 1; diff --git a/sc2/src/sc2code/libs/sound/mixsdl/mixer.c b/sc2/src/sc2code/libs/sound/mixsdl/mixer.c index ba63f0d2a..defe8dff5 100644 --- a/sc2/src/sc2code/libs/sound/mixsdl/mixer.c +++ b/sc2/src/sc2code/libs/sound/mixsdl/mixer.c @@ -1919,7 +1919,7 @@ mixSDL_GetResampledInt_cubic (mixSDL_Source *src, bool left) static __inline__ sint32 mixSDL_GetConvSample (uint8 **psrc, uint32 bpc, uint32 flags) { - register sint32 samp; + sint32 samp; samp = mixSDL_GetSampleExt (*psrc, bpc); *psrc += bpc; @@ -1980,7 +1980,7 @@ mixSDL_ResampleFlat (mixSDL_Convertion *conv) for (; samples; samples--) { - register sint32 samp; + sint32 samp; samp = mixSDL_GetConvSample (&src, srcbpc, flags); mixSDL_PutConvSample (&dst, dstbpc, flags, samp); diff --git a/sc2/src/sc2code/planets/gentopo.c b/sc2/src/sc2code/planets/gentopo.c index c14c1fdc5..75ef7192b 100644 --- a/sc2/src/sc2code/planets/gentopo.c +++ b/sc2/src/sc2code/planets/gentopo.c @@ -38,7 +38,7 @@ DeltaTopography (COUNT num_iterations, PSBYTE DepthArray, PRECT pRect, SIZE d; COUNT h, w1, w2; DWORD rand_val; - register PSBYTE lpDst; + PSBYTE lpDst; depth_delta = ((((SIZE)TFB_Random () & 1) << 1) - 1) * depth_delta; diff --git a/sc2/src/sc2code/planets/plangen.c b/sc2/src/sc2code/planets/plangen.c index 48e378d71..52b3d2f8e 100644 --- a/sc2/src/sc2code/planets/plangen.c +++ b/sc2/src/sc2code/planets/plangen.c @@ -137,7 +137,7 @@ RenderTopography (BOOLEAN Reconstruct) POINT pt; PLANDATAPTR PlanDataPtr; PRIMITIVE BatchArray[NUM_BATCH_POINTS]; - register PPRIMITIVE pBatch; + PPRIMITIVE pBatch; PBYTE lpDst, xlat_tab, cbase; HOT_SPOT OldHot; RECT ClipRect; @@ -678,14 +678,14 @@ static void ExpandMap (PSBYTE DepthArray) { BYTE i, j; - register PSBYTE lpSrc, lpDst; + PSBYTE lpSrc, lpDst; lpSrc = &DepthArray[(MAP_WIDTH >> 1) * ((MAP_HEIGHT >> 1) + 1) - 1]; lpDst = &DepthArray[MAP_WIDTH * MAP_HEIGHT - 1]; i = (MAP_HEIGHT >> 1) + 1; do { - register SBYTE lf, rt; + SBYTE lf, rt; rt = lpSrc[-(MAP_WIDTH >> 1) + 1]; lf = *lpSrc--; @@ -708,7 +708,7 @@ ExpandMap (PSBYTE DepthArray) i = MAP_HEIGHT >> 1; do { - register SBYTE top, bot; + SBYTE top, bot; j = MAP_WIDTH; do @@ -729,7 +729,7 @@ static void DitherMap (PSBYTE DepthArray) { COUNT i; - register PSBYTE lpDst; + PSBYTE lpDst; i = (MAP_WIDTH * MAP_HEIGHT) >> 2; lpDst = DepthArray; @@ -947,7 +947,7 @@ MakeStorms (COUNT storm_count, PSBYTE DepthArray) #define MAX_STORMS 8 COUNT i; RECT storm_r[MAX_STORMS]; - register PRECT pstorm_r; + PRECT pstorm_r; pstorm_r = &storm_r[i = storm_count]; while (i--) @@ -1142,7 +1142,7 @@ ValidateMap (PSBYTE DepthArray) BYTE pixel_count[2], lb[2]; SBYTE last_byte; COUNT i; - register PSBYTE lpDst; + PSBYTE lpDst; i = MAP_WIDTH - 1; lpDst = DepthArray; diff --git a/sc2/src/sc2code/planets/solarsys.c b/sc2/src/sc2code/planets/solarsys.c index f3381476b..2e778e5be 100644 --- a/sc2/src/sc2code/planets/solarsys.c +++ b/sc2/src/sc2code/planets/solarsys.c @@ -697,12 +697,12 @@ ZoomSystem (void) } static UWORD -flagship_inertial_thrust (register COUNT CurrentAngle) +flagship_inertial_thrust (COUNT CurrentAngle) { BYTE max_speed; SIZE cur_delta_x, cur_delta_y; - register COUNT TravelAngle; - register VELOCITYPTR VelocityPtr; + COUNT TravelAngle; + VELOCITYPTR VelocityPtr; max_speed = pSolarSysState->max_ship_speed; VelocityPtr = &GLOBAL (velocity); @@ -714,7 +714,7 @@ flagship_inertial_thrust (register COUNT CurrentAngle) return (SHIP_AT_MAX_SPEED); else { - register SIZE delta_x, delta_y; + SIZE delta_x, delta_y; DWORD desired_speed; delta_x = cur_delta_x diff --git a/sc2/src/sc2code/process.c b/sc2/src/sc2code/process.c index f1a64bef6..59fb54688 100644 --- a/sc2/src/sc2code/process.c +++ b/sc2/src/sc2code/process.c @@ -95,7 +95,7 @@ FreeElement (HELEMENT hElement) } void -SetUpElement (register ELEMENTPTR ElementPtr) +SetUpElement (ELEMENTPTR ElementPtr) { ElementPtr->next = ElementPtr->current; if (CollidingElement (ElementPtr)) @@ -107,9 +107,9 @@ SetUpElement (register ELEMENTPTR ElementPtr) } static void -PreProcess (register ELEMENTPTR ElementPtr) +PreProcess (ELEMENTPTR ElementPtr) { - register ELEMENT_FLAGS state_flags; + ELEMENT_FLAGS state_flags; if (ElementPtr->life_span == 0) { @@ -168,7 +168,7 @@ PreProcess (register ELEMENTPTR ElementPtr) } static void -PostProcess (register ELEMENTPTR ElementPtr) +PostProcess (ELEMENTPTR ElementPtr) { if (ElementPtr->postprocess_func) (*ElementPtr->postprocess_func) (ElementPtr); @@ -264,11 +264,11 @@ CalcReduction (SIZE dx, SIZE dy) #ifdef OLD_ZOOM static VIEW_STATE -CalcView (PPOINT pNewScrollPt, register BYTE next_reduction, +CalcView (PPOINT pNewScrollPt, BYTE next_reduction, PSIZE pdx, PSIZE pdy) #else static VIEW_STATE -CalcView (PPOINT pNewScrollPt, register SIZE next_reduction, +CalcView (PPOINT pNewScrollPt, SIZE next_reduction, PSIZE pdx, PSIZE pdy, COUNT ships_alive) #endif { @@ -349,7 +349,7 @@ CalcView (PPOINT pNewScrollPt, register SIZE next_reduction, static ELEMENT_FLAGS -ProcessCollisions (HELEMENT hSuccElement, register ELEMENTPTR ElementPtr, +ProcessCollisions (HELEMENT hSuccElement, ELEMENTPTR ElementPtr, TIME_VALUE min_time, ELEMENT_FLAGS process_flags) { HELEMENT hTestElement; @@ -372,7 +372,7 @@ ProcessCollisions (HELEMENT hSuccElement, register ELEMENTPTR ElementPtr, if (CollisionPossible (TestElementPtr, ElementPtr)) { - register ELEMENT_FLAGS state_flags, test_state_flags; + ELEMENT_FLAGS state_flags, test_state_flags; TIME_VALUE time_val; state_flags = ElementPtr->state_flags; @@ -632,7 +632,7 @@ PreProcessQueue (PSIZE pscroll_x, PSIZE pscroll_y) #endif COUNT num_ships; POINT Origin; - register HELEMENT hElement; + HELEMENT hElement; COUNT ships_alive; #ifdef KDEBUG @@ -804,16 +804,16 @@ InsertPrim (PRIM_LINKS *pLinks, COUNT primIndex, COUNT iPI) PRIM_LINKS DisplayLinks; static void -PostProcessQueue (register VIEW_STATE view_state, register SIZE scroll_x, - register SIZE scroll_y) +PostProcessQueue (VIEW_STATE view_state, SIZE scroll_x, + SIZE scroll_y) { POINT delta; #ifdef OLD_ZOOM - register BYTE reduction; + BYTE reduction; #else - register SIZE reduction; + SIZE reduction; #endif - register HELEMENT hElement; + HELEMENT hElement; #ifdef KDEBUG fprintf (stderr, "PostProcess:\n"); @@ -827,7 +827,7 @@ PostProcessQueue (register VIEW_STATE view_state, register SIZE scroll_x, hElement = GetHeadElement (); while (hElement != 0) { - register ELEMENT_FLAGS state_flags; + ELEMENT_FLAGS state_flags; ELEMENTPTR ElementPtr; HELEMENT hNextElement; diff --git a/sc2/src/sc2code/ship.c b/sc2/src/sc2code/ship.c index fc63d2272..8babd7e7e 100644 --- a/sc2/src/sc2code/ship.c +++ b/sc2/src/sc2code/ship.c @@ -36,9 +36,9 @@ animation_preprocess (PELEMENT ElementPtr) UWORD inertial_thrust (ELEMENTPTR ElementPtr) { - register COUNT CurrentAngle, TravelAngle; + COUNT CurrentAngle, TravelAngle; COUNT max_thrust, thrust_increment; - register VELOCITYPTR VelocityPtr; + VELOCITYPTR VelocityPtr; STARSHIPPTR StarShipPtr; VelocityPtr = &ElementPtr->velocity; @@ -62,7 +62,7 @@ inertial_thrust (ELEMENTPTR ElementPtr) & (SHIP_AT_MAX_SPEED | SHIP_BEYOND_MAX_SPEED)); else { - register SIZE delta_x, delta_y; + SIZE delta_x, delta_y; SIZE cur_delta_x, cur_delta_y; DWORD desired_speed, max_speed; @@ -130,9 +130,9 @@ inertial_thrust (ELEMENTPTR ElementPtr) } void -ship_preprocess (register PELEMENT ElementPtr) +ship_preprocess (PELEMENT ElementPtr) { - register ELEMENT_FLAGS cur_status_flags; + ELEMENT_FLAGS cur_status_flags; STARSHIPPTR StarShipPtr; RACE_DESCPTR RDPtr; @@ -273,8 +273,7 @@ ship_preprocess (register PELEMENT ElementPtr) } void -ship_postprocess (register - PELEMENT ElementPtr) +ship_postprocess (PELEMENT ElementPtr) { STARSHIPPTR StarShipPtr; RACE_DESCPTR RDPtr; diff --git a/sc2/src/sc2code/ships/shofixti/shofixti.c b/sc2/src/sc2code/ships/shofixti/shofixti.c index d37b9397c..c461bdc60 100644 --- a/sc2/src/sc2code/ships/shofixti/shofixti.c +++ b/sc2/src/sc2code/ships/shofixti/shofixti.c @@ -314,7 +314,7 @@ shofixti_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT StarShipPtr->ship_input_state &= ~SPECIAL; else { - register PEVALUATE_DESC lpWeaponEvalDesc, lpShipEvalDesc; + PEVALUATE_DESC lpWeaponEvalDesc, lpShipEvalDesc; lpWeaponEvalDesc = &ObjectsOfConcern[ENEMY_WEAPON_INDEX]; lpShipEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; diff --git a/sc2/src/sc2code/status.c b/sc2/src/sc2code/status.c index 3da2cd79d..d88660c64 100644 --- a/sc2/src/sc2code/status.c +++ b/sc2/src/sc2code/status.c @@ -22,8 +22,8 @@ #include "options.h" static void -CaptainsWindow (CAPTAIN_STUFFPTR CSPtr, COORD y, register ELEMENT_FLAGS - delta_status_flags, register ELEMENT_FLAGS cur_status_flags, +CaptainsWindow (CAPTAIN_STUFFPTR CSPtr, COORD y, ELEMENT_FLAGS + delta_status_flags, ELEMENT_FLAGS cur_status_flags, COUNT Pass) { STAMP Stamp; @@ -351,7 +351,7 @@ PreProcessStatus (PELEMENT ShipPtr) if (StarShipPtr->captains_name_index || (StarShipPtr->RaceDescPtr->ship_info.ship_flags & GOOD_GUY)) { - register ELEMENT_FLAGS old_status_flags, cur_status_flags; + ELEMENT_FLAGS old_status_flags, cur_status_flags; CAPTAIN_STUFFPTR CSPtr; cur_status_flags = StarShipPtr->cur_status_flags; @@ -380,7 +380,7 @@ PostProcessStatus (PELEMENT ShipPtr) || (StarShipPtr->RaceDescPtr->ship_info.ship_flags & GOOD_GUY)) { COORD y; - register ELEMENT_FLAGS cur_status_flags, old_status_flags; + ELEMENT_FLAGS cur_status_flags, old_status_flags; cur_status_flags = StarShipPtr->cur_status_flags; diff --git a/sc2/src/sc2code/trans.c b/sc2/src/sc2code/trans.c index 35dee117d..e9117d368 100644 --- a/sc2/src/sc2code/trans.c +++ b/sc2/src/sc2code/trans.c @@ -89,7 +89,7 @@ SIZE sinetab[] = COUNT ARCTAN (SIZE delta_x, SIZE delta_y) { - register SIZE v1, v2; + SIZE v1, v2; static COUNT atantab[] = { 0, diff --git a/sc2/src/sc2code/velocity.c b/sc2/src/sc2code/velocity.c index fc73940df..d311e9da9 100644 --- a/sc2/src/sc2code/velocity.c +++ b/sc2/src/sc2code/velocity.c @@ -52,11 +52,11 @@ GetNextVelocityComponents (VELOCITYPTR velocityptr, PSIZE pdx, PSIZE pdy, } void -SetVelocityVector (register VELOCITYPTR velocityptr, register SIZE +SetVelocityVector (VELOCITYPTR velocityptr, SIZE magnitude, COUNT facing) { - register COUNT angle; - register SIZE dx, dy; + COUNT angle; + SIZE dx, dy; angle = velocityptr->TravelAngle = FACING_TO_ANGLE (NORMALIZE_FACING (facing)); @@ -94,8 +94,7 @@ SetVelocityVector (register VELOCITYPTR velocityptr, register SIZE } void -SetVelocityComponents (register VELOCITYPTR velocityptr, register SIZE - dx, register SIZE dy) +SetVelocityComponents (VELOCITYPTR velocityptr, SIZE dx, SIZE dy) { COUNT angle;