diff --git a/sc2/src/sc2code/battle.c b/sc2/src/sc2code/battle.c index 980920b3f..5d0550cc7 100644 --- a/sc2/src/sc2code/battle.c +++ b/sc2/src/sc2code/battle.c @@ -66,9 +66,9 @@ RunAwayAllowed (void) } static void -DoRunAway (STARSHIPPTR StarShipPtr) +DoRunAway (STARSHIP *StarShipPtr) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (StarShipPtr->hShip, &ElementPtr); if (GetPrimType (&DisplayArray[ElementPtr->PrimIndex]) == STAMP_PRIM @@ -77,7 +77,7 @@ DoRunAway (STARSHIPPTR StarShipPtr) && ElementPtr->mass_points != MAX_SHIP_MASS * 10 && !(ElementPtr->state_flags & APPEARING)) { - extern void flee_preprocess (PELEMENT); + extern void flee_preprocess (ELEMENT *); battle_counter -= MAKE_WORD (1, 0); @@ -150,7 +150,7 @@ ProcessInput (void) hBattleShip != 0; hBattleShip = hNextShip) { BATTLE_INPUT_STATE InputState; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (&race_q[cur_player], hBattleShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -345,7 +345,7 @@ selectAllShips (SIZE num_ships) #ifndef NETPLAY while (num_ships--) { - if (!GetNextStarShip (NULL_PTR, num_ships == 1)) + if (!GetNextStarShip (NULL, num_ships == 1)) return FALSE; } return TRUE; @@ -357,7 +357,7 @@ selectAllShips (SIZE num_ships) if (num_ships == 1) { // HyperSpace in full game. - return GetNextStarShip (NULL_PTR, 0); + return GetNextStarShip (NULL, 0); } if (num_ships != 2) @@ -395,7 +395,7 @@ selectAllShips (SIZE num_ships) size_t i; for (i = 0; i < 2; i++) { - if (!GetNextStarShip (NULL_PTR, order[i])) + if (!GetNextStarShip (NULL, order[i])) return FALSE; } } @@ -478,7 +478,7 @@ Battle (void) IN_HYPERSPACE); UnlockMutex (GraphicsLock); - DoInput ((PVOID)&bs, FALSE); + DoInput (&bs, FALSE); LockMutex (GraphicsLock); AbortBattle: diff --git a/sc2/src/sc2code/build.c b/sc2/src/sc2code/build.c index 46fe36603..a96138b6b 100644 --- a/sc2/src/sc2code/build.c +++ b/sc2/src/sc2code/build.c @@ -25,14 +25,14 @@ HSTARSHIP -Build (PQUEUE pQueue, DWORD RaceResIndex, COUNT which_player, BYTE +Build (QUEUE *pQueue, DWORD RaceResIndex, COUNT which_player, BYTE captains_name_index) { HSTARSHIP hNewShip; if ((hNewShip = AllocStarShip (pQueue)) != 0) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (pQueue, hNewShip); memset (StarShipPtr, 0, GetLinkSize (pQueue)); @@ -48,14 +48,14 @@ Build (PQUEUE pQueue, DWORD RaceResIndex, COUNT which_player, BYTE } HSTARSHIP -GetStarShipFromIndex (PQUEUE pShipQ, COUNT Index) +GetStarShipFromIndex (QUEUE *pShipQ, COUNT Index) { HSTARSHIP hStarShip, hNextShip; for (hStarShip = GetHeadLink (pShipQ); Index > 0 && hStarShip; hStarShip = hNextShip, --Index) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (pShipQ, hStarShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -113,9 +113,9 @@ ActivateStarShip (COUNT which_ship, SIZE state) case SPHERE_TRACKING: case SPHERE_KNOWN: { - EXTENDED_SHIP_FRAGMENTPTR StarShipPtr; + EXTENDED_SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); if (state == SPHERE_KNOWN) which_ship = StarShipPtr->ShipInfo.known_strength; @@ -146,9 +146,9 @@ ActivateStarShip (COUNT which_ship, SIZE state) for (hStarShip = GetHeadLink (&GLOBAL (built_ship_q)); hStarShip; hStarShip = hNextShip) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR) LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); total += ShipCost[GET_RACE_ID (StarShipPtr)]; @@ -162,9 +162,9 @@ ActivateStarShip (COUNT which_ship, SIZE state) hStarShip; hStarShip = hNextShip) { BYTE ship_type; - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR) LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); ship_type = GET_RACE_ID (StarShipPtr); @@ -180,13 +180,12 @@ ActivateStarShip (COUNT which_ship, SIZE state) - CountLinks (&GLOBAL (built_ship_q))); default: { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; if (state <= 0) { - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (avail_race_q), hStarShip - ); + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (avail_race_q), hStarShip); if (state == CHECK_ALLIANCE) { state = StarShipPtr->ShipInfo.ship_flags @@ -213,10 +212,10 @@ ActivateStarShip (COUNT which_ship, SIZE state) hStarShip; hStarShip = hNextShip) { BOOLEAN RemoveShip; - SHIP_FRAGMENTPTR StarShipPtr2; + SHIP_FRAGMENT *StarShipPtr2; StarShipPtr2 = - (SHIP_FRAGMENTPTR)LockStarShip ( + (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr2); RemoveShip = (BOOLEAN) ( @@ -278,7 +277,7 @@ ActivateStarShip (COUNT which_ship, SIZE state) { BYTE win_loc; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hOldShip); win_loc = GET_GROUP_LOC (StarShipPtr); UnlockStarShip (&GLOBAL (built_ship_q), @@ -287,7 +286,7 @@ ActivateStarShip (COUNT which_ship, SIZE state) break; } - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); SET_GROUP_LOC (StarShipPtr, which_window - 1); if (which_ship == SPATHI_SHIP @@ -319,7 +318,7 @@ ActivateStarShip (COUNT which_ship, SIZE state) } COUNT -GetIndexFromStarShip (PQUEUE pShipQ, HSTARSHIP hStarShip) +GetIndexFromStarShip (QUEUE *pShipQ, HSTARSHIP hStarShip) { COUNT Index; @@ -327,7 +326,7 @@ GetIndexFromStarShip (PQUEUE pShipQ, HSTARSHIP hStarShip) while (hStarShip != GetHeadLink (pShipQ)) { HSTARSHIP hNextShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (pShipQ, hStarShip); hNextShip = _GetPredLink (StarShipPtr); @@ -341,7 +340,7 @@ GetIndexFromStarShip (PQUEUE pShipQ, HSTARSHIP hStarShip) } BYTE -NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr) +NameCaptain (QUEUE *pQueue, STARSHIP *StarShipPtr) { BYTE name_index; HSTARSHIP hStarShip; @@ -353,7 +352,7 @@ NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr) name_index = PickCaptainName (); for (hStarShip = GetHeadLink (pQueue); hStarShip; hStarShip = hNextShip) { - STARSHIPPTR TestShipPtr; + STARSHIP *TestShipPtr; TestShipPtr = LockStarShip (pQueue, hStarShip); hNextShip = _GetSuccLink (TestShipPtr); @@ -386,28 +385,28 @@ NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr) // crew_level can be set to INFINITE_FLEET for a ship which is to // represent an infinite number of ships. HSTARSHIP -CloneShipFragment (COUNT shipIndex, PQUEUE pDstQueue, COUNT crew_level) +CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level) { HSTARSHIP hStarShip, hBuiltShip; - SHIP_FRAGMENTPTR TemplatePtr; + SHIP_FRAGMENT *TemplatePtr; hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), shipIndex); if (hStarShip == 0) return 0; - TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); hBuiltShip = Build (pDstQueue, TemplatePtr->RaceResIndex, TemplatePtr->ShipInfo.ship_flags & (GOOD_GUY | BAD_GUY), (BYTE)(shipIndex == SAMATRA_SHIP ? - 0 : NameCaptain (pDstQueue, (STARSHIPPTR)TemplatePtr))); + 0 : NameCaptain (pDstQueue, (STARSHIP*)TemplatePtr))); if (hBuiltShip) { - SHIP_FRAGMENTPTR ShipFragPtr; + SHIP_FRAGMENT *ShipFragPtr; - ShipFragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pDstQueue, hBuiltShip); + ShipFragPtr = (SHIP_FRAGMENT*) LockStarShip (pDstQueue, hBuiltShip); ShipFragPtr->ShipInfo = TemplatePtr->ShipInfo; if (crew_level) ShipFragPtr->ShipInfo.crew_level = crew_level; diff --git a/sc2/src/sc2code/build.h b/sc2/src/sc2code/build.h index 20e50173a..a654365c9 100644 --- a/sc2/src/sc2code/build.h +++ b/sc2/src/sc2code/build.h @@ -44,12 +44,12 @@ & (NUM_CAPTAINS_NAMES - 1)) \ + NAME_OFFSET) -extern HSTARSHIP Build (PQUEUE pQueue, DWORD RaceResIndex, COUNT +extern HSTARSHIP Build (QUEUE *pQueue, DWORD RaceResIndex, COUNT which_player, BYTE captains_name_index); -extern HSTARSHIP CloneShipFragment (COUNT shipIndex, PQUEUE pDstQueue, +extern HSTARSHIP CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level); -extern HSTARSHIP GetStarShipFromIndex (PQUEUE pShipQ, COUNT Index); -extern BYTE NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr); +extern HSTARSHIP GetStarShipFromIndex (QUEUE *pShipQ, COUNT Index); +extern BYTE NameCaptain (QUEUE *pQueue, STARSHIP *StarShipPtr); /* Possible values for the 'state' argument of * COUNT ActivateStarShip (COUNT which_ship, SIZE state) @@ -64,19 +64,19 @@ extern BYTE NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr); /* Check for how many escort ships there's still space */ extern COUNT ActivateStarShip (COUNT which_ship, SIZE state); -extern COUNT GetIndexFromStarShip (PQUEUE pShipQ, HSTARSHIP hStarShip); +extern COUNT GetIndexFromStarShip (QUEUE *pShipQ, HSTARSHIP hStarShip); -extern MEM_HANDLE load_ship (STARSHIPPTR StarShipPtr, BOOLEAN +extern MEM_HANDLE load_ship (STARSHIP *StarShipPtr, BOOLEAN LoadBattleData); -extern void free_ship (STARSHIPPTR StarShipPtr, BOOLEAN FreeBattleData); +extern void free_ship (STARSHIP *StarShipPtr, BOOLEAN FreeBattleData); extern void DrawCrewFuelString (COORD y, SIZE state); extern void ClearShipStatus (COORD y); extern void OutlineShipStatus (COORD y); -extern void InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect); -extern void DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, +extern void InitShipStatus (STARSHIP *StarShipPtr, RECT *pClipRect); +extern void DeltaStatistics (STARSHIP *StarShipPtr, SIZE crew_delta, SIZE energy_delta); -extern void DrawBattleCrewAmount (STARSHIPPTR StarShipPtr); +extern void DrawBattleCrewAmount (STARSHIP *StarShipPtr); #endif /* _BUILD_H */ diff --git a/sc2/src/sc2code/clock.c b/sc2/src/sc2code/clock.c index 4b34872bb..5a5523e02 100644 --- a/sc2/src/sc2code/clock.c +++ b/sc2/src/sc2code/clock.c @@ -113,13 +113,13 @@ clock_task_func(void* data) } LockMutex (GraphicsLock); - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); { HEVENT hEvent; while ((hEvent = GetHeadEvent ())) { - EVENTPTR EventPtr; + EVENT *EventPtr; LockEvent (hEvent, &EventPtr); @@ -153,7 +153,7 @@ clock_task_func(void* data) num_ticks = GetTimeCounter () - LastTime; if (!OnAutoPilot) { - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); cycle_index = delay_count = 0; } else if (delay_count > num_ticks) @@ -301,8 +301,8 @@ SetGameClockRate (COUNT seconds_per_day) } BOOLEAN -ValidateEvent (EVENT_TYPE type, PCOUNT pmonth_index, PCOUNT pday_index, - PCOUNT pyear_index) +ValidateEvent (EVENT_TYPE type, COUNT *pmonth_index, COUNT *pday_index, + COUNT *pyear_index) { COUNT month_index, day_index, year_index; @@ -353,7 +353,7 @@ AddEvent (EVENT_TYPE type, COUNT month_index, COUNT day_index, COUNT else if (ValidateEvent (type, &month_index, &day_index, &year_index) && (hNewEvent = AllocEvent ())) { - EVENTPTR EventPtr; + EVENT *EventPtr; LockEvent (hNewEvent, &EventPtr); EventPtr->day_index = (BYTE)day_index; diff --git a/sc2/src/sc2code/clock.h b/sc2/src/sc2code/clock.h index cd439837b..6a889ae15 100644 --- a/sc2/src/sc2code/clock.h +++ b/sc2/src/sc2code/clock.h @@ -40,7 +40,6 @@ typedef struct QUEUE event_q; } CLOCK_STATE; -typedef CLOCK_STATE *PCLOCK_STATE; typedef QUEUE_HANDLE HEVENT; @@ -52,7 +51,6 @@ typedef struct event COUNT year_index; BYTE func_index; } EVENT; -typedef EVENT *PEVENT; typedef enum { @@ -60,22 +58,19 @@ typedef enum RELATIVE_EVENT } EVENT_TYPE; -#define EVENTPTR PEVENT - #define AllocEvent() AllocLink (&GLOBAL (GameClock.event_q)) #define PutEvent(h) PutQueue (&GLOBAL (GameClock.event_q), (h)) #define InsertEvent(h,i) InsertQueue (&GLOBAL (GameClock.event_q), (h), (i)) #define GetHeadEvent() GetHeadLink (&GLOBAL (GameClock.event_q)) #define GetTailEvent() GetTailLink (&GLOBAL (GameClock.event_q)) -#define LockEvent(h,eptr) *(eptr) = (EVENTPTR)LockLink ( \ - &GLOBAL (GameClock.event_q), (h)) +#define LockEvent(h,ppe) (*(ppe) = (EVENT*)LockLink (&GLOBAL (GameClock.event_q), h)) #define UnlockEvent(h) UnlockLink (&GLOBAL (GameClock.event_q), (h)) #define RemoveEvent(h) RemoveQueue (&GLOBAL (GameClock.event_q), (h)) #define FreeEvent(h) FreeLink (&GLOBAL (GameClock.event_q), (h)) #define GetPredEvent(l) _GetPredLink (l) #define GetSuccEvent(l) _GetSuccLink (l) #define ForAllEvents(callback, arg) ForAllLinks(&GLOBAL (GameClock.event_q), \ - (void (*)(LINKPTR, void *)) (callback), (arg)) + (void (*)(LINK *, void *)) (callback), (arg)) /* rates are in seconds per game day */ #define HYPERSPACE_CLOCK_RATE 5 @@ -87,8 +82,8 @@ extern void SuspendGameClock (void); extern void ResumeGameClock (void); extern BOOLEAN GameClockRunning (void); extern void SetGameClockRate (COUNT seconds_per_day); -extern BOOLEAN ValidateEvent (EVENT_TYPE type, PCOUNT pmonth_index, - PCOUNT pday_index, PCOUNT pyear_index); +extern BOOLEAN ValidateEvent (EVENT_TYPE type, COUNT *pmonth_index, + COUNT *pday_index, COUNT *pyear_index); extern HEVENT AddEvent (EVENT_TYPE type, COUNT month_index, COUNT day_index, COUNT year_index, BYTE func_index); extern void EventHandler (BYTE selector); diff --git a/sc2/src/sc2code/cnctdlg.c b/sc2/src/sc2code/cnctdlg.c index 45b430b07..ae40ee342 100644 --- a/sc2/src/sc2code/cnctdlg.c +++ b/sc2/src/sc2code/cnctdlg.c @@ -47,8 +47,6 @@ typedef struct connect_dialog_state static void DrawConnectDialog (void); -typedef CONNECT_DIALOG_STATE *PCONNECT_DIALOG_STATE; - static WIDGET_MENU_SCREEN menu; static WIDGET_BUTTON buttons[3]; static WIDGET_SLIDER slider; @@ -67,7 +65,7 @@ static BOOLEAN done; /* This kind of sucks, but the Button callbacks need access to the * CONNECT_DIALOG_STATE, so we need a pointer to it */ -static PCONNECT_DIALOG_STATE current_state; +static CONNECT_DIALOG_STATE *current_state; static FONT PlayerFont; @@ -232,7 +230,7 @@ MCD_DrawTextEntry (WIDGET *_self, int x, int y) COUNT i; RECT text_r; BYTE char_deltas[WIDGET_TEXTENTRY_WIDTH]; - PBYTE pchar_deltas; + BYTE *pchar_deltas; RECT r; SIZE leading; @@ -311,7 +309,7 @@ MCD_DrawTextEntry (WIDGET *_self, int x, int y) * refactoring, as redraw_menu () is the only real change. */ static BOOLEAN -OnTextEntryChange (PTEXTENTRY_STATE pTES) +OnTextEntryChange (TEXTENTRY_STATE *pTES) { WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam; @@ -329,7 +327,7 @@ OnTextEntryChange (PTEXTENTRY_STATE pTES) } static BOOLEAN -OnTextEntryFrame (PTEXTENTRY_STATE pTES) +OnTextEntryFrame (TEXTENTRY_STATE *pTES) { WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam; @@ -546,7 +544,7 @@ DrawConnectDialog (void) } static BOOLEAN -DoMeleeConnectDialog (PCONNECT_DIALOG_STATE state) +DoMeleeConnectDialog (CONNECT_DIALOG_STATE *state) { BOOLEAN changed; @@ -620,7 +618,7 @@ MeleeConnectDialog (int side) current_state = &state; - DoInput ((PVOID)&state, TRUE); + DoInput (&state, TRUE); current_state = NULL; diff --git a/sc2/src/sc2code/coderes.h b/sc2/src/sc2code/coderes.h index 2954a8272..cccf9fd49 100644 --- a/sc2/src/sc2code/coderes.h +++ b/sc2/src/sc2code/coderes.h @@ -21,11 +21,11 @@ #include "reslib.h" -extern MEM_HANDLE LoadCodeResFile (PSTR pStr); +extern MEM_HANDLE LoadCodeResFile (const char *pStr); extern BOOLEAN InstallCodeResType (COUNT code_type); extern MEM_HANDLE LoadCodeResInstance (RESOURCE res); -extern PVOID CaptureCodeRes (MEM_HANDLE hCode, PVOID pData, PVOID *ppLocData); -extern MEM_HANDLE ReleaseCodeRes (PVOID CodeRef); +extern void* CaptureCodeRes (MEM_HANDLE hCode, void *pData, void **ppLocData); +extern MEM_HANDLE ReleaseCodeRes (void *CodeRef); extern BOOLEAN DestroyCodeRes (MEM_HANDLE hCode); typedef struct @@ -33,7 +33,6 @@ typedef struct MEM_HANDLE hCode; UWORD size; } CODE_REF; -typedef CODE_REF *PCODE_REF; #endif /* _CODERES_H */ diff --git a/sc2/src/sc2code/collide.c b/sc2/src/sc2code/collide.c index 6956e3c58..7275e428d 100644 --- a/sc2/src/sc2code/collide.c +++ b/sc2/src/sc2code/collide.c @@ -27,7 +27,7 @@ //#define DEBUG_COLLIDE void -collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1) +collide (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1) { SIZE speed; SIZE dx0, dy0, dx1, dy1, dx_rel, dy_rel; @@ -103,7 +103,7 @@ collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1) { if (ElementPtr0->state_flags & PLAYER_SHIP) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); StarShipPtr->cur_status_flags &= @@ -140,7 +140,7 @@ collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1) { if (ElementPtr1->state_flags & PLAYER_SHIP) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr1, &StarShipPtr); StarShipPtr->cur_status_flags &= diff --git a/sc2/src/sc2code/collide.h b/sc2/src/sc2code/collide.h index 6b00706fb..85bdb2019 100644 --- a/sc2/src/sc2code/collide.h +++ b/sc2/src/sc2code/collide.h @@ -57,7 +57,7 @@ (eptr)->next.image.frame); \ } -extern void collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1); +extern void collide (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1); #endif /* _COLLIDE_H */ diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index 532a60ee0..e4ea428f5 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -59,7 +59,6 @@ typedef struct response_entry TEXT response_text; RESPONSE_FUNC response_func; } RESPONSE_ENTRY; -typedef RESPONSE_ENTRY *PRESPONSE_ENTRY; typedef struct encounter_state { @@ -75,9 +74,8 @@ typedef struct encounter_state COUNT phrase_buf_index; UNICODE phrase_buf[512]; } ENCOUNTER_STATE; -typedef ENCOUNTER_STATE *PENCOUNTER_STATE; -static PENCOUNTER_STATE pCurInputState; +static ENCOUNTER_STATE *pCurInputState; static SUBTITLE_STATE subtitle_state = DONE_SUBTITLE; static Mutex subtitle_mutex; @@ -97,7 +95,7 @@ RECT CommWndRect = { * display given the line wrapping information */ static int -_count_lines (PTEXT pText) +_count_lines (TEXT *pText) { SIZE text_width; const unsigned char *pStr; @@ -124,11 +122,11 @@ _count_lines (PTEXT pText) // status == -4: use current context, and baseline from pTextIn // status == 1: draw alien speech; subtitle cache is used static COORD -add_text (int status, PTEXT pTextIn) +add_text (int status, TEXT *pTextIn) { COUNT maxchars, numchars; TEXT locText; - PTEXT pText; + TEXT *pText; SIZE leading; const unsigned char *pStr; SIZE text_width; @@ -357,7 +355,7 @@ getLineWithinWidth(TEXT *pText, const unsigned char **startNext, oldCount = pText->CharCount; pText->CharCount = charCount; - TextRect (pText, &rect, NULL_PTR); + TextRect (pText, &rect, NULL); if (rect.extent.width >= maxWidth) { @@ -422,7 +420,7 @@ DrawSISComWindow (void) OldStrings = SetRelStringTableIndex (OldStrings, 1); font_DrawText (&t); SetContextForeGroundColor (WHITE_COLOR); - t.pStr = (PBYTE)GetStringAddress (CreditStrings); + t.pStr = (BYTE*)GetStringAddress (CreditStrings); t.CharCount = GetStringLength (CreditStrings); CreditStrings = SetRelStringTableIndex (CreditStrings, 1); font_DrawText (&t); @@ -443,11 +441,11 @@ DrawSISComWindow (void) } void -DrawAlienFrame (FRAME aframe, PSEQUENCE pSeq) +DrawAlienFrame (FRAME aframe, SEQUENCE *pSeq) { COUNT i; STAMP s; - ANIMATION_DESCPTR ADPtr; + ANIMATION_DESC *ADPtr; s.origin.x = -SAFE_X; s.origin.y = 0; @@ -504,7 +502,7 @@ volatile BOOLEAN ClearSummary; static volatile BOOLEAN ClearSubtitle; static void -RefreshResponses (PENCOUNTER_STATE pES) +RefreshResponses (ENCOUNTER_STATE *pES) { COORD y; BYTE response; @@ -827,7 +825,7 @@ AlienTalkSegue (COUNT wait_track) if (!pCurInputState->Initialized) { SetColorMap (GetColorMapAddress (CommData.AlienColorMap)); - DrawAlienFrame (CommData.AlienFrame, NULL_PTR); + DrawAlienFrame (CommData.AlienFrame, NULL); UpdateSpeechGraphics (TRUE); if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE @@ -920,10 +918,9 @@ typedef struct summary_state const UNICODE *LeftOver; } SUMMARY_STATE; -typedef SUMMARY_STATE *PSUMMARY_STATE; static BOOLEAN -DoConvSummary (PSUMMARY_STATE pSS) +DoConvSummary (SUMMARY_STATE *pSS) { #define DELTA_Y_SUMMARY 8 #define MAX_SUMM_ROWS ((SIS_SCREEN_HEIGHT - SLIDER_Y - SLIDER_HEIGHT) \ @@ -1051,10 +1048,10 @@ DoConvSummary (PSUMMARY_STATE pSS) // Called when the player presses the select button on a response. static void -SelectResponse (PENCOUNTER_STATE pES) +SelectResponse (ENCOUNTER_STATE *pES) { const unsigned char *end; - PTEXT response_text = + TEXT *response_text = &pES->response_list[pES->cur_response].response_text; end = skipUTF8Chars(response_text->pStr, response_text->CharCount); pES->phrase_buf_index = end - response_text->pStr; @@ -1077,7 +1074,7 @@ SelectResponse (PENCOUNTER_STATE pES) // Called when the player presses the cancel button in comm. static void -SelectConversationSummary (PENCOUNTER_STATE pES) +SelectConversationSummary (ENCOUNTER_STATE *pES) { SUMMARY_STATE SummaryState; @@ -1099,7 +1096,7 @@ SelectConversationSummary (PENCOUNTER_STATE pES) } static void -PlayerResponseInput (PENCOUNTER_STATE pES) +PlayerResponseInput (ENCOUNTER_STATE *pES) { BYTE response; @@ -1181,7 +1178,7 @@ PlayerResponseInput (PENCOUNTER_STATE pES) } static BOOLEAN -DoCommunication (PENCOUNTER_STATE pES) +DoCommunication (ENCOUNTER_STATE *pES) { SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT); @@ -1261,8 +1258,8 @@ void DoResponsePhrase (RESPONSE_REF R, RESPONSE_FUNC response_func, UNICODE *ConstructStr) { - PENCOUNTER_STATE pES = pCurInputState; - PRESPONSE_ENTRY pEntry; + ENCOUNTER_STATE *pES = pCurInputState; + RESPONSE_ENTRY *pEntry; if (GLOBAL (CurrentActivity) & CHECK_ABORT) return; @@ -1397,7 +1394,7 @@ HailAlien (void) } else { - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); DrawSISTitle (GLOBAL_SIS (PlanetName)); } } @@ -1410,7 +1407,7 @@ HailAlien (void) LastActivity |= CHECK_LOAD; /* prevent spurious input */ (*CommData.init_encounter_func) (); - DoInput ((PVOID)&ES, FALSE); + DoInput (&ES, FALSE); if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD))) (*CommData.post_encounter_func) (); (*CommData.uninit_encounter_func) (); @@ -1439,7 +1436,7 @@ InitCommunication (RESOURCE which_comm) { COUNT status; MEM_HANDLE hOldIndex, hIndex; - LOCDATAPTR LocDataPtr; + LOCDATA *LocDataPtr; #ifdef DEBUG if (disableInteractivity) @@ -1464,7 +1461,7 @@ InitCommunication (RESOURCE which_comm) ClearSISRect (DRAW_SIS_DISPLAY); RepairSISBorder (); } - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE) DrawHyperCoords (GLOBAL (ShipStamp.origin)); else if (HIWORD (GLOBAL (ShipStamp.frame)) == 0) @@ -1518,7 +1515,7 @@ InitCommunication (RESOURCE which_comm) { SetResourceIndex (hIndex); - LocDataPtr = (LOCDATAPTR)init_race ( + LocDataPtr = init_race ( status != YEHAT_REBEL_SHIP ? which_comm : (RESOURCE)YEHAT_REBEL_CONVERSATION); if (LocDataPtr) @@ -1597,7 +1594,7 @@ RaceCommunication (void) { COUNT i, status; HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; RESOURCE RaceComm[] = { RACE_COMMUNICATION @@ -1655,7 +1652,7 @@ RaceCommunication (void) { COUNT NumShips; HENCOUNTER hEncounter; - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; hEncounter = GetHeadEncounter (); LockEncounter (hEncounter, &EncounterPtr); @@ -1667,13 +1664,13 @@ RaceCommunication (void) &GLOBAL (npc_built_ship_q), 0); } - CurStarDescPtr = (STAR_DESCPTR)&EncounterPtr->SD; + CurStarDescPtr = (STAR_DESC*)&EncounterPtr->SD; UnlockEncounter (hEncounter); } } hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); i = GET_RACE_ID (FragPtr); UnlockStarShip (&GLOBAL (npc_built_ship_q), hStarShip); @@ -1694,9 +1691,9 @@ RaceCommunication (void) } else { - PEXTENDED_STAR_DESC pESD; + EXTENDED_STAR_DESC *pESD; - pESD = (PEXTENDED_STAR_DESC)CurStarDescPtr; + pESD = (EXTENDED_STAR_DESC*)CurStarDescPtr; if (pESD) { BYTE i, NumShips; @@ -1710,11 +1707,11 @@ RaceCommunication (void) for (i = 0; i < NumShips; ++i) { HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR TemplatePtr; + SHIP_FRAGMENT *TemplatePtr; hStarShip = GetStarShipFromIndex ( &GLOBAL (npc_built_ship_q), i); - TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); pESD->ShipList[i] = TemplatePtr->ShipInfo; pESD->ShipList[i].var1 = GET_RACE_ID (TemplatePtr); diff --git a/sc2/src/sc2code/comm.h b/sc2/src/sc2code/comm.h index efb5263bf..9aa0c718d 100644 --- a/sc2/src/sc2code/comm.h +++ b/sc2/src/sc2code/comm.h @@ -38,7 +38,7 @@ typedef enum #include "commanim.h" -void DrawAlienFrame (FRAME aframe, PSEQUENCE pSeq); +void DrawAlienFrame (FRAME aframe, SEQUENCE *pSeq); BOOLEAN SetClearSubtitle (BOOLEAN flag, SUBTITLE_STATE *sub_state); extern LOCDATA CommData; diff --git a/sc2/src/sc2code/comm/arilou/arilouc.c b/sc2/src/sc2code/comm/arilou/arilouc.c index d16630222..47e778422 100644 --- a/sc2/src/sc2code/comm/arilou/arilouc.c +++ b/sc2/src/sc2code/comm/arilou/arilouc.c @@ -25,9 +25,9 @@ static LOCDATA arilou_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)ARILOU_PMAP_ANIM, /* AlienFrame */ (FONT)ARILOU_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -220,7 +220,7 @@ static LOCDATA arilou_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -822,10 +822,10 @@ post_arilou_enc (void) } } -LOCDATAPTR +LOCDATA* init_arilou_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; arilou_desc.init_encounter_func = Intro; arilou_desc.post_encounter_func = post_arilou_enc; diff --git a/sc2/src/sc2code/comm/blackur/blackurc.c b/sc2/src/sc2code/comm/blackur/blackurc.c index 500bee221..5a9da2e01 100644 --- a/sc2/src/sc2code/comm/blackur/blackurc.c +++ b/sc2/src/sc2code/comm/blackur/blackurc.c @@ -22,9 +22,9 @@ static LOCDATA blackurq_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)BLACKURQ_PMAP_ANIM, /* AlienFrame */ (FONT)BLACKURQ_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -122,7 +122,7 @@ static LOCDATA blackurq_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -535,10 +535,10 @@ post_blackurq_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_blackurq_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; blackurq_desc.init_encounter_func = Intro; blackurq_desc.post_encounter_func = post_blackurq_enc; diff --git a/sc2/src/sc2code/comm/chmmr/chmmrc.c b/sc2/src/sc2code/comm/chmmr/chmmrc.c index 72e0555b4..4fbc94d97 100644 --- a/sc2/src/sc2code/comm/chmmr/chmmrc.c +++ b/sc2/src/sc2code/comm/chmmr/chmmrc.c @@ -25,9 +25,9 @@ static LOCDATA chmmr_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)CHMMR_PMAP_ANIM, /* AlienFrame */ (FONT)CHMMR_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -108,7 +108,7 @@ static LOCDATA chmmr_desc = ONE_SECOND / 60, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -587,7 +587,7 @@ Intro (void) i_am_captain1, GLOBAL_SIS (ShipName), i_am_captain2, - NULL_PTR); + (UNICODE*)NULL); DoResponsePhrase (i_am_captain0, ChmmrFree, shared_phrase_buf); Response (i_am_savior, ChmmrFree); Response (i_am_silly, ChmmrFree); @@ -611,10 +611,10 @@ post_chmmr_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_chmmr_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; chmmr_desc.init_encounter_func = Intro; chmmr_desc.post_encounter_func = post_chmmr_enc; diff --git a/sc2/src/sc2code/comm/comandr/comandr.c b/sc2/src/sc2code/comm/comandr/comandr.c index 19d67b7fe..1d82027bd 100644 --- a/sc2/src/sc2code/comm/comandr/comandr.c +++ b/sc2/src/sc2code/comm/comandr/comandr.c @@ -24,9 +24,9 @@ static LOCDATA commander_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */ (FONT)COMMANDER_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -83,7 +83,7 @@ static LOCDATA commander_desc = ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -140,7 +140,7 @@ ByeBye (RESPONSE_REF R) name_40, GLOBAL_SIS (CommanderName), name_41, - NULL_PTR); + (UNICODE*)NULL); NPCPhrase (THIS_MAY_SEEM_SILLY); @@ -194,7 +194,7 @@ NoRadioactives (RESPONSE_REF R) NPCPhrase (ABOUT_TIME); if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE])) - GiveRadios (NULL_PTR); + GiveRadios (0); else { Response (i_lied, NoRadioactives); @@ -255,7 +255,7 @@ NoRadioactives (RESPONSE_REF R) } if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE])) - GiveRadios (NULL_PTR); + GiveRadios (0); else { if (GLOBAL_SIS (NumLanders) == 0 @@ -559,7 +559,7 @@ RevealSelf (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - NULL_PTR); + (UNICODE*)NULL); DoResponsePhrase (we_are_vindicator0, RevealSelf, shared_phrase_buf); } else if (PHRASE_ENABLED (our_mission_was_secret)) @@ -596,7 +596,7 @@ GiveRadios (RESPONSE_REF R) AlienTalkSegue ((COUNT)~0); - RevealSelf (NULL_PTR); + RevealSelf (0); } else { @@ -628,11 +628,11 @@ Intro (void) { if (GET_GAME_STATE (MOONBASE_DESTROYED) == 0) { - TellMoonBase (NULL_PTR); + TellMoonBase (0); } else { - BaseDestroyed (NULL_PTR); + BaseDestroyed (0); } } else @@ -642,9 +642,9 @@ Intro (void) NPCPhrase (DO_YOU_HAVE_RADIO_THIS_TIME); if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE])) - GiveRadios (NULL_PTR); + GiveRadios (0); else - AskAfterRadios (NULL_PTR); + AskAfterRadios (0); } } else /* first visit */ @@ -660,8 +660,7 @@ Intro (void) no_but_well_help0, GLOBAL_SIS (ShipName), no_but_well_help1, - NULL_PTR - ); + (UNICODE*)NULL); DoResponsePhrase (no_but_well_help0, NoRadioactives, shared_phrase_buf); Response (yes_this_is_supply_ship, NoRadioactives); Response (what_slave_planet, NoRadioactives); @@ -680,10 +679,10 @@ post_commander_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_commander_comm () { - LOCDATAPTR retval; + LOCDATA *retval; commander_desc.init_encounter_func = Intro; commander_desc.post_encounter_func = post_commander_enc; diff --git a/sc2/src/sc2code/comm/druuge/druugec.c b/sc2/src/sc2code/comm/druuge/druugec.c index e9771edf7..3269b183b 100644 --- a/sc2/src/sc2code/comm/druuge/druugec.c +++ b/sc2/src/sc2code/comm/druuge/druugec.c @@ -26,9 +26,9 @@ static LOCDATA druuge_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)DRUUGE_PMAP_ANIM, /* AlienFrame */ (FONT)DRUUGE_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -149,7 +149,7 @@ static LOCDATA druuge_desc = ONE_SECOND / 12, ONE_SECOND / 12, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static COUNT SlaveryCount = 0; @@ -897,10 +897,10 @@ post_druuge_enc (void) } } -LOCDATAPTR +LOCDATA* init_druuge_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; druuge_desc.init_encounter_func = Intro; druuge_desc.post_encounter_func = post_druuge_enc; diff --git a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c index fe8114e22..2dc28f6ea 100644 --- a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c +++ b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c @@ -25,9 +25,9 @@ static LOCDATA ilwrath_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)ILWRATH_PMAP_ANIM, /* AlienFrame */ (FONT)ILWRATH_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -92,7 +92,7 @@ static LOCDATA ilwrath_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -615,10 +615,10 @@ post_ilwrath_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_ilwrath_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; ilwrath_desc.init_encounter_func = Intro; ilwrath_desc.post_encounter_func = post_ilwrath_enc; diff --git a/sc2/src/sc2code/comm/melnorm/melnorm.c b/sc2/src/sc2code/comm/melnorm/melnorm.c index 8db88be99..dbe547c0f 100644 --- a/sc2/src/sc2code/comm/melnorm/melnorm.c +++ b/sc2/src/sc2code/comm/melnorm/melnorm.c @@ -36,9 +36,9 @@ static NUMBER_SPEECH_DESC melnorme_numbers_english; static LOCDATA melnorme_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)MELNORME_PMAP_ANIM, /* AlienFrame */ (FONT)MELNORME_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -1501,8 +1501,7 @@ yack0_respond (void) shared_phrase_buf, we_are_from_alliance0, buf, - (RESPONSE_REF)-1 - ); + (RESPONSE_REF)-1); DoResponsePhrase (we_are_from_alliance0, DoFirstMeeting, shared_phrase_buf); break; } @@ -1849,10 +1848,10 @@ post_melnorme_enc (void) UnlockMutex (GraphicsLock); } -LOCDATAPTR +LOCDATA* init_melnorme_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; melnorme_desc.init_encounter_func = Intro; melnorme_desc.post_encounter_func = post_melnorme_enc; diff --git a/sc2/src/sc2code/comm/mycon/myconc.c b/sc2/src/sc2code/comm/mycon/myconc.c index 91855ebb5..536391e90 100644 --- a/sc2/src/sc2code/comm/mycon/myconc.c +++ b/sc2/src/sc2code/comm/mycon/myconc.c @@ -26,9 +26,9 @@ static LOCDATA mycon_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)MYCON_PMAP_ANIM, /* AlienFrame */ (FONT)MYCON_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -101,7 +101,7 @@ static LOCDATA mycon_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static BYTE MadeChoice; @@ -610,10 +610,10 @@ post_mycon_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_mycon_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; mycon_desc.init_encounter_func = Intro; mycon_desc.post_encounter_func = post_mycon_enc; diff --git a/sc2/src/sc2code/comm/orz/orzc.c b/sc2/src/sc2code/comm/orz/orzc.c index a3f35ef74..ce1236028 100644 --- a/sc2/src/sc2code/comm/orz/orzc.c +++ b/sc2/src/sc2code/comm/orz/orzc.c @@ -24,9 +24,9 @@ static LOCDATA orz_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)ORZ_PMAP_ANIM, /* AlienFrame */ (FONT)ORZ_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -163,7 +163,7 @@ static LOCDATA orz_desc = ONE_SECOND / 12, ONE_SECOND * 3 / 8, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -540,7 +540,7 @@ OrzNeutral (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - NULL_PTR); + (UNICODE*)NULL); pStr[1] = we_are_vindicator0; } else @@ -867,10 +867,10 @@ post_orz_enc (void) } } -LOCDATAPTR +LOCDATA* init_orz_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; orz_desc.init_encounter_func = Intro; orz_desc.post_encounter_func = post_orz_enc; diff --git a/sc2/src/sc2code/comm/pkunk/pkunkc.c b/sc2/src/sc2code/comm/pkunk/pkunkc.c index 139e3fd29..09c001a85 100644 --- a/sc2/src/sc2code/comm/pkunk/pkunkc.c +++ b/sc2/src/sc2code/comm/pkunk/pkunkc.c @@ -26,9 +26,9 @@ static LOCDATA pkunk_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)PKUNK_PMAP_ANIM, /* AlienFrame */ (FONT)PKUNK_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -88,7 +88,7 @@ static LOCDATA pkunk_desc = ONE_SECOND / 12, ONE_SECOND / 2, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static BOOLEAN @@ -306,8 +306,7 @@ DiscussConquer (RESPONSE_REF R) shared_phrase_buf, conquer_because_1, buf, - (RESPONSE_REF)-1 - ); + (RESPONSE_REF)-1); DoResponsePhrase (conquer_because_1, DiscussConquer, shared_phrase_buf); #endif Response(conquer_because_1, DiscussConquer); @@ -624,7 +623,7 @@ PkunkHome (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - NULL_PTR); + (UNICODE*)NULL); DoResponsePhrase (we_are_vindicator0, OfferAlliance, shared_phrase_buf); } if (PHRASE_ENABLED (what_about_you)) @@ -1113,10 +1112,10 @@ post_pkunk_enc (void) } } -LOCDATAPTR +LOCDATA* init_pkunk_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; pkunk_desc.init_encounter_func = Intro; pkunk_desc.post_encounter_func = post_pkunk_enc; diff --git a/sc2/src/sc2code/comm/rebel/rebel.c b/sc2/src/sc2code/comm/rebel/rebel.c index b29863810..4786822fa 100644 --- a/sc2/src/sc2code/comm/rebel/rebel.c +++ b/sc2/src/sc2code/comm/rebel/rebel.c @@ -25,9 +25,9 @@ static LOCDATA yehat_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */ (FONT)YEHAT_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -185,7 +185,7 @@ static LOCDATA yehat_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -422,10 +422,10 @@ post_yehat_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_rebel_yehat_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; yehat_desc.init_encounter_func = Intro; yehat_desc.post_encounter_func = post_yehat_enc; diff --git a/sc2/src/sc2code/comm/shofixt/shofixt.c b/sc2/src/sc2code/comm/shofixt/shofixt.c index a0b812a64..c148cc24c 100644 --- a/sc2/src/sc2code/comm/shofixt/shofixt.c +++ b/sc2/src/sc2code/comm/shofixt/shofixt.c @@ -25,9 +25,9 @@ static LOCDATA shofixti_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)SHOFIXTI_PMAP_ANIM, /* AlienFrame */ (FONT)SHOFIXTI_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -149,7 +149,7 @@ static LOCDATA shofixti_desc = ONE_SECOND / 15, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static RESPONSE_REF shofixti_name; @@ -353,8 +353,7 @@ RealizeMistake (RESPONSE_REF R) i_am_captain2, GLOBAL_SIS (ShipName), i_am_captain3, - NULL_PTR - ); + (UNICODE*)NULL); } DoResponsePhrase (i_am_captain0, ExplainDefeat, shared_phrase_buf); Response (i_am_nice, ExplainDefeat); @@ -403,8 +402,7 @@ Hostile (RESPONSE_REF R) shofixti_name, "", look1, - NULL_PTR - ); + (UNICODE*)NULL); DoResponsePhrase (look0, ExitConversation, shared_phrase_buf); break; } @@ -477,8 +475,7 @@ Friendly (RESPONSE_REF R) shofixti_name, "", report1, - NULL_PTR - ); + (UNICODE*)NULL); Resp[0].pStr = report0; Resp[0].c_buf = buf0; } @@ -493,8 +490,7 @@ Friendly (RESPONSE_REF R) shofixti_name, "", why_here1, - NULL_PTR - ); + (UNICODE*)NULL); Resp[1].pStr = why_here0; Resp[1].c_buf = buf1; break; @@ -535,8 +531,7 @@ Friendly (RESPONSE_REF R) shofixti_name, "", bye1, - NULL_PTR - ); + (UNICODE*)NULL); DoResponsePhrase (bye0, ExitConversation, shared_phrase_buf); } @@ -632,10 +627,10 @@ post_shofixti_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_shofixti_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; shofixti_desc.init_encounter_func = Intro; shofixti_desc.post_encounter_func = post_shofixti_enc; diff --git a/sc2/src/sc2code/comm/slyhome/slyhome.c b/sc2/src/sc2code/comm/slyhome/slyhome.c index cd73dad77..3712865a8 100644 --- a/sc2/src/sc2code/comm/slyhome/slyhome.c +++ b/sc2/src/sc2code/comm/slyhome/slyhome.c @@ -24,9 +24,9 @@ static LOCDATA slylandro_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)SLYLANDRO_PMAP_ANIM, /* AlienFrame */ (FONT)SLYLANDRO_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -163,7 +163,7 @@ static LOCDATA slylandro_desc = 0, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -756,7 +756,7 @@ HomeWorld (RESPONSE_REF R) we_are_us1, GLOBAL_SIS (ShipName), we_are_us2, - NULL_PTR); + (UNICODE*)NULL); pStr[0] = we_are_us0; break; case 1: @@ -896,10 +896,10 @@ post_slylandro_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_slylandro_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; slylandro_desc.init_encounter_func = Intro; slylandro_desc.post_encounter_func = post_slylandro_enc; diff --git a/sc2/src/sc2code/comm/slyland/slyland.c b/sc2/src/sc2code/comm/slyland/slyland.c index bc7096398..040409f36 100644 --- a/sc2/src/sc2code/comm/slyland/slyland.c +++ b/sc2/src/sc2code/comm/slyland/slyland.c @@ -27,9 +27,9 @@ static LOCDATA slylandro_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)SLYLAND_PMAP_ANIM, /* AlienFrame */ (FONT)SLYLAND_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -110,7 +110,7 @@ static LOCDATA slylandro_desc = 0, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static RESPONSE_REF threat, @@ -394,10 +394,10 @@ post_slyland_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_slyland_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; slylandro_desc.init_encounter_func = Intro; slylandro_desc.post_encounter_func = post_slyland_enc; diff --git a/sc2/src/sc2code/comm/spahome/spahome.c b/sc2/src/sc2code/comm/spahome/spahome.c index 58075fe7a..e13d3d07d 100644 --- a/sc2/src/sc2code/comm/spahome/spahome.c +++ b/sc2/src/sc2code/comm/spahome/spahome.c @@ -26,9 +26,9 @@ static LOCDATA spahome_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)SPATHI_HOME_PMAP_ANIM, /* AlienFrame */ (FONT)SPATHI_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -176,7 +176,7 @@ static LOCDATA spahome_desc = 0, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -883,7 +883,7 @@ SpathiPassword (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - NULL_PTR); + (UNICODE*)NULL); DoResponsePhrase (we_are_vindicator0, ExitConversation, shared_phrase_buf); Response (gort_merenga, ExitConversation); Response (guph_florp, ExitConversation); @@ -982,10 +982,10 @@ post_spahome_enc (void) } } -LOCDATAPTR +LOCDATA* init_spahome_comm () { - LOCDATAPTR retval; + LOCDATA *retval; spahome_desc.init_encounter_func = Intro; spahome_desc.post_encounter_func = post_spahome_enc; diff --git a/sc2/src/sc2code/comm/spathi/spathic.c b/sc2/src/sc2code/comm/spathi/spathic.c index cc94da8b1..a8257697d 100644 --- a/sc2/src/sc2code/comm/spathi/spathic.c +++ b/sc2/src/sc2code/comm/spathi/spathic.c @@ -25,9 +25,9 @@ static LOCDATA spathi_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)SPATHI_PMAP_ANIM, /* AlienFrame */ (FONT)SPATHI_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -137,7 +137,7 @@ static LOCDATA spathi_desc = 0, /* BlockMask */ }, #endif /* NEVER */ - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -788,10 +788,10 @@ post_spathi_enc (void) } } -LOCDATAPTR +LOCDATA* init_spathi_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; spathi_desc.init_encounter_func = Intro; spathi_desc.post_encounter_func = post_spathi_enc; diff --git a/sc2/src/sc2code/comm/starbas/starbas.c b/sc2/src/sc2code/comm/starbas/starbas.c index cd61c99cb..4fe1bb9dc 100644 --- a/sc2/src/sc2code/comm/starbas/starbas.c +++ b/sc2/src/sc2code/comm/starbas/starbas.c @@ -36,9 +36,9 @@ static void SellMinerals (RESPONSE_REF R); static LOCDATA commander_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */ (FONT)COMMANDER_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -151,7 +151,7 @@ static LOCDATA commander_desc = ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static DWORD CurBulletinMask; @@ -935,8 +935,7 @@ TellStarBase (RESPONSE_REF R) tell_me_about_modules0, GLOBAL_SIS (ShipName), tell_me_about_modules1, - NULL_PTR - ); + (UNICODE*)NULL); pstack[0] = tell_me_about_modules0; break; default: @@ -951,8 +950,7 @@ TellStarBase (RESPONSE_REF R) tell_me_about_fuel0, GLOBAL_SIS (ShipName), tell_me_about_fuel1, - NULL_PTR - ); + (UNICODE*)NULL); pstack[1] = tell_me_about_fuel0; break; default: @@ -1155,7 +1153,7 @@ DiscussDevices (BOOLEAN TalkAbout) if (GET_GAME_STATE (DATA_PLATE_1_ON_SHIP) && !GET_GAME_STATE (DISCUSSED_DATA_PLATE_1)) { - pStr = (PSTR)ABOUT_DATAPLATE_1; + pStr = ABOUT_DATAPLATE_1; SET_GAME_STATE (DISCUSSED_DATA_PLATE_1, TalkAbout); } break; @@ -1163,7 +1161,7 @@ DiscussDevices (BOOLEAN TalkAbout) if (GET_GAME_STATE (DATA_PLATE_2_ON_SHIP) && !GET_GAME_STATE (DISCUSSED_DATA_PLATE_2)) { - pStr = (PSTR)ABOUT_DATAPLATE_2; + pStr = ABOUT_DATAPLATE_2; SET_GAME_STATE (DISCUSSED_DATA_PLATE_2, TalkAbout); } break; @@ -1171,7 +1169,7 @@ DiscussDevices (BOOLEAN TalkAbout) if (GET_GAME_STATE (DATA_PLATE_3_ON_SHIP) && !GET_GAME_STATE (DISCUSSED_DATA_PLATE_3)) { - pStr = (PSTR)ABOUT_DATAPLATE_3; + pStr = ABOUT_DATAPLATE_3; SET_GAME_STATE (DISCUSSED_DATA_PLATE_3, TalkAbout); } break; @@ -1911,7 +1909,7 @@ SellMinerals (RESPONSE_REF R) static void Intro (void) { - NormalStarbase (NULL_PTR); + NormalStarbase (0); } static COUNT @@ -1930,10 +1928,10 @@ post_starbase_enc (void) } } -LOCDATAPTR +LOCDATA* init_starbase_comm () { - LOCDATAPTR retval; + LOCDATA *retval; commander_desc.init_encounter_func = Intro; commander_desc.post_encounter_func = post_starbase_enc; diff --git a/sc2/src/sc2code/comm/supox/supoxc.c b/sc2/src/sc2code/comm/supox/supoxc.c index ae1f3b175..219a920d5 100644 --- a/sc2/src/sc2code/comm/supox/supoxc.c +++ b/sc2/src/sc2code/comm/supox/supoxc.c @@ -25,9 +25,9 @@ static LOCDATA supox_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)SUPOX_PMAP_ANIM, /* AlienFrame */ (FONT)SUPOX_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -93,7 +93,7 @@ static LOCDATA supox_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -422,7 +422,7 @@ NeutralSupox (RESPONSE_REF R) i_am0, GLOBAL_SIS (CommanderName), i_am1, - NULL_PTR); + (UNICODE*)NULL); pStr[0] = i_am0; pStr[1] = 0; break; @@ -431,7 +431,7 @@ NeutralSupox (RESPONSE_REF R) my_ship0, GLOBAL_SIS (ShipName), my_ship1, - NULL_PTR); + (UNICODE*)NULL); pStr[0] = my_ship0; pStr[1] = 0; break; @@ -445,8 +445,7 @@ NeutralSupox (RESPONSE_REF R) from_alliance0, buf, from_alliance1, - NULL_PTR - ); + (UNICODE*)NULL); } pStr[0] = from_alliance0; pStr[1] = 0; @@ -677,10 +676,10 @@ post_supox_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_supox_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; supox_desc.init_encounter_func = Intro; supox_desc.post_encounter_func = post_supox_enc; diff --git a/sc2/src/sc2code/comm/syreen/syreenc.c b/sc2/src/sc2code/comm/syreen/syreenc.c index c3cdf4d45..91422e446 100644 --- a/sc2/src/sc2code/comm/syreen/syreenc.c +++ b/sc2/src/sc2code/comm/syreen/syreenc.c @@ -26,9 +26,9 @@ static LOCDATA syreen_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)SYREEN_PMAP_ANIM, /* AlienFrame */ (FONT)SYREEN_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -183,7 +183,7 @@ static LOCDATA syreen_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -791,7 +791,7 @@ Intro (void) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - NULL_PTR); + (UNICODE*)NULL); Response (we_are_vice_squad, InitialSyreen); Response (we_are_the_one_for_you_baby, InitialSyreen); DoResponsePhrase (we_are_vindicator0, InitialSyreen, shared_phrase_buf); @@ -846,10 +846,10 @@ post_syreen_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_syreen_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; syreen_desc.init_encounter_func = Intro; syreen_desc.post_encounter_func = post_syreen_enc; diff --git a/sc2/src/sc2code/comm/talkpet/talkpet.c b/sc2/src/sc2code/comm/talkpet/talkpet.c index 144c0257e..daab0a009 100644 --- a/sc2/src/sc2code/comm/talkpet/talkpet.c +++ b/sc2/src/sc2code/comm/talkpet/talkpet.c @@ -24,9 +24,9 @@ static LOCDATA talkpet_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)TALKING_PET_PMAP_ANIM, /* AlienFrame */ (FONT)TALKING_PET_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -190,7 +190,7 @@ static LOCDATA talkpet_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; #define STROBE_RATE 15 @@ -520,8 +520,7 @@ CompelPlayer (RESPONSE_REF R) we_are_vindicator0, GLOBAL_SIS (ShipName), we_are_vindicator1, - NULL_PTR - ); + (UNICODE*)NULL); pStr[2] = we_are_vindicator0; } else @@ -792,10 +791,10 @@ post_talkpet_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_talkpet_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; talkpet_desc.init_encounter_func = Intro; talkpet_desc.post_encounter_func = post_talkpet_enc; diff --git a/sc2/src/sc2code/comm/thradd/thraddc.c b/sc2/src/sc2code/comm/thradd/thraddc.c index 7c47247cf..547b93e18 100644 --- a/sc2/src/sc2code/comm/thradd/thraddc.c +++ b/sc2/src/sc2code/comm/thradd/thraddc.c @@ -26,9 +26,9 @@ static LOCDATA thradd_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)THRADD_PMAP_ANIM, /* AlienFrame */ (FONT)THRADD_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -126,7 +126,7 @@ static LOCDATA thradd_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static int @@ -485,7 +485,7 @@ ThraddCulture (RESPONSE_REF R) the_slave_empire0, GLOBAL_SIS (CommanderName), the_slave_empire1, - NULL_PTR); + (UNICODE*)NULL); Response (you_decide, ThraddDemeanor); Response (fat, ThraddDemeanor); @@ -920,10 +920,10 @@ post_thradd_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_thradd_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; thradd_desc.init_encounter_func = Intro; thradd_desc.post_encounter_func = post_thradd_enc; diff --git a/sc2/src/sc2code/comm/umgah/umgahc.c b/sc2/src/sc2code/comm/umgah/umgahc.c index b515fd289..ffcd6afa2 100644 --- a/sc2/src/sc2code/comm/umgah/umgahc.c +++ b/sc2/src/sc2code/comm/umgah/umgahc.c @@ -25,9 +25,9 @@ static LOCDATA umgah_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)UMGAH_PMAP_ANIM, /* AlienFrame */ (FONT)UMGAH_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -188,7 +188,7 @@ static LOCDATA umgah_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -368,7 +368,7 @@ Zombies (RESPONSE_REF R) we_vindicator1, GLOBAL_SIS (ShipName), we_vindicator2, - NULL_PTR); + (UNICODE*)NULL); pStr[1] = we_vindicator0; } else if (PHRASE_ENABLED (come_in_peace)) @@ -697,10 +697,10 @@ post_umgah_enc (void) } } -LOCDATAPTR +LOCDATA* init_umgah_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; umgah_desc.init_encounter_func = Intro; umgah_desc.post_encounter_func = post_umgah_enc; diff --git a/sc2/src/sc2code/comm/urquan/urquanc.c b/sc2/src/sc2code/comm/urquan/urquanc.c index a59b6b894..4ec36e7a6 100644 --- a/sc2/src/sc2code/comm/urquan/urquanc.c +++ b/sc2/src/sc2code/comm/urquan/urquanc.c @@ -22,9 +22,9 @@ static LOCDATA urquan_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)URQUAN_PMAP_ANIM, /* AlienFrame */ (FONT)URQUAN_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -113,7 +113,7 @@ static LOCDATA urquan_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -518,10 +518,10 @@ post_urquan_enc (void) SET_GAME_STATE (PLAYER_HYPNOTIZED, 0); } -LOCDATAPTR +LOCDATA* init_urquan_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; DWORD GrpOffs; diff --git a/sc2/src/sc2code/comm/utwig/utwigc.c b/sc2/src/sc2code/comm/utwig/utwigc.c index d58b5fb12..895f47fed 100644 --- a/sc2/src/sc2code/comm/utwig/utwigc.c +++ b/sc2/src/sc2code/comm/utwig/utwigc.c @@ -26,9 +26,9 @@ static LOCDATA utwig_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)UTWIG_PMAP_ANIM, /* AlienFrame */ (FONT)UTWIG_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -190,7 +190,7 @@ static LOCDATA utwig_desc = ONE_SECOND * 7 / 60, ONE_SECOND / 2, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -558,8 +558,7 @@ NeutralUtwig (RESPONSE_REF R) we_are_vindicator1, buf, we_are_vindicator2, - NULL_PTR - ); + (UNICODE*)NULL); } pStr[0] = we_are_vindicator0; break; @@ -955,10 +954,10 @@ post_utwig_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_utwig_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; utwig_desc.init_encounter_func = Intro; utwig_desc.post_encounter_func = post_utwig_enc; diff --git a/sc2/src/sc2code/comm/vux/vuxc.c b/sc2/src/sc2code/comm/vux/vuxc.c index 161751b4d..f10fc05ad 100644 --- a/sc2/src/sc2code/comm/vux/vuxc.c +++ b/sc2/src/sc2code/comm/vux/vuxc.c @@ -22,9 +22,9 @@ static LOCDATA vux_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)VUX_PMAP_ANIM, /* AlienFrame */ (FONT)VUX_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -193,7 +193,7 @@ static LOCDATA vux_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -763,10 +763,10 @@ post_vux_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_vux_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; vux_desc.init_encounter_func = Intro; vux_desc.post_encounter_func = post_vux_enc; diff --git a/sc2/src/sc2code/comm/yehat/yehatc.c b/sc2/src/sc2code/comm/yehat/yehatc.c index c4903d820..ab91d3cab 100644 --- a/sc2/src/sc2code/comm/yehat/yehatc.c +++ b/sc2/src/sc2code/comm/yehat/yehatc.c @@ -27,9 +27,9 @@ static LOCDATA yehat_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */ (FONT)YEHAT_FONT, /* AlienFont */ WHITE_COLOR, /* AlienTextFColor */ @@ -184,7 +184,7 @@ static LOCDATA yehat_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; static void @@ -381,8 +381,7 @@ YehatHome (RESPONSE_REF R) i_demand_you_ally_homeworld2, GLOBAL_SIS (ShipName), i_demand_you_ally_homeworld3, - NULL_PTR - ); + (UNICODE*)NULL); DoResponsePhrase (i_demand_you_ally_homeworld0, ExitConversation, shared_phrase_buf); } @@ -508,8 +507,7 @@ YehatSpace (RESPONSE_REF R) i_demand_you_ally_space2, buf, i_demand_you_ally_space3, - NULL_PTR - ); + (UNICODE*)NULL); pStr[2] = i_demand_you_ally_space0; break; } @@ -656,10 +654,10 @@ post_yehat_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_yehat_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; yehat_desc.init_encounter_func = Intro; yehat_desc.post_encounter_func = post_yehat_enc; diff --git a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c index b230dabb9..9f91558c3 100644 --- a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c +++ b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c @@ -42,9 +42,9 @@ static LOCDATA zoqfot_desc = { - NULL_PTR, /* init_encounter_func */ - NULL_PTR, /* post_encounter_func */ - NULL_PTR, /* uninit_encounter_func */ + NULL, /* init_encounter_func */ + NULL, /* post_encounter_func */ + NULL, /* uninit_encounter_func */ (FRAME)ZOQFOTPIK_PMAP_ANIM, /* AlienFrame */ (FONT)ZOQFOTPIK_FONT, /* AlienFont */ 0, /* AlienTextFColor */ @@ -102,7 +102,7 @@ static LOCDATA zoqfot_desc = ONE_SECOND / 12, 0, /* RestartRate */ 0, /* BlockMask */ }, - NULL_PTR, /* AlienNumberSpeech - none */ + NULL, /* AlienNumberSpeech - none */ }; enum @@ -413,8 +413,7 @@ AquaintZoqFot (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - NULL_PTR - ); + (UNICODE*)NULL); } if (PHRASE_ENABLED (which_fot)) @@ -932,10 +931,10 @@ post_zoqfot_enc (void) // nothing defined so far } -LOCDATAPTR +LOCDATA* init_zoqfot_comm (void) { - LOCDATAPTR retval; + LOCDATA *retval; zoqfot_desc.init_encounter_func = Intro; zoqfot_desc.post_encounter_func = post_zoqfot_enc; diff --git a/sc2/src/sc2code/commanim.c b/sc2/src/sc2code/commanim.c index bb1558ad8..541a34524 100644 --- a/sc2/src/sc2code/commanim.c +++ b/sc2/src/sc2code/commanim.c @@ -46,10 +46,10 @@ volatile BOOLEAN PauseAnimTask = FALSE; static void -SetUpSequence (PSEQUENCE pSeq) +SetUpSequence (SEQUENCE *pSeq) { COUNT i; - ANIMATION_DESCPTR ADPtr; + ANIMATION_DESC *ADPtr; i = CommData.NumAnimations; pSeq = &pSeq[i]; @@ -112,8 +112,8 @@ ambient_anim_task (void *data) FRAME CommFrame; SEQUENCE Sequencer[MAX_ANIMATIONS]; ANIMATION_DESC TalkBuffer = CommData.AlienTalkDesc; - PSEQUENCE pSeq; - ANIMATION_DESCPTR ADPtr; + SEQUENCE *pSeq; + ANIMATION_DESC *ADPtr; DWORD ActiveMask; DWORD LastOscillTime; Task task = (Task) data; @@ -127,7 +127,7 @@ ambient_anim_task (void *data) TaskSwitch (); LockMutex (GraphicsLock); - memset ((PSTR)&DisplayArray[0], 0, sizeof (DisplayArray)); + memset (&DisplayArray[0], 0, sizeof (DisplayArray)); SetUpSequence (Sequencer); UnlockMutex (GraphicsLock); diff --git a/sc2/src/sc2code/commanim.h b/sc2/src/sc2code/commanim.h index 13fa0fcf7..9019e83a2 100644 --- a/sc2/src/sc2code/commanim.h +++ b/sc2/src/sc2code/commanim.h @@ -50,7 +50,6 @@ struct SEQUENCE #endif typedef struct SEQUENCE SEQUENCE; -typedef SEQUENCE *PSEQUENCE; void UpdateSpeechGraphics (BOOLEAN Initialize); Task StartCommAnimTask(void); diff --git a/sc2/src/sc2code/commglue.c b/sc2/src/sc2code/commglue.c index 55397c656..b7df6b725 100644 --- a/sc2/src/sc2code/commglue.c +++ b/sc2/src/sc2code/commglue.c @@ -292,68 +292,68 @@ construct_response (UNICODE *buf, int R /* promoted from RESPONSE_REF */, ...) } } -LOCDATAPTR +LOCDATA* init_race (RESOURCE comm_id) { switch (comm_id) { case ARILOU_CONVERSATION: - return ((LOCDATAPTR)init_arilou_comm ()); + return init_arilou_comm (); case BLACKURQ_CONVERSATION: - return ((LOCDATAPTR)init_blackurq_comm ()); + return init_blackurq_comm (); case CHMMR_CONVERSATION: - return ((LOCDATAPTR)init_chmmr_comm ()); + return init_chmmr_comm (); case COMMANDER_CONVERSATION: if (!GET_GAME_STATE (STARBASE_AVAILABLE)) - return ((LOCDATAPTR)init_commander_comm ()); + return init_commander_comm (); else - return ((LOCDATAPTR)init_starbase_comm ()); + return init_starbase_comm (); case DRUUGE_CONVERSATION: - return ((LOCDATAPTR)init_druuge_comm ()); + return init_druuge_comm (); case ILWRATH_CONVERSATION: - return ((LOCDATAPTR)init_ilwrath_comm ()); + return init_ilwrath_comm (); case MELNORME_CONVERSATION: - return ((LOCDATAPTR)init_melnorme_comm ()); + return init_melnorme_comm (); case MYCON_CONVERSATION: - return ((LOCDATAPTR)init_mycon_comm ()); + return init_mycon_comm (); case ORZ_CONVERSATION: - return ((LOCDATAPTR)init_orz_comm ()); + return init_orz_comm (); case PKUNK_CONVERSATION: - return ((LOCDATAPTR)init_pkunk_comm ()); + return init_pkunk_comm (); case SHOFIXTI_CONVERSATION: - return ((LOCDATAPTR)init_shofixti_comm ()); + return init_shofixti_comm (); case SLYLANDRO_CONVERSATION: - return ((LOCDATAPTR)init_slyland_comm ()); + return init_slyland_comm (); case SLYLANDRO_HOME_CONVERSATION: - return ((LOCDATAPTR)init_slylandro_comm ()); + return init_slylandro_comm (); case SPATHI_CONVERSATION: if (!(GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 7))) - return ((LOCDATAPTR)init_spathi_comm ()); + return init_spathi_comm (); else - return ((LOCDATAPTR)init_spahome_comm ()); + return init_spahome_comm (); case SUPOX_CONVERSATION: - return ((LOCDATAPTR)init_supox_comm ()); + return init_supox_comm (); case SYREEN_CONVERSATION: - return ((LOCDATAPTR)init_syreen_comm ()); + return init_syreen_comm (); case TALKING_PET_CONVERSATION: - return ((LOCDATAPTR)init_talkpet_comm ()); + return init_talkpet_comm (); case THRADD_CONVERSATION: - return ((LOCDATAPTR)init_thradd_comm ()); + return init_thradd_comm (); case UMGAH_CONVERSATION: - return ((LOCDATAPTR)init_umgah_comm ()); + return init_umgah_comm (); case URQUAN_CONVERSATION: - return ((LOCDATAPTR)init_urquan_comm ()); + return init_urquan_comm (); case UTWIG_CONVERSATION: - return ((LOCDATAPTR)init_utwig_comm ()); + return init_utwig_comm (); case VUX_CONVERSATION: - return ((LOCDATAPTR)init_vux_comm ()); + return init_vux_comm (); case YEHAT_REBEL_CONVERSATION: - return ((LOCDATAPTR)init_rebel_yehat_comm ()); + return init_rebel_yehat_comm (); case YEHAT_CONVERSATION: - return ((LOCDATAPTR)init_yehat_comm ()); + return init_yehat_comm (); case ZOQFOTPIK_CONVERSATION: - return ((LOCDATAPTR)init_zoqfot_comm ()); + return init_zoqfot_comm (); default: - return ((LOCDATAPTR)init_chmmr_comm ()); + return init_chmmr_comm (); } } diff --git a/sc2/src/sc2code/commglue.h b/sc2/src/sc2code/commglue.h index 0d27167ec..e56c143a7 100644 --- a/sc2/src/sc2code/commglue.h +++ b/sc2/src/sc2code/commglue.h @@ -69,63 +69,63 @@ extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1); extern void construct_response (UNICODE *buf, int R /* promoted from RESPONSE_REF */, ...); -extern LOCDATAPTR init_race (RESOURCE comm_id); +extern LOCDATA* init_race (RESOURCE comm_id); -extern LOCDATAPTR init_arilou_comm (void); +extern LOCDATA* init_arilou_comm (void); -extern LOCDATAPTR init_blackurq_comm (void); +extern LOCDATA* init_blackurq_comm (void); -extern LOCDATAPTR init_chmmr_comm (void); +extern LOCDATA* init_chmmr_comm (void); -extern LOCDATAPTR init_commander_comm (void); +extern LOCDATA* init_commander_comm (void); -extern LOCDATAPTR init_druuge_comm (void); +extern LOCDATA* init_druuge_comm (void); -extern LOCDATAPTR init_ilwrath_comm (void); +extern LOCDATA* init_ilwrath_comm (void); -extern LOCDATAPTR init_melnorme_comm (void); +extern LOCDATA* init_melnorme_comm (void); -extern LOCDATAPTR init_mycon_comm (void); +extern LOCDATA* init_mycon_comm (void); -extern LOCDATAPTR init_orz_comm (void); +extern LOCDATA* init_orz_comm (void); -extern LOCDATAPTR init_pkunk_comm (void); +extern LOCDATA* init_pkunk_comm (void); -extern LOCDATAPTR init_rebel_yehat_comm (void); +extern LOCDATA* init_rebel_yehat_comm (void); -extern LOCDATAPTR init_shofixti_comm (void); +extern LOCDATA* init_shofixti_comm (void); -extern LOCDATAPTR init_slyland_comm (void); +extern LOCDATA* init_slyland_comm (void); -extern LOCDATAPTR init_slylandro_comm (void); +extern LOCDATA* init_slylandro_comm (void); -extern LOCDATAPTR init_spahome_comm (void); +extern LOCDATA* init_spahome_comm (void); -extern LOCDATAPTR init_spathi_comm (void); +extern LOCDATA* init_spathi_comm (void); -extern LOCDATAPTR init_starbase_comm (void); +extern LOCDATA* init_starbase_comm (void); -extern LOCDATAPTR init_supox_comm (void); +extern LOCDATA* init_supox_comm (void); -extern LOCDATAPTR init_syreen_comm (void); +extern LOCDATA* init_syreen_comm (void); -extern LOCDATAPTR init_talkpet_comm (void); +extern LOCDATA* init_talkpet_comm (void); -extern LOCDATAPTR init_thradd_comm (void); +extern LOCDATA* init_thradd_comm (void); -extern LOCDATAPTR init_umgah_comm (void); +extern LOCDATA* init_umgah_comm (void); -extern LOCDATAPTR init_urquan_comm (void); +extern LOCDATA* init_urquan_comm (void); -extern LOCDATAPTR init_utwig_comm (void); +extern LOCDATA* init_utwig_comm (void); -extern LOCDATAPTR init_vux_comm (void); +extern LOCDATA* init_vux_comm (void); -extern LOCDATAPTR init_yehat_comm (void); +extern LOCDATA* init_yehat_comm (void); -extern LOCDATAPTR init_zoqfot_comm (void); +extern LOCDATA* init_zoqfot_comm (void); -extern LOCDATAPTR init_umgah_comm (void); +extern LOCDATA* init_umgah_comm (void); #endif /* _COMMGLUE_H */ diff --git a/sc2/src/sc2code/confirm.c b/sc2/src/sc2code/confirm.c index cb2c0c0ed..b93ac0d4b 100644 --- a/sc2/src/sc2code/confirm.c +++ b/sc2/src/sc2code/confirm.c @@ -110,7 +110,7 @@ DoConfirmExit (void) in_confirm = TRUE; oldContext = SetContext (ScreenContext); GetContextClipRect (&oldRect); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); r.extent.width = CONFIRM_WIN_WIDTH + 4; r.extent.height = CONFIRM_WIN_HEIGHT + 4; @@ -245,7 +245,7 @@ DoPopupWindow(const char *msg) oldContext = SetContext (ScreenContext); GetContextClipRect (&oldRect); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); /* TODO: Better measure of dimensions than this */ r.extent.width = SCREEN_WIDTH; diff --git a/sc2/src/sc2code/controls.h b/sc2/src/sc2code/controls.h index c0ec3807b..3ecef43d9 100644 --- a/sc2/src/sc2code/controls.h +++ b/sc2/src/sc2code/controls.h @@ -20,7 +20,7 @@ #define _CONTROLS_H_ #include "races.h" - // For STARSHIPPTR + // For STARSHIP #include "libs/compiler.h" #include "libs/strlib.h" @@ -89,7 +89,7 @@ typedef UBYTE BATTLE_INPUT_STATE; #define BATTLE_DOWN ((BATTLE_INPUT_STATE)(1 << 6)) typedef BATTLE_INPUT_STATE (*battle_summary_func) (COUNT player, - STARSHIPPTR StarShipPtr); + STARSHIP *StarShipPtr); extern battle_summary_func ComputerInput, HumanInput[], NetworkInput; extern battle_summary_func PlayerInput[]; @@ -110,10 +110,10 @@ BOOLEAN WaitAnyButtonOrQuit (BOOLEAN CheckSpecial); void WaitForNoInput (SIZE Duration); BOOLEAN ConfirmExit (void); void DoPopupWindow(const char *msg); -void DoInput (PVOID pInputState, BOOLEAN resetInput); +void DoInput (void *pInputState, BOOLEAN resetInput); -BATTLE_INPUT_STATE p1_combat_summary (COUNT player, STARSHIPPTR StarShipPtr); -BATTLE_INPUT_STATE p2_combat_summary (COUNT player, STARSHIPPTR StarShipPtr); +BATTLE_INPUT_STATE p1_combat_summary (COUNT player, STARSHIP *StarShipPtr); +BATTLE_INPUT_STATE p2_combat_summary (COUNT player, STARSHIP *StarShipPtr); extern volatile BOOLEAN GamePaused, ExitRequested; @@ -152,9 +152,8 @@ typedef struct textentry_state void *CbParam; // callback parameter, use as you like } TEXTENTRY_STATE; -typedef TEXTENTRY_STATE *PTEXTENTRY_STATE; -BOOLEAN DoTextEntry (PTEXTENTRY_STATE pTES); +BOOLEAN DoTextEntry (TEXTENTRY_STATE *pTES); #endif diff --git a/sc2/src/sc2code/credits.c b/sc2/src/sc2code/credits.c index 21aa18e59..af0987661 100644 --- a/sc2/src/sc2code/credits.c +++ b/sc2/src/sc2code/credits.c @@ -214,7 +214,7 @@ Credits_RenderTextFrame (CONTEXT TempContext, int *istr, int dir, SetContextFont (fdef->font); GetContextFontLeading (&leading); // get left/right margin - TextRect (&t, &r, NULL_PTR); + TextRect (&t, &r, NULL); // parse text column alignment for (i = 0, scol = strtok (salign, ","); @@ -627,7 +627,7 @@ OutTakes (void) typedef struct { // standard state required by DoInput - BOOLEAN (*InputFunc) (PVOID pInputState); + BOOLEAN (*InputFunc) (void *pInputState); COUNT MenuRepeatDelay; BOOLEAN AllowCancel; @@ -638,7 +638,7 @@ typedef struct } CREDITS_INPUT_STATE; static BOOLEAN -DoCreditsInput (PVOID pIS) +DoCreditsInput (void *pIS) { CREDITS_INPUT_STATE *pCIS = (CREDITS_INPUT_STATE *) pIS; @@ -716,7 +716,7 @@ Credits (BOOLEAN WithOuttakes) LockMutex (GraphicsLock); SetContext (ScreenContext); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContextBackGroundColor ( BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)); ClearDrawable (); diff --git a/sc2/src/sc2code/cyborg.c b/sc2/src/sc2code/cyborg.c index 101af0944..706c471d8 100644 --- a/sc2/src/sc2code/cyborg.c +++ b/sc2/src/sc2code/cyborg.c @@ -31,8 +31,8 @@ //#define DEBUG_CYBORG COUNT -PlotIntercept (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, COUNT - max_turns, COUNT margin_of_error) +PlotIntercept (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1, + COUNT max_turns, COUNT margin_of_error) { SIZE dy; SIZE time_y_0, time_y_1; @@ -289,10 +289,10 @@ PlotIntercept (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, COUNT return (0); } -STARSHIPPTR CyborgDescPtr; +STARSHIP *CyborgDescPtr; static void -InitCyborg (STARSHIPPTR StarShipPtr) +InitCyborg (STARSHIP *StarShipPtr) { COUNT Index, Divisor; @@ -318,7 +318,7 @@ InitCyborg (STARSHIPPTR StarShipPtr) } static void -ship_movement (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) +ship_movement (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr) { if (EvalDescPtr->which_turn == 0) EvalDescPtr->which_turn = 1; @@ -342,14 +342,13 @@ ship_movement (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) } BOOLEAN -ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, COUNT - margin_of_error) +ship_weapons (ELEMENT *ShipPtr, ELEMENT *OtherPtr, COUNT margin_of_error) { SIZE delta_x, delta_y; COUNT n, num_weapons; ELEMENT Ship; HELEMENT Weapon[6]; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (OBJECT_CLOAKED (OtherPtr)) margin_of_error += DISPLAY_TO_WORLD (40); @@ -370,8 +369,8 @@ ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, COUNT if ((n = num_weapons)) { HELEMENT *WeaponPtr, w; - //STARSHIPPTR StarShipPtr; - ELEMENTPTR EPtr; + //STARSHIP *StarShipPtr; + ELEMENT *EPtr; WeaponPtr = &Weapon[0]; do @@ -416,12 +415,12 @@ ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, COUNT } void -ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR ObjectsOfConcern, +ship_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter) { BOOLEAN ShipMoved, ShipFired; COUNT margin_of_error; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -455,7 +454,7 @@ ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR ObjectsOfConcern, if (!ShipMoved && (ConcernCounter != ENEMY_WEAPON_INDEX || ObjectsOfConcern->MoveState == PURSUE -|| (ObjectsOfConcern->ObjectPtr->state_flags & CREW_OBJECT) + || (ObjectsOfConcern->ObjectPtr->state_flags & CREW_OBJECT) || MANEUVERABILITY ( &StarShipPtr->RaceDescPtr->cyborg_control ) >= MEDIUM_SHIP)) @@ -482,10 +481,10 @@ ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR ObjectsOfConcern, } BOOLEAN -TurnShip (ELEMENTPTR ShipPtr, COUNT angle) +TurnShip (ELEMENT *ShipPtr, COUNT angle) { COUNT f, ship_delta_facing; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); f = StarShipPtr->ShipFacing; @@ -531,10 +530,10 @@ TurnShip (ELEMENTPTR ShipPtr, COUNT angle) } BOOLEAN -ThrustShip (ELEMENTPTR ShipPtr, COUNT angle) +ThrustShip (ELEMENT *ShipPtr, COUNT angle) { BOOLEAN ShouldThrust; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); if (StarShipPtr->ship_input_state & THRUST) @@ -571,14 +570,14 @@ ThrustShip (ELEMENTPTR ShipPtr, COUNT angle) } void -Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) +Pursue (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr) { INPUT_STATE maneuver_state; COUNT desired_thrust_angle, desired_turn_angle; SIZE delta_x, delta_y; SIZE ship_delta_x, ship_delta_y; SIZE other_delta_x, other_delta_y; - ELEMENTPTR OtherObjPtr; + ELEMENT *OtherObjPtr; VELOCITY_DESC ShipVelocity, OtherVelocity; ShipVelocity = ShipPtr->velocity; @@ -617,7 +616,8 @@ Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) if ((OtherObjPtr->state_flags & PLAYER_SHIP) && OtherObjPtr->mass_points <= MAX_SHIP_MASS) { - STARSHIPPTR StarShipPtr, EnemyStarShipPtr; + STARSHIP *StarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); GetElementStarShip (OtherObjPtr, &EnemyStarShipPtr); @@ -701,7 +701,7 @@ Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) } void -Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) +Entice (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr) { INPUT_STATE maneuver_state; COUNT desired_thrust_angle, desired_turn_angle; @@ -709,10 +709,10 @@ Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) SIZE delta_x, delta_y; SIZE ship_delta_x, ship_delta_y; SIZE other_delta_x, other_delta_y; - ELEMENTPTR OtherObjPtr; + ELEMENT *OtherObjPtr; VELOCITY_DESC ShipVelocity, OtherVelocity; - STARSHIPPTR StarShipPtr; - RACE_DESCPTR RDPtr; + STARSHIP *StarShipPtr; + RACE_DESC *RDPtr; ShipVelocity = ShipPtr->velocity; GetNextVelocityComponents (&ShipVelocity, @@ -722,7 +722,7 @@ Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) ShipPtr->next.location.y = ShipPtr->current.location.y + ship_delta_y; - OtherObjPtr = (ELEMENTPTR)EvalDescPtr->ObjectPtr; + OtherObjPtr = EvalDescPtr->ObjectPtr; OtherVelocity = OtherObjPtr->velocity; GetNextVelocityComponents (&OtherVelocity, &other_delta_x, &other_delta_y, EvalDescPtr->which_turn); @@ -840,7 +840,7 @@ Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) { UWORD fire_flags, ship_flags; COUNT facing; - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (OtherObjPtr, &EnemyStarShipPtr); ship_flags = EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags; @@ -1003,24 +1003,25 @@ DoManeuver: } void -Avoid (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) +Avoid (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr) { (void) ShipPtr; /* Satisfying compiler (unused parameter) */ (void) EvalDescPtr; /* Satisfying compiler (unused parameter) */ } BATTLE_INPUT_STATE -tactical_intelligence (COUNT player, STARSHIPPTR StarShipPtr) +tactical_intelligence (COUNT player, STARSHIP *StarShipPtr) { - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; ELEMENT Ship; COUNT ShipFacing; HELEMENT hElement, hNextElement; COUNT ConcernCounter; EVALUATE_DESC ObjectsOfConcern[10]; BOOLEAN ShipMoved, UltraManeuverable; - STARSHIPPTR EnemyStarShipPtr; - RACE_DESCPTR RDPtr, EnemyRDPtr; + STARSHIP *EnemyStarShipPtr; + RACE_DESC *RDPtr; + RACE_DESC *EnemyRDPtr; RDPtr = StarShipPtr->RaceDescPtr; @@ -1313,8 +1314,8 @@ if (!(ShipPtr->state_flags & FINITE_LIFE) UnlockElement (hElement); } - (*RDPtr->cyborg_control.intelligence_func) - (&Ship, ObjectsOfConcern, ConcernCounter); + RDPtr->cyborg_control.intelligence_func (&Ship, ObjectsOfConcern, + ConcernCounter); #ifdef DEBUG_CYBORG StarShipPtr->ship_input_state &= ~SPECIAL; #endif /* DEBUG_CYBORG */ diff --git a/sc2/src/sc2code/demo.c b/sc2/src/sc2code/demo.c index 9fb198bb6..b33b603be 100644 --- a/sc2/src/sc2code/demo.c +++ b/sc2/src/sc2code/demo.c @@ -39,7 +39,7 @@ INPUT_STATE demo_input (INPUT_REF InputRef, INPUT_STATE InputState) { if (InputState || AnyButtonPress () || cread ( - (PBYTE)&InputState, sizeof (InputState), 1, journal_fh + &InputState, sizeof (InputState), 1, journal_fh ) == 0) { cclose (journal_fh); @@ -63,7 +63,7 @@ void JournalInput (INPUT_STATE InputState) { if (ArrowInput != DemoInput && journal_fh) - cwrite ((PBYTE)&InputState, sizeof (InputState), 1, journal_fh); + cwrite (&InputState, sizeof (InputState), 1, journal_fh); } #endif /* CREATE_JOURNAL */ @@ -81,7 +81,7 @@ OpenJournal (void) if (journal_fh = copen (journal_buf, MEMORY_STREAM, STREAM_WRITE)) { start_seed = SeedRandomNumbers (); - cwrite ((PBYTE)&start_seed, sizeof (start_seed), 1, journal_fh); + cwrite (&start_seed, sizeof (start_seed), 1, journal_fh); } } else @@ -102,7 +102,7 @@ OpenJournal (void) FlushInput (); - cread ((PBYTE)&start_seed, sizeof (start_seed), 1, journal_fh); + cread (&start_seed, sizeof (start_seed), 1, journal_fh); TFB_SeedRandom (start_seed); } } diff --git a/sc2/src/sc2code/displist.c b/sc2/src/sc2code/displist.c index d8c0887e1..ff7b9d4d7 100644 --- a/sc2/src/sc2code/displist.c +++ b/sc2/src/sc2code/displist.c @@ -27,7 +27,7 @@ */ BOOLEAN -InitQueue (PQUEUE pq, COUNT num_elements, OBJ_SIZE size) +InitQueue (QUEUE *pq, COUNT num_elements, OBJ_SIZE size) { SetHeadLink (pq, NULL_HANDLE); SetTailLink (pq, NULL_HANDLE); @@ -54,7 +54,7 @@ InitQueue (PQUEUE pq, COUNT num_elements, OBJ_SIZE size) } BOOLEAN -UninitQueue (PQUEUE pq) +UninitQueue (QUEUE *pq) { #ifdef QUEUE_TABLE SetHeadLink (pq, NULL_HANDLE); @@ -79,7 +79,7 @@ UninitQueue (PQUEUE pq) } void -ReinitQueue (PQUEUE pq) +ReinitQueue (QUEUE *pq) { SetHeadLink (pq, NULL_HANDLE); SetTailLink (pq, NULL_HANDLE); @@ -102,14 +102,14 @@ ReinitQueue (PQUEUE pq) #ifdef QUEUE_TABLE HLINK -AllocLink (PQUEUE pq) +AllocLink (QUEUE *pq) { HLINK hLink; hLink = GetFreeList (pq); if (hLink) { - LINKPTR LinkPtr; + LINK *LinkPtr; LinkPtr = LockLink (pq, hLink); SetFreeList (pq, _GetSuccLink (LinkPtr)); @@ -122,9 +122,9 @@ AllocLink (PQUEUE pq) } void -FreeLink (PQUEUE pq, HLINK hLink) +FreeLink (QUEUE *pq, HLINK hLink) { - LINKPTR LinkPtr; + LINK *LinkPtr; LinkPtr = LockLink (pq, hLink); _SetSuccLink (LinkPtr, GetFreeList (pq)); @@ -135,16 +135,16 @@ FreeLink (PQUEUE pq, HLINK hLink) #endif /* QUEUE_TABLE */ void -PutQueue (PQUEUE pq, HLINK hLink) +PutQueue (QUEUE *pq, HLINK hLink) { - LINKPTR LinkPtr; + LINK *LinkPtr; if (GetHeadLink (pq) == 0) SetHeadLink (pq, hLink); else { HLINK hTail; - LINKPTR lpTail; + LINK *lpTail; hTail = GetTailLink (pq); lpTail = LockLink (pq, hTail); @@ -161,13 +161,14 @@ PutQueue (PQUEUE pq, HLINK hLink) } void -InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink) +InsertQueue (QUEUE *pq, HLINK hLink, HLINK hRefLink) { if (hRefLink == 0) PutQueue (pq, hLink); else { - LINKPTR LinkPtr, RefLinkPtr; + LINK *LinkPtr; + LINK *RefLinkPtr; LinkPtr = LockLink (pq, hLink); RefLinkPtr = LockLink (pq, hRefLink); @@ -180,7 +181,7 @@ InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink) else { HLINK hPredLink; - LINKPTR PredLinkPtr; + LINK *PredLinkPtr; hPredLink = _GetPredLink (LinkPtr); PredLinkPtr = LockLink (pq, hPredLink); @@ -193,9 +194,9 @@ InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink) } void -RemoveQueue (PQUEUE pq, HLINK hLink) +RemoveQueue (QUEUE *pq, HLINK hLink) { - LINKPTR LinkPtr; + LINK *LinkPtr; LinkPtr = LockLink (pq, hLink); if (GetHeadLink (pq) == hLink) @@ -205,7 +206,7 @@ RemoveQueue (PQUEUE pq, HLINK hLink) else { HLINK hPredLink; - LINKPTR PredLinkPtr; + LINK *PredLinkPtr; hPredLink = _GetPredLink (LinkPtr); PredLinkPtr = LockLink (pq, hPredLink); @@ -219,7 +220,7 @@ RemoveQueue (PQUEUE pq, HLINK hLink) else { HLINK hSuccLink, hPredLink; - LINKPTR SuccLinkPtr; + LINK *SuccLinkPtr; hSuccLink = _GetSuccLink (LinkPtr); SuccLinkPtr = LockLink (pq, hSuccLink); @@ -231,7 +232,7 @@ RemoveQueue (PQUEUE pq, HLINK hLink) } COUNT -CountLinks (PQUEUE pq) +CountLinks (QUEUE *pq) { COUNT LinkCount; HLINK hLink, hNextLink; @@ -239,7 +240,7 @@ CountLinks (PQUEUE pq) LinkCount = 0; for (hLink = GetHeadLink (pq); hLink; hLink = hNextLink) { - LINKPTR LinkPtr; + LINK *LinkPtr; ++LinkCount; @@ -252,13 +253,13 @@ CountLinks (PQUEUE pq) } void -ForAllLinks (PQUEUE pq, void (*callback)(LINKPTR, void *), void *arg) +ForAllLinks (QUEUE *pq, void (*callback)(LINK *, void *), void *arg) { HLINK hLink, hNextLink; for (hLink = GetHeadLink (pq); hLink; hLink = hNextLink) { - LINKPTR LinkPtr; + LINK *LinkPtr; LinkPtr = LockLink (pq, hLink); hNextLink = _GetSuccLink (LinkPtr); (*callback) (LinkPtr, arg); diff --git a/sc2/src/sc2code/displist.h b/sc2/src/sc2code/displist.h index 143919c08..8ff66cb43 100644 --- a/sc2/src/sc2code/displist.h +++ b/sc2/src/sc2code/displist.h @@ -24,7 +24,7 @@ #define QUEUE_TABLE #ifdef QUEUE_TABLE -typedef PVOID QUEUE_HANDLE; +typedef void* QUEUE_HANDLE; #else /* !QUEUE_TABLE */ typedef MEM_HANDLE QUEUE_HANDLE; #endif /* QUEUE_TABLE */ @@ -37,15 +37,9 @@ typedef struct link HLINK pred; HLINK succ; } LINK; -typedef LINK *PLINK; - -typedef PBYTE BYTEPTR; -typedef PUWORD WORDPTR; -typedef PVOID VOIDPTR; -typedef PLINK LINKPTR; #ifdef QUEUE_TABLE -#define LockLink(pq, h) (LINKPTR)(h) +#define LockLink(pq, h) (LINK*)(h) #define UnlockLink(pq, h) #define GetFreeList(pq) (pq)->free_list #define SetFreeList(pq, h) (pq)->free_list = (h) @@ -53,14 +47,14 @@ typedef PLINK LINKPTR; ((pq)->hq_tab = mem_allocate ((MEM_SIZE)((COUNT)(pq)->object_size * \ (COUNT)((pq)->num_objects = (BYTE)(n))), \ MEM_PRIMARY, DEFAULT_MEM_PRIORITY, MEM_SIMPLE)) -#define LockQueueTab(pq) ((pq)->pq_tab = (BYTEPTR)mem_lock ((pq)->hq_tab)) +#define LockQueueTab(pq) ((pq)->pq_tab = (BYTE*)mem_lock ((pq)->hq_tab)) #define UnlockQueueTab(pq) mem_unlock ((pq)->hq_tab) #define FreeQueueTab(pq) mem_release ((pq)->hq_tab); (pq)->hq_tab = 0 #define SizeQueueTab(pq) (COUNT)((pq)->num_objects) #define GetLinkAddr(pq,i) (HLINK)((pq)->pq_tab + ((pq)->object_size * ((i) - 1))) #else /* !QUEUE_TABLE */ #define AllocLink(pq) (HLINK)mem_request ((pq)->object_size) -#define LockLink(pq, h) (LINKPTR)mem_lock (h) +#define LockLink(pq, h) (LINK*)mem_lock (h) #define UnlockLink(pq, h) mem_unlock (h) #define FreeLink(pq,h) mem_release (h) #endif /* QUEUE_TABLE */ @@ -70,19 +64,16 @@ typedef struct queue HLINK head; HLINK tail; #ifdef QUEUE_TABLE - BYTEPTR pq_tab; + BYTE *pq_tab; HLINK free_list; MEM_HANDLE hq_tab; #endif -// BYTE object_size; COUNT object_size; #ifdef QUEUE_TABLE BYTE num_objects; #endif /* QUEUE_TABLE */ } QUEUE; -typedef QUEUE *PQUEUE; -// #define SetLinkSize(pq,s) ((pq)->object_size = (BYTE)(s)) #define SetLinkSize(pq,s) ((pq)->object_size = (COUNT)(s)) #define GetLinkSize(pq) (COUNT)((pq)->object_size) #define GetHeadLink(pq) ((pq)->head) @@ -94,17 +85,17 @@ typedef QUEUE *PQUEUE; #define _GetSuccLink(lpE) ((lpE)->succ) #define _SetSuccLink(lpE,h) ((lpE)->succ = (h)) -extern BOOLEAN InitQueue (PQUEUE pq, COUNT num_elements, OBJ_SIZE size); -extern BOOLEAN UninitQueue (PQUEUE pq); -extern void ReinitQueue (PQUEUE pq); -extern void PutQueue (PQUEUE pq, HLINK hLink); -extern void InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink); -extern void RemoveQueue (PQUEUE pq, HLINK hLink); -extern COUNT CountLinks (PQUEUE pq); -void ForAllLinks(PQUEUE pq, void (*callback)(LINKPTR, void *), void *arg); +extern BOOLEAN InitQueue (QUEUE *pq, COUNT num_elements, OBJ_SIZE size); +extern BOOLEAN UninitQueue (QUEUE *pq); +extern void ReinitQueue (QUEUE *pq); +extern void PutQueue (QUEUE *pq, HLINK hLink); +extern void InsertQueue (QUEUE *pq, HLINK hLink, HLINK hRefLink); +extern void RemoveQueue (QUEUE *pq, HLINK hLink); +extern COUNT CountLinks (QUEUE *pq); +void ForAllLinks(QUEUE *pq, void (*callback)(LINK *, void *), void *arg); #ifdef QUEUE_TABLE -extern HLINK AllocLink (PQUEUE pq); -extern void FreeLink (PQUEUE pq, HLINK hLink); +extern HLINK AllocLink (QUEUE *pq); +extern void FreeLink (QUEUE *pq, HLINK hLink); #endif /* QUEUE_TABLE */ #endif /* _DISPLIST_H */ diff --git a/sc2/src/sc2code/dummy.c b/sc2/src/sc2code/dummy.c index 3c9d78a84..204241c36 100644 --- a/sc2/src/sc2code/dummy.c +++ b/sc2/src/sc2code/dummy.c @@ -38,7 +38,7 @@ typedef struct } CODERES_STRUCT; MEM_HANDLE -LoadCodeResFile (PSTR pStr) +LoadCodeResFile (const char *pStr) { (void) pStr; /* Satisfying compiler (unused parameter) */ return (0); @@ -87,56 +87,56 @@ enum hData = mem_request (sizeof (CODERES_STRUCT)); if (hData) { - RACE_DESCPTR RDPtr; + RACE_DESC *RDPtr; RDPtr = 0; switch (which_res) { case ANDROSYN_CODE_RES: { - extern RACE_DESCPTR init_androsynth (void); + extern RACE_DESC* init_androsynth (void); RDPtr = init_androsynth (); break; } case ARILOU_CODE_RES: { - extern RACE_DESCPTR init_arilou (void); + extern RACE_DESC* init_arilou (void); RDPtr = init_arilou (); break; } case BLACKURQ_CODE_RES: { - extern RACE_DESCPTR init_black_urquan (void); + extern RACE_DESC* init_black_urquan (void); RDPtr = init_black_urquan (); break; } case CHENJESU_CODE_RES: { - extern RACE_DESCPTR init_chenjesu (void); + extern RACE_DESC* init_chenjesu (void); RDPtr = init_chenjesu (); break; } case CHMMR_CODE_RES: { - extern RACE_DESCPTR init_chmmr (void); + extern RACE_DESC* init_chmmr (void); RDPtr = init_chmmr (); break; } case DRUUGE_CODE_RES: { - extern RACE_DESCPTR init_druuge (void); + extern RACE_DESC* init_druuge (void); RDPtr = init_druuge (); break; } case HUMAN_CODE_RES: { - extern RACE_DESCPTR init_human (void); + extern RACE_DESC* init_human (void); RDPtr = init_human (); break; @@ -144,49 +144,49 @@ enum case ILWRATH_CODE_RES: { - extern RACE_DESCPTR init_ilwrath (void); + extern RACE_DESC* init_ilwrath (void); RDPtr = init_ilwrath (); break; } case MELNORME_CODE_RES: { - extern RACE_DESCPTR init_melnorme (void); + extern RACE_DESC* init_melnorme (void); RDPtr = init_melnorme (); break; } case MMRNMHRM_CODE_RES: { - extern RACE_DESCPTR init_mmrnmhrm (void); + extern RACE_DESC* init_mmrnmhrm (void); RDPtr = init_mmrnmhrm (); break; } case MYCON_CODE_RES: { - extern RACE_DESCPTR init_mycon (void); + extern RACE_DESC* init_mycon (void); RDPtr = init_mycon (); break; } case ORZ_CODE_RES: { - extern RACE_DESCPTR init_orz (void); + extern RACE_DESC* init_orz (void); RDPtr = init_orz (); break; } case PKUNK_CODE_RES: { - extern RACE_DESCPTR init_pkunk (void); + extern RACE_DESC* init_pkunk (void); RDPtr = init_pkunk (); break; } case SHOFIXTI_CODE_RES: { - extern RACE_DESCPTR init_shofixti (void); + extern RACE_DESC* init_shofixti (void); RDPtr = init_shofixti (); break; @@ -194,56 +194,56 @@ enum case SLYLANDR_CODE_RES: { - extern RACE_DESCPTR init_slylandro (void); + extern RACE_DESC* init_slylandro (void); RDPtr = init_slylandro (); break; } case SPATHI_CODE_RES: { - extern RACE_DESCPTR init_spathi (void); + extern RACE_DESC* init_spathi (void); RDPtr = init_spathi (); break; } case SUPOX_CODE_RES: { - extern RACE_DESCPTR init_supox (void); + extern RACE_DESC* init_supox (void); RDPtr = init_supox (); break; } case SYREEN_CODE_RES: { - extern RACE_DESCPTR init_syreen (void); + extern RACE_DESC* init_syreen (void); RDPtr = init_syreen (); break; } case THRADD_CODE_RES: { - extern RACE_DESCPTR init_thraddash (void); + extern RACE_DESC* init_thraddash (void); RDPtr = init_thraddash (); break; } case UMGAH_CODE_RES: { - extern RACE_DESCPTR init_umgah (void); + extern RACE_DESC* init_umgah (void); RDPtr = init_umgah (); break; } case URQUAN_CODE_RES: { - extern RACE_DESCPTR init_urquan (void); + extern RACE_DESC* init_urquan (void); RDPtr = init_urquan (); break; } case UTWIG_CODE_RES: { - extern RACE_DESCPTR init_utwig (void); + extern RACE_DESC* init_utwig (void); RDPtr = init_utwig (); break; @@ -251,42 +251,42 @@ enum case VUX_CODE_RES: { - extern RACE_DESCPTR init_vux (void); + extern RACE_DESC* init_vux (void); RDPtr = init_vux (); break; } case YEHAT_CODE_RES: { - extern RACE_DESCPTR init_yehat (void); + extern RACE_DESC* init_yehat (void); RDPtr = init_yehat (); break; } case ZOQFOT_CODE_RES: { - extern RACE_DESCPTR init_zoqfotpik (void); + extern RACE_DESC* init_zoqfotpik (void); RDPtr = init_zoqfotpik (); break; } case SAMATRA_CODE_RES: { - extern RACE_DESCPTR init_samatra (void); + extern RACE_DESC* init_samatra (void); RDPtr = init_samatra (); break; } case SIS_CODE_RES: { - extern RACE_DESCPTR init_sis (void); + extern RACE_DESC* init_sis (void); RDPtr = init_sis (); break; } case PROBE_CODE_RES: { - extern RACE_DESCPTR init_probe (void); + extern RACE_DESC* init_probe (void); RDPtr = init_probe (); break; @@ -341,8 +341,8 @@ DestroyCodeRes (MEM_HANDLE hCode) } -PVOID -CaptureCodeRes (MEM_HANDLE hCode, PVOID pData, PVOID *ppLocData) +void* +CaptureCodeRes (MEM_HANDLE hCode, void *pData, void **ppLocData) { CODERES_STRUCT *cs; @@ -354,15 +354,15 @@ CaptureCodeRes (MEM_HANDLE hCode, PVOID pData, PVOID *ppLocData) cs = (CODERES_STRUCT *) mem_lock (hCode); cs->handle = hCode; - *ppLocData = (void *) &cs->data; + *ppLocData = &cs->data; (void) pData; /* Satisfying compiler (unused parameter) */ - return (void *) cs; + return cs; } MEM_HANDLE -ReleaseCodeRes (PVOID CodeRef) +ReleaseCodeRes (void *CodeRef) { if (CodeRef) { @@ -376,7 +376,7 @@ ReleaseCodeRes (PVOID CodeRef) } DRAWABLE -CreatePixmapRegion (FRAME Frame, PPOINT lpOrg, SIZE width, SIZE height) +CreatePixmapRegion (FRAME Frame, POINT *lpOrg, SIZE width, SIZE height) { (void) lpOrg; /* Satisfying compiler (unused parameter) */ (void) width; /* Satisfying compiler (unused parameter) */ diff --git a/sc2/src/sc2code/element.h b/sc2/src/sc2code/element.h index 0d92a7fcd..91b53c34d 100644 --- a/sc2/src/sc2code/element.h +++ b/sc2/src/sc2code/element.h @@ -90,10 +90,12 @@ typedef struct state struct { FRAME frame; - PFRAME farray; + FRAME *farray; } image; } STATE; -typedef STATE *PSTATE; + +typedef void (CollisionFunc) (struct element *ElementPtr0, POINT *pPt0, + struct element *ElementPtr1, POINT *pPt1); // Any physical object in the simulation. typedef struct element @@ -102,8 +104,7 @@ typedef struct element void (*preprocess_func) (struct element *ElementPtr); void (*postprocess_func) (struct element *ElementPtr); - void (*collision_func) (struct element *ElementPtr0, PPOINT - pPt0, struct element *ElementPtr1, PPOINT pPt1); + CollisionFunc *collision_func; void (*death_func) (struct element *ElementPtr); ELEMENT_FLAGS state_flags; @@ -116,11 +117,10 @@ typedef struct element COUNT PrimIndex; STATE current, next; - PVOID pParent; + void *pParent; // The ship this element belongs to. HELEMENT hTarget; } ELEMENT; -typedef ELEMENT *PELEMENT; #define MAX_DISPLAY_PRIMS 280 extern COUNT DisplayFreeList; @@ -131,11 +131,8 @@ extern PRIMITIVE DisplayArray[MAX_DISPLAY_PRIMS]; #define FreeDisplayPrim(p) SetPrimLinks (&DisplayArray[p], END_OF_LIST, DisplayFreeList); \ DisplayFreeList = (p) -#define STATEPTR PSTATE -#define ELEMENTPTR PELEMENT - -#define GetElementStarShip(e,psd) *(psd) = (PVOID)(e)->pParent -#define SetElementStarShip(e,psd) ((e)->pParent = (PVOID)(psd)) +#define GetElementStarShip(e,ppsd) do { *(ppsd) = (e)->pParent; } while (0) +#define SetElementStarShip(e,psd) do { (e)->pParent = psd; } while (0) #define blast_offset thrust_wait #define hit_points crew_level @@ -159,58 +156,50 @@ extern void FreeElement (HELEMENT hElement); #define InsertElement(h,i) InsertQueue (&disp_q, h, i) #define GetHeadElement() GetHeadLink (&disp_q) #define GetTailElement() GetTailLink (&disp_q) -#define LockElement(h,eptr) *(eptr) = (ELEMENTPTR)LockLink (&disp_q, h) +#define LockElement(h,ppe) (*(ppe) = (ELEMENT*)LockLink (&disp_q, h)) #define UnlockElement(h) UnlockLink (&disp_q, h) #define GetPredElement(l) _GetPredLink (l) #define GetSuccElement(l) _GetSuccLink (l) extern void RemoveElement (HLINK hLink); extern void RedrawQueue (BOOLEAN clear); -extern BOOLEAN DeltaEnergy (ELEMENTPTR ElementPtr, SIZE - energy_delta); -extern BOOLEAN DeltaCrew (ELEMENTPTR ElementPtr, SIZE - crew_delta); +extern BOOLEAN DeltaEnergy (ELEMENT *ElementPtr, SIZE energy_delta); +extern BOOLEAN DeltaCrew (ELEMENT *ElementPtr, SIZE crew_delta); -extern void PreProcessStatus (PELEMENT ShipPtr); -extern void PostProcessStatus (PELEMENT ShipPtr); +extern void PreProcessStatus (ELEMENT *ShipPtr); +extern void PostProcessStatus (ELEMENT *ShipPtr); extern void load_gravity_well (BYTE selector); extern void free_gravity_well (void); extern void spawn_planet (void); -extern void spawn_asteroid (PELEMENT ElementPtr); -extern void animation_preprocess (PELEMENT ElementPtr); -extern void do_damage (ELEMENTPTR ElementPtr, SIZE - damage); -extern void collision (PELEMENT ElementPtr0, PPOINT pPt0, - PELEMENT ElementPtr1, PPOINT pPt1); -extern void crew_preprocess (PELEMENT ElementPtr); -extern void crew_collision (PELEMENT ElementPtr0, PPOINT - pPt0, PELEMENT ElementPtr1, PPOINT pPt1); -extern void AbandonShip (ELEMENTPTR ShipPtr, ELEMENTPTR - TargetPtr, COUNT crew_loss); -extern BOOLEAN TimeSpaceMatterConflict (ELEMENTPTR - ElementPtr); -extern COUNT PlotIntercept (ELEMENTPTR ElementPtr0, - ELEMENTPTR ElementPtr1, COUNT max_turns, COUNT - margin_of_error); +extern void spawn_asteroid (ELEMENT *ElementPtr); +extern void animation_preprocess (ELEMENT *ElementPtr); +extern void do_damage (ELEMENT *ElementPtr, SIZE damage); +extern void collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1); +extern void crew_preprocess (ELEMENT *ElementPtr); +extern void crew_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1); +extern void AbandonShip (ELEMENT *ShipPtr, ELEMENT *TargetPtr, + COUNT crew_loss); +extern BOOLEAN TimeSpaceMatterConflict (ELEMENT *ElementPtr); +extern COUNT PlotIntercept (ELEMENT *ElementPtr0, + ELEMENT *ElementPtr1, COUNT max_turns, COUNT margin_of_error); extern BOOLEAN LoadKernel (int argc, char *argv[]); extern void FreeKernel (void); extern void InitDisplayList (void); extern void InitGalaxy (void); -extern void MoveGalaxy (VIEW_STATE view_state, - SIZE dx, SIZE dy); -extern void ship_preprocess (PELEMENT ElementPtr); -extern void ship_postprocess (PELEMENT - ElementPtr); -extern void ship_death (PELEMENT ShipPtr); -extern BOOLEAN hyper_transition (PELEMENT ElementPtr); +extern void MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy); +extern void ship_preprocess (ELEMENT *ElementPtr); +extern void ship_postprocess (ELEMENT *ElementPtr); +extern void ship_death (ELEMENT *ShipPtr); +extern BOOLEAN hyper_transition (ELEMENT *ElementPtr); -extern BOOLEAN CalculateGravity (PELEMENT ElementPtr); -extern UWORD inertial_thrust (ELEMENTPTR ElementPtr); -extern void SetUpElement (ELEMENTPTR - ElementPtr); +extern BOOLEAN CalculateGravity (ELEMENT *ElementPtr); +extern UWORD inertial_thrust (ELEMENT *ElementPtr); +extern void SetUpElement (ELEMENT *ElementPtr); extern void BattleSong (BOOLEAN DoPlay); extern void FreeBattleSong (void); diff --git a/sc2/src/sc2code/encount.c b/sc2/src/sc2code/encount.c index 282178ac9..1e3f33c97 100644 --- a/sc2/src/sc2code/encount.c +++ b/sc2/src/sc2code/encount.c @@ -38,11 +38,11 @@ static void DrawFadeText (const UNICODE *str1, const UNICODE *str2, - BOOLEAN fade_in, PRECT pRect); + BOOLEAN fade_in, RECT *pRect); static BOOLEAN -DoSelectAction (PMENU_STATE pMS) +DoSelectAction (MENU_STATE *pMS) { SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); if (GLOBAL (CurrentActivity) & CHECK_ABORT) @@ -85,10 +85,10 @@ DoSelectAction (PMENU_STATE pMS) void BuildBattle (COUNT which_player) { - PQUEUE pQueue; + QUEUE *pQueue; HSTARSHIP hStarShip, hNextShip; HSTARSHIP hBuiltShip; - STARSHIPPTR BuiltShipPtr; + STARSHIP *BuiltShipPtr; EncounterRace = -1; @@ -123,9 +123,9 @@ BuildBattle (COUNT which_player) for (hStarShip = GetHeadLink (pQueue); hStarShip != 0; hStarShip = hNextShip) { - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pQueue, hStarShip); + FragPtr = (SHIP_FRAGMENT*) LockStarShip (pQueue, hStarShip); hNextShip = _GetSuccLink (FragPtr); hBuiltShip = Build (&race_q[which_player], @@ -143,7 +143,7 @@ BuildBattle (COUNT which_player) BuiltShipPtr->special_counter = FragPtr->ShipInfo.crew_level; else /* if infinite ships */ BuiltShipPtr->special_counter = FragPtr->ShipInfo.max_crew; - BuiltShipPtr->RaceDescPtr = (RACE_DESCPTR)&FragPtr->ShipInfo; + BuiltShipPtr->RaceDescPtr = (RACE_DESC*)&FragPtr->ShipInfo; UnlockStarShip (&race_q[which_player], hBuiltShip); } @@ -271,7 +271,7 @@ InitEncounter (void) hStarShip && i < 60; hStarShip = hNextShip, ++i) { RECT r; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (&race_q[1], hStarShip); if (StarShipPtr->RaceDescPtr->ship_info.crew_level != @@ -323,10 +323,10 @@ InitEncounter (void) SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); - DoInput ((PVOID)&MenuState, TRUE); + DoInput (&MenuState, TRUE); LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); return (MenuState.CurState); @@ -335,7 +335,7 @@ InitEncounter (void) static void DrawFadeText (const UNICODE *str1, const UNICODE *str2, BOOLEAN fade_in, - PRECT pRect) + RECT *pRect) { SIZE i; DWORD TimeIn; @@ -436,7 +436,7 @@ UninitEncounter (void) const UNICODE *str2 = NULL; UNICODE buf[80]; HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; static const COLOR fade_ship_cycle[] = { BUILD_COLOR (MAKE_RGB15 (0x07, 0x00, 0x00), 0x2F), @@ -467,7 +467,7 @@ UninitEncounter (void) ) ? 0 : 1; hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (&GLOBAL (npc_built_ship_q), + FragPtr = (SHIP_FRAGMENT*) LockStarShip (&GLOBAL (npc_built_ship_q), hStarShip); EncounterRace = GET_RACE_ID (FragPtr); if (GetStarShipFromIndex (&GLOBAL (avail_race_q), EncounterRace) == 0) @@ -480,7 +480,7 @@ UninitEncounter (void) Sleepy = TRUE; for (i = 0; i < NUM_SIDES; ++i) { - PQUEUE pQueue; + QUEUE *pQueue; HSTARSHIP hNextShip; if (i == 0) @@ -492,7 +492,7 @@ UninitEncounter (void) else { DrawSISFrame (); - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE) DrawHyperCoords (GLOBAL (ShipStamp.origin)); else if (HIWORD (GLOBAL (ShipStamp.frame)) == 0) @@ -512,7 +512,7 @@ UninitEncounter (void) for (hStarShip = GetHeadLink (pQueue); hStarShip; hStarShip = hNextShip) { - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pQueue, hStarShip); + FragPtr = (SHIP_FRAGMENT*) LockStarShip (pQueue, hStarShip); hNextShip = _GetSuccLink (FragPtr); if (FragPtr->ShipInfo.crew_level == 0 @@ -687,7 +687,7 @@ UninitEncounter (void) } } - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); } if (ships_killed && EncounterRace == THRADDASH_SHIP diff --git a/sc2/src/sc2code/encount.h b/sc2/src/sc2code/encount.h index eed9dc04c..2224240b2 100644 --- a/sc2/src/sc2code/encount.h +++ b/sc2/src/sc2code/encount.h @@ -37,7 +37,6 @@ typedef struct BYTE Type, Index; SHIP_INFO ShipList[MAX_HYPER_SHIPS]; } EXTENDED_STAR_DESC; -typedef EXTENDED_STAR_DESC *PEXTENDED_STAR_DESC; typedef struct { @@ -53,22 +52,19 @@ typedef struct SDWORD log_x, log_y; } ENCOUNTER; -typedef ENCOUNTER *PENCOUNTER; #define AllocEncounter() AllocLink (&GLOBAL (encounter_q)) #define PutEncounter(h) PutQueue (&GLOBAL (encounter_q), h) #define InsertEncounter(h,i) InsertQueue (&GLOBAL (encounter_q), h, i) #define GetHeadEncounter() GetHeadLink (&GLOBAL (encounter_q)) #define GetTailEncounter() GetTailLink (&GLOBAL (encounter_q)) -#define LockEncounter(h,eptr) *(eptr) = (ENCOUNTERPTR)LockLink (&GLOBAL (encounter_q), h) +#define LockEncounter(h,ppe) (*(ppe) = (ENCOUNTER*)LockLink (&GLOBAL (encounter_q), h)) #define UnlockEncounter(h) UnlockLink (&GLOBAL (encounter_q), h) #define RemoveEncounter(h) RemoveQueue (&GLOBAL (encounter_q), h) #define FreeEncounter(h) FreeLink (&GLOBAL (encounter_q), h) #define GetPredEncounter(l) _GetPredLink (l) #define GetSuccEncounter(l) _GetSuccLink (l) -#define ENCOUNTERPTR PENCOUNTER - enum { SOL_DEFINED = 1, @@ -126,15 +122,15 @@ enum #define TEXT_Y_OFFS 1 #define SIS_TEXT_WIDTH (SIS_SCREEN_WIDTH - (TEXT_X_OFFS << 1)) -extern STAR_DESCPTR CurStarDescPtr; -extern STAR_DESCPTR star_array; +extern STAR_DESC *CurStarDescPtr; +extern STAR_DESC *star_array; #define NUM_SOLAR_SYSTEMS 502 -extern STAR_DESCPTR FindStar (STAR_DESCPTR pLastStar, PPOINT puniverse, +extern STAR_DESC* FindStar (STAR_DESC *pLastStar, POINT *puniverse, SIZE xbounds, SIZE ybounds); -extern void GetClusterName (STAR_DESCPTR pSD, UNICODE buf[]); +extern void GetClusterName (const STAR_DESC *pSD, UNICODE buf[]); enum { diff --git a/sc2/src/sc2code/galaxy.c b/sc2/src/sc2code/galaxy.c index 830047d90..db3693205 100644 --- a/sc2/src/sc2code/galaxy.c +++ b/sc2/src/sc2code/galaxy.c @@ -47,11 +47,12 @@ static POINT log_star_array[NUM_STARS]; typedef struct { - COUNT min_star_index, num_stars; - PPOINT star_array; - PPOINT pmin_star, plast_star; + COUNT min_star_index; + COUNT num_stars; + POINT *star_array; + POINT *pmin_star; + POINT *plast_star; } STAR_BLOCK; -typedef STAR_BLOCK *PSTAR_BLOCK; STAR_BLOCK StarBlock[NUM_STAR_PLANES] = { @@ -73,7 +74,7 @@ STAR_BLOCK StarBlock[NUM_STAR_PLANES] = }; static void -SortStarBlock (PSTAR_BLOCK pStarBlock) +SortStarBlock (STAR_BLOCK *pStarBlock) { COUNT i; @@ -104,10 +105,10 @@ static void WrapStarBlock (SIZE plane, SIZE dx, SIZE dy) { COUNT i; - PPOINT ppt; + POINT *ppt; SIZE offs_y; COUNT num_stars; - PSTAR_BLOCK pStarBlock; + STAR_BLOCK *pStarBlock; pStarBlock = &StarBlock[plane]; @@ -235,7 +236,7 @@ void InitGalaxy (void) { COUNT i, factor; - PPOINT ppt; + POINT *ppt; PRIM_LINKS Links; log_add (log_Debug, "InitGalaxy(): transition_width = %d, " @@ -286,7 +287,7 @@ InitGalaxy (void) } static BOOLEAN -CmpMovePoints (const PPOINT pt1, const PPOINT pt2, SIZE dx, SIZE dy, +CmpMovePoints (const POINT *pt1, const POINT *pt2, SIZE dx, SIZE dy, SIZE reduction) { if (optMeleeScale == TFB_SCALE_STEP) @@ -304,7 +305,7 @@ CmpMovePoints (const PPOINT pt1, const PPOINT pt2, SIZE dx, SIZE dy, void MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy) { - PPRIMITIVE pprim; + PRIMITIVE *pprim; static const COUNT star_counts[] = { BIG_STAR_COUNT, @@ -318,7 +319,7 @@ MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy) COUNT reduction; COUNT i; COUNT iss; - PPOINT ppt; + POINT *ppt; int wrap_around; reduction = zoom_out; diff --git a/sc2/src/sc2code/gameev.c b/sc2/src/sc2code/gameev.c index 62de3eed3..32288cce3 100644 --- a/sc2/src/sc2code/gameev.c +++ b/sc2/src/sc2code/gameev.c @@ -106,11 +106,11 @@ EventHandler (BYTE selector) else if (GET_GAME_STATE (ZOQFOT_DISTRESS)) { HSTARSHIP hZoqFot; - EXTENDED_SHIP_FRAGMENTPTR ZoqFotPtr; + EXTENDED_SHIP_FRAGMENT *ZoqFotPtr; hZoqFot = GetStarShipFromIndex (&GLOBAL (avail_race_q), ZOQFOTPIK_SHIP); - ZoqFotPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + ZoqFotPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hZoqFot); ZoqFotPtr->ShipInfo.actual_strength = 0; ZoqFotPtr->ShipInfo.ship_flags &= ~(GOOD_GUY | BAD_GUY); @@ -137,11 +137,11 @@ EventHandler (BYTE selector) else { HSTARSHIP hSpathi; - EXTENDED_SHIP_FRAGMENTPTR SpathiPtr; + EXTENDED_SHIP_FRAGMENT *SpathiPtr; hSpathi = GetStarShipFromIndex ( &GLOBAL (avail_race_q), SPATHI_SHIP); - SpathiPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + SpathiPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hSpathi); if (SpathiPtr->ShipInfo.actual_strength) @@ -166,15 +166,16 @@ EventHandler (BYTE selector) case YEHAT_REBEL_EVENT: { HSTARSHIP hRebel, hRoyalist; - EXTENDED_SHIP_FRAGMENTPTR RebelPtr, RoyalistPtr; + EXTENDED_SHIP_FRAGMENT *RebelPtr; + EXTENDED_SHIP_FRAGMENT *RoyalistPtr; hRebel = GetStarShipFromIndex (&GLOBAL (avail_race_q), YEHAT_REBEL_SHIP); - RebelPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + RebelPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hRebel); hRoyalist = GetStarShipFromIndex (&GLOBAL (avail_race_q), YEHAT_SHIP); - RoyalistPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + RoyalistPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hRoyalist); RebelPtr->ShipInfo.actual_strength = RoyalistPtr->ShipInfo.actual_strength = @@ -217,10 +218,10 @@ SetRaceDest (BYTE which_race, COORD x, COORD y, BYTE days_left, BYTE func_index) { HSTARSHIP hStarShip; - EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; + EXTENDED_SHIP_FRAGMENT *TemplatePtr; hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), which_race); - TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); TemplatePtr->ShipInfo.dest_loc.x = x; @@ -263,9 +264,9 @@ check_race_growth (void) for (hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip; hStarShip = hNextShip) { - EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; + EXTENDED_SHIP_FRAGMENT *TemplatePtr; - TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); hNextShip = _GetSuccLink (TemplatePtr); @@ -326,11 +327,11 @@ black_urquan_genocide (void) SIZE best_dx, best_dy; HSTARSHIP hStarShip, hNextShip; HSTARSHIP hBlackUrquan; - EXTENDED_SHIP_FRAGMENTPTR BlackUrquanPtr; + EXTENDED_SHIP_FRAGMENT *BlackUrquanPtr; hBlackUrquan = GetStarShipFromIndex ( &GLOBAL (avail_race_q), BLACK_URQUAN_SHIP); - BlackUrquanPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + BlackUrquanPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hBlackUrquan); best_dist = -1; @@ -339,9 +340,9 @@ black_urquan_genocide (void) for (Index = 0, hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip; ++Index, hStarShip = hNextShip) { - EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; + EXTENDED_SHIP_FRAGMENT *TemplatePtr; - TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); hNextShip = _GetSuccLink (TemplatePtr); @@ -420,10 +421,10 @@ static void pkunk_mission (void) { HSTARSHIP hPkunk; - EXTENDED_SHIP_FRAGMENTPTR PkunkPtr; + EXTENDED_SHIP_FRAGMENT *PkunkPtr; hPkunk = GetStarShipFromIndex (&GLOBAL (avail_race_q), PKUNK_SHIP); - PkunkPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + PkunkPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hPkunk); if (PkunkPtr->ShipInfo.actual_strength) @@ -486,10 +487,10 @@ thradd_mission (void) { BYTE MissionState; HSTARSHIP hThradd; - EXTENDED_SHIP_FRAGMENTPTR ThraddPtr; + EXTENDED_SHIP_FRAGMENT *ThraddPtr; hThradd = GetStarShipFromIndex (&GLOBAL (avail_race_q), THRADDASH_SHIP); - ThraddPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + ThraddPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hThradd); MissionState = GET_GAME_STATE (THRADD_MISSION); @@ -545,13 +546,14 @@ ilwrath_mission (void) { BYTE ThraddState; HSTARSHIP hIlwrath, hThradd; - EXTENDED_SHIP_FRAGMENTPTR IlwrathPtr, ThraddPtr; + EXTENDED_SHIP_FRAGMENT *IlwrathPtr; + EXTENDED_SHIP_FRAGMENT *ThraddPtr; hIlwrath = GetStarShipFromIndex (&GLOBAL (avail_race_q), ILWRATH_SHIP); - IlwrathPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + IlwrathPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hIlwrath); hThradd = GetStarShipFromIndex (&GLOBAL (avail_race_q), THRADDASH_SHIP); - ThraddPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + ThraddPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hThradd); if (IlwrathPtr->ShipInfo.loc.x == ((2500 + 2535) >> 1) @@ -625,13 +627,14 @@ utwig_supox_mission (void) { BYTE MissionState; HSTARSHIP hUtwig, hSupox; - EXTENDED_SHIP_FRAGMENTPTR UtwigPtr, SupoxPtr; + EXTENDED_SHIP_FRAGMENT *UtwigPtr; + EXTENDED_SHIP_FRAGMENT *SupoxPtr; hUtwig = GetStarShipFromIndex (&GLOBAL (avail_race_q), UTWIG_SHIP); - UtwigPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + UtwigPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hUtwig); hSupox = GetStarShipFromIndex (&GLOBAL (avail_race_q), SUPOX_SHIP); - SupoxPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + SupoxPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hSupox); MissionState = GET_GAME_STATE (UTWIG_SUPOX_MISSION); @@ -716,10 +719,10 @@ static void mycon_mission (void) { HSTARSHIP hMycon; - EXTENDED_SHIP_FRAGMENTPTR MyconPtr; + EXTENDED_SHIP_FRAGMENT *MyconPtr; hMycon = GetStarShipFromIndex (&GLOBAL (avail_race_q), MYCON_SHIP); - MyconPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + MyconPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hMycon); if (MyconPtr->ShipInfo.actual_strength) diff --git a/sc2/src/sc2code/gameinp.c b/sc2/src/sc2code/gameinp.c index 0458cc20b..548aad5e8 100644 --- a/sc2/src/sc2code/gameinp.c +++ b/sc2/src/sc2code/gameinp.c @@ -35,10 +35,9 @@ battle_summary_func PlayerInput[NUM_PLAYERS]; typedef struct { - BOOLEAN (*InputFunc) (PVOID pInputState); + BOOLEAN (*InputFunc) (void *pInputState); COUNT MenuRepeatDelay; } INPUT_STATE_DESC; -typedef INPUT_STATE_DESC *PINPUT_STATE_DESC; /* These static variables are the values that are set by the controllers. */ @@ -296,7 +295,7 @@ FlushInputState (void) } void -DoInput (PVOID pInputState, BOOLEAN resetInput) +DoInput (void *pInputState, BOOLEAN resetInput) { SetMenuRepeatDelay (ACCELERATION_INCREMENT, MENU_REPEAT_DELAY, ACCELERATION_INCREMENT, FALSE); if (resetInput) @@ -354,8 +353,7 @@ DoInput (PVOID pInputState, BOOLEAN resetInput) PlaySoundEffect (S, 0, NotPositional (), NULL, 0); } - } while ((*((PINPUT_STATE_DESC)pInputState)->InputFunc) - (pInputState)); + } while (((INPUT_STATE_DESC*)pInputState)->InputFunc (pInputState)); if (resetInput) { TFB_ResetControls (); @@ -380,7 +378,7 @@ GetMenuSounds (MENU_SOUND_FLAGS *s0, MENU_SOUND_FLAGS *s1) /* These can really be refactored */ BATTLE_INPUT_STATE -p1_combat_summary (COUNT player, STARSHIPPTR StarShipPtr) +p1_combat_summary (COUNT player, STARSHIP *StarShipPtr) { BATTLE_INPUT_STATE InputState = 0; if (CurrentInputState.key[PlayerOne][KEY_UP]) @@ -404,7 +402,7 @@ p1_combat_summary (COUNT player, STARSHIPPTR StarShipPtr) } BATTLE_INPUT_STATE -p2_combat_summary (COUNT player, STARSHIPPTR StarShipPtr) +p2_combat_summary (COUNT player, STARSHIP *StarShipPtr) { BATTLE_INPUT_STATE InputState = 0; if (CurrentInputState.key[PlayerTwo][KEY_UP]) diff --git a/sc2/src/sc2code/gameopt.c b/sc2/src/sc2code/gameopt.c index afd89d824..36ece99c2 100644 --- a/sc2/src/sc2code/gameopt.c +++ b/sc2/src/sc2code/gameopt.c @@ -45,10 +45,10 @@ #define SUMMARY_SIDE_OFFS 7 #define SAVES_PER_PAGE 5 -static BOOLEAN DoSettings (PMENU_STATE pMS); -static BOOLEAN DoNaming (PMENU_STATE pMS); +static BOOLEAN DoSettings (MENU_STATE *pMS); +static BOOLEAN DoNaming (MENU_STATE *pMS); -static PMENU_STATE pLocMenuState; +static MENU_STATE *pLocMenuState; static BYTE prev_save; //keeps track of the last slot that was saved or loaded @@ -75,7 +75,7 @@ ConfirmSaveLoad (STAMP *MsgStamp) t.pStr = GAME_STRING (SAVEGAME_STRING_BASE + 0); else t.pStr = GAME_STRING (SAVEGAME_STRING_BASE + 1); - TextRect (&t, &r, NULL_PTR); + TextRect (&t, &r, NULL); r.corner.x -= 4; r.corner.y -= 4; r.extent.width += 8; @@ -106,7 +106,7 @@ enum SETTINGS }; -static BOOLEAN DoGameOptions (PMENU_STATE pMS); +static BOOLEAN DoGameOptions (MENU_STATE *pMS); enum { @@ -215,7 +215,7 @@ FeedbackQuit (BYTE which_setting) #define DDSHS_BLOCKCUR 2 static BOOLEAN -DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state) +DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state) { COUNT rel_index; RECT r; @@ -297,7 +297,7 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state) COUNT i; RECT text_r; BYTE char_deltas[MAX_DESC_CHARS]; - PBYTE pchar_deltas; + BYTE *pchar_deltas; TextRect (&lf, &text_r, char_deltas); if ((text_r.extent.width + 2) >= r.extent.width) @@ -353,9 +353,9 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state) } static BOOLEAN -OnNameChange (PTEXTENTRY_STATE pTES) +OnNameChange (TEXTENTRY_STATE *pTES) { - PMENU_STATE pMS = (PMENU_STATE) pTES->CbParam; + MENU_STATE *pMS = (MENU_STATE*) pTES->CbParam; COUNT hl = DDSHS_EDIT; pMS->first_item.x = pTES->CursorPos; @@ -366,7 +366,7 @@ OnNameChange (PTEXTENTRY_STATE pTES) } static BOOLEAN -DoNaming (PMENU_STATE pMS) +DoNaming (MENU_STATE *pMS) { GAME_DESC buf; TEXTENTRY_STATE tes; @@ -427,7 +427,7 @@ DoNaming (PMENU_STATE pMS) } static BOOLEAN -DoSettings (PMENU_STATE pMS) +DoSettings (MENU_STATE *pMS) { BYTE cur_speed; @@ -448,7 +448,7 @@ DoSettings (PMENU_STATE pMS) && pMS->CurState == EXIT_MENU_SETTING)) { LockMutex (GraphicsLock); - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); UnlockMutex (GraphicsLock); pMS->CurState = SETTINGS; @@ -500,7 +500,7 @@ DoSettings (PMENU_STATE pMS) } static BOOLEAN -DoQuitMenu (PMENU_STATE pMS) +DoQuitMenu (MENU_STATE *pMS) { if (GLOBAL (CurrentActivity) & CHECK_ABORT) return (FALSE); @@ -519,7 +519,7 @@ DoQuitMenu (PMENU_STATE pMS) && pMS->CurState == NO_QUIT_MENU)) { LockMutex (GraphicsLock); - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); UnlockMutex (GraphicsLock); pMS->CurState = QUIT_GAME; @@ -845,11 +845,11 @@ ShowSummary (SUMMARY_DESC *pSD) case IN_STARBASE: { BYTE QuasiState; - STAR_DESCPTR SDPtr; + STAR_DESC *SDPtr; QuasiState = GET_GAME_STATE (ARILOU_SPACE_SIDE); SET_GAME_STATE (ARILOU_SPACE_SIDE, 0); - SDPtr = FindStar (NULL_PTR, &r.corner, 1, 1); + SDPtr = FindStar (NULL, &r.corner, 1, 1); SET_GAME_STATE (ARILOU_SPACE_SIDE, QuasiState); if (SDPtr) { @@ -910,7 +910,7 @@ LoadGameDescriptions (SUMMARY_DESC *pSD) } static BOOLEAN -DoPickGame (PMENU_STATE pMS) +DoPickGame (MENU_STATE *pMS) { BYTE NewState; SUMMARY_DESC *pSD; @@ -992,7 +992,7 @@ Restart: } else { - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); DrawStamp (&MsgStamp); DestroyDrawable (ReleaseDrawable (MsgStamp.frame)); UnlockMutex (GraphicsLock); @@ -1021,10 +1021,10 @@ Restart: else { ConfirmSaveLoad (0); - if (LoadGame ((COUNT)pMS->CurState, NULL_PTR)) + if (LoadGame ((COUNT)pMS->CurState, NULL)) GLOBAL (CurrentActivity) |= CHECK_LOAD; } - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); pMS->ModuleFrame = 0; @@ -1182,7 +1182,7 @@ ChangeGameSelection: } UnbatchGraphics (); } - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); } } @@ -1191,7 +1191,7 @@ ChangeGameSelection: } static BOOLEAN -PickGame (PMENU_STATE pMS) +PickGame (MENU_STATE *pMS) { BOOLEAN retval; CONTEXT OldContext; @@ -1286,7 +1286,7 @@ PickGame (PMENU_STATE pMS) } static BOOLEAN -DoGameOptions (PMENU_STATE pMS) +DoGameOptions (MENU_STATE *pMS) { BOOLEAN force_select = FALSE; if (GLOBAL (CurrentActivity) & CHECK_ABORT) @@ -1353,7 +1353,7 @@ GameOptions (void) MenuState.InputFunc = DoGameOptions; MenuState.CurState = SAVE_GAME; SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)&MenuState, TRUE); + DoInput (&MenuState, TRUE); pLocMenuState = 0; diff --git a/sc2/src/sc2code/getchar.c b/sc2/src/sc2code/getchar.c index 18f65e2d3..c8bc0d414 100644 --- a/sc2/src/sc2code/getchar.c +++ b/sc2/src/sc2code/getchar.c @@ -88,7 +88,7 @@ JoyCharFindIn (const joy_char_t *ch, const joy_char_t *set, } static int -JoyCharIsLower (const joy_char_t *ch, PTEXTENTRY_STATE pTES) +JoyCharIsLower (const joy_char_t *ch, TEXTENTRY_STATE *pTES) { return 0 <= JoyCharFindIn (ch, pTES->JoyLower, pTES->JoyRegLength); } @@ -104,7 +104,7 @@ JoyCharSwitchReg (joy_char_t *ch, const joy_char_t *from, static void JoyCharToUpper (joy_char_t *outch, const joy_char_t *ch, - PTEXTENTRY_STATE pTES) + TEXTENTRY_STATE *pTES) { *outch = *ch; JoyCharSwitchReg (outch, pTES->JoyLower, pTES->JoyUpper, @@ -113,7 +113,7 @@ JoyCharToUpper (joy_char_t *outch, const joy_char_t *ch, static void JoyCharToLower (joy_char_t *outch, const joy_char_t *ch, - PTEXTENTRY_STATE pTES) + TEXTENTRY_STATE *pTES) { *outch = *ch; JoyCharSwitchReg (outch, pTES->JoyUpper, pTES->JoyLower, @@ -121,7 +121,7 @@ JoyCharToLower (joy_char_t *outch, const joy_char_t *ch, } BOOLEAN -DoTextEntry (PTEXTENTRY_STATE pTES) +DoTextEntry (TEXTENTRY_STATE *pTES) { wchar_t ch; UNICODE *pStr; diff --git a/sc2/src/sc2code/globdata.c b/sc2/src/sc2code/globdata.c index c86f72806..e2c50c472 100644 --- a/sc2/src/sc2code/globdata.c +++ b/sc2/src/sc2code/globdata.c @@ -210,35 +210,35 @@ InitSIS (void) hStarShip = Build (&GLOBAL (avail_race_q), ship_ref, 0, 0); if (hStarShip) { - SHIP_FRAGMENTPTR FragPtr; - EXTENDED_SHIP_FRAGMENTPTR ExtFragPtr; + SHIP_FRAGMENT *FragPtr; + EXTENDED_SHIP_FRAGMENT *ExtFragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); if (i < num_ships - 1) { HSTARSHIP hMasterShip; - STARSHIPPTR MasterShipPtr; + STARSHIP *MasterShipPtr; hMasterShip = FindMasterShip (ship_ref); MasterShipPtr = LockStarShip (&master_q, hMasterShip); FragPtr->ShipInfo = - ((SHIP_FRAGMENTPTR)MasterShipPtr)->ShipInfo; + ((SHIP_FRAGMENT*)MasterShipPtr)->ShipInfo; UnlockStarShip (&master_q, hMasterShip); } else { // Ur-Quan probe. - load_ship ((STARSHIPPTR)FragPtr, FALSE); + load_ship ((STARSHIP*)FragPtr, FALSE); FragPtr->ShipInfo = FragPtr->RaceDescPtr->ship_info; FragPtr->RaceDescPtr->ship_info.melee_icon = 0; FragPtr->RaceDescPtr->ship_info.icons = 0; FragPtr->RaceDescPtr->ship_info.race_strings = 0; - free_ship ((STARSHIPPTR)FragPtr, FALSE); + free_ship ((STARSHIP*)FragPtr, FALSE); } FragPtr->ShipInfo.ship_flags = BAD_GUY; - ExtFragPtr = (EXTENDED_SHIP_FRAGMENTPTR)FragPtr; + ExtFragPtr = (EXTENDED_SHIP_FRAGMENT*)FragPtr; ExtFragPtr->ShipInfo.known_strength = 0; ExtFragPtr->ShipInfo.known_loc = ExtFragPtr->ShipInfo.loc; if (FragPtr->ShipInfo.var2 == (BYTE)~0) @@ -252,7 +252,7 @@ InitSIS (void) ExtFragPtr->ShipInfo.growth_err_term = 255 >> 1; ExtFragPtr->ShipInfo.energy_level = 0; ExtFragPtr->ShipInfo.days_left = 0; - FragPtr->RaceDescPtr = (RACE_DESCPTR)&ExtFragPtr->ShipInfo; + FragPtr->RaceDescPtr = (RACE_DESC*)&ExtFragPtr->ShipInfo; UnlockStarShip (&GLOBAL (avail_race_q), hStarShip); } @@ -383,7 +383,7 @@ UninitSIS (void) hStarShip = GetTailLink (&GLOBAL (avail_race_q)); if (hStarShip) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (&GLOBAL (avail_race_q), hStarShip); DestroyDrawable (ReleaseDrawable ( @@ -408,7 +408,7 @@ InitGlobData (void) COUNT i; i = GLOBAL (glob_flags); - memset ((PBYTE)&GlobData, 0, sizeof (GlobData)); + memset (&GlobData, 0, sizeof (GlobData)); GLOBAL (glob_flags) = (BYTE)i; GLOBAL (DisplayArray) = DisplayArray; diff --git a/sc2/src/sc2code/globdata.h b/sc2/src/sc2code/globdata.h index 8a41563f0..67be14ef0 100644 --- a/sc2/src/sc2code/globdata.h +++ b/sc2/src/sc2code/globdata.h @@ -60,8 +60,6 @@ typedef struct DWORD BlockMask; } ANIMATION_DESC; -typedef ANIMATION_DESC *PANIMATION_DESC; -#define ANIMATION_DESCPTR PANIMATION_DESC #define MAX_ANIMATIONS 20 @@ -119,8 +117,6 @@ typedef struct // 0-9, 10-19, ..20-90, ..100-900, etc. SPEECH_DIGIT Digits[MAX_SPEECH_DIGITS]; } NUMBER_SPEECH_DESC; -typedef NUMBER_SPEECH_DESC *PNUMBER_SPEECH_DESC; -#define NUMBER_SPEECH_DESCPTR PNUMBER_SPEECH_DESC typedef NUMBER_SPEECH_DESC *NUMBER_SPEECH; typedef DWORD LDAS_FLAGS; @@ -158,8 +154,6 @@ typedef struct NUMBER_SPEECH AlienNumberSpeech; } LOCDATA; -typedef LOCDATA *PLOCDATA; -#define LOCDATAPTR PLOCDATA enum { @@ -936,7 +930,7 @@ typedef struct BYTE ModuleCost[NUM_MODULES]; BYTE ElementWorth[NUM_ELEMENT_CATEGORIES]; - PPRIMITIVE DisplayArray; + PRIMITIVE *DisplayArray; ACTIVITY CurrentActivity; CLOCK_STATE GameClock; @@ -957,21 +951,17 @@ typedef struct BYTE GameState[(NUM_GAME_STATE_BITS + 7) >> 3]; } GAME_STATE; -typedef GAME_STATE *PGAME_STATE; typedef struct { SIS_STATE SIS_state; GAME_STATE Game_state; } GLOBDATA; -typedef GLOBDATA *PGLOBDATA; extern GLOBDATA GlobData; #define GLOBAL(f) GlobData.Game_state.f #define GLOBAL_SIS(f) GlobData.SIS_state.f -#define GLOBDATAPTR PGLOBDATA - //#define STATE_DEBUG @@ -1010,7 +1000,7 @@ extern void setGameState32 (int startBit, DWORD val extern CONTEXT RadarContext; -extern void DiscardStarMap (PVOID CodeRef); +extern void DiscardStarMap (void *CodeRef); extern void RetrieveStarMap (void); extern void FreeSC2Data (void); diff --git a/sc2/src/sc2code/gravity.c b/sc2/src/sc2code/gravity.c index 33ebcd6b6..5a7899c46 100644 --- a/sc2/src/sc2code/gravity.c +++ b/sc2/src/sc2code/gravity.c @@ -24,7 +24,7 @@ //#define DEBUG_GRAVITY BOOLEAN -CalculateGravity (PELEMENT ElementPtr) +CalculateGravity (ELEMENT *ElementPtr) { BOOLEAN retval, HasGravity; HELEMENT hTestElement, hSuccElement; @@ -36,7 +36,7 @@ CalculateGravity (PELEMENT ElementPtr) hTestElement != 0; hTestElement = hSuccElement) { BOOLEAN TestHasGravity; - ELEMENTPTR TestElementPtr; + ELEMENT *TestElementPtr; LockElement (hTestElement, &TestElementPtr); if (TestElementPtr != ElementPtr @@ -130,7 +130,7 @@ CalculateGravity (PELEMENT ElementPtr) SINE (angle, WORLD_TO_VELOCITY (1))); if (TestElementPtr->state_flags & PLAYER_SHIP) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (TestElementPtr, &StarShipPtr); StarShipPtr->cur_status_flags &= ~SHIP_AT_MAX_SPEED; @@ -149,7 +149,7 @@ CalculateGravity (PELEMENT ElementPtr) } BOOLEAN -TimeSpaceMatterConflict (ELEMENTPTR ElementPtr) +TimeSpaceMatterConflict (ELEMENT *ElementPtr) { HELEMENT hTestElement, hSuccElement; INTERSECT_CONTROL ElementControl; @@ -165,7 +165,7 @@ TimeSpaceMatterConflict (ELEMENTPTR ElementPtr) for (hTestElement = GetHeadElement (); hTestElement != 0; hTestElement = hSuccElement) { - ELEMENTPTR TestElementPtr; + ELEMENT *TestElementPtr; LockElement (hTestElement, &TestElementPtr); hSuccElement = GetSuccElement (TestElementPtr); diff --git a/sc2/src/sc2code/grpinfo.c b/sc2/src/sc2code/grpinfo.c index 95ad9a62d..35826b48e 100644 --- a/sc2/src/sc2code/grpinfo.c +++ b/sc2/src/sc2code/grpinfo.c @@ -62,7 +62,7 @@ typedef struct } GROUP_HEADER; static void -ReadGroupHeader (PVOID fp, GROUP_HEADER* pGH) +ReadGroupHeader (void *fp, GROUP_HEADER *pGH) { sread_8 (fp, &pGH->NumGroups); sread_8 (fp, &pGH->day_index); @@ -74,7 +74,7 @@ ReadGroupHeader (PVOID fp, GROUP_HEADER* pGH) } static void -WriteGroupHeader (PVOID fp, GROUP_HEADER* pGH) +WriteGroupHeader (void *fp, const GROUP_HEADER *pGH) { swrite_8 (fp, pGH->NumGroups); swrite_8 (fp, pGH->day_index); @@ -86,7 +86,7 @@ WriteGroupHeader (PVOID fp, GROUP_HEADER* pGH) } static void -ReadShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr) +ReadShipFragment (void *fp, SHIP_FRAGMENT *FragPtr) { BYTE tmpb; @@ -109,7 +109,7 @@ ReadShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr) } static void -WriteShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr) +WriteShipFragment (void *fp, const SHIP_FRAGMENT *FragPtr) { // Write SHIP_FRAGMENT elements swrite_16 (fp, FragPtr->s.Player); @@ -130,7 +130,7 @@ WriteShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr) void InitGroupInfo (BOOLEAN FirstTime) { - PVOID fp; + void *fp; fp = OpenStateFile (RANDGRPINFO_FILE, "wb"); if (fp) @@ -212,9 +212,9 @@ BuildGroups (void) hTemplate; hTemplate = hNextShip, ++Index) { COUNT i, encounter_radius; - EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; + EXTENDED_SHIP_FRAGMENT *TemplatePtr; - TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hTemplate); hNextShip = _GetSuccLink (TemplatePtr); @@ -329,11 +329,11 @@ FoundHome: } static void -FlushGroupInfo (GROUP_HEADER *pGH, DWORD offset, BYTE which_group, PVOID fp) +FlushGroupInfo (GROUP_HEADER* pGH, DWORD offset, BYTE which_group, void *fp) { BYTE RaceType, NumShips; HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; if (which_group == GROUP_LIST) { @@ -351,7 +351,7 @@ FlushGroupInfo (GROUP_HEADER *pGH, DWORD offset, BYTE which_group, PVOID fp) { COUNT crew_level; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &temp_q, hStarShip); hNextShip = _GetSuccLink (FragPtr); crew_level = FragPtr->ShipInfo.crew_level; @@ -379,7 +379,7 @@ FlushGroupInfo (GROUP_HEADER *pGH, DWORD offset, BYTE which_group, PVOID fp) pGH->GroupOffset[which_group] = LengthStateFile (fp); hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); RaceType = GET_RACE_ID (FragPtr); SeekStateFile (fp, pGH->GroupOffset[which_group], SEEK_SET); @@ -412,9 +412,8 @@ FlushGroupInfo (GROUP_HEADER *pGH, DWORD offset, BYTE which_group, PVOID fp) { HSTARSHIP hNextShip; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (npc_built_ship_q), hStarShip); hNextShip = _GetSuccLink (FragPtr); RaceType = GET_RACE_ID (FragPtr); @@ -439,7 +438,7 @@ FlushGroupInfo (GROUP_HEADER *pGH, DWORD offset, BYTE which_group, PVOID fp) BOOLEAN GetGroupInfo (DWORD offset, BYTE which_group) { - PVOID fp; + void *fp; if (offset != GROUPS_RANDOM && which_group != GROUP_LIST) fp = OpenStateFile (DEFGRPINFO_FILE, "r+b"); @@ -451,7 +450,7 @@ GetGroupInfo (DWORD offset, BYTE which_group) BYTE RaceType, NumShips; GROUP_HEADER GH; HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; SeekStateFile (fp, offset, SEEK_SET); ReadGroupHeader (fp, &GH); @@ -510,7 +509,7 @@ GetGroupInfo (DWORD offset, BYTE which_group) hStarShip = CloneShipFragment (RaceType, &GLOBAL (npc_built_ship_q), 0); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); OwnStarShip (FragPtr, BAD_GUY, 0); SET_GROUP_ID (FragPtr, which_group); @@ -630,7 +629,7 @@ GetGroupInfo (DWORD offset, BYTE which_group) hStarShip = CloneShipFragment (RaceType, &GLOBAL (npc_built_ship_q), 0); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); ReadShipFragment (fp, FragPtr); @@ -689,7 +688,7 @@ GetGroupInfo (DWORD offset, BYTE which_group) DWORD PutGroupInfo (DWORD offset, BYTE which_group) { - PVOID fp; + void *fp; if (offset != GROUPS_RANDOM && which_group != GROUP_LIST) fp = OpenStateFile (DEFGRPINFO_FILE, "r+b"); diff --git a/sc2/src/sc2code/hyper.c b/sc2/src/sc2code/hyper.c index 704726a3d..f54f2dd63 100644 --- a/sc2/src/sc2code/hyper.c +++ b/sc2/src/sc2code/hyper.c @@ -43,7 +43,7 @@ static BYTE fuel_ticks; static COUNT hyper_dx, hyper_dy, hyper_extra; void -MoveSIS (PSIZE pdx, PSIZE pdy) +MoveSIS (SIZE *pdx, SIZE *pdy) { SIZE new_dx, new_dy; @@ -81,7 +81,7 @@ MoveSIS (PSIZE pdx, PSIZE pdy) for (hElement = GetTailElement (); hElement != 0; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); @@ -156,12 +156,10 @@ check_hyperspace_encounter (void) hStarShip = hNextShip, ++Type) { COUNT encounter_radius; - EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; + EXTENDED_SHIP_FRAGMENT *TemplatePtr; - TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (avail_race_q), - hStarShip - ); + TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (avail_race_q), hStarShip); hNextShip = _GetSuccLink (TemplatePtr); encounter_radius = TemplatePtr->ShipInfo.actual_strength; @@ -171,7 +169,7 @@ check_hyperspace_encounter (void) SIZE dx, dy; COUNT percent; HENCOUNTER hEncounter; - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; encounter_flags = 0; percent = EncounterPercent[Type]; @@ -322,7 +320,7 @@ LoadHyperspace (void) RepairSISBorder (); } } - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); SetContext (RadarContext); SetContextBackGroundColor ( @@ -370,7 +368,7 @@ FreeHyperspace (void) } static void -ElementToUniverse (ELEMENTPTR ElementPtr, PPOINT pPt) +ElementToUniverse (ELEMENT *ElementPtr, POINT *pPt) { SDWORD log_x, log_y; @@ -390,13 +388,13 @@ cleanup_hyperspace (void) for (hEncounter = GetHeadEncounter (); hEncounter != 0; hEncounter = hNextEncounter) { - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; LockEncounter (hEncounter, &EncounterPtr); hNextEncounter = GetSuccEncounter (EncounterPtr); if (EncounterPtr->hElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (EncounterPtr->hElement, &ElementPtr); @@ -421,7 +419,7 @@ typedef enum } TRANSITION_TYPE; static void -unhyper_transition (PELEMENT ElementPtr) +unhyper_transition (ELEMENT *ElementPtr) { COUNT frame_index; @@ -459,7 +457,7 @@ unhyper_transition (PELEMENT ElementPtr) GLOBAL (autopilot.y) = ~0; ElementToUniverse (ElementPtr, &pt); - CurStarDescPtr = FindStar (NULL_PTR, &pt, 5, 5); + CurStarDescPtr = FindStar (NULL, &pt, 5, 5); if (CurStarDescPtr->star_pt.x == ARILOU_HOME_X && CurStarDescPtr->star_pt.y == ARILOU_HOME_Y) { @@ -488,7 +486,7 @@ unhyper_transition (PELEMENT ElementPtr) }; index = CurStarDescPtr - - ((STAR_DESCPTR)&star_array[NUM_SOLAR_SYSTEMS + 1]); + - &star_array[NUM_SOLAR_SYSTEMS + 1]; GLOBAL_SIS (log_x) = UNIVERSE_TO_LOGX (portal_pt[index].x); GLOBAL_SIS (log_y) = @@ -548,11 +546,11 @@ unhyper_transition (PELEMENT ElementPtr) } static void -init_transition (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, +init_transition (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1, TRANSITION_TYPE which_transition) { SIZE dx, dy, num_turns; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; dx = WORLD_TO_VELOCITY (ElementPtr0->next.location.x - ElementPtr1->next.location.x); @@ -561,7 +559,7 @@ init_transition (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, ElementPtr1->state_flags |= NONSOLID; ElementPtr1->preprocess_func = unhyper_transition; - ElementPtr1->postprocess_func = NULL_PTR; + ElementPtr1->postprocess_func = NULL; ElementPtr1->turn_wait = (BYTE) which_transition; GetElementStarShip (ElementPtr1, &StarShipPtr); @@ -576,7 +574,7 @@ init_transition (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, } BOOLEAN -hyper_transition (PELEMENT ElementPtr) +hyper_transition (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & APPEARING) { @@ -596,7 +594,7 @@ hyper_transition (PELEMENT ElementPtr) ElementPtr->preprocess_func = (void (*) (struct element *ElementPtr))hyper_transition; - ElementPtr->postprocess_func = NULL_PTR; + ElementPtr->postprocess_func = NULL; ElementPtr->state_flags |= NONSOLID; ElementPtr->next.image.frame = SetAbsFrameIndex (ElementPtr->current.image.frame, @@ -610,7 +608,7 @@ hyper_transition (PELEMENT ElementPtr) frame_index = GetFrameIndex (ElementPtr->current.image.frame); if (frame_index-- <= ANGLE_TO_FACING (FULL_CIRCLE)) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (frame_index == ANGLE_TO_FACING (FULL_CIRCLE) - 1) frame_index = 0; @@ -644,20 +642,20 @@ hyper_transition (PELEMENT ElementPtr) } static void -hyper_collision (PELEMENT ElementPtr0, PPOINT - pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +hyper_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if ((ElementPtr1->state_flags & PLAYER_SHIP) && GET_GAME_STATE (PORTAL_COUNTER) == 0) { SIZE dx, dy; POINT pt; - STAR_DESCPTR SDPtr; - STARSHIPPTR StarShipPtr; + STAR_DESC *SDPtr; + STARSHIP *StarShipPtr; ElementToUniverse (ElementPtr0, &pt); - SDPtr = FindStar (NULL_PTR, &pt, 5, 5); + SDPtr = FindStar (NULL, &pt, 5, 5); GetElementStarShip (ElementPtr1, &StarShipPtr); GetCurrentVelocityComponents (&ElementPtr1->velocity, &dx, &dy); @@ -687,7 +685,7 @@ hyper_collision (PELEMENT ElementPtr0, PPOINT } static void -hyper_death (PELEMENT ElementPtr) +hyper_death (ELEMENT *ElementPtr) { if (!(ElementPtr->state_flags & DEFY_PHYSICS) && (GLOBAL (CurrentActivity) & IN_BATTLE)) @@ -695,7 +693,7 @@ hyper_death (PELEMENT ElementPtr) } static void -arilou_space_death (PELEMENT ElementPtr) +arilou_space_death (ELEMENT *ElementPtr) { if (!(ElementPtr->state_flags & DEFY_PHYSICS) || GET_GAME_STATE (ARILOU_SPACE_COUNTER) == 0) @@ -712,9 +710,8 @@ arilou_space_death (PELEMENT ElementPtr) } static void -arilou_space_collision (PELEMENT ElementPtr0, - PPOINT pPt0, PELEMENT ElementPtr1, PPOINT - pPt1) +arilou_space_collision (ELEMENT *ElementPtr0, + POINT *pPt0, ELEMENT *ElementPtr1, POINT *pPt1) { COUNT which_side; @@ -740,14 +737,14 @@ arilou_space_collision (PELEMENT ElementPtr0, } static HELEMENT -AllocHyperElement (STAR_DESCPTR SDPtr) +AllocHyperElement (STAR_DESC *SDPtr) { HELEMENT hHyperSpaceElement; hHyperSpaceElement = AllocElement (); if (hHyperSpaceElement) { - ELEMENTPTR HyperSpaceElementPtr; + ELEMENT *HyperSpaceElementPtr; LockElement (hHyperSpaceElement, &HyperSpaceElementPtr); HyperSpaceElementPtr->state_flags = CHANGING | FINITE_LIFE; @@ -788,7 +785,7 @@ AddAmbientElement (void) { SIZE dx, dy; DWORD rand_val; - ELEMENTPTR HyperSpaceElementPtr; + ELEMENT *HyperSpaceElementPtr; LockElement (hHyperSpaceElement, &HyperSpaceElementPtr); HyperSpaceElementPtr->state_flags = @@ -828,7 +825,7 @@ AddAmbientElement (void) #define VORTEX_WAIT 1 static void -encounter_transition (PELEMENT ElementPtr) +encounter_transition (ELEMENT *ElementPtr) { ElementPtr->state_flags &= ~DISAPPEARING; ElementPtr->life_span = 1; @@ -851,7 +848,7 @@ encounter_transition (PELEMENT ElementPtr) if (f != ElementPtr->current.image.farray[0]) ElementPtr->next.image.frame = f; else - ElementPtr->death_func = NULL_PTR; + ElementPtr->death_func = NULL; } ElementPtr->turn_wait = VORTEX_WAIT; @@ -859,8 +856,8 @@ encounter_transition (PELEMENT ElementPtr) } static void -encounter_collision (PELEMENT ElementPtr0, PPOINT - pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +encounter_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if ((ElementPtr1->state_flags & PLAYER_SHIP) @@ -873,13 +870,13 @@ encounter_collision (PELEMENT ElementPtr0, PPOINT for (hEncounter = GetHeadEncounter (); hEncounter != 0; hEncounter = hNextEncounter) { - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; LockEncounter (hEncounter, &EncounterPtr); hNextEncounter = GetSuccEncounter (EncounterPtr); if (EncounterPtr->hElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (EncounterPtr->hElement, &ElementPtr); @@ -898,8 +895,7 @@ encounter_collision (PELEMENT ElementPtr0, PPOINT } static HELEMENT -AddEncounterElement (ENCOUNTERPTR EncounterPtr, - PPOINT puniverse) +AddEncounterElement (ENCOUNTER *EncounterPtr, POINT *puniverse) { BOOLEAN NewEncounter; HELEMENT hElement; @@ -956,10 +952,10 @@ AddEncounterElement (ENCOUNTERPTR EncounterPtr, for (i = 0; i < NumShips; ++i) { HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR TemplatePtr; + SHIP_FRAGMENT *TemplatePtr; hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), Type); - TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); EncounterPtr->SD.ShipList[i] = TemplatePtr->ShipInfo; EncounterPtr->SD.ShipList[i].var1 = Type; @@ -999,8 +995,7 @@ AddEncounterElement (ENCOUNTERPTR EncounterPtr, if (hElement) { SIZE i; - ELEMENTPTR ElementPtr; - + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); @@ -1025,8 +1020,8 @@ AddEncounterElement (ENCOUNTERPTR EncounterPtr, } ElementPtr->turn_wait = VORTEX_WAIT; - ElementPtr->preprocess_func = NULL_PTR; - ElementPtr->postprocess_func = NULL_PTR; + ElementPtr->preprocess_func = NULL; + ElementPtr->postprocess_func = NULL; ElementPtr->collision_func = encounter_collision; SetUpElement (ElementPtr); @@ -1098,8 +1093,7 @@ DrawHyperGrid (COORD ux, COORD uy, COORD ox, static void -ProcessEncounters (PPOINT puniverse, COORD ox, - COORD oy) +ProcessEncounters (POINT *puniverse, COORD ox, COORD oy) { STAMP s; HENCOUNTER hEncounter, hNextEncounter; @@ -1109,7 +1103,7 @@ ProcessEncounters (PPOINT puniverse, COORD ox, hEncounter; hEncounter = hNextEncounter) { COORD ex, ey; - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; LockEncounter (hEncounter, &EncounterPtr); hNextEncounter = GetSuccEncounter (EncounterPtr); @@ -1126,7 +1120,7 @@ DeleteEncounter: } { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (EncounterPtr->hElement, &ElementPtr); @@ -1142,7 +1136,7 @@ DeleteEncounter: else if (EncounterPtr->transition_state == -NUM_VORTEX_TRANSITIONS) { - ElementPtr->death_func = NULL_PTR; + ElementPtr->death_func = NULL; UnlockElement (EncounterPtr->hElement); goto DeleteEncounter; } @@ -1234,7 +1228,7 @@ DeleteEncounter: } else { - ElementPtr->death_func = NULL_PTR; + ElementPtr->death_func = NULL; UnlockElement (EncounterPtr->hElement); goto DeleteEncounter; } @@ -1276,7 +1270,7 @@ DeleteEncounter: || ey - puniverse->y > YOFFS) { ElementPtr->life_span = 0; - ElementPtr->death_func = NULL_PTR; + ElementPtr->death_func = NULL; UnlockElement (EncounterPtr->hElement); goto DeleteEncounter; @@ -1307,9 +1301,9 @@ SeedUniverse (void) POINT universe; FRAME blip_frame; STAMP s; - STAR_DESCPTR SDPtr; + STAR_DESC *SDPtr; HELEMENT hHyperSpaceElement; - ELEMENTPTR HyperSpaceElementPtr; + ELEMENT *HyperSpaceElementPtr; ClockTick (); @@ -1440,7 +1434,7 @@ SeedUniverse (void) if (ex <= (XOFFS / NUM_RADAR_SCREENS) && ey <= (YOFFS / NUM_RADAR_SCREENS) && (hHyperSpaceElement = - AllocHyperElement ((STAR_DESCPTR)&SD[i])) != 0) + AllocHyperElement (&SD[i])) != 0) { LockElement (hHyperSpaceElement, &HyperSpaceElementPtr); HyperSpaceElementPtr->current.image.frame = SetAbsFrameIndex ( @@ -1448,7 +1442,7 @@ SeedUniverse (void) SD[i].Index ); HyperSpaceElementPtr->preprocess_func = - HyperSpaceElementPtr->postprocess_func = NULL_PTR; + HyperSpaceElementPtr->postprocess_func = NULL; HyperSpaceElementPtr->collision_func = arilou_space_collision; SetUpElement (HyperSpaceElementPtr); @@ -1457,7 +1451,7 @@ SeedUniverse (void) HyperSpaceElementPtr->death_func = arilou_space_death; else { - HyperSpaceElementPtr->death_func = NULL_PTR; + HyperSpaceElementPtr->death_func = NULL; HyperSpaceElementPtr->IntersectControl.IntersectStamp.frame = DecFrameIndex (stars_in_space); } @@ -1496,7 +1490,7 @@ SeedUniverse (void) + STAR_COLOR (star_type) ); HyperSpaceElementPtr->preprocess_func = - HyperSpaceElementPtr->postprocess_func = NULL_PTR; + HyperSpaceElementPtr->postprocess_func = NULL; HyperSpaceElementPtr->collision_func = hyper_collision; SetUpElement (HyperSpaceElementPtr); @@ -1506,7 +1500,7 @@ SeedUniverse (void) HyperSpaceElementPtr->death_func = hyper_death; else { - HyperSpaceElementPtr->death_func = NULL_PTR; + HyperSpaceElementPtr->death_func = NULL; HyperSpaceElementPtr->IntersectControl.IntersectStamp.frame = DecFrameIndex (stars_in_space); } @@ -1589,7 +1583,7 @@ UnbatchGraphics (); UnlockMutex (GraphicsLock); SuspendGameClock (); - memset ((PMENU_STATE)&MenuState, 0, sizeof (MenuState)); + memset (&MenuState, 0, sizeof (MenuState)); MenuState.InputFunc = DoFlagshipCommands; MenuState.Initialized = 1; MenuState.CurState = STARMAP + 1; @@ -1600,10 +1594,10 @@ UnbatchGraphics (); UnlockMutex (GraphicsLock); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)&MenuState, TRUE); + DoInput (&MenuState, TRUE); LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); SetContext (SpaceContext); diff --git a/sc2/src/sc2code/init.c b/sc2/src/sc2code/init.c index b11f195cc..355f9f2bc 100644 --- a/sc2/src/sc2code/init.c +++ b/sc2/src/sc2code/init.c @@ -35,28 +35,37 @@ FRAME explosion[NUM_VIEWS]; BOOLEAN -load_animation (PFRAME pixarray, DWORD big_res, DWORD med_res, DWORD +load_animation (FRAME *pixarray, DWORD big_res, DWORD med_res, DWORD sml_res) { DRAWABLE d; - if ((d = LoadGraphic (big_res)) == (DRAWABLE)NULL_PTR) - return (FALSE); + d = LoadGraphic (big_res); + if (!d) + return FALSE; pixarray[0] = CaptureDrawable (d); - if (med_res != 0L && (d = LoadGraphic (med_res)) == (DRAWABLE)NULL_PTR) - return (FALSE); + if (med_res != 0L) + { + d = LoadGraphic (med_res); + if (!d) + return FALSE; + } pixarray[1] = CaptureDrawable (d); - if (sml_res != 0L && (d = LoadGraphic (sml_res)) == (DRAWABLE)NULL_PTR) - return (FALSE); + if (sml_res != 0L) + { + d = LoadGraphic (sml_res); + if (!d) + return FALSE; + } pixarray[2] = CaptureDrawable (d); - return (TRUE); + return TRUE; } BOOLEAN -free_image (PFRAME pixarray) +free_image (FRAME *pixarray) { BOOLEAN retval; COUNT i; @@ -64,11 +73,11 @@ free_image (PFRAME pixarray) retval = TRUE; for (i = 0; i < NUM_VIEWS; ++i) { - if (pixarray[i] != (FRAME)NULL_PTR) + if (pixarray[i] != NULL) { if (!DestroyDrawable (ReleaseDrawable (pixarray[i]))) retval = FALSE; - pixarray[i] = (FRAME)NULL_PTR; + pixarray[i] = NULL; } } @@ -179,7 +188,7 @@ InitShips (void) { #define NUM_ASTEROIDS 5 for (i = 0; i < NUM_ASTEROIDS; ++i) - spawn_asteroid (NULL_PTR); + spawn_asteroid (NULL); #define NUM_PLANETS 1 for (i = 0; i < NUM_PLANETS; ++i) spawn_planet (); @@ -197,7 +206,7 @@ UninitShips (void) BYTE crew_retrieved; SIZE i; HELEMENT hElement, hNextElement; - STARSHIPPTR SPtr[NUM_PLAYERS]; + STARSHIP *SPtr[NUM_PLAYERS]; StopSound (); @@ -211,7 +220,7 @@ UninitShips (void) for (hElement = GetHeadElement (); hElement != 0; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = GetSuccElement (ElementPtr); if (ElementPtr->state_flags & CREW_OBJECT) @@ -222,15 +231,15 @@ UninitShips (void) for (hElement = GetHeadElement (); hElement != 0; hElement = hNextElement) { - ELEMENTPTR ElementPtr; - extern void new_ship (PELEMENT ElementPtr); + ELEMENT *ElementPtr; + extern void new_ship (ELEMENT *ElementPtr); LockElement (hElement, &ElementPtr); hNextElement = GetSuccElement (ElementPtr); if ((ElementPtr->state_flags & PLAYER_SHIP) || ElementPtr->death_func == new_ship) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); diff --git a/sc2/src/sc2code/intel.c b/sc2/src/sc2code/intel.c index 3e336ff59..48e3aba02 100644 --- a/sc2/src/sc2code/intel.c +++ b/sc2/src/sc2code/intel.c @@ -29,7 +29,7 @@ SIZE cur_player; BATTLE_INPUT_STATE -computer_intelligence (COUNT player, STARSHIPPTR StarShipPtr) +computer_intelligence (COUNT player, STARSHIP *StarShipPtr) { BATTLE_INPUT_STATE InputState; diff --git a/sc2/src/sc2code/intel.h b/sc2/src/sc2code/intel.h index fb465fbcd..9a4b3a31a 100644 --- a/sc2/src/sc2code/intel.h +++ b/sc2/src/sc2code/intel.h @@ -23,23 +23,6 @@ #include "element.h" #include "races.h" -typedef enum -{ - PURSUE = 0, - AVOID, - ENTICE, - NO_MOVEMENT -} MOVEMENT_STATE; - -typedef struct -{ - PELEMENT ObjectPtr; - COUNT facing, which_turn; - MOVEMENT_STATE MoveState; -} EVALUATE_DESC; -typedef EVALUATE_DESC *PEVALUATE_DESC; -#define EVALUATE_DESCPTR PEVALUATE_DESC - #define MANEUVERABILITY(pi) ((pi)->ManeuverabilityIndex) #define WEAPON_RANGE(pi) ((pi)->WeaponRange) @@ -60,23 +43,23 @@ enum FIRST_EMPTY_INDEX }; -extern STARSHIPPTR CyborgDescPtr; +extern STARSHIP *CyborgDescPtr; extern SIZE cur_player; extern BATTLE_INPUT_STATE computer_intelligence (COUNT player, - STARSHIPPTR StarShipPtr); + STARSHIP *StarShipPtr); extern BATTLE_INPUT_STATE tactical_intelligence (COUNT player, - STARSHIPPTR StarShipPtr); -extern void ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR - ObjectsOfConcern, COUNT ConcernCounter); -extern BOOLEAN ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, + STARSHIP *StarShipPtr); +extern void ship_intelligence (ELEMENT *ShipPtr, + EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter); +extern BOOLEAN ship_weapons (ELEMENT *ShipPtr, ELEMENT *OtherPtr, COUNT margin_of_error); -extern void Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr); -extern void Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr); -extern void Avoid (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr); -extern BOOLEAN TurnShip (ELEMENTPTR ShipPtr, COUNT angle); -extern BOOLEAN ThrustShip (ELEMENTPTR ShipPtr, COUNT angle); +extern void Pursue (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr); +extern void Entice (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr); +extern void Avoid (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr); +extern BOOLEAN TurnShip (ELEMENT *ShipPtr, COUNT angle); +extern BOOLEAN ThrustShip (ELEMENT *ShipPtr, COUNT angle); #define HUMAN_CONTROL (BYTE)(1 << 0) diff --git a/sc2/src/sc2code/intro.c b/sc2/src/sc2code/intro.c index 965845969..51bde8070 100644 --- a/sc2/src/sc2code/intro.c +++ b/sc2/src/sc2code/intro.c @@ -37,7 +37,7 @@ typedef struct { /* standard state required by DoInput */ - BOOLEAN (*InputFunc) (PVOID pInputState); + BOOLEAN (*InputFunc) (void *pInputState); COUNT MenuRepeatDelay; /* Presentation state */ @@ -66,10 +66,10 @@ typedef struct COUNT LinesCount; char Buffer[512]; -} PRESENTATION_INPUT_STATE, *PPRESENTATION_INPUT_STATE; +} PRESENTATION_INPUT_STATE; -static BOOLEAN DoPresentation (PVOID pIS); +static BOOLEAN DoPresentation (void *pIS); BOOLEAN @@ -204,7 +204,7 @@ Present_GenerateSIS (PRESENTATION_INPUT_STATE* pPIS) WANT_PIXMAP, r.extent.width, r.extent.height, 1 )); SetContextFGFrame (SisFrame); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SisBack = BUILD_COLOR (MAKE_RGB15 (0x01, 0x01, 0x01), 0x07); SetContextBackGroundColor (SisBack); ClearDrawable (); @@ -274,7 +274,7 @@ ShowPresentationFile (const char *name) } static BOOLEAN -DoPresentation (PVOID pIS) +DoPresentation (void *pIS) { PRESENTATION_INPUT_STATE* pPIS = (PRESENTATION_INPUT_STATE*) pIS; @@ -353,7 +353,7 @@ DoPresentation (PVOID pIS) utf8StringCopy (pPIS->Buffer, sizeof (pPIS->Buffer), pStr); if (pPIS->Frame) DestroyDrawable (ReleaseDrawable (pPIS->Frame)); - pPIS->Frame = CaptureDrawable (LoadCelFile (pPIS->Buffer)); + pPIS->Frame = CaptureDrawable (LoadGraphicFile (pPIS->Buffer)); } else if (strcmp (Opcode, "MUSIC") == 0) { /* set music */ diff --git a/sc2/src/sc2code/ipdisp.c b/sc2/src/sc2code/ipdisp.c index 8d01f3f49..d0a568d8e 100644 --- a/sc2/src/sc2code/ipdisp.c +++ b/sc2/src/sc2code/ipdisp.c @@ -32,9 +32,9 @@ NotifyOthers (COUNT which_race, BYTE target_loc) for (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); hStarShip; hStarShip = hNextShip) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -79,7 +79,7 @@ NotifyOthers (COUNT which_race, BYTE target_loc) } static void -ip_group_preprocess (PELEMENT ElementPtr) +ip_group_preprocess (ELEMENT *ElementPtr) { #define TRACK_WAIT 5 BYTE task; @@ -87,10 +87,10 @@ ip_group_preprocess (PELEMENT ElementPtr) SIZE radius; POINT dest_pt; SIZE vdx, vdy; - ELEMENTPTR EPtr; - SHIP_FRAGMENTPTR StarShipPtr; + ELEMENT *EPtr; + SHIP_FRAGMENT *StarShipPtr; - EPtr = (ELEMENTPTR)ElementPtr; + EPtr = ElementPtr; EPtr->state_flags &= ~(DISAPPEARING | NONSOLID); /* "I'm not quite dead." */ ++EPtr->life_span; /* so that it will 'die' @@ -399,7 +399,7 @@ CheckGetAway: ZeroVelocityComponents (&EPtr->velocity); if (group_loc != 0) { - PPLANET_DESC pCurDesc; + PLANET_DESC *pCurDesc; pCurDesc = &pSolarSysState->PlanetDesc[group_loc - 1]; XFormIPLoc ( @@ -494,8 +494,8 @@ ExitIPProcess: } static void -flag_ship_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT - ElementPtr1, PPOINT pPt1) +flag_ship_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if ((GLOBAL (CurrentActivity) & START_ENCOUNTER) || pSolarSysState->MenuState.CurState @@ -514,10 +514,10 @@ flag_ship_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT } static void -ip_group_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT - ElementPtr1, PPOINT pPt1) +ip_group_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; if ((GLOBAL (CurrentActivity) & START_ENCOUNTER) || pSolarSysState->MenuState.CurState @@ -574,7 +574,7 @@ ip_group_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT } static void -spawn_ip_group (SHIP_FRAGMENTPTR StarShipPtr) +spawn_ip_group (SHIP_FRAGMENT *StarShipPtr) { HELEMENT hIPSHIPElement; @@ -582,7 +582,7 @@ spawn_ip_group (SHIP_FRAGMENTPTR StarShipPtr) if (hIPSHIPElement) { BYTE task; - ELEMENTPTR IPSHIPElementPtr; + ELEMENT *IPSHIPElementPtr; LockElement (hIPSHIPElement, &IPSHIPElementPtr); IPSHIPElementPtr->turn_wait = GET_GROUP_ID (StarShipPtr); @@ -660,7 +660,7 @@ spawn_ip_group (SHIP_FRAGMENTPTR StarShipPtr) #define FLIP_WAIT 42 static void -flag_ship_preprocess (PELEMENT ElementPtr) +flag_ship_preprocess (ELEMENT *ElementPtr) { if (--ElementPtr->thrust_wait == 0) /* juggle list after flagship */ @@ -671,7 +671,7 @@ flag_ship_preprocess (PELEMENT ElementPtr) && hSuccElement != GetTailElement ()) { HELEMENT hPredElement; - ELEMENTPTR TailPtr; + ELEMENT *TailPtr; LockElement (GetTailElement (), &TailPtr); hPredElement = _GetPredLink (TailPtr); @@ -779,7 +779,7 @@ spawn_flag_ship (void) hFlagShipElement = AllocElement (); if (hFlagShipElement) { - ELEMENTPTR FlagShipElementPtr; + ELEMENT *FlagShipElementPtr; LockElement (hFlagShipElement, &FlagShipElementPtr); FlagShipElementPtr->hit_points = 1; @@ -834,9 +834,9 @@ DoMissions (void) for (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); hStarShip; hStarShip = hNextShip) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); diff --git a/sc2/src/sc2code/libs/cdp/cdpapi.c b/sc2/src/sc2code/libs/cdp/cdpapi.c index 5f069cfea..a512b1694 100644 --- a/sc2/src/sc2code/libs/cdp/cdpapi.c +++ b/sc2/src/sc2code/libs/cdp/cdpapi.c @@ -225,7 +225,7 @@ cdp_UninitApi (void) { itf->used = false; if (itf->name) - HFree ((void*) itf->name); + HFree (itf->name); itf->name = NULL; itf->itfvtbl = NULL; itf->module = NULL; @@ -449,7 +449,7 @@ cdp_Host_UnregisterItf (cdp_ItfReg* itfreg) if (!itfreg->builtin) { - HFree ((void*) itfreg->name); + HFree (itfreg->name); } itfreg->module = NULL; itfreg->name = NULL; @@ -682,7 +682,7 @@ cdp_Host_UnregisterEvent (cdp_EventReg* evtreg) if (!evtreg->builtin) { - HFree ((void*) evtreg->name); + HFree (evtreg->name); } evtreg->module = NULL; evtreg->name = NULL; diff --git a/sc2/src/sc2code/libs/compiler.h b/sc2/src/sc2code/libs/compiler.h index adb65daa9..5e4e31c8c 100644 --- a/sc2/src/sc2code/libs/compiler.h +++ b/sc2/src/sc2code/libs/compiler.h @@ -22,40 +22,23 @@ #include "types.h" typedef uint8 BYTE; -typedef BYTE *PBYTE; typedef uint8 UBYTE; -typedef UBYTE *PUBYTE; typedef sint8 SBYTE; -typedef SBYTE *PSBYTE; typedef uint16 UWORD; -typedef UWORD *PUWORD; typedef sint16 SWORD; -typedef SWORD *PSWORD; typedef uint32 DWORD; -typedef DWORD *PDWORD; typedef sint32 SDWORD; -typedef SDWORD *PSDWORD; - -typedef SBYTE *PSTR; - -typedef void *PVOID; -typedef const void *PCVOID; typedef UWORD COUNT; -typedef COUNT *PCOUNT; typedef SWORD SIZE; -typedef SIZE *PSIZE; typedef unsigned char UNICODE; -#define NULL_PTR 0L - typedef enum { FALSE = 0, TRUE } BOOLEAN; -typedef BOOLEAN *PBOOLEAN; typedef void (*PVOIDFUNC) (void); typedef BOOLEAN (*PBOOLFUNC) (void); diff --git a/sc2/src/sc2code/libs/declib.h b/sc2/src/sc2code/libs/declib.h index 7b14769c8..dc2f922a5 100644 --- a/sc2/src/sc2code/libs/declib.h +++ b/sc2/src/sc2code/libs/declib.h @@ -20,7 +20,7 @@ #define _DECLIB_H #include "libs/compiler.h" -#define DECODE_REF PVOID +typedef struct _LZHCODE_DESC* DECODE_REF; enum { @@ -36,19 +36,13 @@ enum }; typedef BYTE STREAM_MODE; -#endif /* _DECLIB_H */ - -#ifndef _DEC_PROTOS -#define _DEC_PROTOS - -extern DECODE_REF copen (PVOID InStream, STREAM_TYPE SType, STREAM_MODE - SMode); +extern DECODE_REF copen (void *InStream, STREAM_TYPE SType, + STREAM_MODE SMode); extern DWORD cclose (DECODE_REF DecodeRef); extern void cfilelength (DECODE_REF DecodeRef, DWORD *pfilelen); -extern COUNT cread (PVOID pStr, COUNT size, COUNT count, DECODE_REF - DecodeRef); -extern COUNT cwrite (PVOID pStr, COUNT size, COUNT count, DECODE_REF - DecodeRef); - -#endif /* _DEC_PROTOS */ +extern COUNT cread (void *pStr, COUNT size, COUNT count, + DECODE_REF DecodeRef); +extern COUNT cwrite (const void *pStr, COUNT size, COUNT count, + DECODE_REF DecodeRef); +#endif /* _DECLIB_H */ diff --git a/sc2/src/sc2code/libs/decomp/lzdecode.c b/sc2/src/sc2code/libs/decomp/lzdecode.c index 8223cbd71..fa519d37a 100644 --- a/sc2/src/sc2code/libs/decomp/lzdecode.c +++ b/sc2/src/sc2code/libs/decomp/lzdecode.c @@ -32,7 +32,7 @@ PLZHCODE_DESC _lpCurCodeDesc; STREAM_TYPE _StreamType; -PBYTE _Stream; +BYTE* _Stream; UWORD _workbuf; BYTE _workbuflen; @@ -101,7 +101,7 @@ StartHuff (void) } DECODE_REF -copen (PVOID InStream, STREAM_TYPE SType, STREAM_MODE SMode) +copen (void *InStream, STREAM_TYPE SType, STREAM_MODE SMode) { MEM_HANDLE h; DWORD StreamLength; @@ -148,7 +148,7 @@ copen (PVOID InStream, STREAM_TYPE SType, STREAM_MODE SMode) _lpCurCodeDesc->StreamMode = SMode; _lpCurCodeDesc->StreamLength = StreamLength; _lpCurCodeDesc->buf_index = N - F; - memset ((PBYTE)&_lpCurCodeDesc->text_buf[0], ' ', N - F); + memset (&_lpCurCodeDesc->text_buf[0], ' ', N - F); StartHuff (); } @@ -292,11 +292,10 @@ static const BYTE d_len[256] = } COUNT -cread (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC - lpCodeDesc) +cread (void *buf, COUNT size, COUNT count, PLZHCODE_DESC lpCodeDesc) { COUNT r, j, i; - PBYTE lpStr; + BYTE *lpStr; if ((_lpCurCodeDesc = lpCodeDesc) == 0) return (0); @@ -314,7 +313,7 @@ cread (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC if (size == 0) return (0); - lpStr = (PBYTE)buf; + lpStr = (BYTE*)buf; _StreamType = lpCodeDesc->StreamType; _Stream = lpCodeDesc->Stream; diff --git a/sc2/src/sc2code/libs/decomp/lzencode.c b/sc2/src/sc2code/libs/decomp/lzencode.c index 126bfd16c..f632a19b7 100644 --- a/sc2/src/sc2code/libs/decomp/lzencode.c +++ b/sc2/src/sc2code/libs/decomp/lzencode.c @@ -28,7 +28,9 @@ #include "lzh.h" static UWORD match_position, match_length; -static PSWORD lson, rson, dad; +static SWORD *lson; +static SWORD *rson; +static SWORD *dad; #define AllocEncodeArrays() \ mem_allocate ( \ @@ -36,7 +38,7 @@ static PSWORD lson, rson, dad; * sizeof (lson[0]) + sizeof (MEM_HANDLE)), \ MEM_ZEROINIT, DEFAULT_MEM_PRIORITY, MEM_SIMPLE \ ) -#define LockCodeArrays (PSWORD)mem_lock +#define LockCodeArrays (SWORD*)mem_lock #define UnlockCodeArrays mem_unlock #define FreeCodeArrays mem_release @@ -56,7 +58,7 @@ InitTree (void) SWORD i; *(MEM_HANDLE *)lson = h; - lson = (PSWORD)((PBYTE)lson + sizeof (h)); + lson = (SWORD*)((BYTE*)lson + sizeof (h)); rson = lson + (N + 1); dad = rson + (N + 257); @@ -73,7 +75,7 @@ static void InsertNode (SWORD r) { SWORD p, cmp; - PBYTE lpBuf; + BYTE *lpBuf; cmp = 1; lpBuf = _lpCurCodeDesc->text_buf; @@ -284,7 +286,7 @@ UninitTree (void) ++_lpCurCodeDesc->StreamIndex; } - lson = (PSWORD)((PBYTE)lson - sizeof (h)); + lson = (SWORD*)((BYTE*)lson - sizeof (h)); h = *(MEM_HANDLE *)lson; UnlockCodeArrays (h); FreeCodeArrays (h); @@ -334,8 +336,7 @@ _encode_cleanup (void) SeekResFile ((uio_Stream *)_Stream, -(int)_lpCurCodeDesc->StreamIndex, SEEK_CUR); else /* _lpCurCodeDesc->StreamType == MEMORY_STREAM */ - _Stream = (PBYTE)((BYTE *)_Stream - - _lpCurCodeDesc->StreamIndex); + _Stream = (BYTE*)_Stream - _lpCurCodeDesc->StreamIndex; loword = LOWORD (_lpCurCodeDesc->StreamLength); lobyte = LOBYTE (loword); @@ -371,11 +372,11 @@ _encode_cleanup (void) } COUNT -cwrite (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC - lpCodeDesc) +cwrite (const void *buf, COUNT size, COUNT count, PLZHCODE_DESC lpCodeDesc) { UWORD r, s, last_match_length; - PBYTE lpBuf, lpStr; + BYTE *lpBuf; + BYTE *lpStr; if ((_lpCurCodeDesc = lpCodeDesc) == 0 || (size *= count) == 0) @@ -385,7 +386,7 @@ cwrite (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC _Stream = lpCodeDesc->Stream; _workbuf = lpCodeDesc->workbuf; _workbuflen = lpCodeDesc->workbuflen; - lpStr = (PBYTE)buf; + lpStr = (BYTE*)buf; lpBuf = lpCodeDesc->text_buf; r = lpCodeDesc->buf_index; diff --git a/sc2/src/sc2code/libs/decomp/lzh.h b/sc2/src/sc2code/libs/decomp/lzh.h index c01eb78b2..1a3855d6f 100644 --- a/sc2/src/sc2code/libs/decomp/lzh.h +++ b/sc2/src/sc2code/libs/decomp/lzh.h @@ -20,7 +20,6 @@ #define _LZH_H #include "reslib.h" -#define _DEC_PROTOS #include "declib.h" /* LZSS Parameters */ @@ -40,7 +39,7 @@ #define MAX_FREQ 0x8000 /* update when cumulative frequency */ -typedef struct +struct _LZHCODE_DESC { MEM_HANDLE fh; @@ -60,12 +59,14 @@ typedef struct STREAM_TYPE StreamType; - PVOID Stream; + void *Stream; DWORD StreamIndex, StreamLength; STREAM_MODE StreamMode; PVOIDFUNC CleanupFunc; -} LZHCODE_DESC; +}; + +typedef struct _LZHCODE_DESC LZHCODE_DESC; typedef LZHCODE_DESC *PLZHCODE_DESC; #define InChar() (_StreamType == FILE_STREAM ? \ @@ -86,14 +87,9 @@ typedef LZHCODE_DESC *PLZHCODE_DESC; extern void _update (COUNT c); extern void StartHuff (void); -#undef DECODE_REF -#define DECODE_REF PLZHCODE_DESC -#undef _DEC_PROTOS -#include "declib.h" - extern PLZHCODE_DESC _lpCurCodeDesc; extern STREAM_TYPE _StreamType; -extern PBYTE _Stream; +extern BYTE* _Stream; extern UWORD _workbuf; extern BYTE _workbuflen; diff --git a/sc2/src/sc2code/libs/gfxlib.h b/sc2/src/sc2code/libs/gfxlib.h index 97cde814a..6ac45e9cc 100644 --- a/sc2/src/sc2code/libs/gfxlib.h +++ b/sc2/src/sc2code/libs/gfxlib.h @@ -29,21 +29,13 @@ typedef CONTEXT_DESC *CONTEXT; typedef FRAME_DESC *FRAME; typedef FONT_DESC *FONT; -typedef CONTEXT *PCONTEXT; -typedef FRAME *PFRAME; -typedef FONT *PFONT; - typedef UWORD TIME_VALUE; -typedef TIME_VALUE *PTIME_VALUE; #define TIME_SHIFT 8 #define MAX_TIME_VALUE ((1 << TIME_SHIFT) + 1) typedef SWORD COORD; -typedef COORD *PCOORD; - typedef DWORD COLOR; -typedef COLOR *PCOLOR; #define BUILD_COLOR(c32k,c256) \ (COLOR)(((DWORD)(c32k)<<8)|(BYTE)(c256)) @@ -74,33 +66,28 @@ typedef struct extent { COORD width, height; } EXTENT; -typedef EXTENT *PEXTENT; typedef struct point { COORD x, y; } POINT; -typedef POINT *PPOINT; typedef struct stamp { POINT origin; FRAME frame; } STAMP; -typedef STAMP *PSTAMP; typedef struct rect { POINT corner; EXTENT extent; } RECT; -typedef RECT *PRECT; typedef struct line { POINT first, second; } LINE; -typedef LINE *PLINE; typedef enum { @@ -123,7 +110,6 @@ typedef struct text TEXT_ALIGN align; COUNT CharCount; } TEXT; -typedef TEXT *PTEXT; #include "strlib.h" @@ -144,18 +130,13 @@ typedef struct POINT EndPoint; STAMP IntersectStamp; } INTERSECT_CONTROL; -typedef INTERSECT_CONTROL *PINTERSECT_CONTROL; typedef MEM_HANDLE CONTEXT_REF; -typedef CONTEXT_REF *PCONTEXT_REF; typedef DWORD DRAWABLE; -typedef DRAWABLE *PDRAWABLE; - #define BUILD_DRAWABLE(h,i) ((DRAWABLE)MAKE_DWORD(h,i)) typedef MEM_HANDLE FONT_REF; -typedef FONT_REF *PFONT_REF; typedef BYTE INTERSECT_CODE; @@ -173,9 +154,8 @@ typedef POINT HOT_SPOT; extern HOT_SPOT MAKE_HOT_SPOT (COORD, COORD); -extern INTERSECT_CODE BoxIntersect (PRECT pr1, PRECT pr2, PRECT - printer); -extern void BoxUnion (PRECT pr1, PRECT pr2, PRECT punion); +extern INTERSECT_CODE BoxIntersect (RECT *pr1, RECT *pr2, RECT *printer); +extern void BoxUnion (RECT *pr1, RECT *pr2, RECT *punion); enum { @@ -198,48 +178,48 @@ extern COLOR SetContextForeGroundColor (COLOR Color); extern COLOR SetContextBackGroundColor (COLOR Color); extern FRAME SetContextFGFrame (FRAME Frame); extern BOOLEAN SetContextClipping (BOOLEAN ClipStatus); -extern BOOLEAN SetContextClipRect (PRECT pRect); -extern BOOLEAN GetContextClipRect (PRECT pRect); -extern TIME_VALUE DrawablesIntersect (PINTERSECT_CONTROL pControl0, - PINTERSECT_CONTROL pControl1, TIME_VALUE max_time_val); -extern void DrawStamp (PSTAMP pStamp); -extern void DrawFilledStamp (PSTAMP pStamp); -extern void DrawPoint (PPOINT pPoint); -extern void DrawRectangle (PRECT pRect); -extern void DrawFilledRectangle (PRECT pRect); -extern void DrawLine (PLINE pLine); -extern void font_DrawText (PTEXT pText); -extern void DrawBatch (PPRIMITIVE pBasePrim, PRIM_LINKS PrimLinks, +extern BOOLEAN SetContextClipRect (RECT *pRect); +extern BOOLEAN GetContextClipRect (RECT *pRect); +extern TIME_VALUE DrawablesIntersect (INTERSECT_CONTROL *pControl0, + INTERSECT_CONTROL *pControl1, TIME_VALUE max_time_val); +extern void DrawStamp (STAMP *pStamp); +extern void DrawFilledStamp (STAMP *pStamp); +extern void DrawPoint (POINT *pPoint); +extern void DrawRectangle (RECT *pRect); +extern void DrawFilledRectangle (RECT *pRect); +extern void DrawLine (LINE *pLine); +extern void font_DrawText (TEXT *pText); +extern void DrawBatch (PRIMITIVE *pBasePrim, PRIM_LINKS PrimLinks, BATCH_FLAGS BatchFlags); extern void BatchGraphics (void); extern void UnbatchGraphics (void); extern void FlushGraphics (void); -extern void ClearBackGround (PRECT pClipRect); +extern void ClearBackGround (RECT *pClipRect); extern void ClearDrawable (void); extern CONTEXT_REF CreateContext (void); extern BOOLEAN DestroyContext (CONTEXT_REF ContextRef); -extern DRAWABLE CreateDisplay (CREATE_FLAGS CreateFlags, PSIZE pwidth, - PSIZE pheight); +extern DRAWABLE CreateDisplay (CREATE_FLAGS CreateFlags, SIZE *pwidth, + SIZE *pheight); extern DRAWABLE CreateDrawable (CREATE_FLAGS CreateFlags, SIZE width, SIZE height, COUNT num_frames); extern BOOLEAN DestroyDrawable (DRAWABLE Drawable); -extern BOOLEAN GetFrameRect (FRAME Frame, PRECT pRect); +extern BOOLEAN GetFrameRect (FRAME Frame, RECT *pRect); extern HOT_SPOT SetFrameHot (FRAME Frame, HOT_SPOT HotSpot); extern HOT_SPOT GetFrameHot (FRAME Frame); extern BOOLEAN InstallGraphicResTypes (COUNT cel_type, COUNT font_type); -extern DWORD LoadCelFile (PVOID pStr); -extern DWORD LoadFontFile (PVOID pStr); +extern DWORD LoadGraphicFile (const char *pStr); +extern DWORD LoadFontFile (const char *pStr); extern DWORD LoadGraphicInstance (DWORD res); -extern DRAWABLE LoadDisplayPixmap (PRECT area, FRAME frame); +extern DRAWABLE LoadDisplayPixmap (RECT *area, FRAME frame); extern FRAME SetContextFontEffect (FRAME EffectFrame); extern FONT SetContextFont (FONT Font); extern BOOLEAN DestroyFont (FONT_REF FontRef); extern FONT CaptureFont (FONT_REF FontRef); extern FONT_REF ReleaseFont (FONT Font); -extern BOOLEAN TextRect (PTEXT pText, PRECT pRect, PBYTE pdelta); -extern BOOLEAN GetContextFontLeading (PSIZE pheight); -extern BOOLEAN GetContextFontLeadingWidth (PSIZE pwidth); +extern BOOLEAN TextRect (TEXT *pText, RECT *pRect, BYTE *pdelta); +extern BOOLEAN GetContextFontLeading (SIZE *pheight); +extern BOOLEAN GetContextFontLeadingWidth (SIZE *pwidth); extern COUNT GetFrameCount (FRAME Frame); extern COUNT GetFrameIndex (FRAME Frame); extern FRAME SetAbsFrameIndex (FRAME Frame, COUNT FrameIndex); @@ -273,7 +253,7 @@ extern void FlushColorXForms (void); #define GetColorMapAddress GetStringAddress #define GetColorMapContents GetStringContents -void SetSystemRect (PRECT pRect); +void SetSystemRect (RECT *pRect); void ClearSystemRect (void); #endif /* _GFXLIB_H */ diff --git a/sc2/src/sc2code/libs/graphics/boxint.c b/sc2/src/sc2code/libs/graphics/boxint.c index 2e1845327..05003115e 100644 --- a/sc2/src/sc2code/libs/graphics/boxint.c +++ b/sc2/src/sc2code/libs/graphics/boxint.c @@ -24,7 +24,7 @@ #define MAX(a, b) (((a) >= (b)) ? (a) : (b)) INTERSECT_CODE -BoxIntersect (PRECT pr1, PRECT pr2, PRECT pinter) +BoxIntersect (RECT *pr1, RECT *pr2, RECT *pinter) { INTERSECT_CODE intersect_code; COORD x1; @@ -102,7 +102,7 @@ BoxIntersect (PRECT pr1, PRECT pr2, PRECT pinter) } void -BoxUnion (PRECT pr1, PRECT pr2, PRECT punion) +BoxUnion (RECT *pr1, RECT *pr2, RECT *punion) { #if NEVER // Part of lower FIXME. COORD x2, y2, w2, h2; diff --git a/sc2/src/sc2code/libs/graphics/clipline.c b/sc2/src/sc2code/libs/graphics/clipline.c index 8782f741e..940f75db9 100644 --- a/sc2/src/sc2code/libs/graphics/clipline.c +++ b/sc2/src/sc2code/libs/graphics/clipline.c @@ -19,7 +19,7 @@ #include "gfxintrn.h" INTERSECT_CODE -_clip_line (PRECT pClipRect, PBRESENHAM_LINE pLine) +_clip_line (RECT *pClipRect, BRESENHAM_LINE *pLine) { COORD p; COORD x0, y0, xmin, ymin, xmax, ymax; diff --git a/sc2/src/sc2code/libs/graphics/context.c b/sc2/src/sc2code/libs/graphics/context.c index 2c30da5dc..7723ba35f 100644 --- a/sc2/src/sc2code/libs/graphics/context.c +++ b/sc2/src/sc2code/libs/graphics/context.c @@ -188,7 +188,7 @@ SetContextClipping (BOOLEAN ClipStatus) } BOOLEAN -SetContextClipRect (PRECT lpRect) +SetContextClipRect (RECT *lpRect) { if (!ContextActive ()) return (FALSE); @@ -202,7 +202,7 @@ SetContextClipRect (PRECT lpRect) } BOOLEAN -GetContextClipRect (PRECT lpRect) +GetContextClipRect (RECT *lpRect) { if (!ContextActive ()) return (FALSE); diff --git a/sc2/src/sc2code/libs/graphics/display.h b/sc2/src/sc2code/libs/graphics/display.h index be110da02..2b0e28f14 100644 --- a/sc2/src/sc2code/libs/graphics/display.h +++ b/sc2/src/sc2code/libs/graphics/display.h @@ -29,15 +29,13 @@ typedef struct DRAWABLE (*alloc_image) (COUNT NumFrames, DRAWABLE_TYPE DrawableType, CREATE_FLAGS flags, SIZE width, SIZE height); - void (*read_display) (PRECT pRect, FRAME DstFramePtr); + void (*read_display) (RECT *pRect, FRAME DstFramePtr); } DISPLAY_INTERFACE; -typedef DISPLAY_INTERFACE *PDISPLAY_INTERFACE; -extern PDISPLAY_INTERFACE _pCurDisplay; +extern DISPLAY_INTERFACE *_pCurDisplay; -extern void (* mask_func_array[]) (PRECT pClipRect, - PRIMITIVEPTR PrimPtr); +extern void (* mask_func_array[]) (RECT *pClipRect, PRIMITIVE *PrimPtr); #define AllocDrawableImage (*_pCurDisplay->alloc_image) #define ReadDisplay (*_pCurDisplay->read_display) diff --git a/sc2/src/sc2code/libs/graphics/drawable.c b/sc2/src/sc2code/libs/graphics/drawable.c index baed4a25e..e275e5cd9 100644 --- a/sc2/src/sc2code/libs/graphics/drawable.c +++ b/sc2/src/sc2code/libs/graphics/drawable.c @@ -49,7 +49,7 @@ SetContextFGFrame (FRAME Frame) } DRAWABLE -CreateDisplay (CREATE_FLAGS CreateFlags, PSIZE pwidth, PSIZE pheight) +CreateDisplay (CREATE_FLAGS CreateFlags, SIZE *pwidth, SIZE *pheight) { DRAWABLE Drawable; @@ -88,7 +88,7 @@ AllocDrawable (COUNT n) DRAWABLE_PRIORITY, MEM_SIMPLE); if (Drawable) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; int i; DrawablePtr = LockDrawable (Drawable); DrawablePtr->Frame = (FRAME)HMalloc ((MEM_SIZE)(sizeof (FRAME_DESC) * n)); @@ -142,7 +142,7 @@ CreateDrawable (CREATE_FLAGS CreateFlags, SIZE width, SIZE height, COUNT BOOLEAN DestroyDrawable (DRAWABLE Drawable) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; if (LOWORD (Drawable) == GetFrameHandle (_CurFramePtr)) SetContextFGFrame ((FRAME)0); @@ -160,7 +160,7 @@ DestroyDrawable (DRAWABLE Drawable) } BOOLEAN -GetFrameRect (FRAME FramePtr, PRECT pRect) +GetFrameRect (FRAME FramePtr, RECT *pRect) { if (FramePtr) { diff --git a/sc2/src/sc2code/libs/graphics/drawable.h b/sc2/src/sc2code/libs/graphics/drawable.h index 1d8de350b..f985ea5d6 100644 --- a/sc2/src/sc2code/libs/graphics/drawable.h +++ b/sc2/src/sc2code/libs/graphics/drawable.h @@ -32,7 +32,6 @@ typedef struct bresenham_line BOOLEAN end_points_exchanged; INTERSECT_CODE intersect_code; } BRESENHAM_LINE; -typedef BRESENHAM_LINE *PBRESENHAM_LINE; typedef UWORD DRAWABLE_TYPE; #define ROM_DRAWABLE 0 @@ -57,7 +56,6 @@ typedef struct drawable_desc UWORD MaxIndex; FRAME_DESC *Frame; } DRAWABLE_DESC; -typedef DRAWABLE_DESC *PDRAWABLE_DESC; #define GetFrameWidth(f) ((f)->Bounds.width) #define GetFrameHeight(f) ((f)->Bounds.height) @@ -67,19 +65,14 @@ typedef DRAWABLE_DESC *PDRAWABLE_DESC; #define DRAWABLE_PRIORITY DEFAULT_MEM_PRIORITY -#define DRAWABLEPTR PDRAWABLE_DESC -#define COUNTPTR PCOUNT - extern DRAWABLE AllocDrawable (COUNT num_frames); -#define LockDrawable(D) ((DRAWABLEPTR)mem_lock (GetDrawableHandle (D))) +#define LockDrawable(D) ((DRAWABLE_DESC*)mem_lock (GetDrawableHandle (D))) #define UnlockDrawable(D) mem_unlock (GetDrawableHandle (D)) #define FreeDrawable(D) _ReleaseCelData (GetDrawableHandle (D)) #define GetDrawableHandle(D) ((MEM_HANDLE)LOWORD (D)) #define GetDrawableIndex(D) ((COUNT)HIWORD (D)) #define GetFrameParentDrawable(F) (F)->parent -#define NULL_DRAWABLE (DRAWABLE)NULL_PTR - #define TYPE_GET(f) ((f) & FTYPE_MASK) #define INDEX_GET(f) ((f) & FINDEX_MASK) #define TYPE_SET(f,t) ((f)|=t) @@ -90,27 +83,19 @@ typedef struct RECT Box; FRAME FramePtr; } IMAGE_BOX; -typedef IMAGE_BOX *PIMAGE_BOX; extern DRAWABLE _request_drawable (COUNT NumFrames, DRAWABLE_TYPE DrawableType, CREATE_FLAGS flags, SIZE width, SIZE height); -extern INTERSECT_CODE _clip_line (PRECT pClipRect, PBRESENHAM_LINE - pLine); +extern INTERSECT_CODE _clip_line (RECT *pClipRect, BRESENHAM_LINE *pLine); extern MEM_HANDLE _GetCelData (uio_Stream *fp, DWORD length); extern BOOLEAN _ReleaseCelData (MEM_HANDLE handle); -typedef PPRIMITIVE PRIMITIVEPTR; -typedef PPOINT POINTPTR; -typedef PRECT RECTPTR; -typedef PSTAMP STAMPPTR; -typedef PTEXT TEXTPTR; - extern STAMP _save_stamp; extern FRAME _CurFramePtr; -extern void _rect_blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr); -extern void _text_blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr); +extern void _rect_blt (RECT *pClipRect, PRIMITIVE *PrimPtr); +extern void _text_blt (RECT *pClipRect, PRIMITIVE *PrimPtr); #endif /* _DRAWABLE_H */ diff --git a/sc2/src/sc2code/libs/graphics/filegfx.c b/sc2/src/sc2code/libs/graphics/filegfx.c index 5b8911bcf..9b43bae20 100644 --- a/sc2/src/sc2code/libs/graphics/filegfx.c +++ b/sc2/src/sc2code/libs/graphics/filegfx.c @@ -22,7 +22,7 @@ DWORD -LoadCelFile (PVOID pStr) +LoadGraphicFile (const char *pStr) { uio_Stream *fp; @@ -47,7 +47,7 @@ LoadCelFile (PVOID pStr) } DWORD -LoadFontFile (PVOID pStr) +LoadFontFile (const char *pStr) { uio_Stream *fp; diff --git a/sc2/src/sc2code/libs/graphics/font.c b/sc2/src/sc2code/libs/graphics/font.c index 78403b78e..a4a3e533a 100644 --- a/sc2/src/sc2code/libs/graphics/font.c +++ b/sc2/src/sc2code/libs/graphics/font.c @@ -85,7 +85,7 @@ ReleaseFont (FONT Font) } void -font_DrawText (PTEXT lpText) +font_DrawText (TEXT *lpText) { FixContextFontEffect (); SetPrimType (&_locPrim, TEXT_PRIM); @@ -94,7 +94,7 @@ font_DrawText (PTEXT lpText) } BOOLEAN -GetContextFontLeading (PSIZE pheight) +GetContextFontLeading (SIZE *pheight) { if (_CurFontPtr != 0) { @@ -107,7 +107,7 @@ GetContextFontLeading (PSIZE pheight) } BOOLEAN -GetContextFontLeadingWidth (PSIZE pwidth) +GetContextFontLeadingWidth (SIZE *pwidth) { if (_CurFontPtr != 0) { @@ -120,7 +120,7 @@ GetContextFontLeadingWidth (PSIZE pwidth) } BOOLEAN -TextRect (PTEXT lpText, PRECT pRect, PBYTE pdelta) +TextRect (TEXT *lpText, RECT *pRect, BYTE *pdelta) { FONT FontPtr; @@ -235,14 +235,14 @@ TextRect (PTEXT lpText, PRECT pRect, PBYTE pdelta) } void -_text_blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr) +_text_blt (RECT *pClipRect, PRIMITIVE *PrimPtr) { FONT FontPtr; COUNT num_chars; wchar_t next_ch; const unsigned char *pStr; - TEXTPTR TextPtr; + TEXT *TextPtr; POINT origin; TFB_Palette color; TFB_Image *backing; diff --git a/sc2/src/sc2code/libs/graphics/font.h b/sc2/src/sc2code/libs/graphics/font.h index bc5bf2309..5bdbcdda9 100644 --- a/sc2/src/sc2code/libs/graphics/font.h +++ b/sc2/src/sc2code/libs/graphics/font.h @@ -30,7 +30,6 @@ typedef struct FontPage size_t numChars; TFB_Char *charDesc; } FONT_PAGE; -typedef FONT_PAGE *PFONT_PAGE; static inline FONT_PAGE * AllocFontPage (int numChars) @@ -67,8 +66,6 @@ struct font_desc #define UnlockFont(h) mem_unlock (h) #define FreeFont _ReleaseFontData -#define NULL_FONT (FONT)NULL_PTR - extern FONT _CurFontPtr; extern MEM_HANDLE _GetFontData (uio_Stream *fp, DWORD length); diff --git a/sc2/src/sc2code/libs/graphics/frame.c b/sc2/src/sc2code/libs/graphics/frame.c index ed3fb2e78..c9dd19eba 100644 --- a/sc2/src/sc2code/libs/graphics/frame.c +++ b/sc2/src/sc2code/libs/graphics/frame.c @@ -32,6 +32,7 @@ MAKE_HOT_SPOT (COORD x, COORD y) return hs; } +// XXX: INTERNAL_PRIMITIVE and INTERNAL_PRIM_DESC are not used typedef union { POINT Point; @@ -40,9 +41,6 @@ typedef union TEXT Text; RECT Rect; } INTERNAL_PRIM_DESC; -typedef INTERNAL_PRIM_DESC *PINTERNAL_PRIM_DESC; - -typedef PINTERNAL_PRIM_DESC INTERNAL_PRIM_DESCPTR; typedef struct { @@ -51,12 +49,11 @@ typedef struct COLOR Color; INTERNAL_PRIM_DESC Object; } INTERNAL_PRIMITIVE; -typedef INTERNAL_PRIMITIVE *PINTERNAL_PRIMITIVE; STAMP _save_stamp; static BOOLEAN -GetFrameValidRect (PRECT pValidRect, HOT_SPOT *pOldHot) +GetFrameValidRect (RECT *pValidRect, HOT_SPOT *pOldHot) { COORD hx, hy; HOT_SPOT OldHot; @@ -86,7 +83,7 @@ GetFrameValidRect (PRECT pValidRect, HOT_SPOT *pOldHot) } void -ClearBackGround (PRECT pClipRect) +ClearBackGround (RECT *pClipRect) { TFB_Palette color; @@ -95,7 +92,7 @@ ClearBackGround (PRECT pClipRect) } void -DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, +DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks, BATCH_FLAGS BatchFlags) { RECT ValidRect; @@ -105,7 +102,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, { COUNT CurIndex; PRIM_LINKS OldLinks; - PPRIMITIVE lpPrim; + PRIMITIVE *lpPrim; BatchFlags &= BATCH_SINGLE | BATCH_BUILD_PAGE @@ -138,7 +135,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, for (; CurIndex != END_OF_LIST; CurIndex = GetSuccLink (GetPrimLinks (lpPrim))) { GRAPHICS_PRIM PrimType; - PPRIMITIVE lpWorkPrim; + PRIMITIVE *lpWorkPrim; RECT ClipRect; TFB_Palette color; @@ -168,7 +165,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, break; case TEXT_PRIM: if (!TextRect (&lpWorkPrim->Object.Text, - &ClipRect, NULL_PTR)) + &ClipRect, NULL)) continue; _save_stamp.origin = ClipRect.corner; @@ -215,7 +212,7 @@ ClearDrawable (void) } void -DrawPoint (PPOINT lpPoint) +DrawPoint (POINT *lpPoint) { RECT ValidRect; HOT_SPOT OldHot; @@ -231,7 +228,7 @@ DrawPoint (PPOINT lpPoint) } void -DrawRectangle (PRECT lpRect) +DrawRectangle (RECT *lpRect) { RECT ValidRect; HOT_SPOT OldHot; @@ -247,7 +244,7 @@ DrawRectangle (PRECT lpRect) } void -DrawFilledRectangle (PRECT lpRect) +DrawFilledRectangle (RECT *lpRect) { RECT ValidRect; HOT_SPOT OldHot; @@ -263,7 +260,7 @@ DrawFilledRectangle (PRECT lpRect) } void -DrawLine (PLINE lpLine) +DrawLine (LINE *lpLine) { RECT ValidRect; HOT_SPOT OldHot; @@ -279,7 +276,7 @@ DrawLine (PLINE lpLine) } void -DrawStamp (PSTAMP stmp) +DrawStamp (STAMP *stmp) { RECT ValidRect; HOT_SPOT OldHot; @@ -292,7 +289,7 @@ DrawStamp (PSTAMP stmp) } void -DrawFilledStamp (PSTAMP stmp) +DrawFilledStamp (STAMP *stmp) { RECT ValidRect; HOT_SPOT OldHot; diff --git a/sc2/src/sc2code/libs/graphics/gfx_common.c b/sc2/src/sc2code/libs/graphics/gfx_common.c index 9db1bf66e..702043c2e 100644 --- a/sc2/src/sc2code/libs/graphics/gfx_common.c +++ b/sc2/src/sc2code/libs/graphics/gfx_common.c @@ -21,10 +21,9 @@ #include "libs/graphics/gfx_common.h" #include "libs/graphics/drawcmd.h" -PDISPLAY_INTERFACE _pCurDisplay; //Not a function. Probably has to be initialized... +DISPLAY_INTERFACE *_pCurDisplay; //Not a function. Probably has to be initialized... -void (*mask_func_array[]) - (PRECT pClipRect, PRIMITIVEPTR PrimPtr) +void (*mask_func_array[]) (RECT *pClipRect, PRIMITIVE *PrimPtr) = { 0 }; int ScreenWidth; @@ -52,13 +51,13 @@ SetGraphicGrabOther (int grab_other) } void -DrawFromExtraScreen (PRECT r) +DrawFromExtraScreen (RECT *r) { TFB_DrawScreen_Copy(r, TFB_SCREEN_EXTRA, TFB_SCREEN_MAIN); } void -LoadIntoExtraScreen (PRECT r) +LoadIntoExtraScreen (RECT *r) { TFB_DrawScreen_Copy(r, TFB_SCREEN_MAIN, TFB_SCREEN_EXTRA); } diff --git a/sc2/src/sc2code/libs/graphics/gfx_common.h b/sc2/src/sc2code/libs/graphics/gfx_common.h index a9cd6d793..7532ff627 100644 --- a/sc2/src/sc2code/libs/graphics/gfx_common.h +++ b/sc2/src/sc2code/libs/graphics/gfx_common.h @@ -63,14 +63,14 @@ void TFB_ProcessEvents (void); #define GSCALE_IDENTITY 256 -void LoadIntoExtraScreen (PRECT r); -void DrawFromExtraScreen (PRECT r); +void LoadIntoExtraScreen (RECT *r); +void DrawFromExtraScreen (RECT *r); void SetGraphicGrabOther (int grab_other); void SetGraphicScale (int scale); int GetGraphicScale (void); void SetGraphicUseOtherExtra (int other); -void SetTransitionSource (PRECT pRect); -void ScreenTransition (int transition, PRECT pRect); +void SetTransitionSource (RECT *pRect); +void ScreenTransition (int transition, RECT *pRect); extern float FrameRate; extern int FrameRateTickBase; diff --git a/sc2/src/sc2code/libs/graphics/intersec.c b/sc2/src/sc2code/libs/graphics/intersec.c index 1dcdd1e3c..572eea75f 100644 --- a/sc2/src/sc2code/libs/graphics/intersec.c +++ b/sc2/src/sc2code/libs/graphics/intersec.c @@ -22,8 +22,8 @@ //#define DEBUG_INTERSEC static TIME_VALUE -frame_intersect (PINTERSECT_CONTROL pControl0, PRECT pr0, - PINTERSECT_CONTROL pControl1, PRECT pr1, TIME_VALUE t0, +frame_intersect (INTERSECT_CONTROL *pControl0, RECT *pr0, + INTERSECT_CONTROL *pControl1, RECT *pr1, TIME_VALUE t0, TIME_VALUE t1) { SIZE time_error0, time_error1; @@ -201,8 +201,8 @@ frame_intersect (PINTERSECT_CONTROL pControl0, PRECT pr0, * separated by a pixel, the shapes wouldn't be touching * each other. */ - BOOLEAN _image_intersect (PIMAGE_BOX pImageBox0, PIMAGE_BOX - pImageBox1, PRECT pIRect); + extern BOOLEAN _image_intersect (IMAGE_BOX *pImageBox0, + IMAGE_BOX *pImageBox1, RECT *pIRect); CheckFirstIntersection: if (BoxIntersect (&IB0.Box, &IB1.Box, &r_intersect) @@ -228,9 +228,8 @@ CheckFirstIntersection: } TIME_VALUE -DrawablesIntersect (PINTERSECT_CONTROL pControl0, - PINTERSECT_CONTROL pControl1, TIME_VALUE - max_time_val) +DrawablesIntersect (INTERSECT_CONTROL *pControl0, + INTERSECT_CONTROL *pControl1, TIME_VALUE max_time_val) { SIZE dy; SIZE time_y_0, time_y_1; diff --git a/sc2/src/sc2code/libs/graphics/loaddisp.c b/sc2/src/sc2code/libs/graphics/loaddisp.c index d0c35ec94..ca07646a2 100644 --- a/sc2/src/sc2code/libs/graphics/loaddisp.c +++ b/sc2/src/sc2code/libs/graphics/loaddisp.c @@ -34,7 +34,7 @@ DRAWABLE -LoadDisplayPixmap (PRECT area, FRAME frame) +LoadDisplayPixmap (RECT *area, FRAME frame) { DRAWABLE buffer; diff --git a/sc2/src/sc2code/libs/graphics/pixmap.c b/sc2/src/sc2code/libs/graphics/pixmap.c index b85dc7281..1b20138b7 100644 --- a/sc2/src/sc2code/libs/graphics/pixmap.c +++ b/sc2/src/sc2code/libs/graphics/pixmap.c @@ -21,7 +21,7 @@ FRAME CaptureDrawable (DRAWABLE Drawable) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; DrawablePtr = LockDrawable (Drawable); if (DrawablePtr) @@ -41,7 +41,7 @@ ReleaseDrawable (FRAME FramePtr) if (FramePtr != 0) { DRAWABLE Drawable; - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; DrawablePtr = GetFrameParentDrawable (FramePtr); Drawable = BUILD_DRAWABLE (DrawablePtr->hDrawable, FramePtr->Index); @@ -56,7 +56,7 @@ ReleaseDrawable (FRAME FramePtr) MEM_HANDLE GetFrameHandle (FRAME FramePtr) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; if (FramePtr == 0) return (0); @@ -68,7 +68,7 @@ GetFrameHandle (FRAME FramePtr) COUNT GetFrameCount (FRAME FramePtr) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; if (FramePtr == 0) return (0); @@ -91,7 +91,7 @@ SetAbsFrameIndex (FRAME FramePtr, COUNT FrameIndex) { if (FramePtr != 0) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; DrawablePtr = GetFrameParentDrawable (FramePtr); @@ -108,7 +108,7 @@ SetRelFrameIndex (FRAME FramePtr, SIZE FrameOffs) if (FramePtr != 0) { COUNT num_frames; - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; DrawablePtr = GetFrameParentDrawable (FramePtr); num_frames = DrawablePtr->MaxIndex + 1; @@ -130,9 +130,9 @@ SetEquFrameIndex (FRAME DstFramePtr, FRAME SrcFramePtr) { if (DstFramePtr && SrcFramePtr) return ((FRAME)( - (PBYTE)((GetFrameParentDrawable (DstFramePtr))->Frame) - + ((PBYTE)SrcFramePtr - - (PBYTE)((GetFrameParentDrawable (SrcFramePtr))->Frame)) + (BYTE*)((GetFrameParentDrawable (DstFramePtr))->Frame) + + ((BYTE*)SrcFramePtr - + (BYTE*)((GetFrameParentDrawable (SrcFramePtr))->Frame)) )); return (0); @@ -141,7 +141,7 @@ SetEquFrameIndex (FRAME DstFramePtr, FRAME SrcFramePtr) FRAME IncFrameIndex (FRAME FramePtr) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; if (FramePtr == 0) return (0); @@ -163,7 +163,7 @@ DecFrameIndex (FRAME FramePtr) return --FramePtr; else { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; DrawablePtr = GetFrameParentDrawable (FramePtr); return &DrawablePtr->Frame[DrawablePtr->MaxIndex]; diff --git a/sc2/src/sc2code/libs/graphics/prim.h b/sc2/src/sc2code/libs/graphics/prim.h index ed5ef164f..ef932924c 100644 --- a/sc2/src/sc2code/libs/graphics/prim.h +++ b/sc2/src/sc2code/libs/graphics/prim.h @@ -38,7 +38,6 @@ typedef union TEXT Text; RECT Rect; } PRIM_DESC; -typedef PRIM_DESC *PPRIM_DESC; typedef DWORD PRIM_LINKS; @@ -49,7 +48,6 @@ typedef struct COLOR Color; PRIM_DESC Object; } PRIMITIVE; -typedef PRIMITIVE *PPRIMITIVE; #define END_OF_LIST ((COUNT)0xFFFF) @@ -64,14 +62,14 @@ typedef PRIMITIVE *PPRIMITIVE; #define GetPrimColor(pPrim) ((pPrim)->Color) static inline void -SetPrimNextLink (PPRIMITIVE pPrim, COUNT Link) +SetPrimNextLink (PRIMITIVE *pPrim, COUNT Link) { SetPrimLinks (pPrim, END_OF_LIST, Link); } static inline COUNT -GetPrimNextLink (PPRIMITIVE pPrim) +GetPrimNextLink (PRIMITIVE *pPrim) { return GetSuccLink (GetPrimLinks (pPrim)); } diff --git a/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c b/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c index 3df6dca2a..0557151b5 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c +++ b/sc2/src/sc2code/libs/graphics/sdl/3do_blt.c @@ -37,7 +37,7 @@ GetGraphicScale () } static void -read_screen (PRECT lpRect, FRAME DstFramePtr) +read_screen (RECT *lpRect, FRAME DstFramePtr) { if (_CurFramePtr->Type != SCREEN_DRAWABLE || DstFramePtr->Type == SCREEN_DRAWABLE @@ -78,7 +78,7 @@ static DISPLAY_INTERFACE DisplayInterface = }; void -LoadDisplay (PDISPLAY_INTERFACE *pDisplay) +LoadDisplay (DISPLAY_INTERFACE **pDisplay) { *pDisplay = &DisplayInterface; } diff --git a/sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c b/sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c index b61b7cce1..43b9a3f1f 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c +++ b/sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c @@ -84,7 +84,7 @@ FlushGraphics () } static void -ExpandRect (PRECT rect, int expansion) +ExpandRect (RECT *rect, int expansion) { if (rect->corner.x - expansion >= 0) { @@ -120,7 +120,7 @@ ExpandRect (PRECT rect, int expansion) } void -SetTransitionSource (PRECT pRect) +SetTransitionSource (RECT *pRect) { RECT ActualRect; @@ -135,7 +135,7 @@ SetTransitionSource (PRECT pRect) // Status: Implemented void -ScreenTransition (int TransType, PRECT pRect) +ScreenTransition (int TransType, RECT *pRect) { const float DURATION = (31.0f / 60.0f); // in seconds Uint32 last_time = 0, current_time, delta_time, add_amount; @@ -183,7 +183,7 @@ ScreenTransition (int TransType, PRECT pRect) } BOOLEAN -_image_intersect (PIMAGE_BOX box1, PIMAGE_BOX box2, PRECT rect) +_image_intersect (IMAGE_BOX *box1, IMAGE_BOX *box2, RECT *rect) { BOOLEAN ret; SDL_Surface *img1, *img2; diff --git a/sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c b/sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c index 8867dff34..710d6874c 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c +++ b/sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c @@ -438,7 +438,7 @@ _GetCelData (uio_Stream *fp, DWORD length) Drawable = 0; if (cel_ct && (Drawable = AllocDrawable (cel_ct))) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; if ((DrawablePtr = LockDrawable (Drawable)) == 0) { @@ -473,7 +473,7 @@ _GetCelData (uio_Stream *fp, DWORD length) BOOLEAN _ReleaseCelData (MEM_HANDLE handle) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; int cel_ct; FRAME FramePtr = NULL; @@ -738,7 +738,7 @@ _request_drawable (COUNT NumFrames, DRAWABLE_TYPE DrawableType, ); if (Drawable) { - DRAWABLEPTR DrawablePtr; + DRAWABLE_DESC *DrawablePtr; if ((DrawablePtr = LockDrawable (Drawable)) == 0) { diff --git a/sc2/src/sc2code/libs/graphics/sdl/bbox.c b/sc2/src/sc2code/libs/graphics/sdl/bbox.c index 56342f390..224e6a42d 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/bbox.c +++ b/sc2/src/sc2code/libs/graphics/sdl/bbox.c @@ -105,7 +105,7 @@ TFB_BBox_RegisterPoint (int x, int y) } void -TFB_BBox_RegisterRect (PRECT r) +TFB_BBox_RegisterRect (RECT *r) { TFB_BBox_RegisterPoint (r->corner.x, r->corner.y); TFB_BBox_RegisterPoint (r->corner.x + r->extent.width, r->corner.y + r->extent.height); diff --git a/sc2/src/sc2code/libs/graphics/sdl/bbox.h b/sc2/src/sc2code/libs/graphics/sdl/bbox.h index 7fa172672..3138324f1 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/bbox.h +++ b/sc2/src/sc2code/libs/graphics/sdl/bbox.h @@ -37,7 +37,7 @@ typedef struct { extern TFB_BoundingBox TFB_BBox; void TFB_BBox_RegisterPoint (int x, int y); -void TFB_BBox_RegisterRect (PRECT r); +void TFB_BBox_RegisterRect (RECT *r); void TFB_BBox_RegisterCanvas (TFB_Canvas c, int x, int y); void TFB_BBox_Reset (void); diff --git a/sc2/src/sc2code/libs/graphics/sdl/canvas.c b/sc2/src/sc2code/libs/graphics/sdl/canvas.c index a9f39ca35..16994ccab 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/canvas.c +++ b/sc2/src/sc2code/libs/graphics/sdl/canvas.c @@ -55,7 +55,7 @@ TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Ca } void -TFB_DrawCanvas_Rect (PRECT rect, int r, int g, int b, TFB_Canvas target) +TFB_DrawCanvas_Rect (RECT *rect, int r, int g, int b, TFB_Canvas target) { SDL_Surface *dst = target; SDL_PixelFormat *fmt = dst->format; @@ -709,7 +709,7 @@ TFB_DrawCanvas_SetTransparentColor (TFB_Canvas canvas, int r, int g, int b, BOOL void TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT src_hs, TFB_Canvas src_mipmap, HOT_SPOT mm_hs, - int scale, PEXTENT size, HOT_SPOT *hs) + int scale, EXTENT *size, HOT_SPOT *hs) { SDL_Surface *src = (SDL_Surface *)src_canvas; @@ -747,7 +747,7 @@ TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT src_hs, } void -TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, PEXTENT size) +TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, EXTENT *size) { SDL_Surface *src = (SDL_Surface *)canvas; @@ -1338,7 +1338,7 @@ TFB_DrawCanvas_Rotate (TFB_Canvas src_canvas, TFB_Canvas dst_canvas, int angle, } void -TFB_DrawCanvas_GetRotatedExtent (TFB_Canvas src_canvas, int angle, PEXTENT size) +TFB_DrawCanvas_GetRotatedExtent (TFB_Canvas src_canvas, int angle, EXTENT *size) { int dstw, dsth; SDL_Surface *src = (SDL_Surface *)src_canvas; diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c index b4ee9134b..b3325c520 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c +++ b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c @@ -218,7 +218,7 @@ static BOOLEAN system_box_active = 0; static SDL_Rect system_box; void -SetSystemRect (PRECT r) +SetSystemRect (RECT *r) { system_box_active = TRUE; system_box.x = r->corner.x; diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.h b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.h index be67596ef..de04dc94f 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.h +++ b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.h @@ -55,7 +55,7 @@ extern volatile int TransitionAmount; extern SDL_Rect TransitionClipRect; void ScreenOrigin (FRAME Display, COORD sx, COORD sy); -void LoadDisplay (PDISPLAY_INTERFACE *pDisplay); +void LoadDisplay (DISPLAY_INTERFACE **pDisplay); void TFB_SwapBuffers (int force_full_redraw); SDL_Surface* TFB_DisplayFormatAlpha (SDL_Surface *surface); diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdluio.c b/sc2/src/sc2code/libs/graphics/sdl/sdluio.c index 3f88bbd0c..4f109a0c0 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/sdluio.c +++ b/sc2/src/sc2code/libs/graphics/sdl/sdluio.c @@ -125,7 +125,7 @@ sdluio_makeRWops (uio_Stream *stream) { result->read = sdluio_read; result->write = sdluio_write; result->close = sdluio_close; - result->hidden.unknown.data1 = (void *) stream; + result->hidden.unknown.data1 = stream; return result; } diff --git a/sc2/src/sc2code/libs/graphics/tfb_draw.c b/sc2/src/sc2code/libs/graphics/tfb_draw.c index 234d39e25..2fe4f63fb 100644 --- a/sc2/src/sc2code/libs/graphics/tfb_draw.c +++ b/sc2/src/sc2code/libs/graphics/tfb_draw.c @@ -42,7 +42,7 @@ TFB_DrawScreen_Line (int x1, int y1, int x2, int y2, int r, int g, int b, } void -TFB_DrawScreen_Rect (PRECT rect, int r, int g, int b, SCREEN dest) +TFB_DrawScreen_Rect (RECT *rect, int r, int g, int b, SCREEN dest) { RECT locRect; TFB_DrawCommand DC; @@ -132,7 +132,7 @@ TFB_DrawScreen_FontChar (TFB_Char *fontChar, TFB_Image *backing, } void -TFB_DrawScreen_CopyToImage (TFB_Image *img, PRECT lpRect, SCREEN src) +TFB_DrawScreen_CopyToImage (TFB_Image *img, RECT *lpRect, SCREEN src) { TFB_DrawCommand DC; @@ -148,7 +148,7 @@ TFB_DrawScreen_CopyToImage (TFB_Image *img, PRECT lpRect, SCREEN src) } void -TFB_DrawScreen_Copy (PRECT r, SCREEN src, SCREEN dest) +TFB_DrawScreen_Copy (RECT *r, SCREEN src, SCREEN dest) { RECT locRect; TFB_DrawCommand DC; @@ -239,7 +239,7 @@ TFB_DrawImage_Line (int x1, int y1, int x2, int y2, int r, int g, int b, } void -TFB_DrawImage_Rect (PRECT rect, int r, int g, int b, TFB_Image *image) +TFB_DrawImage_Rect (RECT *rect, int r, int g, int b, TFB_Image *image) { LockMutex (image->mutex); TFB_DrawCanvas_Rect (rect, r, g, b, image->NormalImg); diff --git a/sc2/src/sc2code/libs/graphics/tfb_draw.h b/sc2/src/sc2code/libs/graphics/tfb_draw.h index a27b0b398..5978be0b0 100644 --- a/sc2/src/sc2code/libs/graphics/tfb_draw.h +++ b/sc2/src/sc2code/libs/graphics/tfb_draw.h @@ -93,13 +93,13 @@ typedef struct tfb_pixelformat // Drawing commands void TFB_DrawScreen_Line (int x1, int y1, int x2, int y2, int r, int g, int b, SCREEN dest); -void TFB_DrawScreen_Rect (PRECT rect, int r, int g, int b, SCREEN dest); +void TFB_DrawScreen_Rect (RECT *rect, int r, int g, int b, SCREEN dest); void TFB_DrawScreen_Image (TFB_Image *img, int x, int y, int scale, TFB_ColorMap *cmap, SCREEN dest); -void TFB_DrawScreen_Copy (PRECT r, SCREEN src, SCREEN dest); +void TFB_DrawScreen_Copy (RECT *r, SCREEN src, SCREEN dest); void TFB_DrawScreen_FilledImage (TFB_Image *img, int x, int y, int scale, int r, int g, int b, SCREEN dest); void TFB_DrawScreen_FontChar (TFB_Char *, TFB_Image *backing, int x, int y, SCREEN dest); -void TFB_DrawScreen_CopyToImage (TFB_Image *img, PRECT lpRect, SCREEN src); +void TFB_DrawScreen_CopyToImage (TFB_Image *img, RECT *lpRect, SCREEN src); void TFB_DrawScreen_DeleteImage (TFB_Image *img); void TFB_DrawScreen_DeleteData (void *); void TFB_DrawScreen_WaitForSignal (void); @@ -113,7 +113,7 @@ void TFB_DrawImage_Delete (TFB_Image *image); void TFB_DrawImage_FixScaling (TFB_Image *image, int target, int type); void TFB_DrawImage_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Image *dest); -void TFB_DrawImage_Rect (PRECT rect, int r, int g, int b, TFB_Image *image); +void TFB_DrawImage_Rect (RECT *rect, int r, int g, int b, TFB_Image *image); void TFB_DrawImage_Image (TFB_Image *img, int x, int y, int scale, TFB_ColorMap *cmap, TFB_Image *target); void TFB_DrawImage_FilledImage (TFB_Image *img, int x, int y, int scale, int r, int g, int b, TFB_Image *target); void TFB_DrawImage_FontChar (TFB_Char *, TFB_Image *backing, int x, int y, TFB_Image *target); @@ -129,15 +129,15 @@ void TFB_DrawCanvas_Rescale_Nearest (TFB_Canvas src, TFB_Canvas dst, EXTENT size void TFB_DrawCanvas_Rescale_Trilinear (TFB_Canvas src, TFB_Canvas dst, TFB_Canvas mipmap, EXTENT size); void TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT src_hs, TFB_Canvas src_mipmap, HOT_SPOT mm_hs, - int scale, PEXTENT size, HOT_SPOT *hs); + int scale, EXTENT *size, HOT_SPOT *hs); void TFB_DrawCanvas_Rotate (TFB_Canvas src, TFB_Canvas dst, int angle, EXTENT size); -void TFB_DrawCanvas_GetRotatedExtent (TFB_Canvas src, int angle, PEXTENT size); -void TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, PEXTENT size); +void TFB_DrawCanvas_GetRotatedExtent (TFB_Canvas src, int angle, EXTENT *size); +void TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, EXTENT *size); void TFB_DrawCanvas_Delete (TFB_Canvas canvas); void TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Canvas dest); -void TFB_DrawCanvas_Rect (PRECT rect, int r, int g, int b, TFB_Canvas image); +void TFB_DrawCanvas_Rect (RECT *rect, int r, int g, int b, TFB_Canvas image); void TFB_DrawCanvas_Image (TFB_Image *img, int x, int y, int scale, TFB_ColorMap *cmap, TFB_Canvas target); void TFB_DrawCanvas_FilledImage (TFB_Image *img, int x, int y, int scale, int r, int g, int b, TFB_Canvas target); void TFB_DrawCanvas_FontChar (TFB_Char *, TFB_Image *backing, int x, int y, TFB_Canvas target); diff --git a/sc2/src/sc2code/libs/graphics/tfb_prim.c b/sc2/src/sc2code/libs/graphics/tfb_prim.c index 0cfca65ea..917b28972 100644 --- a/sc2/src/sc2code/libs/graphics/tfb_prim.c +++ b/sc2/src/sc2code/libs/graphics/tfb_prim.c @@ -29,7 +29,7 @@ #include "libs/log.h" void -TFB_Prim_Point (PPOINT p, TFB_Palette *color) +TFB_Prim_Point (POINT *p, TFB_Palette *color) { RECT r; @@ -44,7 +44,7 @@ TFB_Prim_Point (PPOINT p, TFB_Palette *color) } void -TFB_Prim_Rect (PRECT r, TFB_Palette *color) +TFB_Prim_Rect (RECT *r, TFB_Palette *color) { RECT arm; int gscale; @@ -69,7 +69,7 @@ TFB_Prim_Rect (PRECT r, TFB_Palette *color) } void -TFB_Prim_FillRect (PRECT r, TFB_Palette *color) +TFB_Prim_FillRect (RECT *r, TFB_Palette *color) { RECT rect; int gscale; @@ -99,7 +99,7 @@ TFB_Prim_FillRect (PRECT r, TFB_Palette *color) } void -TFB_Prim_Line (PLINE line, TFB_Palette *color) +TFB_Prim_Line (LINE *line, TFB_Palette *color) { int x1, y1, x2, y2; @@ -115,7 +115,7 @@ TFB_Prim_Line (PLINE line, TFB_Palette *color) } void -TFB_Prim_Stamp (PSTAMP stmp) +TFB_Prim_Stamp (STAMP *stmp) { int x, y; FRAME SrcFramePtr; @@ -164,7 +164,7 @@ TFB_Prim_Stamp (PSTAMP stmp) } void -TFB_Prim_StampFill (PSTAMP stmp, TFB_Palette *color) +TFB_Prim_StampFill (STAMP *stmp, TFB_Palette *color) { int x, y; FRAME SrcFramePtr; @@ -213,7 +213,7 @@ TFB_Prim_StampFill (PSTAMP stmp, TFB_Palette *color) } void -TFB_Prim_FontChar (PPOINT origin, TFB_Char *fontChar, TFB_Image *backing) +TFB_Prim_FontChar (POINT *origin, TFB_Char *fontChar, TFB_Image *backing) { int x, y; diff --git a/sc2/src/sc2code/libs/graphics/tfb_prim.h b/sc2/src/sc2code/libs/graphics/tfb_prim.h index 519b1b3b4..7d241bdb4 100644 --- a/sc2/src/sc2code/libs/graphics/tfb_prim.h +++ b/sc2/src/sc2code/libs/graphics/tfb_prim.h @@ -20,10 +20,10 @@ #include "tfb_draw.h" -void TFB_Prim_Line (PLINE line, TFB_Palette *color); -void TFB_Prim_Point (PPOINT p, TFB_Palette *color); -void TFB_Prim_Rect (PRECT r, TFB_Palette *color); -void TFB_Prim_FillRect (PRECT r, TFB_Palette *color); -void TFB_Prim_Stamp (PSTAMP stamp); -void TFB_Prim_StampFill (PSTAMP stamp, TFB_Palette *color); -void TFB_Prim_FontChar (PPOINT origin, TFB_Char *, TFB_Image *backing); +void TFB_Prim_Line (LINE *line, TFB_Palette *color); +void TFB_Prim_Point (POINT *p, TFB_Palette *color); +void TFB_Prim_Rect (RECT *r, TFB_Palette *color); +void TFB_Prim_FillRect (RECT *r, TFB_Palette *color); +void TFB_Prim_Stamp (STAMP *stamp); +void TFB_Prim_StampFill (STAMP *stamp, TFB_Palette *color); +void TFB_Prim_FontChar (POINT *origin, TFB_Char *, TFB_Image *backing); diff --git a/sc2/src/sc2code/libs/graphics/widgets.c b/sc2/src/sc2code/libs/graphics/widgets.c index e35b8e5c4..5fb150e97 100644 --- a/sc2/src/sc2code/libs/graphics/widgets.c +++ b/sc2/src/sc2code/libs/graphics/widgets.c @@ -38,7 +38,7 @@ WIDGET *widget_focus = NULL; BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00) void -DrawShadowedBox(PRECT r, COLOR bg, COLOR dark, COLOR medium) +DrawShadowedBox (RECT *r, COLOR bg, COLOR dark, COLOR medium) { RECT t; COLOR oldcolor; @@ -466,7 +466,7 @@ Widget_DrawTextEntry (WIDGET *_self, int x, int y) COUNT i; RECT text_r; BYTE char_deltas[WIDGET_TEXTENTRY_WIDTH]; - PBYTE pchar_deltas; + BYTE *pchar_deltas; RECT r; SIZE leading; diff --git a/sc2/src/sc2code/libs/graphics/widgets.h b/sc2/src/sc2code/libs/graphics/widgets.h index 30c11086b..30b0994b8 100644 --- a/sc2/src/sc2code/libs/graphics/widgets.h +++ b/sc2/src/sc2code/libs/graphics/widgets.h @@ -175,7 +175,7 @@ typedef struct _widget_controlentry { char controlname[2][WIDGET_CONTROLENTRY_WIDTH]; } WIDGET_CONTROLENTRY; -void DrawShadowedBox (PRECT r, COLOR bg, COLOR dark, COLOR medium); +void DrawShadowedBox (RECT *r, COLOR bg, COLOR dark, COLOR medium); void DrawLabelAsWindow(WIDGET_LABEL *label); int Widget_Event (int event); diff --git a/sc2/src/sc2code/libs/inplib.h b/sc2/src/sc2code/libs/inplib.h index bcb4b8bc9..058187be3 100644 --- a/sc2/src/sc2code/libs/inplib.h +++ b/sc2/src/sc2code/libs/inplib.h @@ -35,7 +35,7 @@ extern void FlushInput (void); * Not used right now extern BOOLEAN FindMouse (void); extern void MoveMouse (SWORD x, SWORD y); -extern BYTE LocateMouse (PSWORD px, PSWORD py); +extern BYTE LocateMouse (SWORD *px, SWORD *py); */ extern volatile int MouseButtonDown; diff --git a/sc2/src/sc2code/libs/memlib.h b/sc2/src/sc2code/libs/memlib.h index 5010fd8f0..c0452d5a1 100644 --- a/sc2/src/sc2code/libs/memlib.h +++ b/sc2/src/sc2code/libs/memlib.h @@ -122,20 +122,20 @@ extern MEM_HANDLE mem_reallocate (MEM_HANDLE handle, MEM_SIZE size, MEM_FLAGS flags, MEM_PRIORITY priority, MEM_USAGE usage); #define mem_resize(h, size) \ mem_reallocate(h, (MEM_SIZE)size, SAME_MEM_FLAGS, SAME_MEM_PRIORITY, SAME_MEM_USAGE) -extern MEM_HANDLE mem_static (PVOID pVoid, MEM_SIZE size, MEM_USAGE +extern MEM_HANDLE mem_static (void *pVoid, MEM_SIZE size, MEM_USAGE usage); extern MEM_HANDLE mem_dup (MEM_HANDLE handle, MEM_USAGE usage); -extern PVOID mem_simple_access (MEM_HANDLE handle); +extern void* mem_simple_access (MEM_HANDLE handle); extern MEM_BOOL mem_simple_unaccess (MEM_HANDLE handle); #define mem_lock mem_simple_access #define mem_unlock mem_simple_unaccess -extern PVOID mem_complex_access (MEM_HANDLE handle, MEM_SIZE pos, +extern void* mem_complex_access (MEM_HANDLE handle, MEM_SIZE pos, PMEM_SIZE_REQUEST pSizeRequest, MEM_ACCESS_MODE access_mode); extern MEM_BOOL mem_complex_unaccess (MEM_HANDLE handle); -extern PVOID mem_complex_seek (MEM_HANDLE handle, MEM_OFFS offset, +extern void* mem_complex_seek (MEM_HANDLE handle, MEM_OFFS offset, PMEM_SIZE_REQUEST pSizeRequest, MEM_SEEK_MODE seek_mode); extern MEM_SIZE mem_get_memavailable (MEM_SIZE size, MEM_PRIORITY diff --git a/sc2/src/sc2code/libs/reslib.h b/sc2/src/sc2code/libs/reslib.h index 23c28f99a..8a8ed75c7 100644 --- a/sc2/src/sc2code/libs/reslib.h +++ b/sc2/src/sc2code/libs/reslib.h @@ -55,8 +55,8 @@ typedef BOOLEAN (ResourceFreeFun) (MEM_HANDLE handle); extern uio_Stream *res_OpenResFile (uio_DirHandle *dir, const char *filename, const char *mode); -extern int ReadResFile (PVOID lpBuf, COUNT size, COUNT count, uio_Stream *fp); -extern int WriteResFile (PCVOID lpBuf, COUNT size, COUNT count, +extern int ReadResFile (void *lpBuf, COUNT size, COUNT count, uio_Stream *fp); +extern int WriteResFile (const void *lpBuf, COUNT size, COUNT count, uio_Stream *fp); extern int GetResFileChar (uio_Stream *fp); extern int PutResFileChar (char ch, uio_Stream *fp); @@ -86,7 +86,6 @@ extern MEM_HANDLE GetResourceData (uio_Stream *fp, DWORD length, MEM_FLAGS mem_flags); #define RESOURCE_PRIORITY DEFAULT_MEM_PRIORITY -#define RESOURCE_DATAPTR PBYTE #define AllocResourceData(s,mf) \ mem_allocate ((MEM_SIZE)(s), (mf), RESOURCE_PRIORITY, MEM_SIMPLE) @@ -107,7 +106,7 @@ typedef STRINGPTR DIRENTRYPTR; extern DIRENTRY_REF LoadDirEntryTable (uio_DirHandle *dirHandle, const char *path, const char *pattern, match_MatchType matchType, - PCOUNT pnum_entries); + COUNT *pnum_entries); #define CaptureDirEntryTable CaptureStringTable #define ReleaseDirEntryTable ReleaseStringTable #define DestroyDirEntryTable DestroyStringTable diff --git a/sc2/src/sc2code/libs/resource/direct.c b/sc2/src/sc2code/libs/resource/direct.c index b99b98b36..cd1ac4812 100644 --- a/sc2/src/sc2code/libs/resource/direct.c +++ b/sc2/src/sc2code/libs/resource/direct.c @@ -23,7 +23,7 @@ DIRENTRY_REF LoadDirEntryTable (uio_DirHandle *dirHandle, const char *path, - const char *pattern, match_MatchType matchType, PCOUNT pnum_entries) + const char *pattern, match_MatchType matchType, COUNT *pnum_entries) { uio_DirList *dirList; COUNT num_entries, length; @@ -32,8 +32,8 @@ LoadDirEntryTable (uio_DirHandle *dirHandle, const char *path, uio_DirHandle *dir; STRING_TABLE StringTable; STRING_TABLEPTR lpST; - PSTR lpStr; - PDWORD lpLastOffs; + char *lpStr; + DWORD *lpLastOffs; dir = uio_openDirRelative (dirHandle, path, 0); assert(dir != NULL); @@ -87,7 +87,7 @@ LoadDirEntryTable (uio_DirHandle *dirHandle, const char *path, lpST->StringCount = num_entries; lpLastOffs = &lpST->StringOffsets[0]; *lpLastOffs = slen; - lpStr = (PSTR)lpST + slen; + lpStr = (BYTE*)lpST + slen; for (i = 0; i < dirList->numNames; i++) { diff --git a/sc2/src/sc2code/libs/resource/filecntl.c b/sc2/src/sc2code/libs/resource/filecntl.c index fe88a984e..f07699a35 100644 --- a/sc2/src/sc2code/libs/resource/filecntl.c +++ b/sc2/src/sc2code/libs/resource/filecntl.c @@ -61,7 +61,7 @@ DeleteResFile (uio_DirHandle *dir, const char *filename) } int -ReadResFile (PVOID lpBuf, COUNT size, COUNT count, uio_Stream *fp) +ReadResFile (void *lpBuf, COUNT size, COUNT count, uio_Stream *fp) { int retval; @@ -71,7 +71,7 @@ ReadResFile (PVOID lpBuf, COUNT size, COUNT count, uio_Stream *fp) } int -WriteResFile (PCVOID lpBuf, COUNT size, COUNT count, uio_Stream *fp) +WriteResFile (const void *lpBuf, COUNT size, COUNT count, uio_Stream *fp) { int retval; diff --git a/sc2/src/sc2code/libs/resource/loadres.c b/sc2/src/sc2code/libs/resource/loadres.c index 55ddc85f0..4fda94adb 100644 --- a/sc2/src/sc2code/libs/resource/loadres.c +++ b/sc2/src/sc2code/libs/resource/loadres.c @@ -23,10 +23,10 @@ MEM_HANDLE GetResourceData (uio_Stream *fp, DWORD length, MEM_FLAGS mem_flags) { MEM_HANDLE RData; - DECODE_REF fh; + DECODE_REF fh = 0; if (length == ~(DWORD)0) - length = LengthResFile (fp), fh = 0; + length = LengthResFile (fp); else if ((fh = copen (fp, FILE_STREAM, STREAM_READ))) cfilelength (fh, &length); else @@ -35,10 +35,10 @@ GetResourceData (uio_Stream *fp, DWORD length, MEM_FLAGS mem_flags) RData = AllocResourceData (length, mem_flags); if (RData) { - RESOURCE_DATAPTR RDPtr; + BYTE *RDPtr; LockResourceData (RData, &RDPtr); - if (RDPtr == NULL_PTR) + if (RDPtr == NULL) { FreeResourceData (RData); RData = 0; @@ -62,7 +62,7 @@ GetResourceData (uio_Stream *fp, DWORD length, MEM_FLAGS mem_flags) if ((int)(ReadResFile (RDPtr, 1, num_read, fp)) != (int)num_read) break; } - RDPtr = (RESOURCE_DATAPTR) ((BYTE *) RDPtr + num_read); + RDPtr += num_read; } while (length -= num_read); UnlockResourceData (RData); diff --git a/sc2/src/sc2code/libs/sndlib.h b/sc2/src/sc2code/libs/sndlib.h index 99f886a12..5a824f8dd 100644 --- a/sc2/src/sc2code/libs/sndlib.h +++ b/sc2/src/sc2code/libs/sndlib.h @@ -47,8 +47,8 @@ typedef MEM_HANDLE MUSIC_REF; extern BOOLEAN InitSound (int argc, char *argv[]); extern void UninitSound (void); -extern SOUND_REF LoadSoundFile (PVOID pStr); -extern MUSIC_REF LoadMusicFile (PVOID pStr); +extern SOUND_REF LoadSoundFile (const char *pStr); +extern MUSIC_REF LoadMusicFile (const char *pStr); extern BOOLEAN InstallAudioResTypes (COUNT sound_type, COUNT music_type); extern SOUND_REF LoadSoundInstance (DWORD res); @@ -72,7 +72,7 @@ extern void PLRStop (MUSIC_REF MusicRef); extern BOOLEAN PLRPlaying (MUSIC_REF MusicRef); extern void PLRPause (MUSIC_REF MusicRef); extern void PLRResume (MUSIC_REF MusicRef); -extern void PlayChannel (COUNT channel, PVOID sample, SoundPosition pos, +extern void PlayChannel (COUNT channel, void *sample, SoundPosition pos, void *positional_object, unsigned char priority); extern BOOLEAN ChannelPlaying (COUNT Channel); extern void * GetPositionalObject (COUNT channel); @@ -90,13 +90,13 @@ extern BOOLEAN SoundPlaying (void); extern void WaitForSoundEnd (COUNT Channel); #define TFBSOUND_WAIT_ALL ((COUNT)~0) -extern BOOLEAN AllocHardwareSample (PBYTE lpSnd, DWORD SampleRate, COUNT +extern BOOLEAN AllocHardwareSample (BYTE *lpSnd, DWORD SampleRate, COUNT SampleLength, COUNT LoopBegin, COUNT LoopLen); -extern BOOLEAN FreeHardwareSample (PBYTE lpSnd, COUNT SampleLength); +extern BOOLEAN FreeHardwareSample (BYTE *lpSnd, COUNT SampleLength); extern COUNT GetSampleRate (SOUND Sound); extern COUNT GetSampleLength (SOUND Sound); -extern PBYTE GetSampleAddress (SOUND Sound); +extern BYTE* GetSampleAddress (SOUND Sound); extern DWORD FadeMusic (BYTE end_vol, SIZE TimeInterval); #endif /* _SNDLIB_H */ diff --git a/sc2/src/sc2code/libs/sound/decoders/dukaud.c b/sc2/src/sc2code/libs/sound/decoders/dukaud.c index 4a34f4ac4..449bf7b84 100644 --- a/sc2/src/sc2code/libs/sound/decoders/dukaud.c +++ b/sc2/src/sc2code/libs/sound/decoders/dukaud.c @@ -501,7 +501,7 @@ duka_Decode (THIS_PTR, void* buf, sint32 bufsize) do { stuffed = duka_stuffBuffer (duka, buf, bufsize); - buf = (void *) ((uint8 *) buf + stuffed); + buf = (uint8*)buf + stuffed; bufsize -= stuffed; total += stuffed; diff --git a/sc2/src/sc2code/libs/sound/fileinst.c b/sc2/src/sc2code/libs/sound/fileinst.c index 84fa853ef..fc1f7fdd9 100644 --- a/sc2/src/sc2code/libs/sound/fileinst.c +++ b/sc2/src/sc2code/libs/sound/fileinst.c @@ -23,7 +23,7 @@ SOUND_REF -LoadSoundFile (PVOID pStr) +LoadSoundFile (const char *pStr) { uio_Stream *fp; @@ -50,7 +50,7 @@ LoadSoundFile (PVOID pStr) } MUSIC_REF -LoadMusicFile (PVOID pStr) +LoadMusicFile (const char *pStr) { uio_Stream *fp; char filename[256]; diff --git a/sc2/src/sc2code/libs/sound/sfx.c b/sc2/src/sc2code/libs/sound/sfx.c index 8fc9fdc23..74c8835b6 100644 --- a/sc2/src/sc2code/libs/sound/sfx.c +++ b/sc2/src/sc2code/libs/sound/sfx.c @@ -25,7 +25,7 @@ static void CheckFinishedChannels (void); void -PlayChannel (COUNT channel, PVOID sample, SoundPosition pos, +PlayChannel (COUNT channel, void *sample, SoundPosition pos, void *positional_object, unsigned char priority) { TFB_SoundSample *tfb_sample = *(TFB_SoundSample**) sample; @@ -144,11 +144,11 @@ SetChannelVolume (COUNT channel, COUNT volume, BYTE priority) } // Status: Ignored -PBYTE +BYTE* GetSampleAddress (SOUND sound) // I might be prototyping this wrong, type-wise. { - return ((PBYTE)GetSoundAddress (sound)); + return ((BYTE*)GetSoundAddress (sound)); } // Status: Ignored diff --git a/sc2/src/sc2code/libs/sound/trackplayer.c b/sc2/src/sc2code/libs/sound/trackplayer.c index 325a93708..5e1fe370c 100644 --- a/sc2/src/sc2code/libs/sound/trackplayer.c +++ b/sc2/src/sc2code/libs/sound/trackplayer.c @@ -646,7 +646,7 @@ SpliceTrack (UNICODE *TrackName, UNICODE *TrackText, UNICODE *TimeStamp, TFB_Tra last_chain->track_num = tct - 1; if (page_counter < num_pages) { - last_chain->text = (void *)split_text[page_counter]; + last_chain->text = split_text[page_counter]; last_ts_chain = last_chain; } last_chain->callback = cb; diff --git a/sc2/src/sc2code/libs/strings/getstr.c b/sc2/src/sc2code/libs/strings/getstr.c index 3cb3aeea2..e02873ee8 100644 --- a/sc2/src/sc2code/libs/strings/getstr.c +++ b/sc2/src/sc2code/libs/strings/getstr.c @@ -24,9 +24,9 @@ static void -dword_convert (PDWORD dword_array, COUNT num_dwords) +dword_convert (DWORD *dword_array, COUNT num_dwords) { - PBYTE p = (PBYTE)dword_array; + BYTE *p = (BYTE*)dword_array; do { @@ -243,7 +243,9 @@ _GetStringData (uio_Stream *fp, DWORD length) + (sizeof (DWORD) * ((n + 1) * num_data_sets)) + StringOffs + ClipOffs + TSOffs))) { - PDWORD lpStringOffs, lpClipOffs, lpTSOffs; + DWORD *lpStringOffs; + DWORD *lpClipOffs; + DWORD *lpTSOffs; STRING_TABLEPTR lpST; LockStringTable (hData, &lpST); @@ -311,7 +313,7 @@ _GetStringData (uio_Stream *fp, DWORD length) { COUNT StringCount; DWORD StringOffs; - PDWORD lpStringOffs; + DWORD *lpStringOffs; STRING_TABLEPTR lpST; LockStringTable (hData, &lpST); diff --git a/sc2/src/sc2code/libs/strings/strings.c b/sc2/src/sc2code/libs/strings/strings.c index d7cbe5099..c3fce2af6 100644 --- a/sc2/src/sc2code/libs/strings/strings.c +++ b/sc2/src/sc2code/libs/strings/strings.c @@ -37,7 +37,7 @@ CaptureStringTable (STRING_TABLE StringTable) return (BUILD_STRING (StringTable, StringTableIndex)); } - return ((STRING)NULL_PTR); + return ((STRING)NULL); } STRING_TABLE diff --git a/sc2/src/sc2code/libs/strlib.h b/sc2/src/sc2code/libs/strlib.h index e72d1df13..672642208 100644 --- a/sc2/src/sc2code/libs/strlib.h +++ b/sc2/src/sc2code/libs/strlib.h @@ -27,7 +27,7 @@ typedef DWORD STRING_TABLE; typedef DWORD STRING; -typedef PBYTE STRINGPTR; +typedef BYTE* STRINGPTR; extern BOOLEAN InstallStringTableResType (COUNT string_type); extern STRING_TABLE LoadStringTableInstance (DWORD res); diff --git a/sc2/src/sc2code/libs/video/vidplayer.c b/sc2/src/sc2code/libs/video/vidplayer.c index 8f7fe81af..80139896d 100644 --- a/sc2/src/sc2code/libs/video/vidplayer.c +++ b/sc2/src/sc2code/libs/video/vidplayer.c @@ -58,7 +58,7 @@ static void* vp_interthread_clip = NULL; typedef struct { // standard state required by DoInput - BOOLEAN (*InputFunc) (PVOID pInputState); + BOOLEAN (*InputFunc) (void *pInputState); COUNT MenuRepeatDelay; VIDEO_REF CurVideo; @@ -398,7 +398,7 @@ TFB_VideoPlaying (VIDEO_REF VidRef) } static BOOLEAN -TFB_DoVideoInput (PVOID pIS) +TFB_DoVideoInput (void *pIS) { VIDEO_INPUT_STATE* pVIS = (VIDEO_INPUT_STATE*) pIS; TFB_VideoClip* vid = (TFB_VideoClip*) pVIS->CurVideo; diff --git a/sc2/src/sc2code/load.c b/sc2/src/sc2code/load.c index a9984db2e..5ac7477cc 100644 --- a/sc2/src/sc2code/load.c +++ b/sc2/src/sc2code/load.c @@ -39,7 +39,7 @@ ACTIVITY NextActivity; // XXX: these should handle endian conversions later static inline COUNT -cread_8 (DECODE_REF fh, PBYTE v) +cread_8 (DECODE_REF fh, BYTE *v) { BYTE t; if (!v) /* read value ignored */ @@ -48,7 +48,7 @@ cread_8 (DECODE_REF fh, PBYTE v) } static inline COUNT -cread_16 (DECODE_REF fh, PUWORD v) +cread_16 (DECODE_REF fh, UWORD *v) { UWORD t; if (!v) /* read value ignored */ @@ -57,7 +57,7 @@ cread_16 (DECODE_REF fh, PUWORD v) } static inline COUNT -cread_32 (DECODE_REF fh, PDWORD v) +cread_32 (DECODE_REF fh, DWORD *v) { DWORD t; if (!v) /* read value ignored */ @@ -73,14 +73,14 @@ cread_ptr (DECODE_REF fh) } static inline COUNT -cread_a8 (DECODE_REF fh, PBYTE ar, COUNT count) +cread_a8 (DECODE_REF fh, BYTE *ar, COUNT count) { assert (ar != NULL); return cread (ar, 1, count, fh) == count; } static inline COUNT -read_8 (PVOID fp, PBYTE v) +read_8 (void *fp, BYTE *v) { BYTE t; if (!v) /* read value ignored */ @@ -89,7 +89,7 @@ read_8 (PVOID fp, PBYTE v) } static inline COUNT -read_16 (PVOID fp, PUWORD v) +read_16 (void *fp, UWORD *v) { UWORD t; if (!v) /* read value ignored */ @@ -98,7 +98,7 @@ read_16 (PVOID fp, PUWORD v) } static inline COUNT -read_32 (PVOID fp, PDWORD v) +read_32 (void *fp, DWORD *v) { DWORD t; if (!v) /* read value ignored */ @@ -107,21 +107,21 @@ read_32 (PVOID fp, PDWORD v) } static inline COUNT -read_ptr (PVOID fp) +read_ptr (void *fp) { DWORD t; return read_32 (fp, &t); /* ptrs are useless in saves */ } static inline COUNT -read_a8 (PVOID fp, PBYTE ar, COUNT count) +read_a8 (void *fp, BYTE *ar, COUNT count) { assert (ar != NULL); return ReadResFile (ar, 1, count, fp) == count; } static inline COUNT -read_a16 (PVOID fp, PUWORD ar, COUNT count) +read_a16 (void *fp, UWORD *ar, COUNT count) { assert (ar != NULL); @@ -134,7 +134,7 @@ read_a16 (PVOID fp, PUWORD ar, COUNT count) } static void -LoadShipQueue (DECODE_REF fh, PQUEUE pQueue, BOOLEAN MakeQ) +LoadShipQueue (DECODE_REF fh, QUEUE *pQueue, BOOLEAN MakeQ) { COUNT num_links; @@ -145,7 +145,7 @@ LoadShipQueue (DECODE_REF fh, PQUEUE pQueue, BOOLEAN MakeQ) while (num_links--) { HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; COUNT Index; BYTE tmpb; @@ -156,7 +156,7 @@ LoadShipQueue (DECODE_REF fh, PQUEUE pQueue, BOOLEAN MakeQ) else hStarShip = CloneShipFragment (Index, pQueue, 0); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pQueue, hStarShip); + FragPtr = (SHIP_FRAGMENT*) LockStarShip (pQueue, hStarShip); if (pQueue != &GLOBAL (avail_race_q)) { // queues other than avail_race_q save SHIP_FRAGMENT elements @@ -182,8 +182,8 @@ LoadShipQueue (DECODE_REF fh, PQUEUE pQueue, BOOLEAN MakeQ) { // avail_race_q contains information not about specific ships, // but about a race. - EXTENDED_SHIP_FRAGMENTPTR ExtFragPtr = - (EXTENDED_SHIP_FRAGMENTPTR) FragPtr; + EXTENDED_SHIP_FRAGMENT *ExtFragPtr = + (EXTENDED_SHIP_FRAGMENT*) FragPtr; cread_16 (fh, &ExtFragPtr->ShipInfo.actual_strength); cread_16 (fh, &ExtFragPtr->ShipInfo.known_strength); @@ -201,7 +201,7 @@ LoadShipQueue (DECODE_REF fh, PQUEUE pQueue, BOOLEAN MakeQ) } static void -LoadEncounter (ENCOUNTERPTR EncounterPtr, DECODE_REF fh) +LoadEncounter (ENCOUNTER *EncounterPtr, DECODE_REF fh) { COUNT i; @@ -225,7 +225,7 @@ LoadEncounter (ENCOUNTERPTR EncounterPtr, DECODE_REF fh) // Load each entry in the SHIP_INFO array: for (i = 0; i < MAX_HYPER_SHIPS; i++) { - SHIP_INFOPTR ShipInfo = &EncounterPtr->SD.ShipList[i]; + SHIP_INFO *ShipInfo = &EncounterPtr->SD.ShipList[i]; BYTE tmpb; cread_16 (fh, &ShipInfo->ship_flags); @@ -253,7 +253,7 @@ LoadEncounter (ENCOUNTERPTR EncounterPtr, DECODE_REF fh) } static void -LoadEvent (EVENTPTR EventPtr, DECODE_REF fh) +LoadEvent (EVENT *EventPtr, DECODE_REF fh) { cread_ptr (fh); /* useless ptr; HEVENT pred */ EventPtr->pred = 0; @@ -268,7 +268,7 @@ LoadEvent (EVENTPTR EventPtr, DECODE_REF fh) } static void -DummyLoadQueue (PQUEUE QueuePtr, DECODE_REF fh) +DummyLoadQueue (QUEUE *QueuePtr, DECODE_REF fh) { /* QUEUE should never actually be loaded since it contains * purely internal representation and the lists @@ -278,7 +278,7 @@ DummyLoadQueue (PQUEUE QueuePtr, DECODE_REF fh) /* QUEUE format with QUEUE_TABLE defined -- UQM default */ cread_ptr (fh); /* HLINK head */ cread_ptr (fh); /* HLINK tail */ - cread_ptr (fh); /* PBYTE pq_tab */ + cread_ptr (fh); /* BYTE* pq_tab */ cread_ptr (fh); /* HLINK free_list */ cread_16 (fh, NULL); /* MEM_HANDLE hq_tab */ cread_16 (fh, NULL); /* COUNT object_size */ @@ -289,7 +289,7 @@ DummyLoadQueue (PQUEUE QueuePtr, DECODE_REF fh) } static void -LoadClockState (PCLOCK_STATE ClockPtr, DECODE_REF fh) +LoadClockState (CLOCK_STATE *ClockPtr, DECODE_REF fh) { cread_8 (fh, &ClockPtr->day_index); cread_8 (fh, &ClockPtr->month_index); @@ -304,7 +304,7 @@ LoadClockState (PCLOCK_STATE ClockPtr, DECODE_REF fh) } static void -LoadGameState (PGAME_STATE GSPtr, DECODE_REF fh) +LoadGameState (GAME_STATE *GSPtr, DECODE_REF fh) { DWORD tmpd; @@ -314,7 +314,7 @@ LoadGameState (PGAME_STATE GSPtr, DECODE_REF fh) cread_8 (fh, &GSPtr->FuelCost); cread_a8 (fh, GSPtr->ModuleCost, NUM_MODULES); cread_a8 (fh, GSPtr->ElementWorth, NUM_ELEMENT_CATEGORIES); - cread_ptr (fh); /* not loading ptr; PPRIMITIVE DisplayArray */ + cread_ptr (fh); /* not loading ptr; PRIMITIVE *DisplayArray */ cread_16 (fh, &GSPtr->CurrentActivity); cread_16 (fh, NULL); /* CLOCK_STATE alignment padding */ @@ -356,7 +356,7 @@ LoadGameState (PGAME_STATE GSPtr, DECODE_REF fh) } static BOOLEAN -LoadSisState (PSIS_STATE SSPtr, PVOID fp) +LoadSisState (SIS_STATE *SSPtr, void *fp) { if ( read_32 (fp, &SSPtr->log_x) != 1 || @@ -384,7 +384,7 @@ LoadSisState (PSIS_STATE SSPtr, PVOID fp) } static BOOLEAN -LoadSummary (SUMMARY_DESC *SummPtr, PVOID fp) +LoadSummary (SUMMARY_DESC *SummPtr, void *fp) { if (!LoadSisState (&SummPtr->SS, fp)) return FALSE; @@ -410,7 +410,7 @@ LoadSummary (SUMMARY_DESC *SummPtr, PVOID fp) } static void -LoadStarDesc (STAR_DESCPTR SDPtr, DECODE_REF fh) +LoadStarDesc (STAR_DESC *SDPtr, DECODE_REF fh) { cread_16 (fh, &SDPtr->star_pt.x); cread_16 (fh, &SDPtr->star_pt.y); @@ -512,7 +512,7 @@ LoadGame (COUNT which_game, SUMMARY_DESC *SummPtr) while (num_links--) { HEVENT hEvent; - EVENTPTR EventPtr; + EVENT *EventPtr; hEvent = AllocEvent (); LockEvent (hEvent, &EventPtr); @@ -538,7 +538,7 @@ LoadGame (COUNT which_game, SUMMARY_DESC *SummPtr) { BYTE i, NumShips; HENCOUNTER hEncounter; - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; hEncounter = AllocEncounter (); LockEncounter (hEncounter, &EncounterPtr); @@ -549,12 +549,12 @@ LoadGame (COUNT which_game, SUMMARY_DESC *SummPtr) for (i = 0; i < NumShips; ++i) { HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR TemplatePtr; + SHIP_FRAGMENT *TemplatePtr; hStarShip = GetStarShipFromIndex ( &GLOBAL (avail_race_q), EncounterPtr->SD.ShipList[i].var1); - TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); EncounterPtr->SD.ShipList[i].race_strings = TemplatePtr->ShipInfo.race_strings; diff --git a/sc2/src/sc2code/loadship.c b/sc2/src/sc2code/loadship.c index 4ab09499b..61173c8bd 100644 --- a/sc2/src/sc2code/loadship.c +++ b/sc2/src/sc2code/loadship.c @@ -24,7 +24,7 @@ MEM_HANDLE -load_ship (STARSHIPPTR StarShipPtr, BOOLEAN LoadBattleData) +load_ship (STARSHIP *StarShipPtr, BOOLEAN LoadBattleData) { BOOLEAN retval; MEM_HANDLE h; @@ -36,7 +36,7 @@ load_ship (STARSHIPPTR StarShipPtr, BOOLEAN LoadBattleData) { #define INITIAL_CODE_RES MAKE_RESOURCE (1, CODE, 0) BYTE captains_name_index; - PVOID CodeRef; + void *CodeRef; MEM_HANDLE hOldIndex; COUNT which_player; @@ -45,7 +45,7 @@ load_ship (STARSHIPPTR StarShipPtr, BOOLEAN LoadBattleData) hOldIndex = SetResourceIndex (h); CodeRef = CaptureCodeRes (LoadCodeRes (INITIAL_CODE_RES), - (PVOID)&GlobData, (PVOID)&StarShipPtr->RaceDescPtr); + &GlobData, &StarShipPtr->RaceDescPtr); if (CodeRef == 0) goto BadLoad; StarShipPtr->RaceDescPtr->CodeRef = CodeRef; @@ -76,7 +76,7 @@ load_ship (STARSHIPPTR StarShipPtr, BOOLEAN LoadBattleData) if (LoadBattleData) { - DATA_STUFFPTR RawPtr; + DATA_STUFF *RawPtr; StarShipPtr->captains_name_index = captains_name_index; StarShipPtr->RaceDescPtr->ship_info.ship_flags |= which_player; @@ -146,9 +146,9 @@ BadLoad: } void -free_ship (STARSHIPPTR StarShipPtr, BOOLEAN FreeBattleData) +free_ship (STARSHIP *StarShipPtr, BOOLEAN FreeBattleData) { - RACE_DESCPTR raceDescPtr = StarShipPtr->RaceDescPtr; + RACE_DESC *raceDescPtr = StarShipPtr->RaceDescPtr; SHIP_INFO *shipInfo = &raceDescPtr->ship_info; if (FreeBattleData) diff --git a/sc2/src/sc2code/master.c b/sc2/src/sc2code/master.c index 1e19742c6..4f5eed3a8 100644 --- a/sc2/src/sc2code/master.c +++ b/sc2/src/sc2code/master.c @@ -47,21 +47,21 @@ LoadMasterShipList (void) { char built_buf[30]; HSTARSHIP hStarShip, hNextShip; - STARSHIPPTR BuiltShipPtr; - SHIP_INFOPTR ShipInfoPtr; + STARSHIP *BuiltShipPtr; + SHIP_INFO *ShipInfoPtr; TaskSwitch (); // XXX: what is this doing here? BuiltShipPtr = LockStarShip (&master_q, hBuiltShip); load_ship (BuiltShipPtr, FALSE); - ShipInfoPtr = &((SHIP_FRAGMENTPTR)BuiltShipPtr)->ShipInfo; + ShipInfoPtr = &((SHIP_FRAGMENT*)BuiltShipPtr)->ShipInfo; *ShipInfoPtr = BuiltShipPtr->RaceDescPtr->ship_info; BuiltShipPtr->RaceDescPtr->ship_info.melee_icon = 0; BuiltShipPtr->RaceDescPtr->ship_info.icons = 0; BuiltShipPtr->RaceDescPtr->ship_info.race_strings = 0; free_ship (BuiltShipPtr, FALSE); - BuiltShipPtr->RaceDescPtr = (RACE_DESCPTR)ShipInfoPtr; + BuiltShipPtr->RaceDescPtr = (RACE_DESC*)ShipInfoPtr; GetStringContents (SetAbsStringTableIndex ( BuiltShipPtr->RaceDescPtr->ship_info.race_strings, 2 @@ -76,7 +76,7 @@ LoadMasterShipList (void) hStarShip; hStarShip = hNextShip) { char ship_buf[30]; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (&master_q, hStarShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -101,7 +101,7 @@ FreeMasterShipList (void) for (hStarShip = GetHeadLink (&master_q); hStarShip != 0; hStarShip = hNextShip) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (&master_q, hStarShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -131,7 +131,7 @@ FindMasterShip (DWORD ship_ref) { DWORD ref; HSTARSHIP hNextShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (&master_q, hStarShip); hNextShip = _GetSuccLink (StarShipPtr); diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c index cdccab0af..767060096 100644 --- a/sc2/src/sc2code/melee.c +++ b/sc2/src/sc2code/melee.c @@ -58,8 +58,8 @@ #include -static void DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE NewStarShip); -static void StartMelee (PMELEE_STATE pMS); +static void DrawMeleeShipStrings (MELEE_STATE *pMS, BYTE NewStarShip); +static void StartMelee (MELEE_STATE *pMS); static ssize_t numPlayersReady (void); static int flash_selection_func (void *data); @@ -188,12 +188,12 @@ static FRAME MeleeFrame; static FRAME BuildPickFrame; extern QUEUE master_q; DWORD InTime; -PMELEE_STATE volatile pMeleeState; +MELEE_STATE *pMeleeState; -static BOOLEAN DoMelee (PMELEE_STATE pMS); -static BOOLEAN DoEdit (PMELEE_STATE pMS); -static BOOLEAN DoPickShip (PMELEE_STATE pMS); -static BOOLEAN DoConfirmSettings (PMELEE_STATE pMS); +static BOOLEAN DoMelee (MELEE_STATE *pMS); +static BOOLEAN DoEdit (MELEE_STATE *pMS); +static BOOLEAN DoPickShip (MELEE_STATE *pMS); +static BOOLEAN DoConfirmSettings (MELEE_STATE *pMS); #define DTSHS_NORMAL 0 #define DTSHS_EDIT 1 @@ -201,11 +201,11 @@ static BOOLEAN DoConfirmSettings (PMELEE_STATE pMS); #define DTSHS_REPAIR 4 #define DTSHS_BLOCKCUR 8 -static BOOLEAN DrawTeamString (PMELEE_STATE pMS, COUNT side, +static BOOLEAN DrawTeamString (MELEE_STATE *pMS, COUNT side, COUNT HiLiteState); -static BOOLEAN DoLoadTeam (PMELEE_STATE pMS); -static void DrawFileStrings (PMELEE_STATE pMS, int HiLiteState); +static BOOLEAN DoLoadTeam (MELEE_STATE *pMS); +static void DrawFileStrings (MELEE_STATE *pMS, int HiLiteState); static void @@ -219,7 +219,7 @@ DrawMeleeIcon (COUNT which_icon) } static void -GetShipBox (PRECT pRect, COUNT side, COUNT row, COUNT col) +GetShipBox (RECT *pRect, COUNT side, COUNT row, COUNT col) { pRect->corner.x = MELEE_X_OFFS + (col * (MELEE_BOX_WIDTH + MELEE_BOX_SPACE)); @@ -274,7 +274,7 @@ DrawShipBox (COUNT side, COUNT row, COUNT col, BYTE ship, BOOLEAN HiLite) { STAMP s; HSTARSHIP hStarShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; hStarShip = GetStarShipFromIndex (&master_q, ship); StarShipPtr = LockStarShip (&master_q, hStarShip); @@ -289,7 +289,7 @@ DrawShipBox (COUNT side, COUNT row, COUNT col, BYTE ship, BOOLEAN HiLite) } static void -DrawShipBoxCurrent (PMELEE_STATE pMS, BOOLEAN HiLite) +DrawShipBoxCurrent (MELEE_STATE *pMS, BOOLEAN HiLite) { FleetShipIndex index = GetShipIndex (pMS->row, pMS->col); BYTE ship = pMS->TeamImage[pMS->side].ShipList[index]; @@ -335,7 +335,7 @@ DrawControls (COUNT which_side, BOOLEAN HiLite) } static void -DrawPickFrame (PMELEE_STATE pMS) +DrawPickFrame (MELEE_STATE *pMS) { RECT r, r0, r1, ship_r; STAMP s; @@ -364,7 +364,7 @@ DrawPickFrame (PMELEE_STATE pMS) } static void -RepairMeleeFrame (PRECT pRect) +RepairMeleeFrame (RECT *pRect) { RECT r; CONTEXT OldContext; @@ -436,7 +436,7 @@ RedrawMeleeFrame (void) } static BOOLEAN -DrawTeamString (PMELEE_STATE pMS, COUNT side, COUNT HiLiteState) +DrawTeamString (MELEE_STATE *pMS, COUNT side, COUNT HiLiteState) { RECT r; TEXT lfText; @@ -484,7 +484,7 @@ DrawTeamString (PMELEE_STATE pMS, COUNT side, COUNT HiLiteState) COUNT i; RECT text_r; BYTE char_deltas[MAX_TEAM_CHARS]; - PBYTE pchar_deltas; + BYTE *pchar_deltas; // not drawing team bucks r.extent.width -= 29; @@ -548,7 +548,7 @@ DrawPickIcon (COUNT iship, BYTE DrawErase) { STAMP s; HSTARSHIP hStarShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; RECT r; GetFrameRect (BuildPickFrame, &r); @@ -826,6 +826,7 @@ flash_selection_func (void *data) { DWORD TimeIn; Task task = (Task) data; + volatile MELEE_STATE *pMS = pMeleeState; TimeIn = GetTimeCounter (); while (!Task_ReadState (task, TASK_EXIT)) @@ -835,7 +836,7 @@ flash_selection_func (void *data) LockMutex (GraphicsLock); OldContext = SetContext (SpaceContext); - Deselect (pMeleeState->MeleeOption); + Deselect (pMS->MeleeOption); SetContext (OldContext); UnlockMutex (GraphicsLock); SleepThreadUntil (TimeIn + FLASH_RATE); @@ -843,7 +844,7 @@ flash_selection_func (void *data) LockMutex (GraphicsLock); OldContext = SetContext (SpaceContext); - Select (pMeleeState->MeleeOption); + Select (pMS->MeleeOption); SetContext (OldContext); UnlockMutex (GraphicsLock); SleepThreadUntil (TimeIn + FLASH_RATE); @@ -856,13 +857,13 @@ flash_selection_func (void *data) } static void -InitMelee (PMELEE_STATE pMS) +InitMelee (MELEE_STATE *pMS) { RECT r; SetContext (SpaceContext); SetContextFGFrame (Screen); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContextBackGroundColor (BLACK_COLOR); ClearDrawable (); r.corner.x = SAFE_X; @@ -879,11 +880,11 @@ InitMelee (PMELEE_STATE pMS) } static void -DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE NewStarShip) +DrawMeleeShipStrings (MELEE_STATE *pMS, BYTE NewStarShip) { RECT r, OldRect; HSTARSHIP hStarShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; CONTEXT OldContext; LockMutex (GraphicsLock); @@ -936,7 +937,7 @@ DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE NewStarShip) hStarShip = GetStarShipFromIndex (&master_q, NewStarShip); StarShipPtr = LockStarShip (&master_q, hStarShip); - InitShipStatus (StarShipPtr, NULL_PTR); + InitShipStatus (StarShipPtr, NULL); UnlockStarShip (&master_q, hStarShip); } @@ -949,7 +950,7 @@ DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE NewStarShip) } static void -UpdateCurrentShip (PMELEE_STATE pMS) +UpdateCurrentShip (MELEE_STATE *pMS) { FleetShipIndex fleetShipIndex = GetShipIndex (pMS->row, pMS->col); if (pMS->row == NUM_MELEE_ROWS) @@ -973,7 +974,7 @@ GetShipValue (BYTE StarShip) return (COUNT)~0; { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; COUNT val; StarShipPtr = LockStarShip (&master_q, hStarShip); @@ -1040,7 +1041,7 @@ LoadTeamImage (DIRENTRY DirEntry, TEAM_IMAGE* pTI, UNICODE* pFilePath) uio_Stream *load_fp; int status; - pfile = pFilePath != NULL_PTR ? pFilePath : file; + pfile = pFilePath != NULL ? pFilePath : file; GetDirEntryContents (DirEntry, (STRINGPTR)pfile, FALSE); load_fp = res_OpenResFile (meleeDir, pfile, "rb"); @@ -1059,7 +1060,7 @@ LoadTeamImage (DIRENTRY DirEntry, TEAM_IMAGE* pTI, UNICODE* pFilePath) } static void -DrawFileStrings (PMELEE_STATE pMS, int HiLiteState) +DrawFileStrings (MELEE_STATE *pMS, int HiLiteState) { #define ENTRY_HEIGHT 32 COORD y; @@ -1141,7 +1142,7 @@ DrawFileStrings (PMELEE_STATE pMS, int HiLiteState) pMS->TeamDE = SetAbsDirEntryTableIndex ( pMS->TeamDE, bot - NUM_PREBUILT); if (-1 == LoadTeamImage (pMS->TeamDE, - &pMS->FileList[bot - top], NULL_PTR)) + &pMS->FileList[bot - top], NULL)) { pMS->FileList[bot - top] = pMS->PreBuiltList[0]; } @@ -1171,7 +1172,7 @@ DrawFileStrings (PMELEE_STATE pMS, int HiLiteState) if (StarShip != MELEE_NONE) { HSTARSHIP hStarShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; hStarShip = GetStarShipFromIndex (&master_q, StarShip); StarShipPtr = LockStarShip (&master_q, hStarShip); @@ -1192,7 +1193,7 @@ DrawFileStrings (PMELEE_STATE pMS, int HiLiteState) } static BOOLEAN -DoLoadTeam (PMELEE_STATE pMS) +DoLoadTeam (MELEE_STATE *pMS) { SIZE index; @@ -1327,7 +1328,7 @@ WriteTeamImage (TEAM_IMAGE *pTI, uio_Stream *save_fp) } static void -LoadTeamList (PMELEE_STATE pMS, UNICODE *pbuf) +LoadTeamList (MELEE_STATE *pMS, UNICODE *pbuf) { COUNT num_entries; char file[NAME_MAX]; @@ -1373,7 +1374,7 @@ GetNewList: } static BOOLEAN -DoSaveTeam (PMELEE_STATE pMS) +DoSaveTeam (MELEE_STATE *pMS) { STAMP MsgStamp; char file[NAME_MAX]; @@ -1424,11 +1425,11 @@ DoSaveTeam (PMELEE_STATE pMS) } static void -DeleteCurrentShip (PMELEE_STATE pMS) +DeleteCurrentShip (MELEE_STATE *pMS) { RECT r; HSTARSHIP hStarShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; FleetShipIndex fleetShipIndex; int CurIndex; @@ -1454,7 +1455,7 @@ DeleteCurrentShip (PMELEE_STATE pMS) } static void -AdvanceCursor (PMELEE_STATE pMS) +AdvanceCursor (MELEE_STATE *pMS) { if (++pMS->col == NUM_MELEE_COLUMNS) { @@ -1469,9 +1470,9 @@ AdvanceCursor (PMELEE_STATE pMS) } static BOOLEAN -OnTeamNameChange (PTEXTENTRY_STATE pTES) +OnTeamNameChange (TEXTENTRY_STATE *pTES) { - PMELEE_STATE pMS = (PMELEE_STATE) pTES->CbParam; + MELEE_STATE *pMS = (MELEE_STATE*) pTES->CbParam; BOOLEAN ret; COUNT hl = DTSHS_EDIT; @@ -1487,7 +1488,7 @@ OnTeamNameChange (PTEXTENTRY_STATE pTES) } static BOOLEAN -DoEdit (PMELEE_STATE pMS) +DoEdit (MELEE_STATE *pMS) { if (GLOBAL (CurrentActivity) & CHECK_ABORT) return (FALSE); @@ -1651,9 +1652,9 @@ DoEdit (PMELEE_STATE pMS) // Handle the popup from which a ship to add to the fleet can be chosen. static BOOLEAN -DoPickShip (PMELEE_STATE pMS) +DoPickShip (MELEE_STATE *pMS) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (GLOBAL (CurrentActivity) & CHECK_ABORT) return (FALSE); @@ -1823,7 +1824,7 @@ numPlayersReady (void) // When the other party changes something in the settings, the confirmation // is cancelled. static BOOLEAN -DoConfirmSettings (PMELEE_STATE pMS) +DoConfirmSettings (MELEE_STATE *pMS) { #ifdef NETPLAY ssize_t numDone; @@ -1937,7 +1938,7 @@ DoConfirmSettings (PMELEE_STATE pMS) } static void -LoadMeleeInfo (PMELEE_STATE pMS) +LoadMeleeInfo (MELEE_STATE *pMS) { STAMP s; CONTEXT OldContext; @@ -1983,7 +1984,7 @@ LoadMeleeInfo (PMELEE_STATE pMS) } static void -FreeMeleeInfo (PMELEE_STATE pMS) +FreeMeleeInfo (MELEE_STATE *pMS) { if (pMS->flash_task) { @@ -2012,7 +2013,7 @@ FreeMeleeInfo (PMELEE_STATE pMS) } static void -BuildAndDrawShipList (PMELEE_STATE pMS) +BuildAndDrawShipList (MELEE_STATE *pMS) { COUNT i; CONTEXT OldContext; @@ -2078,7 +2079,8 @@ BuildAndDrawShipList (PMELEE_STATE pMS) BYTE row, col; BYTE ship_cost; HSTARSHIP hStarShip, hBuiltShip; - STARSHIPPTR StarShipPtr, BuiltShipPtr; + STARSHIP *StarShipPtr; + STARSHIP *BuiltShipPtr; hStarShip = GetStarShipFromIndex (&master_q, StarShip); StarShipPtr = LockStarShip (&master_q, hStarShip); @@ -2110,7 +2112,7 @@ BuildAndDrawShipList (PMELEE_STATE pMS) } static void -StartMelee (PMELEE_STATE pMS) +StartMelee (MELEE_STATE *pMS) { if (pMS->flash_task) { @@ -2165,7 +2167,7 @@ StartMelee (PMELEE_STATE pMS) } static void -StartMeleeButtonPressed (PMELEE_STATE pMS) +StartMeleeButtonPressed (MELEE_STATE *pMS) { if (pMS->star_bucks[0] == 0 || pMS->star_bucks[1] == 0) { @@ -2258,7 +2260,7 @@ StartMeleeButtonPressed (PMELEE_STATE pMS) #ifdef NETPLAY static BOOLEAN -DoConnectingDialog (PMELEE_STATE pMS) +DoConnectingDialog (MELEE_STATE *pMS) { COUNT which_side = (pMS->MeleeOption == NET_TOP) ? 1 : 0; NetConnection *conn; @@ -2279,7 +2281,7 @@ DoConnectingDialog (PMELEE_STATE pMS) closePlayerNetworkConnection(which_side); pMS->Initialized = TRUE; - conn = openPlayerNetworkConnection (which_side, (void *) pMS); + conn = openPlayerNetworkConnection (which_side, pMS); pMS->InputFunc = DoConnectingDialog; /* Draw the dialog box here */ @@ -2377,7 +2379,7 @@ DoConnectingDialog (PMELEE_STATE pMS) /* Check for disconnections, and revert to human control if so */ static void -check_for_disconnections (PMELEE_STATE pMS) +check_for_disconnections (MELEE_STATE *pMS) { COUNT player; bool changed = FALSE; @@ -2412,7 +2414,7 @@ check_for_disconnections (PMELEE_STATE pMS) static BOOLEAN -DoMelee (PMELEE_STATE pMS) +DoMelee (MELEE_STATE *pMS) { BOOLEAN force_select = FALSE; if (GLOBAL (CurrentActivity) & CHECK_ABORT) @@ -2628,7 +2630,7 @@ DoMelee (PMELEE_STATE pMS) } static void -InitPreBuilt (PMELEE_STATE pMS) +InitPreBuilt (MELEE_STATE *pMS) { { FleetShipIndex shipI = 0; @@ -2901,7 +2903,7 @@ InitPreBuilt (PMELEE_STATE pMS) } int -LoadMeleeConfig (PMELEE_STATE pMS) +LoadMeleeConfig (MELEE_STATE *pMS) { uio_Stream *load_fp; int status; @@ -2948,7 +2950,7 @@ err: } int -WriteMeleeConfig (PMELEE_STATE pMS) +WriteMeleeConfig (MELEE_STATE *pMS) { uio_Stream *save_fp; @@ -3027,7 +3029,7 @@ Melee (void) MenuState.star_bucks[0] = GetTeamValue (&MenuState.TeamImage[0]); MenuState.star_bucks[1] = GetTeamValue (&MenuState.TeamImage[1]); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)&MenuState, TRUE); + DoInput (&MenuState, TRUE); StopMusic (); WaitForSoundEnd (TFBSOUND_WAIT_ALL); @@ -3046,7 +3048,7 @@ Melee (void) // Notify the network connections of a team name change. void -teamStringChanged (PMELEE_STATE pMS, int player) +teamStringChanged (MELEE_STATE *pMS, int player) { #ifdef NETPLAY const char *name; @@ -3078,7 +3080,7 @@ teamStringChanged (PMELEE_STATE pMS, int player) // Notify the network connections of the configuration of a fleet. void -entireFleetChanged (PMELEE_STATE pMS, int player) +entireFleetChanged (MELEE_STATE *pMS, int player) { #ifdef NETPLAY size_t playerI; @@ -3105,7 +3107,7 @@ entireFleetChanged (PMELEE_STATE pMS, int player) // Notify the network of a change in the configuration of a fleet. void -fleetShipChanged (PMELEE_STATE pMS, int player, size_t index) +fleetShipChanged (MELEE_STATE *pMS, int player, size_t index) { #ifdef NETPLAY size_t playerI; @@ -3136,7 +3138,7 @@ fleetShipChanged (PMELEE_STATE pMS, int player, size_t index) // NB: 'len' does not include the terminating 0. // 'len' counts in bytes, not in characters. void -updateTeamName (PMELEE_STATE pMS, COUNT side, const char *name, +updateTeamName (MELEE_STATE *pMS, COUNT side, const char *name, size_t len) { // NB: MAX_TEAM_CHARS is the maximum number of characters, @@ -3161,7 +3163,7 @@ updateTeamName (PMELEE_STATE pMS, COUNT side, const char *name, // Update a ship in a fleet as specified by a remote party. bool -updateFleetShip (PMELEE_STATE pMS, COUNT side, COUNT index, BYTE ship) +updateFleetShip (MELEE_STATE *pMS, COUNT side, COUNT index, BYTE ship) { BYTE row = GetShipRow (index); BYTE col = GetShipColumn (index); @@ -3222,7 +3224,7 @@ updateFleetShip (PMELEE_STATE pMS, COUNT side, COUNT index, BYTE ship) } void -updateRandomSeed (PMELEE_STATE pMS, COUNT side, DWORD seed) +updateRandomSeed (MELEE_STATE *pMS, COUNT side, DWORD seed) { TFB_SeedRandom (seed); (void) pMS; @@ -3231,7 +3233,7 @@ updateRandomSeed (PMELEE_STATE pMS, COUNT side, DWORD seed) // The remote player has done something which invalidates our confirmation. void -confirmationCancelled(PMELEE_STATE pMS, COUNT side) +confirmationCancelled(MELEE_STATE *pMS, COUNT side) { LockMutex (GraphicsLock); if (side == 0) diff --git a/sc2/src/sc2code/melee.h b/sc2/src/sc2code/melee.h index 58c38e613..7a673ce51 100644 --- a/sc2/src/sc2code/melee.h +++ b/sc2/src/sc2code/melee.h @@ -109,21 +109,18 @@ struct melee_state MUSIC_REF hMusic; }; -typedef MELEE_STATE *PMELEE_STATE; - -extern PMELEE_STATE volatile pMeleeState; extern void Melee (void); -void teamStringChanged (PMELEE_STATE pMS, int player); -void entireFleetChanged (PMELEE_STATE pMS, int player); -void fleetShipChanged (PMELEE_STATE pMS, int player, size_t index); +void teamStringChanged (MELEE_STATE *pMS, int player); +void entireFleetChanged (MELEE_STATE *pMS, int player); +void fleetShipChanged (MELEE_STATE *pMS, int player, size_t index); -void updateTeamName (PMELEE_STATE pMS, COUNT side, const char *name, +void updateTeamName (MELEE_STATE *pMS, COUNT side, const char *name, size_t len); -bool updateFleetShip (PMELEE_STATE pMS, COUNT side, COUNT index, BYTE ship); -void updateRandomSeed (PMELEE_STATE pMS, COUNT side, DWORD seed); -void confirmationCancelled(PMELEE_STATE pMS, COUNT side); +bool updateFleetShip (MELEE_STATE *pMS, COUNT side, COUNT index, BYTE ship); +void updateRandomSeed (MELEE_STATE *pMS, COUNT side, DWORD seed); +void confirmationCancelled(MELEE_STATE *pMS, COUNT side); void connectedFeedback (NetConnection *conn); void abortFeedback (NetConnection *conn, NetplayAbortReason reason); void resetFeedback (NetConnection *conn, NetplayResetReason reason, diff --git a/sc2/src/sc2code/menu.c b/sc2/src/sc2code/menu.c index 741e4674f..d34865494 100644 --- a/sc2/src/sc2code/menu.c +++ b/sc2/src/sc2code/menu.c @@ -397,7 +397,7 @@ ConvertAlternateMenu (BYTE BaseState, BYTE NewState) } BOOLEAN -DoMenuChooser (PMENU_STATE pMS, BYTE BaseState) +DoMenuChooser (MENU_STATE *pMS, BYTE BaseState) { { diff --git a/sc2/src/sc2code/menustat.h b/sc2/src/sc2code/menustat.h index e41a7f55f..bbe02f110 100755 --- a/sc2/src/sc2code/menustat.h +++ b/sc2/src/sc2code/menustat.h @@ -47,9 +47,7 @@ typedef struct menu_state void *Extra; } MENU_STATE; -typedef MENU_STATE *PMENU_STATE; - -extern PMENU_STATE pMenuState; +extern MENU_STATE *pMenuState; #endif /* _MENUSTAT_H */ diff --git a/sc2/src/sc2code/misc.c b/sc2/src/sc2code/misc.c index 052c663e0..ac62931c9 100644 --- a/sc2/src/sc2code/misc.c +++ b/sc2/src/sc2code/misc.c @@ -33,7 +33,7 @@ spawn_planet (void) hPlanetElement = AllocElement (); if (hPlanetElement) { - ELEMENTPTR PlanetElementPtr; + ELEMENT *PlanetElementPtr; extern FRAME planet[]; LockElement (hPlanetElement, &PlanetElementPtr); @@ -66,14 +66,14 @@ spawn_planet (void) extern FRAME asteroid[]; static void -spawn_rubble (PELEMENT AsteroidElementPtr) +spawn_rubble (ELEMENT *AsteroidElementPtr) { HELEMENT hRubbleElement; hRubbleElement = AllocElement (); if (hRubbleElement) { - ELEMENTPTR RubbleElementPtr; + ELEMENT *RubbleElementPtr; PutElement (hRubbleElement); LockElement (hRubbleElement, &RubbleElementPtr); @@ -92,7 +92,7 @@ spawn_rubble (PELEMENT AsteroidElementPtr) } static void -asteroid_preprocess (PELEMENT ElementPtr) +asteroid_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -115,7 +115,7 @@ asteroid_preprocess (PELEMENT ElementPtr) } void -spawn_asteroid (PELEMENT ElementPtr) +spawn_asteroid (ELEMENT *ElementPtr) { HELEMENT hAsteroidElement; @@ -130,7 +130,7 @@ spawn_asteroid (PELEMENT ElementPtr) } else { - ELEMENTPTR AsteroidElementPtr; + ELEMENT *AsteroidElementPtr; COUNT val; LockElement (hAsteroidElement, &AsteroidElementPtr); @@ -187,7 +187,7 @@ spawn_asteroid (PELEMENT ElementPtr) } void -do_damage (ELEMENTPTR ElementPtr, SIZE damage) +do_damage (ELEMENT *ElementPtr, SIZE damage) { if (ElementPtr->state_flags & PLAYER_SHIP) { @@ -211,7 +211,7 @@ do_damage (ELEMENTPTR ElementPtr, SIZE damage) } void -crew_preprocess (PELEMENT ElementPtr) +crew_preprocess (ELEMENT *ElementPtr) { HELEMENT hTarget; @@ -222,7 +222,7 @@ crew_preprocess (PELEMENT ElementPtr) if ((hTarget = ElementPtr->hTarget) == 0) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr && StarShipPtr->RaceDescPtr->ship_info.crew_level) @@ -232,7 +232,7 @@ crew_preprocess (PELEMENT ElementPtr) COUNT facing; facing = 0; - TrackShip ((ELEMENTPTR)ElementPtr, &facing); + TrackShip (ElementPtr, &facing); } } @@ -240,7 +240,7 @@ crew_preprocess (PELEMENT ElementPtr) { #define CREW_DELTA SCALED_ONE SIZE delta; - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; LockElement (hTarget, &ShipPtr); delta = ShipPtr->current.location.x @@ -263,20 +263,20 @@ crew_preprocess (PELEMENT ElementPtr) } void -crew_collision (PELEMENT ElementPtr0, PPOINT pPt0, - PELEMENT ElementPtr1, PPOINT pPt1) +crew_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if ((ElementPtr1->state_flags & PLAYER_SHIP) && ElementPtr1->life_span >= NORMAL_LIFE && ElementPtr0->hit_points > 0) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr1, &StarShipPtr); if (!(StarShipPtr->RaceDescPtr->ship_info.ship_flags & CREW_IMMUNE)) { ProcessSound (SetAbsSoundIndex (GameSounds, GRAB_CREW), ElementPtr1); - DeltaCrew ((ELEMENTPTR)ElementPtr1, 1); + DeltaCrew (ElementPtr1, 1); } } @@ -288,13 +288,13 @@ crew_collision (PELEMENT ElementPtr0, PPOINT pPt0, } void -AbandonShip (ELEMENTPTR ShipPtr, ELEMENTPTR TargetPtr, +AbandonShip (ELEMENT *ShipPtr, ELEMENT *TargetPtr, COUNT crew_loss) { SIZE dx, dy; COUNT direction; RECT r; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; HELEMENT hCrew; INTERSECT_CONTROL ShipIntersect; @@ -319,7 +319,7 @@ AbandonShip (ELEMENTPTR ShipPtr, ELEMENTPTR TargetPtr, while (crew_loss-- && (hCrew = AllocElement ())) { #define CREW_LIFE 300 - ELEMENTPTR CrewPtr; + ELEMENT *CrewPtr; DeltaCrew (ShipPtr, -1); diff --git a/sc2/src/sc2code/netplay/checksum.c b/sc2/src/sc2code/netplay/checksum.c index 871e26ec9..2f59b7237 100644 --- a/sc2/src/sc2code/netplay/checksum.c +++ b/sc2/src/sc2code/netplay/checksum.c @@ -118,7 +118,7 @@ crc_processELEMENT(crc_State *state, const ELEMENT *val) { // the side this ship is on. This must be excluded from the checksum // as this does not have to be the same for both sides. { - extern void new_ship(PELEMENT ElementPtr); + extern void new_ship(ELEMENT *ElementPtr); BYTE turn_wait = val->turn_wait; if (val->preprocess_func == new_ship) @@ -146,7 +146,7 @@ crc_processDispQueue(crc_State *state) { crc_log("START crc_processDispQueue()."); #endif for (element = GetHeadElement(); element != 0; element = nextElement) { - ELEMENTPTR elementPtr; + ELEMENT *elementPtr; #ifdef DUMP_CRC_OPS crc_log("===== disp_q[%d]:", i); diff --git a/sc2/src/sc2code/netplay/netmelee.c b/sc2/src/sc2code/netplay/netmelee.c index d38d28044..9448d5916 100644 --- a/sc2/src/sc2code/netplay/netmelee.c +++ b/sc2/src/sc2code/netplay/netmelee.c @@ -320,7 +320,7 @@ setBattleStateConnections(struct battlestate_struct *bs) { } BATTLE_INPUT_STATE -networkBattleInput(COUNT player, STARSHIPPTR StarShipPtr) { +networkBattleInput(COUNT player, STARSHIP *StarShipPtr) { BattleInputBuffer *bib = getBattleInputBuffer(player); BATTLE_INPUT_STATE result; @@ -549,7 +549,7 @@ typedef struct NegotiateReadyState NegotiateReadyState; struct NegotiateReadyState { // Common fields of INPUT_STATE_DESC, from which this structure // "inherits". - BOOLEAN(*InputFunc)(PVOID pInputState); + BOOLEAN(*InputFunc)(void *pInputState); COUNT MenuRepeatDelay; NetConnection *conn; @@ -638,7 +638,7 @@ typedef struct WaitReadyState WaitReadyState; struct WaitReadyState { // Common fields of INPUT_STATE_DESC, from which this structure // "inherits". - BOOLEAN(*InputFunc)(PVOID pInputState); + BOOLEAN(*InputFunc)(void *pInputState); COUNT MenuRepeatDelay; NetConnection *conn; @@ -697,7 +697,7 @@ typedef struct WaitResetState WaitResetState; struct WaitResetState { // Common fields of INPUT_STATE_DESC, from which this structure // "inherits". - BOOLEAN(*InputFunc)(PVOID pInputState); + BOOLEAN(*InputFunc)(void *pInputState); COUNT MenuRepeatDelay; NetConnection *conn; diff --git a/sc2/src/sc2code/netplay/netmelee.h b/sc2/src/sc2code/netplay/netmelee.h index e9dec76e9..fa2580aad 100644 --- a/sc2/src/sc2code/netplay/netmelee.h +++ b/sc2/src/sc2code/netplay/netmelee.h @@ -55,7 +55,7 @@ void sendChecksumConnections(uint32 frameNr, uint32 checksum); void initBattleStateDataConnections(void); void setBattleStateConnections(struct battlestate_struct *bs); -BATTLE_INPUT_STATE networkBattleInput(COUNT player, STARSHIPPTR StarShipPtr); +BATTLE_INPUT_STATE networkBattleInput(COUNT player, STARSHIP *StarShipPtr); NetConnection *openPlayerNetworkConnection(COUNT player, void *extra); void closePlayerNetworkConnection(COUNT player); diff --git a/sc2/src/sc2code/outfit.c b/sc2/src/sc2code/outfit.c index 4ce9efe11..ddb961fe4 100644 --- a/sc2/src/sc2code/outfit.c +++ b/sc2/src/sc2code/outfit.c @@ -42,7 +42,7 @@ enum static void -DrawModuleStrings (PMENU_STATE pMS, BYTE NewModule) +DrawModuleStrings (MENU_STATE *pMS, BYTE NewModule) { RECT r; STAMP s; @@ -139,7 +139,7 @@ RedistributeFuel (void) #define LANDER_WIDTH 15 static void -DisplayLanders (PMENU_STATE pMS) +DisplayLanders (MENU_STATE *pMS) { STAMP s; @@ -172,7 +172,7 @@ DisplayLanders (PMENU_STATE pMS) } static BOOLEAN -DoInstallModule (PMENU_STATE pMS) +DoInstallModule (MENU_STATE *pMS) { BYTE NewState, new_slot_piece, old_slot_piece; SIZE FirstItem, LastItem; @@ -237,7 +237,7 @@ DoInstallModule (PMENU_STATE pMS) SetContext (SpaceContext); ClearSISRect (CLEAR_SIS_RADAR); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); goto InitFlash; } else if (select || cancel) @@ -298,7 +298,7 @@ DoInstallModule (PMENU_STATE pMS) LockMutex (GraphicsLock); SetContext (SpaceContext); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); if (select) { @@ -609,7 +609,7 @@ ChangeFuelQuantity (void) } BOOLEAN -DoOutfit (PMENU_STATE pMS) +DoOutfit (MENU_STATE *pMS) { if (GLOBAL (CurrentActivity) & CHECK_ABORT) goto ExitOutfit; @@ -680,16 +680,16 @@ DoOutfit (PMENU_STATE pMS) s.frame = SetAbsFrameIndex (pMS->ModuleFrame, GetFrameCount (pMS->ModuleFrame) - 5); if (ShieldFlags & (1 << EARTHQUAKE_DISASTER)) - DrawStamp ((PSTAMP)&s); + DrawStamp (&s); s.frame = IncFrameIndex (s.frame); if (ShieldFlags & (1 << BIOLOGICAL_DISASTER)) - DrawStamp ((PSTAMP)&s); + DrawStamp (&s); s.frame = IncFrameIndex (s.frame); if (ShieldFlags & (1 << LIGHTNING_DISASTER)) - DrawStamp ((PSTAMP)&s); + DrawStamp (&s); s.frame = IncFrameIndex (s.frame); if (ShieldFlags & (1 << LAVASPOT_DISASTER)) - DrawStamp ((PSTAMP)&s); + DrawStamp (&s); } UnlockMutex (GraphicsLock); diff --git a/sc2/src/sc2code/pickmele.c b/sc2/src/sc2code/pickmele.c index 065f565ab..f51fcadfd 100644 --- a/sc2/src/sc2code/pickmele.c +++ b/sc2/src/sc2code/pickmele.c @@ -68,7 +68,7 @@ MeleeShipByQueueIndex (const QUEUE *queue, COUNT index) for (hShip = GetHeadLink (queue); hShip != 0; hShip = hNextShip) { - STARSHIPPTR StarShipPtr = LockStarShip (queue, hShip); + STARSHIP *StarShipPtr = LockStarShip (queue, hShip); if (StarShipPtr->ShipFacing == index) { hNextShip = hShip; @@ -93,7 +93,7 @@ MeleeShipByUsedIndex (const QUEUE *queue, COUNT index) for (hShip = GetHeadLink (queue); hShip != 0; hShip = hNextShip) { - STARSHIPPTR StarShipPtr = LockStarShip (queue, hShip); + STARSHIP *StarShipPtr = LockStarShip (queue, hShip); if (StarShipPtr->RaceResIndex && index-- == 0) { UnlockStarShip (queue, hShip); @@ -111,7 +111,7 @@ static COUNT queueIndexFromShip (HSTARSHIP hShip) { COUNT result; - STARSHIPPTR StarShipPtr = LockStarShip (queue, hShip); + STARSHIP *StarShipPtr = LockStarShip (queue, hShip); result = StarShipPtr->ShipFacing; UnlockStarShip (queue, hShip); } @@ -299,7 +299,7 @@ endMeleeCallback (NetConnection *conn, void *arg) #endif HSTARSHIP -GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) +GetMeleeStarShip (STARSHIP *LastStarShipPtr, COUNT which_player) { COUNT ships_left; TEXT t; @@ -307,7 +307,7 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) STAMP s; CONTEXT OldContext; GETMELEE_STATE gmstate; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; BOOLEAN firstTime; if (!(GLOBAL (CurrentActivity) & IN_BATTLE)) @@ -492,10 +492,10 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) UnlockMutex (GraphicsLock); ResetKeyRepeat (); - DoInput ((PVOID)&gmstate, FALSE); + DoInput (&gmstate, FALSE); LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); if (gmstate.hBattleShip == 0) { diff --git a/sc2/src/sc2code/pickmele.h b/sc2/src/sc2code/pickmele.h index cc4cfbb47..def2b294e 100644 --- a/sc2/src/sc2code/pickmele.h +++ b/sc2/src/sc2code/pickmele.h @@ -20,7 +20,7 @@ #include "races.h" #include "libs/compiler.h" -HSTARSHIP GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, +HSTARSHIP GetMeleeStarShip (STARSHIP *LastStarShipPtr, COUNT which_player); typedef struct getmelee_struct GETMELEE_STATE; diff --git a/sc2/src/sc2code/pickship.c b/sc2/src/sc2code/pickship.c index 6ea265b3b..d9830fa23 100644 --- a/sc2/src/sc2code/pickship.c +++ b/sc2/src/sc2code/pickship.c @@ -41,7 +41,7 @@ #define FLAGSHIP_HEIGHT 48 static BOOLEAN -DoPickBattleShip (PMENU_STATE pMS) +DoPickBattleShip (MENU_STATE *pMS) { if (GLOBAL (CurrentActivity) & CHECK_ABORT) { @@ -87,7 +87,7 @@ DoPickBattleShip (PMENU_STATE pMS) COUNT crew_level, max_crew; COUNT ship_index; HSTARSHIP hBattleShip, hNextShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (new_col < 0) new_col = NUM_PICK_SHIP_COLUMNS; @@ -189,7 +189,7 @@ ChangeSelection: t.pStr = GLOBAL_SIS (CommanderName); t.CharCount = (COUNT)~0; crew_level = GLOBAL_SIS (CrewEnlisted); - max_crew = GetCPodCapacity (NULL_PTR); + max_crew = GetCPodCapacity (NULL); } else { @@ -232,7 +232,7 @@ ChangeSelection: font_DrawText (&t); } - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); SetFlashRect (&pMS->flash_rect0, (FRAME)0); UnlockMutex (GraphicsLock); } @@ -273,11 +273,11 @@ OldContext = SetContext (SpaceContext); UnlockMutex (GraphicsLock); pMenuState = &MenuState; SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)&MenuState, FALSE); + DoInput (&MenuState, FALSE); pMenuState = 0; LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); hBattleShip = (HSTARSHIP)MenuState.CurFrame; } @@ -298,7 +298,7 @@ SetContext (OldContext); } HSTARSHIP -GetEncounterStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) +GetEncounterStarShip (STARSHIP *LastStarShipPtr, COUNT which_player) { HSTARSHIP hBattleShip; @@ -313,8 +313,8 @@ GetEncounterStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) else { HSTARSHIP hStarShip; - STARSHIPPTR SPtr; - SHIP_FRAGMENTPTR FragPtr; + STARSHIP *SPtr; + SHIP_FRAGMENT *FragPtr; if (LastStarShipPtr == 0) { @@ -326,7 +326,7 @@ GetEncounterStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) if (which_player == 1) { hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); if (FragPtr->ShipInfo.crew_level == INFINITE_FLEET) { @@ -339,7 +339,7 @@ GetEncounterStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) } else { - PQUEUE pQueue; + QUEUE *pQueue; HSTARSHIP hNextShip; if (which_player == 0) @@ -356,13 +356,13 @@ GetEncounterStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) UnlockStarShip (&race_q[which_player], hBattleShip); hBattleShip = hNextShip; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pQueue, hStarShip); + FragPtr = (SHIP_FRAGMENT*) LockStarShip (pQueue, hStarShip); if (SPtr == LastStarShipPtr) { if (FragPtr->ShipInfo.crew_level != INFINITE_FLEET) { FragPtr->ShipInfo.crew_level = SPtr->special_counter; - SPtr->RaceDescPtr = (RACE_DESCPTR)&FragPtr->ShipInfo; + SPtr->RaceDescPtr = (RACE_DESC*)&FragPtr->ShipInfo; if (GLOBAL (CurrentActivity) & IN_BATTLE) SPtr->RaceResIndex = 0; } @@ -414,12 +414,12 @@ GetEncounterStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player) } void -DrawArmadaPickShip (BOOLEAN draw_salvage_frame, PRECT pPickRect) +DrawArmadaPickShip (BOOLEAN draw_salvage_frame, RECT *pPickRect) { #define PICK_NAME_HEIGHT 6 //COUNT i; HSTARSHIP hBattleShip, hNextShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; RECT r, pick_r; STAMP s; TEXT t; diff --git a/sc2/src/sc2code/planets/calc.c b/sc2/src/sc2code/planets/calc.c index 4abcf57e4..30cac7782 100644 --- a/sc2/src/sc2code/planets/calc.c +++ b/sc2/src/sc2code/planets/calc.c @@ -57,7 +57,7 @@ enum }; static void -CalcSysInfo (SYSTEM_INFOPTR SysInfoPtr) +CalcSysInfo (SYSTEM_INFO *SysInfoPtr) { SysInfoPtr->StarSize = pSolarSysState->SunDesc[0].data_index; switch (STAR_COLOR (CurStarDescPtr->Type)) @@ -100,8 +100,8 @@ CalcSysInfo (SYSTEM_INFOPTR SysInfoPtr) } static UWORD -GeneratePlanetComposition (PLANET_INFOPTR PlanetInfoPtr, SIZE - SurfaceTemp, SIZE radius) +GeneratePlanetComposition (PLANET_INFO *PlanetInfoPtr, SIZE SurfaceTemp, + SIZE radius) { if (PLANSIZE (PlanetInfoPtr->PlanDataPtr->Type) == GAS_GIANT) { @@ -166,7 +166,7 @@ GeneratePlanetComposition (PLANET_INFOPTR PlanetInfoPtr, SIZE // (eg. Beta Corvi I). I don't know what the idea behind this is, // but the if statement must be there for a reason. -- SvdB static SIZE -CalcTemp (SYSTEM_INFOPTR SysInfoPtr, SIZE radius) +CalcTemp (SYSTEM_INFO *SysInfoPtr, SIZE radius) { #define GENERIC_ALBEDO 33 /* In %, 0=black, 100 is reflective */ #define ADJUST_FOR_KELVIN 273 @@ -201,7 +201,7 @@ CalcTemp (SYSTEM_INFOPTR SysInfoPtr, SIZE radius) } static COUNT -CalcRotation (PLANET_INFOPTR PlanetInfoPtr) +CalcRotation (PLANET_INFO *PlanetInfoPtr) { if (PLANSIZE (PlanetInfoPtr->PlanDataPtr->Type) == GAS_GIANT) return ((COUNT)CalcFromBase (80, 80)); @@ -231,8 +231,7 @@ CalcTilt (void) // NB. Returns the RNG to the state it found it in. DWORD -DoPlanetaryAnalysis (SYSTEM_INFOPTR SysInfoPtr, PPLANET_DESC - pPlanetDesc) +DoPlanetaryAnalysis (SYSTEM_INFO *SysInfoPtr, PLANET_DESC *pPlanetDesc) { DWORD old_seed; diff --git a/sc2/src/sc2code/planets/cargo.c b/sc2/src/sc2code/planets/cargo.c index ff18210ab..a37a08e92 100644 --- a/sc2/src/sc2code/planets/cargo.c +++ b/sc2/src/sc2code/planets/cargo.c @@ -37,7 +37,7 @@ ShowRemainingCapacity (void) SetContextFont (TinyFont); sprintf (rt_amount_buf, "%u", - GetSBayCapacity (NULL_PTR) + GetSBayCapacity (NULL) - GLOBAL_SIS (TotalElementMass)); rt.baseline.x = 59; rt.baseline.y = 113; @@ -289,7 +289,7 @@ DrawCargoStrings (BYTE OldElement, BYTE NewElement) } static BOOLEAN -DoDiscardCargo (PMENU_STATE pMS) +DoDiscardCargo (MENU_STATE *pMS) { BYTE NewState; BOOLEAN select, cancel, back, forward; @@ -365,7 +365,7 @@ SelectCargo: } void -Cargo (PMENU_STATE pMS) +Cargo (MENU_STATE *pMS) { pMS->InputFunc = DoDiscardCargo; --pMS->Initialized; @@ -376,7 +376,7 @@ Cargo (PMENU_STATE pMS) UnlockMutex (GraphicsLock); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)pMS, TRUE); + DoInput (pMS, TRUE); pMS->InputFunc = DoFlagshipCommands; pMS->CurState = CARGO + 1; diff --git a/sc2/src/sc2code/planets/devices.c b/sc2/src/sc2code/planets/devices.c index 8d37ab8cc..453284545 100644 --- a/sc2/src/sc2code/planets/devices.c +++ b/sc2/src/sc2code/planets/devices.c @@ -36,13 +36,13 @@ //#define DEBUG_DEVICES static void -DrawDevices (PMENU_STATE pMS, BYTE OldDevice, BYTE NewDevice) +DrawDevices (MENU_STATE *pMS, BYTE OldDevice, BYTE NewDevice) { #define MAX_VIS_DEVICES 5 COORD y, cy; TEXT t; RECT r; - PBYTE pDeviceMap; + BYTE *pDeviceMap; LockMutex (GraphicsLock); @@ -54,7 +54,7 @@ DrawDevices (PMENU_STATE pMS, BYTE OldDevice, BYTE NewDevice) t.align = ALIGN_CENTER; t.CharCount = 3; - pDeviceMap = (PBYTE)pMS->CurFrame; + pDeviceMap = (BYTE*)pMS->CurFrame; if (OldDevice > NUM_DEVICES || (NewDevice < NUM_DEVICES && (NewDevice < (BYTE)pMS->first_item.y @@ -235,9 +235,9 @@ UseCaster (void) (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)))) { // Ilwrath ship is in the system. - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); FoundIlwrath = (BOOLEAN)( GET_RACE_ID (FragPtr) == ILWRATH_SHIP); @@ -441,7 +441,7 @@ DeviceFailed (BYTE which_device) } static BOOLEAN -DoManipulateDevices (PMENU_STATE pMS) +DoManipulateDevices (MENU_STATE *pMS) { BYTE NewState; BOOLEAN select, cancel, back, forward; @@ -474,7 +474,7 @@ DoManipulateDevices (PMENU_STATE pMS) LockMutex (GraphicsLock); status = DeviceFailed ( - ((PBYTE)pMS->CurFrame)[pMS->CurState - 1] + ((BYTE*)pMS->CurFrame)[pMS->CurState - 1] ); NewState = LOBYTE (status); if (NewState) @@ -630,7 +630,7 @@ InventoryDevices (BYTE *pDeviceMap) } BOOLEAN -Devices (PMENU_STATE pMS) +Devices (MENU_STATE *pMS) { BYTE DeviceMap[NUM_DEVICES]; @@ -646,7 +646,7 @@ Devices (PMENU_STATE pMS) TFB_ResetControls (); DoManipulateDevices (pMS); /* to make sure it's initialized */ SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)pMS, TRUE); + DoInput (pMS, TRUE); pMS->CurFrame = 0; pMS->InputFunc = DoFlagshipCommands; diff --git a/sc2/src/sc2code/planets/gencol.c b/sc2/src/sc2code/planets/gencol.c index 9a54ea781..dc0dd4442 100644 --- a/sc2/src/sc2code/planets/gencol.c +++ b/sc2/src/sc2code/planets/gencol.c @@ -46,11 +46,10 @@ GenerateColony (BYTE control) if (GLOBAL (BattleGroupRef) && (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)))) { - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (npc_built_ship_q), hStarShip); SET_GROUP_MISSION (FragPtr, IN_ORBIT); SET_GROUP_LOC (FragPtr, 0 + 1); /* orbitting colony */ SET_GROUP_DEST (FragPtr, 0 + 1); /* orbitting colony */ @@ -65,7 +64,7 @@ GenerateColony (BYTE control) case GENERATE_PLANETS: { COUNT angle; - PPLANET_DESC pMinPlanet; + PLANET_DESC *pMinPlanet; pMinPlanet = &pSolarSysState->PlanetDesc[0]; FillOrbits (pSolarSysState, (BYTE)~0, pMinPlanet, FALSE); diff --git a/sc2/src/sc2code/planets/gendru.c b/sc2/src/sc2code/planets/gendru.c index 847719b10..b2bc1f27b 100644 --- a/sc2/src/sc2code/planets/gendru.c +++ b/sc2/src/sc2code/planets/gendru.c @@ -63,7 +63,7 @@ GenerateDruuge (BYTE control) if (!GET_GAME_STATE (ROSY_SPHERE)) { - ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit = TRUE; + ((PLANETSIDE_DESC*)pMenuState->ModuleFrame)->InTransit = TRUE; SET_GAME_STATE (ROSY_SPHERE, 1); SET_GAME_STATE (ROSY_SPHERE_ON_SHIP, 1); diff --git a/sc2/src/sc2code/planets/genorz.c b/sc2/src/sc2code/planets/genorz.c index bb368c29d..82e00578e 100644 --- a/sc2/src/sc2code/planets/genorz.c +++ b/sc2/src/sc2code/planets/genorz.c @@ -75,9 +75,9 @@ GenerateAndrosynth (BYTE control) |= (1L << (i + 16)); if (pSolarSysState->SysInfo.PlanetInfo.DiscoveryString) { - PPLANETSIDE_DESC pPSD; + PLANETSIDE_DESC *pPSD; - pPSD = (PPLANETSIDE_DESC)pMenuState->ModuleFrame; + pPSD = (PLANETSIDE_DESC*)pMenuState->ModuleFrame; UnbatchGraphics (); DoDiscoveryReport (MenuSounds); BatchGraphics (); diff --git a/sc2/src/sc2code/planets/genpet.c b/sc2/src/sc2code/planets/genpet.c index 4f1d1fcb0..0b990fbef 100644 --- a/sc2/src/sc2code/planets/genpet.c +++ b/sc2/src/sc2code/planets/genpet.c @@ -35,9 +35,9 @@ ZapToUrquanEncounter (void) if ((hEncounter = AllocEncounter ()) || (hEncounter = GetHeadEncounter ())) { SIZE dx, dy; - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; HSTARSHIP hStarShip; - EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; + EXTENDED_SHIP_FRAGMENT *TemplatePtr; LockEncounter (hEncounter, &EncounterPtr); @@ -48,16 +48,13 @@ ZapToUrquanEncounter (void) InsertEncounter (hEncounter, GetHeadEncounter ()); hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), URQUAN_SHIP); - TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (avail_race_q), - hStarShip - ); + TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (avail_race_q), hStarShip); EncounterPtr->origin = TemplatePtr->ShipInfo.loc; EncounterPtr->radius = TemplatePtr->ShipInfo.actual_strength; EncounterPtr->SD.Type = URQUAN_SHIP; EncounterPtr->SD.Index = MAKE_BYTE (1, 0) | ONE_SHOT_ENCOUNTER; - EncounterPtr->SD.ShipList[0] = - ((SHIP_FRAGMENTPTR)TemplatePtr)->ShipInfo; + EncounterPtr->SD.ShipList[0] = ((SHIP_FRAGMENT*)TemplatePtr)->ShipInfo; EncounterPtr->SD.ShipList[0].var1 = URQUAN_SHIP; EncounterPtr->SD.star_pt.x = 5288; EncounterPtr->SD.star_pt.y = 4892; @@ -102,7 +99,7 @@ ZapToUrquanEncounter (void) - (SIZE)GLOBAL_SIS (FuelOnBoard); DeltaSISGauges (0, dx, 0); } - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); DrawHyperCoords (EncounterPtr->SD.star_pt); UnlockMutex (GraphicsLock); diff --git a/sc2/src/sc2code/planets/genpku.c b/sc2/src/sc2code/planets/genpku.c index a0014885b..dad4c792a 100644 --- a/sc2/src/sc2code/planets/genpku.c +++ b/sc2/src/sc2code/planets/genpku.c @@ -63,7 +63,7 @@ GeneratePkunk (BYTE control) if (!GET_GAME_STATE (CLEAR_SPINDLE)) { - ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit = TRUE; + ((PLANETSIDE_DESC*)pMenuState->ModuleFrame)->InTransit = TRUE; SET_GAME_STATE (CLEAR_SPINDLE, 1); SET_GAME_STATE (CLEAR_SPINDLE_ON_SHIP, 1); diff --git a/sc2/src/sc2code/planets/genrain.c b/sc2/src/sc2code/planets/genrain.c index 99c272316..82a106954 100644 --- a/sc2/src/sc2code/planets/genrain.c +++ b/sc2/src/sc2code/planets/genrain.c @@ -53,7 +53,7 @@ GenerateRainbow (BYTE control) { BYTE which_rainbow; UWORD rainbow_mask; - STAR_DESCPTR SDPtr; + STAR_DESC *SDPtr; rainbow_mask = MAKE_WORD ( GET_GAME_STATE (RAINBOW_WORLD0), diff --git a/sc2/src/sc2code/planets/gensam.c b/sc2/src/sc2code/planets/gensam.c index 2adfde691..6d66dff44 100644 --- a/sc2/src/sc2code/planets/gensam.c +++ b/sc2/src/sc2code/planets/gensam.c @@ -75,14 +75,13 @@ BuildUrquanGuard (void) b0 < NUM_URQUAN_GUARDS0; ++b0, b1 += FULL_CIRCLE / (NUM_URQUAN_GUARDS0 + NUM_URQUAN_GUARDS1)) { - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; if (b1 % (FULL_CIRCLE / NUM_URQUAN_GUARDS1) == 0) b1 += FULL_CIRCLE / (NUM_URQUAN_GUARDS0 + NUM_URQUAN_GUARDS1); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (npc_built_ship_q), hStarShip); hNextShip = _GetSuccLink (FragPtr); SET_GROUP_MISSION (FragPtr, ON_STATION | IGNORE_FLAGSHIP); SET_GROUP_LOC (FragPtr, 0); @@ -104,11 +103,10 @@ BuildUrquanGuard (void) b0 < NUM_URQUAN_GUARDS1; ++b0, b1 += FULL_CIRCLE / NUM_URQUAN_GUARDS1) { - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (npc_built_ship_q), hStarShip); hNextShip = _GetSuccLink (FragPtr); SET_GROUP_MISSION (FragPtr, ON_STATION | IGNORE_FLAGSHIP); SET_GROUP_LOC (FragPtr, 0); @@ -153,11 +151,10 @@ GenerateSamatra (BYTE control) hStarShip; hStarShip = hNextShip) { BYTE task; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (npc_built_ship_q), hStarShip); hNextShip = _GetSuccLink (FragPtr); task = GET_GROUP_MISSION (FragPtr); diff --git a/sc2/src/sc2code/planets/genshof.c b/sc2/src/sc2code/planets/genshof.c index 4db54369e..dbdf7ead9 100644 --- a/sc2/src/sc2code/planets/genshof.c +++ b/sc2/src/sc2code/planets/genshof.c @@ -32,9 +32,9 @@ check_old_shofixti (void) && GET_GAME_STATE (SHOFIXTI_RECRUITED)) { BYTE task; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); task = GET_GROUP_MISSION (FragPtr); @@ -97,7 +97,7 @@ GenerateShofixti (BYTE control) case GENERATE_PLANETS: { COUNT i; - PPLANET_DESC pCurDesc; + PLANET_DESC *pCurDesc; #define NUM_PLANETS 6 pSolarSysState->SunDesc[0].NumPlanets = NUM_PLANETS; diff --git a/sc2/src/sc2code/planets/gensol.c b/sc2/src/sc2code/planets/gensol.c index 74969af5e..4693e4500 100644 --- a/sc2/src/sc2code/planets/gensol.c +++ b/sc2/src/sc2code/planets/gensol.c @@ -39,9 +39,9 @@ init_probe (void) && GetGroupInfo (GLOBAL (BattleGroupRef), GROUP_INIT_IP) && (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)))) { - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip); SET_GROUP_MISSION (FragPtr, IN_ORBIT); SET_GROUP_LOC (FragPtr, 2 + 1); /* orbitting earth */ @@ -74,7 +74,7 @@ generate_energy_nodes (void) SET_GAME_STATE (FOUND_PLUTO_SPATHI, 1); pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[ENERGY_SCAN] &= ~(1L << 0); - ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit = TRUE; + ((PLANETSIDE_DESC*)pMenuState->ModuleFrame)->InTransit = TRUE; } else if (pSolarSysState->CurNode == (COUNT)~0) pSolarSysState->CurNode = 1; @@ -402,7 +402,7 @@ GenerateSOL (BYTE control) { COUNT i; DWORD rand_val; - PPLANET_DESC pCurDesc; + PLANET_DESC *pCurDesc; switch (control) { diff --git a/sc2/src/sc2code/planets/genspa.c b/sc2/src/sc2code/planets/genspa.c index 46974fd03..7bd58a046 100644 --- a/sc2/src/sc2code/planets/genspa.c +++ b/sc2/src/sc2code/planets/genspa.c @@ -93,7 +93,7 @@ GenerateSpathi (BYTE control) break; case GENERATE_PLANETS: { - PPLANET_DESC pMinPlanet; + PLANET_DESC *pMinPlanet; pMinPlanet = &pSolarSysState->PlanetDesc[0]; FillOrbits (pSolarSysState, diff --git a/sc2/src/sc2code/planets/gensup.c b/sc2/src/sc2code/planets/gensup.c index 19efdfe09..420b73877 100644 --- a/sc2/src/sc2code/planets/gensup.c +++ b/sc2/src/sc2code/planets/gensup.c @@ -62,7 +62,7 @@ GenerateSupox (BYTE control) if (!GET_GAME_STATE (ULTRON_CONDITION)) { - ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit = TRUE; + ((PLANETSIDE_DESC*)pMenuState->ModuleFrame)->InTransit = TRUE; SET_GAME_STATE (ULTRON_CONDITION, 1); } diff --git a/sc2/src/sc2code/planets/gentopo.c b/sc2/src/sc2code/planets/gentopo.c index 25e77c330..4495c67f7 100644 --- a/sc2/src/sc2code/planets/gentopo.c +++ b/sc2/src/sc2code/planets/gentopo.c @@ -23,7 +23,7 @@ #include "planets.h" void -DeltaTopography (COUNT num_iterations, PSBYTE DepthArray, PRECT pRect, +DeltaTopography (COUNT num_iterations, SBYTE *DepthArray, RECT *pRect, SIZE depth_delta) { SIZE width, height, delta_y; @@ -41,7 +41,7 @@ DeltaTopography (COUNT num_iterations, PSBYTE DepthArray, PRECT pRect, SIZE d; COUNT h, w1, w2; DWORD rand_val; - PSBYTE lpDst; + SBYTE *lpDst; depth_delta = ((((SIZE)TFB_Random () & 1) << 1) - 1) * depth_delta; diff --git a/sc2/src/sc2code/planets/genvault.c b/sc2/src/sc2code/planets/genvault.c index 1a904a71b..483e35211 100644 --- a/sc2/src/sc2code/planets/genvault.c +++ b/sc2/src/sc2code/planets/genvault.c @@ -59,7 +59,7 @@ GenerateShipVault (BYTE control) &= ~(1L << 0); if (GET_GAME_STATE (SYREEN_SHUTTLE_ON_SHIP)) { - ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit = TRUE; + ((PLANETSIDE_DESC*)pMenuState->ModuleFrame)->InTransit = TRUE; SET_GAME_STATE (SHIP_VAULT_UNLOCKED, 1); SET_GAME_STATE (SYREEN_SHUTTLE_ON_SHIP, 0); diff --git a/sc2/src/sc2code/planets/genvux.c b/sc2/src/sc2code/planets/genvux.c index 7eb494ed6..64fd723f0 100644 --- a/sc2/src/sc2code/planets/genvux.c +++ b/sc2/src/sc2code/planets/genvux.c @@ -312,9 +312,9 @@ GenerateVUX (BYTE control) & (1L << i)) && !GET_GAME_STATE (VUX_BEAST)) { - PPLANETSIDE_DESC pPSD; + PLANETSIDE_DESC *pPSD; - pPSD = (PPLANETSIDE_DESC)pMenuState->ModuleFrame; + pPSD = (PLANETSIDE_DESC*)pMenuState->ModuleFrame; UnbatchGraphics (); DoDiscoveryReport (MenuSounds); BatchGraphics (); diff --git a/sc2/src/sc2code/planets/genwreck.c b/sc2/src/sc2code/planets/genwreck.c index 7851c791f..35f7a5c39 100644 --- a/sc2/src/sc2code/planets/genwreck.c +++ b/sc2/src/sc2code/planets/genwreck.c @@ -57,7 +57,7 @@ GenerateUrquanWreck (BYTE control) if (!GET_GAME_STATE (PORTAL_KEY)) { - ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit = TRUE; + ((PLANETSIDE_DESC*)pMenuState->ModuleFrame)->InTransit = TRUE; SET_GAME_STATE (PORTAL_KEY, 1); SET_GAME_STATE (PORTAL_KEY_ON_SHIP, 1); diff --git a/sc2/src/sc2code/planets/genzoq.c b/sc2/src/sc2code/planets/genzoq.c index a9ed2ed13..4e2888664 100644 --- a/sc2/src/sc2code/planets/genzoq.c +++ b/sc2/src/sc2code/planets/genzoq.c @@ -37,11 +37,10 @@ check_scout (void) ))) { BYTE task; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (npc_built_ship_q), hStarShip); task = GET_GROUP_MISSION (FragPtr); if (task & REFORM_GROUP) diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c index ad61aae03..dd6c0d49b 100644 --- a/sc2/src/sc2code/planets/lander.c +++ b/sc2/src/sc2code/planets/lander.c @@ -171,7 +171,7 @@ DamageColorCycle (COLOR c, COUNT i) #define MAGNIFICATION (1 << MAG_SHIFT) static BOOLEAN -RepairTopography (ELEMENTPTR ElementPtr) +RepairTopography (ELEMENT *ElementPtr) { //BOOLEAN CursorIntersect; SIZE delta; @@ -213,10 +213,10 @@ RepairTopography (ELEMENTPTR ElementPtr) static HELEMENT AddGroundDisaster (COUNT which_disaster); void -object_animation (PELEMENT ElementPtr) +object_animation (ELEMENT *ElementPtr) { COUNT frame_index, angle; - PPRIMITIVE pPrim; + PRIMITIVE *pPrim; pPrim = &DisplayArray[ElementPtr->PrimIndex]; if (GetPrimType (pPrim) == STAMPFILL_PRIM @@ -283,7 +283,7 @@ object_animation (PELEMENT ElementPtr) hLavaElement = AddGroundDisaster (LAVASPOT_DISASTER); if (hLavaElement) { - ELEMENTPTR LavaElementPtr; + ELEMENT *LavaElementPtr; angle = FACING_TO_ANGLE (ElementPtr->hit_points); LockElement (hLavaElement, &LavaElementPtr); @@ -479,7 +479,7 @@ DeltaLanderCrew (SIZE crew_delta, COUNT which_disaster) } static void -FillLanderHold (PPLANETSIDE_DESC pPSD, COUNT scan, COUNT NumRetrieved) +FillLanderHold (PLANETSIDE_DESC *pPSD, COUNT scan, COUNT NumRetrieved) { COUNT start_count; STAMP s; @@ -532,8 +532,9 @@ CheckObjectCollision (COUNT index) { INTERSECT_CONTROL LanderControl; MEM_HANDLE LanderHandle; - PPRIMITIVE pPrim, pLanderPrim; - PPLANETSIDE_DESC pPSD; + PRIMITIVE *pPrim; + PRIMITIVE *pLanderPrim; + PLANETSIDE_DESC *pPSD; if (index != END_OF_LIST) { @@ -550,7 +551,7 @@ CheckObjectCollision (COUNT index) index = GetSuccLink (DisplayLinks); } - pPSD = (PPLANETSIDE_DESC)pMenuState->ModuleFrame; + pPSD = (PLANETSIDE_DESC*)pMenuState->ModuleFrame; LanderControl.EndPoint = LanderControl.IntersectStamp.origin; LanderHandle = GetFrameHandle (LanderControl.IntersectStamp.frame); @@ -576,7 +577,7 @@ CheckObjectCollision (COUNT index) for (hElement = GetHeadElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = GetSuccElement (ElementPtr); @@ -864,9 +865,9 @@ CheckObjectCollision (COUNT index) } static void -lightning_process (PELEMENT ElementPtr) +lightning_process (ELEMENT *ElementPtr) { - PPRIMITIVE pPrim; + PRIMITIVE *pPrim; pPrim = &DisplayArray[ElementPtr->PrimIndex]; if (LONIBBLE (ElementPtr->turn_wait)) @@ -893,7 +894,7 @@ lightning_process (PELEMENT ElementPtr) if (HIBYTE (pMenuState->delta_item) && (BYTE)TFB_Random () < (256 / 10) && !( - (PPLANETSIDE_DESC)pMenuState->ModuleFrame + (PLANETSIDE_DESC*)pMenuState->ModuleFrame )->InTransit) lander_flags |= KILL_CREW; @@ -922,7 +923,7 @@ AddLightning (void) if (hLightningElement) { DWORD rand_val; - ELEMENTPTR LightningElementPtr; + ELEMENT *LightningElementPtr; LockElement (hLightningElement, &LightningElementPtr); @@ -971,8 +972,8 @@ AddGroundDisaster (COUNT which_disaster) if (hGroundDisasterElement) { DWORD rand_val; - ELEMENTPTR GroundDisasterElementPtr; - PPRIMITIVE pPrim; + ELEMENT *GroundDisasterElementPtr; + PRIMITIVE *pPrim; LockElement (hGroundDisasterElement, &GroundDisasterElementPtr); @@ -1026,13 +1027,13 @@ BuildObjectList (void) DWORD rand_val; POINT org; HELEMENT hElement, hNextElement; - PPLANETSIDE_DESC pPSD; + PLANETSIDE_DESC *pPSD; DisplayLinks = MakeLinks (END_OF_LIST, END_OF_LIST); lander_flags &= ~KILL_CREW; - pPSD = (PPLANETSIDE_DESC)pMenuState->ModuleFrame; + pPSD = (PLANETSIDE_DESC*)pMenuState->ModuleFrame; rand_val = TFB_Random (); if (LOBYTE (HIWORD (rand_val)) < pPSD->FireChance) { @@ -1052,7 +1053,7 @@ BuildObjectList (void) hElement; hElement = hNextElement) { SIZE dx, dy; - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); @@ -1107,7 +1108,7 @@ BuildObjectList (void) } { - PPRIMITIVE pPrim; + PRIMITIVE *pPrim; pPrim = &DisplayArray[ElementPtr->PrimIndex]; pPrim->Object.Stamp.origin.x = @@ -1146,7 +1147,7 @@ RepairScan (void) for (hElement = GetHeadElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = GetSuccElement (ElementPtr); @@ -1332,9 +1333,9 @@ ScrollPlanetSide (SIZE dx, SIZE dy, SIZE CountDown) CheckObjectCollision (END_OF_LIST); { - PPLANETSIDE_DESC pPSD; + PLANETSIDE_DESC *pPSD; - pPSD = (PPLANETSIDE_DESC)pMenuState->ModuleFrame; + pPSD = (PLANETSIDE_DESC*)pMenuState->ModuleFrame; if (pPSD->NumFrames) { --pPSD->NumFrames; @@ -1586,7 +1587,7 @@ InitPlanetSide (void) } static BOOLEAN -DoPlanetSide (PMENU_STATE pMS) +DoPlanetSide (MENU_STATE *pMS) { #define NUM_LANDING_DELTAS 10 #define SHUTTLE_TURN_WAIT 2 @@ -1627,7 +1628,7 @@ SetVelocityComponents ( || (HIBYTE (pMS->delta_item) && ((CurrentInputState.key[PlayerOne][KEY_ESCAPE] || CurrentInputState.key[PlayerOne][KEY_SPECIAL]) - || ((PPLANETSIDE_DESC)pMenuState->ModuleFrame)->InTransit))) + || ((PLANETSIDE_DESC*)pMenuState->ModuleFrame)->InTransit))) { if (pMS->delta_item || pMS->CurState > EXPLOSION_LIFE + 60) return (FALSE); @@ -1643,7 +1644,7 @@ SetVelocityComponents ( hExplosionElement = AllocElement (); if (hExplosionElement) { - ELEMENTPTR ExplosionElementPtr; + ELEMENT *ExplosionElementPtr; LockElement (hExplosionElement, &ExplosionElementPtr); @@ -1746,7 +1747,7 @@ SetVelocityComponents ( if (hWeaponElement) { SIZE wdx, wdy; - ELEMENTPTR WeaponElementPtr; + ELEMENT *WeaponElementPtr; LockElement (hWeaponElement, &WeaponElementPtr); @@ -1871,7 +1872,7 @@ SetPlanetMusic (BYTE planet_type) } static void -ReturnToOrbit (PRECT pRect) +ReturnToOrbit (RECT *pRect) { CONTEXT OldContext; @@ -1896,7 +1897,7 @@ ReturnToOrbit (PRECT pRect) } void -PlanetSide (PMENU_STATE pMS) +PlanetSide (MENU_STATE *pMS) { SIZE index; DWORD TimeIn; @@ -1905,7 +1906,7 @@ PlanetSide (PMENU_STATE pMS) BYTE WeatherChanceTab[] = {0*3, 0*3, 1*3, 2*3, 3*3, 6*3, 12*3, 24*3}; BYTE FireChanceTab[] = {0*3, 0*3, 1*3, 2*3, 4*3, 12*3, 24*3, 48*3}; - memset ((PPLANETSIDE_DESC)&PSD, 0, sizeof (PSD)); + memset (&PSD, 0, sizeof (PSD)); PSD.InTransit = TRUE; PSD.TectonicsChance = @@ -1930,7 +1931,7 @@ PlanetSide (PMENU_STATE pMS) else PSD.FireChance = FireChanceTab[7]; - PSD.ElementLevel = GetSBayCapacity (NULL_PTR) + PSD.ElementLevel = GetSBayCapacity (NULL) - GLOBAL_SIS (TotalElementMass); PSD.MaxElementLevel = MAX_SCROUNGED; if (GET_GAME_STATE (IMPROVED_LANDER_CARGO)) @@ -1993,7 +1994,7 @@ PlanetSide (PMENU_STATE pMS) pMS->Initialized = FALSE; pMS->InputFunc = DoPlanetSide; SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE); - DoInput ((PVOID)pMS, FALSE); + DoInput (pMS, FALSE); if (!(GLOBAL (CurrentActivity) & CHECK_ABORT)) { @@ -2081,7 +2082,7 @@ PlanetSide (PMENU_STATE pMS) for (hElement = GetHeadElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = _GetSuccLink (ElementPtr); @@ -2174,9 +2175,8 @@ InitLander (BYTE LanderFlags) DrawStamp (&s); } - if ((int)(free_space = GetSBayCapacity (NULL_PTR) - - GLOBAL_SIS (TotalElementMass)) < - (int)(MAX_SCROUNGED << capacity_shift)) + free_space = GetSBayCapacity (NULL) - GLOBAL_SIS (TotalElementMass); + if ((int)free_space < (int)(MAX_SCROUNGED << capacity_shift)) { r.corner.x = 1; r.extent.width = 4; diff --git a/sc2/src/sc2code/planets/lander.h b/sc2/src/sc2code/planets/lander.h index acf6a1b17..e75119d7c 100644 --- a/sc2/src/sc2code/planets/lander.h +++ b/sc2/src/sc2code/planets/lander.h @@ -48,12 +48,11 @@ typedef struct BYTE TectonicsChance, WeatherChance, FireChance; } PLANETSIDE_DESC; -typedef PLANETSIDE_DESC *PPLANETSIDE_DESC; extern CONTEXT ScanContext; extern MUSIC_REF LanderMusic; -extern void PlanetSide (PMENU_STATE pMS); +extern void PlanetSide (MENU_STATE *pMS); extern void DoDiscoveryReport (SOUND ReadOutSounds); extern void SetPlanetMusic (BYTE planet_type); extern void LoadLanderData (void); diff --git a/sc2/src/sc2code/planets/orbits.c b/sc2/src/sc2code/planets/orbits.c index 7cc683168..888179958 100644 --- a/sc2/src/sc2code/planets/orbits.c +++ b/sc2/src/sc2code/planets/orbits.c @@ -470,13 +470,13 @@ YellowDistribution (BYTE which_world) #define SUPERGIANT_GASG_DIST SCALE_RADIUS (33) void -FillOrbits (PSOLARSYS_STATE system, - BYTE NumPlanets, PPLANET_DESC pBaseDesc, BOOLEAN TypesDefined) +FillOrbits (SOLARSYS_STATE *system, BYTE NumPlanets, + PLANET_DESC *pBaseDesc, BOOLEAN TypesDefined) { /* Generate Planets in orbit around star */ BYTE StarColor, PlanetCount, MaxPlanet; BOOLEAN GeneratingMoons; COUNT StarSize; - PPLANET_DESC pPD; + PLANET_DESC *pPD; struct { COUNT MinRockyDist, MinGasGDist; @@ -523,7 +523,7 @@ char scolor[] = {'B', 'G', 'O', 'R', 'W', 'Y'}; DWORD rand_val; COUNT min_radius, angle; SIZE delta_r; - PPLANET_DESC pLocPD; + PLANET_DESC *pLocPD; do { diff --git a/sc2/src/sc2code/planets/oval.c b/sc2/src/sc2code/planets/oval.c index 9cff9087c..29caf6816 100644 --- a/sc2/src/sc2code/planets/oval.c +++ b/sc2/src/sc2code/planets/oval.c @@ -25,7 +25,7 @@ #define NUM_QUADS 4 void -DrawOval (PRECT pRect, BYTE num_off_pixels) +DrawOval (RECT *pRect, BYTE num_off_pixels) { #define FIRST_QUAD (1 << 0) #define SECOND_QUAD (1 << 1) @@ -216,7 +216,7 @@ DrawOval (PRECT pRect, BYTE num_off_pixels) } void -DrawFilledOval (PRECT pRect) +DrawFilledOval (RECT *pRect) { COORD x, y; SIZE A, B; diff --git a/sc2/src/sc2code/planets/pl_stuff.c b/sc2/src/sc2code/planets/pl_stuff.c index db13f26f6..53910e842 100644 --- a/sc2/src/sc2code/planets/pl_stuff.c +++ b/sc2/src/sc2code/planets/pl_stuff.c @@ -48,8 +48,9 @@ extern void arith_frame_blit (FRAME srcFrame, RECT *rsrc, FRAME dstFrame, // The speed to zoom in. #define PLANET_ZOOM_SPEED 2 -PRECT -RotatePlanet (int x, int dx, int dy, COUNT scale_amt, UBYTE zoom_from, PRECT zoomr) +RECT* +RotatePlanet (int x, int dx, int dy, COUNT scale_amt, UBYTE zoom_from, + RECT *zoomr) { STAMP s; FRAME pFrame[2]; @@ -88,7 +89,7 @@ RotatePlanet (int x, int dx, int dy, COUNT scale_amt, UBYTE zoom_from, PRECT zoo // operation is moved before the RenderLevelMasks call, one of // the two PauseRotate checks can be removed. - //if (((PSOLARSYS_STATE volatile)pSolarSysState)->PauseRotate !=1) + //if (((SOLARSYS_STATE *volatile)pSolarSysState)->PauseRotate !=1) { OldContext = SetContext (SpaceContext); BatchGraphics (); diff --git a/sc2/src/sc2code/planets/plandata.h b/sc2/src/sc2code/planets/plandata.h index 4a50a1636..440585fe6 100644 --- a/sc2/src/sc2code/planets/plandata.h +++ b/sc2/src/sc2code/planets/plandata.h @@ -193,7 +193,6 @@ typedef struct const SIZE level_tab[3]; const BYTE xlat_tab[256]; } XLAT_DESC; -typedef const XLAT_DESC *PXLAT_DESC; typedef struct { @@ -204,7 +203,7 @@ typedef struct * deposits), one of FEW, MODERATE, or NUMEROUS * bits 4-7: quality of the deposit, one of LOW, MEDIUM, or HEAVY */ -} ElementEntry; +} ELEMENT_ENTRY; // PlanetFrame describes a type of planet. It is not used to describe // individual planets. @@ -234,7 +233,7 @@ typedef struct * (no define for this) super thick. */ #define NUM_USEFUL_ELEMENTS 8 - ElementEntry UsefulElements[NUM_USEFUL_ELEMENTS]; + ELEMENT_ENTRY UsefulElements[NUM_USEFUL_ELEMENTS]; /* Minerals on the planet */ RESOURCE CMapInstance; @@ -248,13 +247,6 @@ typedef struct COUNT num_blemishes; SIZE base_elevation; } PlanetFrame; -typedef const PlanetFrame *PPLANDATA; - -typedef const ElementEntry *PELEMENT_ENTRY; - -#define XLAT_DESCPTR PXLAT_DESC -#define PLANDATAPTR PPLANDATA -#define ELEMENT_ENTRYPTR PELEMENT_ENTRY typedef struct { @@ -270,7 +262,7 @@ typedef struct SIZE LifeChance; UWORD PlanetToSunDist; - PLANDATAPTR PlanDataPtr; + const PlanetFrame *PlanDataPtr; DWORD ScanSeed[NUM_SCAN_TYPES]; DWORD ScanRetrieveMask[NUM_SCAN_TYPES]; @@ -300,7 +292,6 @@ typedef struct FONT LanderFont; FRAME LanderFontEff; } PLANET_INFO; -typedef PLANET_INFO *PPLANET_INFO; enum { @@ -315,8 +306,6 @@ enum #define CalcGravity(d,r) (UWORD)((DWORD)(d) * (r) / 100) #define CalcFromBase(b,v) ((UWORD)(b) + ((UWORD)TFB_Random () % (v))) -#define PLANET_INFOPTR PPLANET_INFO - #define EARTH_ATMOSPHERE 50 #define COLD_THRESHOLD -40 diff --git a/sc2/src/sc2code/planets/planets.c b/sc2/src/sc2code/planets/planets.c index cf85c2cd8..d911698d0 100644 --- a/sc2/src/sc2code/planets/planets.c +++ b/sc2/src/sc2code/planets/planets.c @@ -27,7 +27,7 @@ #include "nameref.h" -extern int rotate_planet_task (PVOID data); +extern int rotate_planet_task (void *data); void @@ -38,7 +38,7 @@ DrawScannedObjects (BOOLEAN Reversed) for (hElement = Reversed ? GetTailElement () : GetHeadElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = Reversed ? @@ -79,7 +79,7 @@ DrawOrbitalDisplay (DRAW_ORBITAL_MODE Mode) SetTransitionSource (NULL); DrawSISFrame (); - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); DrawSISTitle (GLOBAL_SIS (PlanetName)); DrawStarBackGround (TRUE); } @@ -148,7 +148,7 @@ LoadPlanet (FRAME SurfDefFrame) // The "rotate planets" task is not initialised yet. // This means the call to LoadPlanet is made from a // GENERATE_ORBITAL case of an IP generation function. - PPLANET_DESC pPlanetDesc; + PLANET_DESC *pPlanetDesc; StopMusic (); diff --git a/sc2/src/sc2code/planets/planets.h b/sc2/src/sc2code/planets/planets.h index 944a5a918..a9e99daa5 100644 --- a/sc2/src/sc2code/planets/planets.h +++ b/sc2/src/sc2code/planets/planets.h @@ -120,7 +120,6 @@ typedef struct planet_desc struct planet_desc *pPrevDesc; } PLANET_DESC; -typedef PLANET_DESC *PPLANET_DESC; typedef struct { @@ -128,8 +127,6 @@ typedef struct BYTE Type, Index; BYTE Prefix, Postfix; } STAR_DESC; -typedef STAR_DESC *PSTAR_DESC; -#define STAR_DESCPTR PSTAR_DESC #define MAX_SUNS 1 #define MAX_PLANETS 16 @@ -145,7 +142,7 @@ typedef struct planet_orbit { FRAME TopoZoomFrame; // 4x scaled topo image for planet-side - PBYTE lpTopoData; + BYTE *lpTopoData; // normal topo data; expressed in elevation levels // data is signed for planets other than gas giants // transformed to light variance map for 3d planet @@ -181,8 +178,8 @@ typedef struct solarsys_state // by pBaseDesc. // Only defined after a call to GenFunc with GENERATE_MOONS // as its argument, and overwritten by subsequent calls. - PPLANET_DESC pBaseDesc; - PPLANET_DESC pOrbitalDesc; + PLANET_DESC *pBaseDesc; + PLANET_DESC *pOrbitalDesc; SIZE FirstPlanetIndex, LastPlanetIndex; // The planets get sorted on their image.origin.y value. // PlanetDesc[FirstPlanetIndex] is the planet with the lowest @@ -211,9 +208,8 @@ typedef struct solarsys_state FRAME TopoFrame; PLANET_ORBIT Orbit; } SOLARSYS_STATE; -typedef SOLARSYS_STATE *PSOLARSYS_STATE; -extern PSOLARSYS_STATE pSolarSysState; +extern SOLARSYS_STATE *pSolarSysState; extern MUSIC_REF SpaceMusic; extern void LoadPlanet (FRAME SurfDefFrame); @@ -224,18 +220,18 @@ extern void FreeLanderFont (PLANET_INFO *info); extern void ExploreSolarSys (void); extern void DrawStarBackGround (BOOLEAN ForPlanet); -extern void XFormIPLoc (PPOINT pIn, PPOINT pOut, BOOLEAN ToDisplay); +extern void XFormIPLoc (POINT *pIn, POINT *pOut, BOOLEAN ToDisplay); extern void GenerateRandomIP (BYTE control); extern PLAN_GEN_FUNC GenerateIP (BYTE Index); extern void DrawSystem (SIZE radius, BOOLEAN IsInnerSystem); -extern void DrawOval (PRECT pRect, BYTE num_off_pixels); -extern void DrawFilledOval (PRECT pRect); +extern void DrawOval (RECT *pRect, BYTE num_off_pixels); +extern void DrawFilledOval (RECT *pRect); extern void DoMissions (void); -extern void FillOrbits (PSOLARSYS_STATE system, - BYTE NumPlanets, PPLANET_DESC pBaseDesc, BOOLEAN TypesDefined); +extern void FillOrbits (SOLARSYS_STATE *system, BYTE NumPlanets, + PLANET_DESC *pBaseDesc, BOOLEAN TypesDefined); extern void ScanSystem (void); extern void ChangeSolarSys (void); -extern BOOLEAN DoFlagshipCommands (PMENU_STATE pMS); +extern BOOLEAN DoFlagshipCommands (MENU_STATE *pMS); extern void ZoomSystem (void); extern void LoadSolarSys (void); extern void InitLander (BYTE LanderFlags); @@ -243,13 +239,13 @@ extern BOOLEAN ValidateOrbits (void); extern void IP_reset (void); extern void IP_frame (void); -extern PRECT RotatePlanet (int x, int dx, int dy, COUNT scale_amt, - UBYTE zoom_from, PRECT r); +extern RECT* RotatePlanet (int x, int dx, int dy, COUNT scale_amt, + UBYTE zoom_from, RECT *r); extern void SetPlanetTilt (int da); extern void DrawScannedObjects (BOOLEAN Reversed); -extern void GeneratePlanetMask (PPLANET_DESC pPlanetDesc, FRAME SurfDefFrame); -extern void DeltaTopography (COUNT num_iterations, PSBYTE DepthArray, - PRECT pRect, SIZE depth_delta); +extern void GeneratePlanetMask (PLANET_DESC *pPlanetDesc, FRAME SurfDefFrame); +extern void DeltaTopography (COUNT num_iterations, SBYTE *DepthArray, + RECT *pRect, SIZE depth_delta); #endif /* _PLANETS_H */ diff --git a/sc2/src/sc2code/planets/plangen.c b/sc2/src/sc2code/planets/plangen.c index 2d1ad7013..f6dcae048 100644 --- a/sc2/src/sc2code/planets/plangen.c +++ b/sc2/src/sc2code/planets/plangen.c @@ -106,7 +106,7 @@ typedef struct } POINT3; static void -TransformTopography (FRAME DstFrame, PBYTE pTopoData, int w, int h) +TransformTopography (FRAME DstFrame, BYTE *pTopoData, int w, int h) { CONTEXT OldContext; FRAME OldFrame; @@ -132,16 +132,18 @@ TransformTopography (FRAME DstFrame, PBYTE pTopoData, int w, int h) BYTE AlgoType; SIZE base, d; POINT pt; - PLANDATAPTR PlanDataPtr; + const PlanetFrame *PlanDataPtr; PRIMITIVE BatchArray[NUM_BATCH_POINTS]; - PPRIMITIVE pBatch; - PBYTE pSrc, xlat_tab, cbase; + PRIMITIVE *pBatch; + BYTE *pSrc; + BYTE *xlat_tab; + BYTE *cbase; HOT_SPOT OldHot; RECT ClipRect; OldHot = SetFrameHot (DstFrame, MAKE_HOT_SPOT (0, 0)); GetContextClipRect (&ClipRect); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContextClipping (FALSE); pBatch = &BatchArray[0]; @@ -157,7 +159,7 @@ TransformTopography (FRAME DstFrame, PBYTE pTopoData, int w, int h) ]; AlgoType = PLANALGO (PlanDataPtr->Type); base = PlanDataPtr->base_elevation; - xlat_tab = (PBYTE)((XLAT_DESCPTR)pSolarSysState->XlatPtr)->xlat_tab; + xlat_tab = (BYTE*)((XLAT_DESC*)pSolarSysState->XlatPtr)->xlat_tab; cbase = GetColorMapAddress (pSolarSysState->OrbitalCMap); i = NUM_BATCH_POINTS; @@ -167,7 +169,7 @@ TransformTopography (FRAME DstFrame, PBYTE pTopoData, int w, int h) { for (pt.x = 0; pt.x < w; ++pt.x, ++pSrc) { - PBYTE ctab; + BYTE *ctab; d = (SBYTE)*pSrc; if (AlgoType == GAS_GIANT_ALGO) @@ -881,10 +883,10 @@ RenderLevelMasks (FRAME MaskFrame, int offset, BOOLEAN doThrob) #define RANGE_SHIFT 6 static void -DitherMap (PSBYTE DepthArray) +DitherMap (SBYTE *DepthArray) { COUNT i; - PSBYTE lpDst; + SBYTE *lpDst; i = (MAP_WIDTH * MAP_HEIGHT) >> 2; lpDst = DepthArray; @@ -909,7 +911,7 @@ DitherMap (PSBYTE DepthArray) } static void -MakeCrater (PRECT pRect, PSBYTE DepthArray, SIZE rim_delta, SIZE +MakeCrater (RECT *pRect, SBYTE *DepthArray, SIZE rim_delta, SIZE crater_delta, BOOLEAN SetDepth) { COORD x, y, lf_x, rt_x; @@ -947,10 +949,8 @@ MakeCrater (PRECT pRect, PSBYTE DepthArray, SIZE rim_delta, SIZE rt_x = A + x; if (SetDepth) { - memset ((PSBYTE)&DepthArray[TopIndex + lf_x], 0, - rt_x - lf_x + 1); - memset ((PSBYTE)&DepthArray[BotIndex + lf_x], 0, - rt_x - lf_x + 1); + memset (&DepthArray[TopIndex + lf_x], 0, rt_x - lf_x + 1); + memset (&DepthArray[BotIndex + lf_x], 0, rt_x - lf_x + 1); } if (lf_x == rt_x) { @@ -1011,8 +1011,8 @@ MakeCrater (PRECT pRect, PSBYTE DepthArray, SIZE rim_delta, SIZE rt_x = A + x; if (SetDepth) { - memset ((PSBYTE)&DepthArray[TopIndex + lf_x], 0, rt_x - lf_x + 1); - memset ((PSBYTE)&DepthArray[BotIndex + lf_x], 0, rt_x - lf_x + 1); + memset (&DepthArray[TopIndex + lf_x], 0, rt_x - lf_x + 1); + memset (&DepthArray[BotIndex + lf_x], 0, rt_x - lf_x + 1); } if (lf_x == rt_x) { @@ -1069,7 +1069,7 @@ MakeCrater (PRECT pRect, PSBYTE DepthArray, SIZE rim_delta, SIZE lf_x = A - x; rt_x = A + x; if (SetDepth) - memset ((PSBYTE)&DepthArray[TopIndex + lf_x], 0, rt_x - lf_x + 1); + memset (&DepthArray[TopIndex + lf_x], 0, rt_x - lf_x + 1); if (lf_x == rt_x) { DepthArray[TopIndex + lf_x] += rim_delta; @@ -1103,12 +1103,12 @@ MakeCrater (PRECT pRect, PSBYTE DepthArray, SIZE rim_delta, SIZE #define NUM_BAND_COLORS 4 static void -MakeStorms (COUNT storm_count, PSBYTE DepthArray) +MakeStorms (COUNT storm_count, SBYTE *DepthArray) { #define MAX_STORMS 8 COUNT i; RECT storm_r[MAX_STORMS]; - PRECT pstorm_r; + RECT *pstorm_r; pstorm_r = &storm_r[i = storm_count]; while (i--) @@ -1227,13 +1227,13 @@ MakeStorms (COUNT storm_count, PSBYTE DepthArray) } static void -MakeGasGiant (COUNT num_bands, PSBYTE DepthArray, PRECT pRect, SIZE +MakeGasGiant (COUNT num_bands, SBYTE *DepthArray, RECT *pRect, SIZE depth_delta) { COORD last_y, next_y; SIZE band_error, band_bump, band_delta; COUNT i, j, band_height; - PSBYTE lpDst; + SBYTE *lpDst; UWORD loword, hiword; DWORD rand_val; @@ -1297,13 +1297,13 @@ MakeGasGiant (COUNT num_bands, PSBYTE DepthArray, PRECT pRect, SIZE } static void -ValidateMap (PSBYTE DepthArray) +ValidateMap (SBYTE *DepthArray) { BYTE state; BYTE pixel_count[2], lb[2]; SBYTE last_byte; COUNT i; - PSBYTE lpDst; + SBYTE *lpDst; i = MAP_WIDTH - 1; lpDst = DepthArray; @@ -1402,7 +1402,7 @@ TopoVarianceCalc (int factor) } static void -TopoScale4x (PBYTE pDstTopo, PBYTE pSrcTopo, int num_faults, int fault_var) +TopoScale4x (BYTE *pDstTopo, BYTE *pSrcTopo, int num_faults, int fault_var) { // Interpolate the topographical data by connecting the elevations // to their nearest neighboors using straight lines (in random @@ -1412,7 +1412,8 @@ TopoScale4x (PBYTE pDstTopo, PBYTE pSrcTopo, int num_faults, int fault_var) int x, y; const int w = MAP_WIDTH, h = MAP_HEIGHT; const int spitch = MAP_WIDTH, dpitch = MAP_WIDTH * 4; - PSBYTE pSrc, pDst; + SBYTE *pSrc; + SBYTE *pDst; int* prevrow; int* prow; int elev[5][5]; @@ -1492,7 +1493,7 @@ TopoScale4x (PBYTE pDstTopo, PBYTE pSrcTopo, int num_faults, int fault_var) for (y = 0; y < h; ++y, pDst += dpitch * 3) { int x2, y2; - PSBYTE p; + SBYTE *p; int val, step, rndfact; const struct line_def_t* pld; @@ -1614,7 +1615,7 @@ typedef struct } elev_block_t; static inline void -get_vblock_avg (elev_block_t *pblk, PSBYTE pTopo, int x, int y) +get_vblock_avg (elev_block_t *pblk, SBYTE *pTopo, int x, int y) { SBYTE *elev = pTopo; int y0, y1, i; @@ -1660,7 +1661,7 @@ get_vblock_avg (elev_block_t *pblk, PSBYTE pTopo, int x, int y) // See description above static void -GenerateLightMap (PSBYTE pTopo, int w, int h) +GenerateLightMap (SBYTE *pTopo, int w, int h) { #define LMAP_BLOCKS (2 * LMAP_MAX_DIST + 1) int x, y; @@ -1778,16 +1779,16 @@ GenerateLightMap (PSBYTE pTopo, int w, int h) } void -GeneratePlanetMask (PPLANET_DESC pPlanetDesc, FRAME SurfDefFrame) +GeneratePlanetMask (PLANET_DESC *pPlanetDesc, FRAME SurfDefFrame) { RECT r; DWORD old_seed; - PLANDATAPTR PlanDataPtr; + const PlanetFrame *PlanDataPtr; COUNT i, y; POINT loc; CONTEXT OldContext; PLANET_ORBIT *Orbit = &pSolarSysState->Orbit; - PBYTE pScaledTopo = 0; + BYTE *pScaledTopo = 0; old_seed = TFB_SeedRandom (pPlanetDesc->rand_seed); @@ -2013,7 +2014,7 @@ rotate_planet_task (void *data) SIZE spin_dir; COORD init_x; DWORD TimeIn; - PSOLARSYS_STATE pSS; + SOLARSYS_STATE *pSS; BOOLEAN zooming; RECT r, *repair = &r; UBYTE zoom_from; @@ -2084,7 +2085,7 @@ rotate_planet_task (void *data) // to acquire the graphics lock LockMutex (GraphicsLock); if (*(volatile UBYTE *)&pSS->PauseRotate != 1 -// if (((PSOLARSYS_STATE volatile)pSS)->MenuState.Initialized <= 3 +// if (((SOLARSYS_STATE *volatile)pSS)->MenuState.Initialized <= 3 && !(GLOBAL (CurrentActivity) & CHECK_ABORT)) { //PauseRotate == 2 is a single-step diff --git a/sc2/src/sc2code/planets/pstarmap.c b/sc2/src/sc2code/planets/pstarmap.c index a9540b272..1f415f4fc 100644 --- a/sc2/src/sc2code/planets/pstarmap.c +++ b/sc2/src/sc2code/planets/pstarmap.c @@ -115,7 +115,7 @@ DrawCursor (COORD curs_x, COORD curs_y) } static void -DrawAutoPilot (PPOINT pDstPt) +DrawAutoPilot (POINT *pDstPt) { SIZE dx, dy, xincr, yincr, @@ -181,8 +181,8 @@ DrawAutoPilot (PPOINT pDstPt) } static void -GetSphereRect (EXTENDED_SHIP_FRAGMENTPTR StarShipPtr, PRECT pRect, PRECT - pRepairRect) +GetSphereRect (EXTENDED_SHIP_FRAGMENT *StarShipPtr, RECT *pRect, + RECT *pRepairRect) { long diameter; @@ -226,7 +226,7 @@ GetSphereRect (EXTENDED_SHIP_FRAGMENTPTR StarShipPtr, PRECT pRect, PRECT ); t.CharCount = GetStringLength (locString); t.pStr = (UNICODE *)GetStringAddress (locString); - TextRect (&t, pRepairRect, NULL_PTR); + TextRect (&t, pRepairRect, NULL); if (pRepairRect->corner.x <= 0) pRepairRect->corner.x = 1; @@ -244,7 +244,7 @@ GetSphereRect (EXTENDED_SHIP_FRAGMENTPTR StarShipPtr, PRECT pRect, PRECT } static void -DrawStarMap (COUNT race_update, PRECT pClipRect) +DrawStarMap (COUNT race_update, RECT *pClipRect) { #define GRID_DELTA 500 SIZE i; @@ -253,10 +253,10 @@ DrawStarMap (COUNT race_update, PRECT pClipRect) RECT r, old_r; STAMP s; FRAME star_frame; - STAR_DESCPTR SDPtr; + STAR_DESC *SDPtr; BOOLEAN draw_cursor; - if (pClipRect == (PRECT)-1) + if (pClipRect == (RECT*)-1) { pClipRect = 0; draw_cursor = FALSE; @@ -373,12 +373,10 @@ DrawStarMap (COUNT race_update, PRECT pClipRect) hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip != 0; ++index, hStarShip = hNextShip) { - EXTENDED_SHIP_FRAGMENTPTR StarShipPtr; + EXTENDED_SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (avail_race_q), - hStarShip - ); + StarShipPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (avail_race_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); if (StarShipPtr->ShipInfo.known_strength) @@ -417,7 +415,7 @@ DrawStarMap (COUNT race_update, PRECT pClipRect) ); t.CharCount = GetStringLength (locString); t.pStr = (UNICODE *)GetStringAddress (locString); - TextRect (&t, &r, NULL_PTR); + TextRect (&t, &r, NULL); if (r.corner.x <= 0) t.baseline.x -= r.corner.x - 1; @@ -588,7 +586,7 @@ ZoomStarMap (SIZE dir) ++pMenuState->delta_item; pMenuState->flash_rect1.corner = pMenuState->first_item; - DrawStarMap (0, NULL_PTR); + DrawStarMap (0, NULL); SleepThread (ONE_SECOND >> 3); } } @@ -605,14 +603,14 @@ ZoomStarMap (SIZE dir) } --pMenuState->delta_item; - DrawStarMap (0, NULL_PTR); + DrawStarMap (0, NULL); SleepThread (ONE_SECOND >> 3); } } } static void -UpdateCursorLocation (PMENU_STATE pMS, int sx, int sy, const POINT *newpt) +UpdateCursorLocation (MENU_STATE *pMS, int sx, int sy, const POINT *newpt) { STAMP s; POINT pt; @@ -680,7 +678,7 @@ UpdateCursorLocation (PMENU_STATE pMS, int sx, int sy, const POINT *newpt) || s.origin.y >= SIS_SCREEN_HEIGHT) { pMS->flash_rect1.corner = pMS->first_item; - DrawStarMap (0, NULL_PTR); + DrawStarMap (0, NULL); s.origin.x = UNIVERSE_TO_DISPX (pMS->first_item.x); s.origin.y = UNIVERSE_TO_DISPY (pMS->first_item.y); @@ -698,11 +696,12 @@ UpdateCursorLocation (PMENU_STATE pMS, int sx, int sy, const POINT *newpt) #define CURSOR_INFO_BUFSIZE 256 static void -UpdateCursorInfo (PMENU_STATE pMS, UNICODE *prevbuf) +UpdateCursorInfo (MENU_STATE *pMS, UNICODE *prevbuf) { UNICODE buf[CURSOR_INFO_BUFSIZE] = ""; POINT pt; - STAR_DESCPTR SDPtr, BestSDPtr; + STAR_DESC *SDPtr; + STAR_DESC *BestSDPtr; pt.x = UNIVERSE_TO_DISPX (pMS->first_item.x); pt.y = UNIVERSE_TO_DISPY (pMS->first_item.y); @@ -758,7 +757,7 @@ UpdateCursorInfo (PMENU_STATE pMS, UNICODE *prevbuf) } static void -UpdateFuelRequirement (PMENU_STATE pMS) +UpdateFuelRequirement (MENU_STATE *pMS) { UNICODE buf[80]; COUNT fuel_required; @@ -795,7 +794,7 @@ UpdateFuelRequirement (PMENU_STATE pMS) typedef struct starsearch_state { - PMENU_STATE pMS; + MENU_STATE *pMS; UNICODE Text[STAR_SEARCH_BUFSIZE]; UNICODE LastText[STAR_SEARCH_BUFSIZE]; DWORD LastChangeTime; @@ -927,7 +926,7 @@ FindNextStarIndex (STAR_SEARCH_STATE *pSS, int from, BOOLEAN WithinClust) for (i = from; i < NUM_SOLAR_SYSTEMS; ++i) { - STAR_DESCPTR SDPtr = &star_array[pSS->SortedStars[i]]; + STAR_DESC *SDPtr = &star_array[pSS->SortedStars[i]]; UNICODE FullName[STAR_SEARCH_BUFSIZE]; UNICODE *ClusterName = GAME_STRING (SDPtr->Postfix); const UNICODE *sptr; @@ -1002,14 +1001,14 @@ FindNextStarIndex (STAR_SEARCH_STATE *pSS, int from, BOOLEAN WithinClust) } static void -DrawMatchedStarName (PTEXTENTRY_STATE pTES) +DrawMatchedStarName (TEXTENTRY_STATE *pTES) { STAR_SEARCH_STATE *pSS = (STAR_SEARCH_STATE *) pTES->CbParam; - PMENU_STATE pMS = pSS->pMS; + MENU_STATE *pMS = pSS->pMS; UNICODE buf[STAR_SEARCH_BUFSIZE] = ""; SIZE ExPos = 0; SIZE CurPos = -1; - STAR_DESCPTR SDPtr = &star_array[pSS->SortedStars[pSS->CurIndex]]; + STAR_DESC *SDPtr = &star_array[pSS->SortedStars[pSS->CurIndex]]; COUNT flags; if (pSS->SingleClust || pSS->SingleMatch) @@ -1085,10 +1084,10 @@ MatchNextStar (STAR_SEARCH_STATE *pSS, BOOLEAN Reset) } static BOOLEAN -OnStarNameChange (PTEXTENTRY_STATE pTES) +OnStarNameChange (TEXTENTRY_STATE *pTES) { STAR_SEARCH_STATE *pSS = (STAR_SEARCH_STATE *) pTES->CbParam; - PMENU_STATE pMS = pSS->pMS; + MENU_STATE *pMS = pSS->pMS; COUNT flags; BOOLEAN ret = TRUE; @@ -1116,7 +1115,7 @@ OnStarNameChange (PTEXTENTRY_STATE pTES) } else { - STAR_DESCPTR SDPtr; + STAR_DESC *SDPtr; // move the cursor to the found star SDPtr = &star_array[pSS->SortedStars[pSS->CurIndex]]; @@ -1130,14 +1129,14 @@ OnStarNameChange (PTEXTENTRY_STATE pTES) } static BOOLEAN -OnStarNameFrame (PTEXTENTRY_STATE pTES) +OnStarNameFrame (TEXTENTRY_STATE *pTES) { STAR_SEARCH_STATE *pSS = (STAR_SEARCH_STATE *) pTES->CbParam; - PMENU_STATE pMS = pSS->pMS; + MENU_STATE *pMS = pSS->pMS; if (PulsedInputState.menu[KEY_MENU_NEXT]) { // search for next match - STAR_DESCPTR SDPtr; + STAR_DESC *SDPtr; MatchNextStar (pSS, FALSE); @@ -1160,7 +1159,7 @@ OnStarNameFrame (PTEXTENTRY_STATE pTES) } static BOOLEAN -DoStarSearch (PMENU_STATE pMS) +DoStarSearch (MENU_STATE *pMS) { TEXTENTRY_STATE tes; STAR_SEARCH_STATE *pss; @@ -1204,7 +1203,7 @@ DoStarSearch (PMENU_STATE pMS) } static BOOLEAN -DoMoveCursor (PMENU_STATE pMS) +DoMoveCursor (MENU_STATE *pMS) { #define MIN_ACCEL_DELAY (ONE_SECOND / 60) #define MAX_ACCEL_DELAY (ONE_SECOND / 8) @@ -1269,7 +1268,7 @@ DoMoveCursor (PMENU_STATE pMS) return (FALSE); } #endif - DrawStarMap (0, NULL_PTR); + DrawStarMap (0, NULL); } else if (PulsedInputState.menu[KEY_MENU_SEARCH]) { @@ -1316,7 +1315,7 @@ DoMoveCursor (PMENU_STATE pMS) if (sx != 0 || sy != 0) { - UpdateCursorLocation (pMS, sx, sy, NULL_PTR); + UpdateCursorLocation (pMS, sx, sy, NULL); UpdateCursorInfo (pMS, last_buf); UpdateFuelRequirement (pMS); } @@ -1337,7 +1336,7 @@ DoMoveCursor (PMENU_STATE pMS) } static void -RepairMap (COUNT update_race, PRECT pLastRect, PRECT pNextRect) +RepairMap (COUNT update_race, RECT *pLastRect, RECT *pNextRect) { RECT r; @@ -1397,12 +1396,10 @@ UpdateMap (void) hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip; ++index, hStarShip = hNextShip) { - EXTENDED_SHIP_FRAGMENTPTR StarShipPtr; + EXTENDED_SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (avail_race_q), - hStarShip - ); + StarShipPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (avail_race_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); if (ButtonState) @@ -1456,7 +1453,7 @@ UpdateMap (void) if (!MapDrawn) { - DrawStarMap ((COUNT)~0, NULL_PTR); + DrawStarMap ((COUNT)~0, NULL); MapDrawn = TRUE; } @@ -1519,7 +1516,7 @@ DoneSphereMove: { if (!MapDrawn) { - DrawStarMap ((COUNT)~0, NULL_PTR); + DrawStarMap ((COUNT)~0, NULL); MapDrawn = TRUE; } @@ -1622,7 +1619,7 @@ DoStarMap (void) LockMutex (GraphicsLock); - DrawStarMap (0, (PRECT)-1); + DrawStarMap (0, (RECT*)-1); transition_pending = FALSE; BatchGraphics (); @@ -1637,7 +1634,7 @@ DoStarMap (void) UnbatchGraphics (); UnlockMutex (GraphicsLock); - DoInput ((PVOID)&MenuState, FALSE); + DoInput (&MenuState, FALSE); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); pMenuState = 0; @@ -1645,8 +1642,8 @@ DoStarMap (void) LockMutex (GraphicsLock); DrawHyperCoords (universe); - DrawSISMessage (NULL_PTR); - DrawStatusMessage (NULL_PTR); + DrawSISMessage (NULL); + DrawStatusMessage (NULL); if (GLOBAL (autopilot.x) == universe.x && GLOBAL (autopilot.y) == universe.y) @@ -1657,7 +1654,7 @@ DoStarMap (void) } BOOLEAN -DoFlagshipCommands (PMENU_STATE pMS) +DoFlagshipCommands (MENU_STATE *pMS) { /* TODO: Make this carried cleanly by MENU_STATE structure */ // static DWORD NextTime; @@ -1708,7 +1705,7 @@ DoFlagshipCommands (PMENU_STATE pMS) if (NewState != SCAN + 1 && NewState != (GAME_MENU) + 1) { LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); } @@ -1826,7 +1823,7 @@ DoFlagshipCommands (PMENU_STATE pMS) else { LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); DrawMenuStateStrings (PM_STARMAP, -NAVIGATION); } diff --git a/sc2/src/sc2code/planets/roster.c b/sc2/src/sc2code/planets/roster.c index 03396d22d..7b0c7046b 100644 --- a/sc2/src/sc2code/planets/roster.c +++ b/sc2/src/sc2code/planets/roster.c @@ -39,13 +39,13 @@ flash_ship_task (void *data) while (!Task_ReadState (task, TASK_EXIT)) { STAMP s; - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; COLOR OldColor; CONTEXT OldContext; LockMutex (GraphicsLock); s.origin = pMenuState->first_item; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), (HSTARSHIP)pMenuState->CurFrame); s.frame = StarShipPtr->ShipInfo.icons; UnlockStarShip (&GLOBAL (built_ship_q), @@ -68,18 +68,18 @@ flash_ship_task (void *data) } static HSTARSHIP -MatchSupportShip (PMENU_STATE pMS) +MatchSupportShip (MENU_STATE *pMS) { - PPOINT pship_pos; + POINT *pship_pos; HSTARSHIP hStarShip, hNextShip; for (hStarShip = GetHeadLink (&GLOBAL (built_ship_q)), - pship_pos = (PPOINT)pMS->flash_frame0; + pship_pos = (POINT*)pMS->flash_frame0; hStarShip; hStarShip = hNextShip, ++pship_pos) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); if (pship_pos->x == pMS->first_item.x @@ -102,13 +102,14 @@ DeltaSupportCrew (SIZE crew_delta) BOOLEAN ret = FALSE; UNICODE buf[40]; HSTARSHIP hTemplate; - SHIP_FRAGMENTPTR StarShipPtr, TemplatePtr; + SHIP_FRAGMENT *StarShipPtr; + SHIP_FRAGMENT *TemplatePtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), (HSTARSHIP)pMenuState->CurFrame); hTemplate = GetStarShipFromIndex (&GLOBAL (avail_race_q), GET_RACE_ID (StarShipPtr)); - TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hTemplate); StarShipPtr->ShipInfo.crew_level += crew_delta; @@ -154,7 +155,7 @@ DeltaSupportCrew (SIZE crew_delta) #define SHIP_TOGGLE ((BYTE)(1 << 7)) static void -RosterCleanup (PMENU_STATE pMS) +RosterCleanup (MENU_STATE *pMS) { if (pMS->flash_task) { @@ -167,11 +168,11 @@ RosterCleanup (PMENU_STATE pMS) if (pMS->CurFrame) { STAMP s; - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; SetContext (StatusContext); s.origin = pMS->first_item; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), (HSTARSHIP)pMS->CurFrame); s.frame = StarShipPtr->ShipInfo.icons; UnlockStarShip (&GLOBAL (built_ship_q), (HSTARSHIP)pMS->CurFrame); @@ -186,13 +187,13 @@ RosterCleanup (PMENU_STATE pMS) } static BOOLEAN -DoModifyRoster (PMENU_STATE pMS) +DoModifyRoster (MENU_STATE *pMS) { BYTE NewState; SBYTE sx, sy; RECT r; STAMP s; - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; BOOLEAN select, cancel, up, down, horiz; if (GLOBAL (CurrentActivity) & CHECK_ABORT) @@ -235,10 +236,10 @@ DoModifyRoster (PMENU_STATE pMS) else if (cancel && !(pMS->CurState & SHIP_TOGGLE)) { LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); RosterCleanup (pMS); pMS->CurFrame = 0; - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); UnlockMutex (GraphicsLock); return FALSE; @@ -248,7 +249,7 @@ DoModifyRoster (PMENU_STATE pMS) LockMutex (GraphicsLock); pMS->CurState ^= SHIP_TOGGLE; if (!(pMS->CurState & SHIP_TOGGLE)) - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); else { RosterCleanup (pMS); @@ -278,7 +279,7 @@ DoModifyRoster (PMENU_STATE pMS) else if (down) { sy = 1; - if (GLOBAL_SIS (CrewEnlisted) < GetCPodCapacity (NULL_PTR)) + if (GLOBAL_SIS (CrewEnlisted) < GetCPodCapacity (NULL)) delta = -1; else failed = TRUE; @@ -297,13 +298,13 @@ DoModifyRoster (PMENU_STATE pMS) } else { - PPOINT pship_pos; + POINT *pship_pos; NewState = pMS->CurState; sx = (SBYTE)((pMS->delta_item + 1) >> 1); if (horiz) { - pship_pos = (PPOINT)pMS->flash_frame1; + pship_pos = (POINT*)pMS->flash_frame1; if (NewState == (BYTE)(sx - 1)) NewState = (BYTE)(pMS->delta_item - 1); else if (NewState >= (BYTE)sx) @@ -344,18 +345,13 @@ DoModifyRoster (PMENU_STATE pMS) LockMutex (GraphicsLock); SetContext (StatusContext); s.origin = pMS->first_item; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (built_ship_q), - (HSTARSHIP)pMS->CurFrame - ); + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (built_ship_q), (HSTARSHIP)pMS->CurFrame); s.frame = StarShipPtr->ShipInfo.icons; - UnlockStarShip ( - &GLOBAL (built_ship_q), - (HSTARSHIP)pMS->CurFrame - ); + UnlockStarShip (&GLOBAL (built_ship_q), (HSTARSHIP)pMS->CurFrame); DrawStamp (&s); SelectSupport: - pship_pos = (PPOINT)pMS->flash_frame1; + pship_pos = (POINT*)pMS->flash_frame1; pMS->first_item = pship_pos[NewState]; pMS->CurFrame = (FRAME)MatchSupportShip (pMS); @@ -388,7 +384,7 @@ Roster (void) SUPPORT_SHIP_PTS }; MENU_STATE MenuState; - PMENU_STATE pOldMenuState; + MENU_STATE *pOldMenuState; pOldMenuState = pMenuState; pMenuState = &MenuState; @@ -443,7 +439,7 @@ Roster (void) MenuState.flash_frame0 = (FRAME)ship_pos; MenuState.flash_frame1 = (FRAME)modified_ship_pos; SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)&MenuState, TRUE); + DoInput (&MenuState, TRUE); pMenuState = pOldMenuState; diff --git a/sc2/src/sc2code/planets/scan.c b/sc2/src/sc2code/planets/scan.c index 3ae283a2d..c21c94154 100644 --- a/sc2/src/sc2code/planets/scan.c +++ b/sc2/src/sc2code/planets/scan.c @@ -49,7 +49,7 @@ extern FRAME SpaceJunkFrame; CONTEXT ScanContext; void -RepairBackRect (PRECT pRect) +RepairBackRect (RECT *pRect) { RECT new_r, old_r; @@ -105,7 +105,7 @@ PrintScanTitlePC (TEXT *t, RECT *r, const char *txt, int xpos) t->pStr = txt; t->CharCount = (COUNT)~0; font_DrawText (t); - TextRect (t, r, NULL_PTR); + TextRect (t, r, NULL); t->baseline.x += r->extent.width; SetContextForeGroundColor ( BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x19), 0x3B)); @@ -663,10 +663,10 @@ flash_planet_loc_func(void *data) return(0); } -static BOOLEAN DoScan (PMENU_STATE pMS); +static BOOLEAN DoScan (MENU_STATE *pMS); static BOOLEAN -PickPlanetSide (PMENU_STATE pMS) +PickPlanetSide (MENU_STATE *pMS) { BOOLEAN select, cancel; select = PulsedInputState.menu[KEY_MENU_SELECT]; @@ -705,7 +705,7 @@ PickPlanetSide (PMENU_STATE pMS) r.extent.height = FLASH_HEIGHT; LoadDisplayPixmap (&r, pMenuState->flash_frame0); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); InitLander (0); @@ -721,7 +721,7 @@ PickPlanetSide (PMENU_STATE pMS) SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); LockMutex (GraphicsLock); - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); UnlockMutex (GraphicsLock); FlushInput (); @@ -780,7 +780,7 @@ PickPlanetSide (PMENU_STATE pMS) { BYTE captains_name_index; COUNT which_player; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip ( &GLOBAL (npc_built_ship_q), hStarShip @@ -870,7 +870,7 @@ DrawScannedStuff (COUNT y, BYTE CurState) for (hElement = GetHeadElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; //COLOR OldColor; SIZE dy; @@ -949,7 +949,7 @@ DrawScannedStuff (COUNT y, BYTE CurState) } static BOOLEAN -DoScan (PMENU_STATE pMS) +DoScan (MENU_STATE *pMS) { DWORD TimeIn, WaitTime; BOOLEAN select, cancel; @@ -1258,7 +1258,7 @@ ScanSystem (void) pMenuState = &MenuState; SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)&MenuState, FALSE); + DoInput (&MenuState, FALSE); pMenuState = 0; if (ScanContext) @@ -1298,7 +1298,7 @@ GeneratePlanetSide (void) while (num_nodes--) { HELEMENT hNodeElement; - ELEMENTPTR NodeElementPtr; + ELEMENT *NodeElementPtr; if (pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[scan] & (1L << num_nodes)) @@ -1340,7 +1340,7 @@ GeneratePlanetSide (void) } else { - extern void object_animation (PELEMENT ElementPtr); + extern void object_animation (ELEMENT *ElementPtr); NodeElementPtr->current.image.frame = f; NodeElementPtr->next.image.frame = SetRelFrameIndex ( diff --git a/sc2/src/sc2code/planets/scan.h b/sc2/src/sc2code/planets/scan.h index 624902e2f..7c6c2efb0 100644 --- a/sc2/src/sc2code/planets/scan.h +++ b/sc2/src/sc2code/planets/scan.h @@ -25,25 +25,24 @@ typedef struct { POINT start; - COUNT start_dot, - num_dots, - dots_per_semi; + COUNT start_dot; + COUNT num_dots; + COUNT dots_per_semi; } SCAN_DESC; -typedef SCAN_DESC *PSCAN_DESC; typedef struct { - PPOINT line_base; - COUNT num_scans, num_same_scans; - PSCAN_DESC scan_base; + POINT *line_base; + COUNT num_scans; + COUNT num_same_scans; + SCAN_DESC *scan_base; } SCAN_BLOCK; -typedef SCAN_BLOCK *PSCAN_BLOCK; #define SAME_SCAN (1 << 16) #define SCALED_ROOT_TWO 92682L /* root 2 * (1 << 16) */ #define SCALE_FACTOR 16 -extern void RepairBackRect (PRECT pRect); +extern void RepairBackRect (RECT *pRect); extern void GeneratePlanetSide (void); #endif /* _SCAN_H */ diff --git a/sc2/src/sc2code/planets/solarsys.c b/sc2/src/sc2code/planets/solarsys.c index 86113aee3..7562ced90 100644 --- a/sc2/src/sc2code/planets/solarsys.c +++ b/sc2/src/sc2code/planets/solarsys.c @@ -40,7 +40,7 @@ //#define DEBUG_SOLARSYS -PSOLARSYS_STATE pSolarSysState; +SOLARSYS_STATE *pSolarSysState; FRAME SISIPFrame, SunFrame, OrbitalFrame, SpaceJunkFrame; COLORMAP OrbitalCMap; COLORMAP SunCMap; @@ -65,10 +65,10 @@ BYTE draw_sys_flags = DRAW_STARS | DRAW_PLANETS | DRAW_ORBITS // NB. This function modifies the RNG state. static void -GeneratePlanets (PSOLARSYS_STATE system) +GeneratePlanets (SOLARSYS_STATE *system) { COUNT i; - PPLANET_DESC planet; + PLANET_DESC *planet; for (i = system->SunDesc[0].NumPlanets, planet = &system->PlanetDesc[0]; i; --i, ++planet) @@ -118,8 +118,8 @@ static void GenerateMoons (void) { COUNT i, facing; - PPLANET_DESC pMoonDesc; - PPLANET_DESC pCurDesc; + PLANET_DESC *pMoonDesc; + PLANET_DESC *pCurDesc; DWORD old_seed; GLOBAL (ip_location.x) = @@ -213,7 +213,7 @@ void LoadSolarSys (void) { COUNT i; - PPLANET_DESC pCurDesc; + PLANET_DESC *pCurDesc; DWORD old_seed; #define NUM_TEMP_RANGES 5 static const COLOR temp_color_array[NUM_TEMP_RANGES] = @@ -422,7 +422,7 @@ static void CheckIntersect (BOOLEAN just_checking) { COUNT i; - PPLANET_DESC pCurDesc; + PLANET_DESC *pCurDesc; INTERSECT_CONTROL ShipIntersect, PlanetIntersect; COUNT NewWaitPlanet; BYTE PlanetOffset, MoonOffset; @@ -574,7 +574,7 @@ ShowPlanet: } static void -GetOrbitRect (PRECT pRect, COORD cx, COORD cy, SIZE +GetOrbitRect (RECT *pRect, COORD cx, COORD cy, SIZE radius, COUNT xnumer, COUNT ynumer, COUNT denom) { #ifdef BVT_NOT @@ -594,7 +594,7 @@ GetOrbitRect (PRECT pRect, COORD cx, COORD cy, SIZE } static void -DrawOrbit (PPLANET_DESC pPlanetDesc, COUNT xnumer, COUNT ynumer0, +DrawOrbit (PLANET_DESC *pPlanetDesc, COUNT xnumer, COUNT ynumer0, COUNT ynumer1, COUNT denom) { COUNT index; @@ -754,7 +754,7 @@ flagship_inertial_thrust (COUNT CurrentAngle) BYTE max_speed; SIZE cur_delta_x, cur_delta_y; COUNT TravelAngle; - VELOCITYPTR VelocityPtr; + VELOCITY_DESC *VelocityPtr; max_speed = pSolarSysState->max_ship_speed; VelocityPtr = &GLOBAL (velocity); @@ -897,7 +897,7 @@ UndrawShip (void) } else { - PPLANET_DESC pPlanetDesc; + PLANET_DESC *pPlanetDesc; LeavingInnerSystem = TRUE; pPlanetDesc = pSolarSysState->pBaseDesc->pPrevDesc; @@ -1238,7 +1238,7 @@ IP_frame (void) SuspendGameClock (); LockMutex (GraphicsLock); - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); if (LastActivity == CHECK_LOAD) pSolarSysState->MenuState.CurState = (ROSTER + 1) + 1; else @@ -1270,7 +1270,7 @@ ValidateOrbits (void) BYTE i; BOOLEAN InnerSystem; POINT old_pts[2]; - PPLANET_DESC pCurDesc; + PLANET_DESC *pCurDesc; InnerSystem = (BOOLEAN)( pSolarSysState->pBaseDesc == pSolarSysState->MoonDesc); @@ -1491,7 +1491,7 @@ InitSolarSys (void) // Enabled graphics synchronization again, as in 3DO code originally. // This should fix the 'entering star' lockup/messed graphics problems. - DrawSISMessage (NULL_PTR); + DrawSISMessage (NULL); SetContext (SpaceContext); SetContextFGFrame (Screen); SetContextBackGroundColor (BLACK_COLOR); @@ -1544,7 +1544,7 @@ UninitSolarSys (void) { BYTE i; DWORD best_dist; - PPLANET_DESC pCurDesc; + PLANET_DESC *pCurDesc; best_dist = ~0L; for (i = 0, pCurDesc = pSolarSysState->PlanetDesc; @@ -1664,7 +1664,8 @@ void DrawSystem (SIZE radius, BOOLEAN IsInnerSystem) { BYTE i; - PPLANET_DESC pCurDesc, pBaseDesc; + PLANET_DESC *pCurDesc; + PLANET_DESC *pBaseDesc; BatchGraphics (); if (draw_sys_flags & DRAW_STARS) @@ -1873,7 +1874,7 @@ DrawStarBackGround (BOOLEAN ForPlanet) } void -XFormIPLoc (PPOINT pIn, PPOINT pOut, BOOLEAN ToDisplay) +XFormIPLoc (POINT *pIn, POINT *pOut, BOOLEAN ToDisplay) { if (ToDisplay) { @@ -1927,7 +1928,7 @@ ExploreSolarSys (void) InitSolarSys (); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)&SolarSysState.MenuState, FALSE); + DoInput (&SolarSysState.MenuState, FALSE); UninitSolarSys (); pSolarSysState = 0; } diff --git a/sc2/src/sc2code/planets/sundata.h b/sc2/src/sc2code/planets/sundata.h index 1dc6cd09d..717c7099f 100644 --- a/sc2/src/sc2code/planets/sundata.h +++ b/sc2/src/sc2code/planets/sundata.h @@ -39,14 +39,10 @@ typedef struct PLANET_INFO PlanetInfo; } SYSTEM_INFO; -typedef SYSTEM_INFO *PSYSTEM_INFO; - -#define SYSTEM_INFOPTR PSYSTEM_INFO -extern DWORD GenerateMineralDeposits (SYSTEM_INFOPTR SysInfoPtr, PCOUNT - pwhich_deposit); -extern DWORD GenerateLifeForms (SYSTEM_INFOPTR SysInfoPtr, PCOUNT - pwhich_life); +extern DWORD GenerateMineralDeposits (SYSTEM_INFO *SysInfoPtr, + COUNT *pwhich_deposit); +extern DWORD GenerateLifeForms (SYSTEM_INFO *SysInfoPtr, COUNT *pwhich_life); #define DWARF_ELEMENT_DENSITY 1 #define GIANT_ELEMENT_DENSITY 3 @@ -54,8 +50,8 @@ extern DWORD GenerateLifeForms (SYSTEM_INFOPTR SysInfoPtr, PCOUNT #define MAX_ELEMENT_DENSITY ((MAX_ELEMENT_UNITS * SUPERGIANT_ELEMENT_DENSITY) << 1) -extern DWORD DoPlanetaryAnalysis (SYSTEM_INFOPTR SysInfoPtr, PPLANET_DESC - pPlanetDesc); +extern DWORD DoPlanetaryAnalysis (SYSTEM_INFO *SysInfoPtr, + PLANET_DESC *pPlanetDesc); extern SYSTEM_INFO CurSysInfo; diff --git a/sc2/src/sc2code/planets/surface.c b/sc2/src/sc2code/planets/surface.c index efe6a6506..d3fb8d26c 100644 --- a/sc2/src/sc2code/planets/surface.c +++ b/sc2/src/sc2code/planets/surface.c @@ -28,11 +28,11 @@ const BYTE *Elements; const PlanetFrame *PlanData; static COUNT -CalcMineralDeposits (SYSTEM_INFOPTR SysInfoPtr, COUNT which_deposit) +CalcMineralDeposits (SYSTEM_INFO *SysInfoPtr, COUNT which_deposit) { BYTE j; COUNT num_deposits; - ELEMENT_ENTRYPTR eptr; + const ELEMENT_ENTRY *eptr; eptr = &SysInfoPtr->PlanetInfo.PlanDataPtr->UsefulElements[0]; num_deposits = 0; @@ -96,8 +96,7 @@ ExitCalcMinerals: } DWORD -GenerateMineralDeposits (SYSTEM_INFOPTR SysInfoPtr, PCOUNT - pwhich_deposit) +GenerateMineralDeposits (SYSTEM_INFO *SysInfoPtr, COUNT *pwhich_deposit) { DWORD old_rand; @@ -107,7 +106,7 @@ GenerateMineralDeposits (SYSTEM_INFOPTR SysInfoPtr, PCOUNT } static COUNT -CalcLifeForms (SYSTEM_INFOPTR SysInfoPtr, COUNT which_life) +CalcLifeForms (SYSTEM_INFO *SysInfoPtr, COUNT which_life) { COUNT num_life_forms; @@ -251,7 +250,7 @@ CalcLifeForms (SYSTEM_INFOPTR SysInfoPtr, COUNT which_life) } DWORD -GenerateLifeForms (SYSTEM_INFOPTR SysInfoPtr, PCOUNT pwhich_life) +GenerateLifeForms (SYSTEM_INFO *SysInfoPtr, COUNT *pwhich_life) { DWORD old_rand; diff --git a/sc2/src/sc2code/process.c b/sc2/src/sc2code/process.c index 56fc0ac3f..92bb2dd26 100644 --- a/sc2/src/sc2code/process.c +++ b/sc2/src/sc2code/process.c @@ -75,7 +75,7 @@ AllocElement (void) hElement = AllocLink (&disp_q); if (hElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); memset (ElementPtr, 0, sizeof (*ElementPtr)); @@ -92,7 +92,7 @@ FreeElement (HELEMENT hElement) { if (hElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); FreeDisplayPrim (ElementPtr->PrimIndex); @@ -103,7 +103,7 @@ FreeElement (HELEMENT hElement) } void -SetUpElement (ELEMENTPTR ElementPtr) +SetUpElement (ELEMENT *ElementPtr) { ElementPtr->next = ElementPtr->current; if (CollidingElement (ElementPtr)) @@ -115,7 +115,7 @@ SetUpElement (ELEMENTPTR ElementPtr) } static void -PreProcess (ELEMENTPTR ElementPtr) +PreProcess (ELEMENT *ElementPtr) { ELEMENT_FLAGS state_flags; @@ -175,7 +175,7 @@ PreProcess (ELEMENTPTR ElementPtr) } static void -PostProcess (ELEMENTPTR ElementPtr) +PostProcess (ELEMENT *ElementPtr) { if (ElementPtr->postprocess_func) (*ElementPtr->postprocess_func) (ElementPtr); @@ -270,8 +270,8 @@ CalcReduction (SIZE dx, SIZE dy) } static VIEW_STATE -CalcView (PPOINT pNewScrollPt, SIZE next_reduction, - PSIZE pdx, PSIZE pdy, COUNT ships_alive) +CalcView (POINT *pNewScrollPt, SIZE next_reduction, + SIZE *pdx, SIZE *pdy, COUNT ships_alive) { SIZE dx, dy; VIEW_STATE view_state; @@ -347,14 +347,14 @@ CalcView (PPOINT pNewScrollPt, SIZE next_reduction, static ELEMENT_FLAGS -ProcessCollisions (HELEMENT hSuccElement, ELEMENTPTR ElementPtr, +ProcessCollisions (HELEMENT hSuccElement, ELEMENT *ElementPtr, TIME_VALUE min_time, ELEMENT_FLAGS process_flags) { HELEMENT hTestElement; while ((hTestElement = hSuccElement) != 0) { - ELEMENTPTR TestElementPtr; + ELEMENT *TestElementPtr; LockElement (hTestElement, &TestElementPtr); if (!(TestElementPtr->state_flags & process_flags)) @@ -472,7 +472,7 @@ ProcessCollisions (HELEMENT hSuccElement, ELEMENTPTR ElementPtr, InitIntersectFrame (ElementPtr); if (state_flags & PLAYER_SHIP) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); StarShipPtr->ShipFacing = @@ -485,7 +485,7 @@ ProcessCollisions (HELEMENT hSuccElement, ELEMENTPTR ElementPtr, InitIntersectFrame (TestElementPtr); if (test_state_flags & PLAYER_SHIP) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (TestElementPtr, &StarShipPtr); StarShipPtr->ShipFacing = @@ -616,7 +616,7 @@ ProcessCollisions (HELEMENT hSuccElement, ELEMENTPTR ElementPtr, } static VIEW_STATE -PreProcessQueue (PSIZE pscroll_x, PSIZE pscroll_y) +PreProcessQueue (SIZE *pscroll_x, SIZE *pscroll_y) { SIZE min_reduction, max_reduction; COUNT num_ships; @@ -642,7 +642,7 @@ PreProcessQueue (PSIZE pscroll_x, PSIZE pscroll_y) ships_alive = 0; while (hElement != 0) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; HELEMENT hNextElement; LockElement (hElement, &ElementPtr); @@ -804,7 +804,7 @@ PostProcessQueue (VIEW_STATE view_state, SIZE scroll_x, while (hElement != 0) { ELEMENT_FLAGS state_flags; - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; HELEMENT hNextElement; LockElement (hElement, &ElementPtr); @@ -835,7 +835,7 @@ PostProcessQueue (VIEW_STATE view_state, SIZE scroll_x, hPostElement = hElement; do { - ELEMENTPTR PostElementPtr; + ELEMENT *PostElementPtr; LockElement (hPostElement, &PostElementPtr); if (!(PostElementPtr->state_flags & PRE_PROCESS)) @@ -1062,14 +1062,14 @@ RedrawQueue (BOOLEAN clear) } void -Untarget (ELEMENTPTR ElementPtr) +Untarget (ELEMENT *ElementPtr) { HELEMENT hElement, hNextElement; for (hElement = GetHeadElement (); hElement; hElement = hNextElement) { HELEMENT hTarget; - ELEMENTPTR ListPtr; + ELEMENT *ListPtr; LockElement (hElement, &ListPtr); hNextElement = GetSuccElement (ListPtr); @@ -1077,7 +1077,7 @@ Untarget (ELEMENTPTR ElementPtr) hTarget = ListPtr->hTarget; if (hTarget) { - ELEMENTPTR TargetElementPtr; + ELEMENT *TargetElementPtr; LockElement (hTarget, &TargetElementPtr); if (TargetElementPtr == ElementPtr) @@ -1094,7 +1094,7 @@ RemoveElement (HLINK hLink) { if (optStereoSFX) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hLink, &ElementPtr); if (ElementPtr != NULL) diff --git a/sc2/src/sc2code/races.h b/sc2/src/sc2code/races.h index 0003311e8..ad9a7f34f 100644 --- a/sc2/src/sc2code/races.h +++ b/sc2/src/sc2code/races.h @@ -19,9 +19,9 @@ #ifndef _RACES_H #define _RACES_H +#include "libs/compiler.h" #include "units.h" #include "element.h" -#include "libs/compiler.h" #include "libs/sndlib.h" @@ -69,11 +69,25 @@ typedef struct captain_stuff FRAME weapon; FRAME special; } CAPTAIN_STUFF; -typedef CAPTAIN_STUFF *PCAPTAIN_STUFF; -#define CAPTAIN_STUFFPTR PCAPTAIN_STUFF -typedef void (IntelligenceFunc) (PVOID ShipPtr, PVOID ObjectsOfConcern, - COUNT ConcernCounter); +typedef enum +{ + PURSUE = 0, + AVOID, + ENTICE, + NO_MOVEMENT +} MOVEMENT_STATE; + +typedef struct +{ + ELEMENT *ObjectPtr; + COUNT facing; + COUNT which_turn; + MOVEMENT_STATE MoveState; +} EVALUATE_DESC; + +typedef void (IntelligenceFunc) (ELEMENT *ShipPtr, + EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter); typedef struct { COUNT ManeuverabilityIndex; @@ -83,28 +97,30 @@ typedef struct typedef struct { - COUNT max_thrust, - thrust_increment; - BYTE energy_regeneration, - weapon_energy_cost, - special_energy_cost, - energy_wait, - turn_wait, - thrust_wait, - weapon_wait, - special_wait, - ship_mass; + COUNT max_thrust; + COUNT thrust_increment; + BYTE energy_regeneration; + BYTE weapon_energy_cost; + BYTE special_energy_cost; + BYTE energy_wait; + BYTE turn_wait; + BYTE thrust_wait; + BYTE weapon_wait; + BYTE special_wait; + BYTE ship_mass; } CHARACTERISTIC_STUFF; -typedef CHARACTERISTIC_STUFF *PCHARACTERISTIC_STUFF; typedef struct { UWORD ship_flags; - BYTE var1, var2; - COUNT crew_level, max_crew; + BYTE var1; + BYTE var2; + COUNT crew_level; /* For ships in npc_built_ship_q, the value INFINITE_FLEET for * crew_level indicates an infinite number of ships. */ - BYTE energy_level, max_energy; + COUNT max_crew; + BYTE energy_level; + BYTE max_energy; POINT loc; /* The fields above this line are included in queues in savegames, @@ -113,11 +129,10 @@ typedef struct */ STRING race_strings; - FRAME icons, melee_icon; + FRAME icons; + FRAME melee_icon; #define INFINITE_FLEET ((COUNT) ~0) } SHIP_INFO; -typedef SHIP_INFO *PSHIP_INFO; -#define SHIP_INFOPTR PSHIP_INFO #define ship_cost var1 #define group_counter ship_flags @@ -160,16 +175,19 @@ typedef struct BYTE days_left; /* Days left before the fleet reachers 'dest_loc'. */ BYTE growth_fract; - COUNT crew_level, max_crew; + COUNT crew_level; /* For ships in npc_built_ship_q, the value INFINITE_FLEET for * crew_level indicates an infinite number of ships. */ - BYTE energy_level, max_energy; + COUNT max_crew; + BYTE energy_level; + BYTE max_energy; POINT loc; /* Location of the fleet (center) */ STRING race_strings; /* Race specific strings, see doc/devel/racestrings. */ - FRAME icons, melee_icon; + FRAME icons; + FRAME melee_icon; /* -== The fields below this line are included in savegames. ==- */ @@ -194,7 +212,6 @@ typedef struct POINT dest_loc; /* Location to which the fleet (center) is moving. */ } EXTENDED_SHIP_INFO; -typedef EXTENDED_SHIP_INFO *PEXTENDED_SHIP_INFO; typedef struct { @@ -205,18 +222,14 @@ typedef struct DWORD victory_ditty; SOUND ship_sounds; } DATA_STUFF; -typedef DATA_STUFF *PDATA_STUFF; -#define DATA_STUFFPTR PDATA_STUFF typedef struct race_desc RACE_DESC; -typedef RACE_DESC *PRACE_DESC; -#define RACE_DESCPTR PRACE_DESC -typedef void (PREPROCESS_FUNC) (PELEMENT ElementPtr); -typedef void (POSTPROCESS_FUNC) (PELEMENT ElementPtr); -typedef COUNT (INIT_WEAPON_FUNC) (PELEMENT ElementPtr, HELEMENT Weapon[]); -typedef void (UNINIT_FUNC) (RACE_DESCPTR pRaceDesc); +typedef void (PREPROCESS_FUNC) (ELEMENT *ElementPtr); +typedef void (POSTPROCESS_FUNC) (ELEMENT *ElementPtr); +typedef COUNT (INIT_WEAPON_FUNC) (ELEMENT *ElementPtr, HELEMENT Weapon[]); +typedef void (UNINIT_FUNC) (RACE_DESC *pRaceDesc); struct race_desc { @@ -234,7 +247,7 @@ struct race_desc INIT_WEAPON_FUNC *init_weapon_func _ALIGNED_ON(sizeof (INIT_WEAPON_FUNC *)); - PVOID CodeRef _ALIGNED_ON(sizeof (PVOID)); + void *CodeRef _ALIGNED_ON(sizeof (void *)); }; @@ -254,7 +267,7 @@ typedef struct * the ship (accessed through StarShipCaptain()). * These values are set using OwnStarShip(). */ union { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; struct { COUNT Player; BYTE Captain; @@ -275,8 +288,6 @@ typedef struct HELEMENT hShip _ALIGNED_ON(sizeof (HELEMENT)); COUNT ShipFacing _ALIGNED_ON(sizeof (COUNT)); } STARSHIP; -typedef STARSHIP *PSTARSHIP; -#define STARSHIPPTR PSTARSHIP typedef struct { @@ -292,7 +303,7 @@ typedef struct * the ship (accessed through StarShipCaptain()). * These values are set using OwnStarShip(). */ union { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; struct { COUNT Player; BYTE Captain; @@ -301,8 +312,6 @@ typedef struct SHIP_INFO ShipInfo; } SHIP_FRAGMENT; -typedef SHIP_FRAGMENT *PSHIP_FRAGMENT; -#define SHIP_FRAGMENTPTR PSHIP_FRAGMENT typedef struct { @@ -310,14 +319,12 @@ typedef struct HSTARSHIP succ; DWORD RaceResIndex; - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; EXTENDED_SHIP_INFO ShipInfo; } EXTENDED_SHIP_FRAGMENT; -typedef EXTENDED_SHIP_FRAGMENT *PEXTENDED_SHIP_FRAGMENT; -#define EXTENDED_SHIP_FRAGMENTPTR PEXTENDED_SHIP_FRAGMENT #define AllocStarShip(pq) AllocLink (pq) -#define LockStarShip(pq,h) (STARSHIPPTR)LockLink (pq, h) +#define LockStarShip(pq,h) (STARSHIP*)LockLink (pq, h) #define UnlockStarShip(pq,h) UnlockLink (pq, h) #define FreeStarShip(pq,h) FreeLink (pq, h) @@ -586,20 +593,17 @@ enum extern BOOLEAN InitKernel (void); -extern void DrawCaptainsWindow (STARSHIPPTR - StarShipPtr); -extern BOOLEAN GetNextStarShip (STARSHIPPTR - LastStarShipPtr, COUNT which_side); -extern HSTARSHIP GetEncounterStarShip (STARSHIPPTR - LastStarShipPtr, COUNT which_player); -extern void DrawArmadaPickShip (BOOLEAN - draw_salvage_frame, PRECT pPickRect); +extern void DrawCaptainsWindow (STARSHIP *StarShipPtr); +extern BOOLEAN GetNextStarShip (STARSHIP *LastStarShipPtr, + COUNT which_side); +extern HSTARSHIP GetEncounterStarShip (STARSHIP *LastStarShipPtr, + COUNT which_player); +extern void DrawArmadaPickShip (BOOLEAN draw_salvage_frame, RECT *pPickRect); -extern BOOLEAN load_animation (PFRAME pixarray, DWORD - big_res, DWORD med_res, DWORD sml_res); -extern BOOLEAN free_image (PFRAME pixarray); -extern void NotifyOthers (COUNT which_race, BYTE - target_loc); +extern BOOLEAN load_animation (FRAME *pixarray, DWORD big_res, + DWORD med_res, DWORD sml_res); +extern BOOLEAN free_image (FRAME *pixarray); +extern void NotifyOthers (COUNT which_race, BYTE target_loc); #endif /* _RACES_H */ diff --git a/sc2/src/sc2code/restart.c b/sc2/src/sc2code/restart.c index 31102754e..066b9ec7b 100644 --- a/sc2/src/sc2code/restart.c +++ b/sc2/src/sc2code/restart.c @@ -50,7 +50,7 @@ enum }; static void -DrawRestartMenuGraphic (PMENU_STATE pMS) +DrawRestartMenuGraphic (MENU_STATE *pMS) { RECT r; STAMP s; @@ -108,7 +108,7 @@ DrawRestartMenu (BYTE OldState, BYTE NewState, FRAME f) static BOOLEAN -DoRestart (PMENU_STATE pMS) +DoRestart (MENU_STATE *pMS) { static DWORD InTime; static DWORD InactTimeOut; @@ -183,7 +183,7 @@ else if (InputState & DEVICE_EXIT) return (FALSE); break; case SETUP_GAME: LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); SetupMenu (); SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT); @@ -204,7 +204,7 @@ else if (InputState & DEVICE_EXIT) return (FALSE); } LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); return (FALSE); @@ -236,7 +236,7 @@ else if (InputState & DEVICE_EXIT) return (FALSE); if (MouseButtonDown) { LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); MouseError (); SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT); @@ -253,7 +253,7 @@ else if (InputState & DEVICE_EXIT) return (FALSE); } static BOOLEAN -RestartMenu (PMENU_STATE pMS) +RestartMenu (MENU_STATE *pMS) { DWORD TimeOut; BYTE black_buf[1]; @@ -318,7 +318,7 @@ RestartMenu (PMENU_STATE pMS) } LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); DestroyDrawable (ReleaseDrawable (pMS->CurFrame)); diff --git a/sc2/src/sc2code/save.c b/sc2/src/sc2code/save.c index 9b5ef206b..5ab3b3bfd 100644 --- a/sc2/src/sc2code/save.c +++ b/sc2/src/sc2code/save.c @@ -63,43 +63,43 @@ cwrite_ptr (DECODE_REF fh) } static inline COUNT -cwrite_a8 (DECODE_REF fh, PBYTE ar, COUNT count) +cwrite_a8 (DECODE_REF fh, const BYTE *ar, COUNT count) { return cwrite (ar, 1, count, fh) == count; } static inline COUNT -write_8 (PVOID fp, BYTE v) +write_8 (void *fp, BYTE v) { return WriteResFile (&v, 1, 1, fp); } static inline COUNT -write_16 (PVOID fp, UWORD v) +write_16 (void *fp, UWORD v) { return WriteResFile (&v, 2, 1, fp); } static inline COUNT -write_32 (PVOID fp, DWORD v) +write_32 (void *fp, DWORD v) { return WriteResFile (&v, 4, 1, fp); } static inline COUNT -write_ptr (PVOID fp) +write_ptr (void *fp) { return write_32 (fp, 0); /* ptrs are useless in saves */ } static inline COUNT -write_a8 (PVOID fp, PBYTE ar, COUNT count) +write_a8 (void *fp, const BYTE *ar, COUNT count) { return WriteResFile (ar, 1, count, fp) == count; } static inline COUNT -write_a16 (PVOID fp, PUWORD ar, COUNT count) +write_a16 (void *fp, const UWORD *ar, COUNT count) { for ( ; count > 0; --count, ++ar) { @@ -110,7 +110,7 @@ write_a16 (PVOID fp, PUWORD ar, COUNT count) } static void -SaveShipQueue (DECODE_REF fh, PQUEUE pQueue) +SaveShipQueue (DECODE_REF fh, QUEUE *pQueue) { COUNT num_links; HSTARSHIP hStarShip; @@ -123,10 +123,10 @@ SaveShipQueue (DECODE_REF fh, PQUEUE pQueue) while (num_links--) { HSTARSHIP hNextShip; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; COUNT Index; - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pQueue, hStarShip); + FragPtr = (SHIP_FRAGMENT*) LockStarShip (pQueue, hStarShip); hNextShip = _GetSuccLink (FragPtr); if (pQueue == &GLOBAL (avail_race_q)) @@ -161,8 +161,8 @@ SaveShipQueue (DECODE_REF fh, PQUEUE pQueue) { // avail_race_q contains information not about specific ships, // but about a race. - EXTENDED_SHIP_FRAGMENTPTR ExtFragPtr = - (EXTENDED_SHIP_FRAGMENTPTR) FragPtr; + EXTENDED_SHIP_FRAGMENT *ExtFragPtr = + (EXTENDED_SHIP_FRAGMENT*) FragPtr; cwrite_16 (fh, ExtFragPtr->ShipInfo.actual_strength); cwrite_16 (fh, ExtFragPtr->ShipInfo.known_strength); @@ -181,7 +181,7 @@ SaveShipQueue (DECODE_REF fh, PQUEUE pQueue) } static void -SaveEncounter (ENCOUNTERPTR EncounterPtr, DECODE_REF fh) +SaveEncounter (const ENCOUNTER *EncounterPtr, DECODE_REF fh) { COUNT i; @@ -202,7 +202,7 @@ SaveEncounter (ENCOUNTERPTR EncounterPtr, DECODE_REF fh) // Save each entry in the SHIP_INFO array: for (i = 0; i < MAX_HYPER_SHIPS; i++) { - SHIP_INFOPTR ShipInfo = &EncounterPtr->SD.ShipList[i]; + const SHIP_INFO *ShipInfo = &EncounterPtr->SD.ShipList[i]; cwrite_16 (fh, ShipInfo->ship_flags); cwrite_8 (fh, ShipInfo->var1); @@ -224,7 +224,7 @@ SaveEncounter (ENCOUNTERPTR EncounterPtr, DECODE_REF fh) } static void -SaveEvent (EVENTPTR EventPtr, DECODE_REF fh) +SaveEvent (const EVENT *EventPtr, DECODE_REF fh) { cwrite_ptr (fh); /* useless ptr; HEVENT pred */ cwrite_ptr (fh); /* useless ptr; HEVENT succ */ @@ -237,7 +237,7 @@ SaveEvent (EVENTPTR EventPtr, DECODE_REF fh) } static void -DummySaveQueue (PQUEUE QueuePtr, DECODE_REF fh) +DummySaveQueue (const QUEUE *QueuePtr, DECODE_REF fh) { /* QUEUE should never actually be saved since it contains * purely internal representation and the lists @@ -247,7 +247,7 @@ DummySaveQueue (PQUEUE QueuePtr, DECODE_REF fh) /* QUEUE format with QUEUE_TABLE defined -- UQM default */ cwrite_ptr (fh); /* HLINK head */ cwrite_ptr (fh); /* HLINK tail */ - cwrite_ptr (fh); /* PBYTE pq_tab */ + cwrite_ptr (fh); /* BYTE* pq_tab */ cwrite_ptr (fh); /* HLINK free_list */ cwrite_16 (fh, 0); /* MEM_HANDLE hq_tab */ cwrite_16 (fh, 0); /* COUNT object_size */ @@ -258,7 +258,7 @@ DummySaveQueue (PQUEUE QueuePtr, DECODE_REF fh) } static void -SaveClockState (PCLOCK_STATE ClockPtr, DECODE_REF fh) +SaveClockState (const CLOCK_STATE *ClockPtr, DECODE_REF fh) { cwrite_8 (fh, ClockPtr->day_index); cwrite_8 (fh, ClockPtr->month_index); @@ -273,7 +273,7 @@ SaveClockState (PCLOCK_STATE ClockPtr, DECODE_REF fh) } static void -SaveGameState (PGAME_STATE GSPtr, DECODE_REF fh) +SaveGameState (const GAME_STATE *GSPtr, DECODE_REF fh) { cwrite_8 (fh, 0); /* obsolete; BYTE cur_state */ cwrite_8 (fh, GSPtr->glob_flags); @@ -281,7 +281,7 @@ SaveGameState (PGAME_STATE GSPtr, DECODE_REF fh) cwrite_8 (fh, GSPtr->FuelCost); cwrite_a8 (fh, GSPtr->ModuleCost, NUM_MODULES); cwrite_a8 (fh, GSPtr->ElementWorth, NUM_ELEMENT_CATEGORIES); - cwrite_ptr (fh); /* useless ptr; PPRIMITIVE DisplayArray */ + cwrite_ptr (fh); /* useless ptr; PRIMITIVE *DisplayArray */ cwrite_16 (fh, GSPtr->CurrentActivity); cwrite_16 (fh, 0); /* CLOCK_STATE alignment padding */ @@ -321,7 +321,7 @@ SaveGameState (PGAME_STATE GSPtr, DECODE_REF fh) } static BOOLEAN -SaveSisState (PSIS_STATE SSPtr, PVOID fp) +SaveSisState (const SIS_STATE *SSPtr, void *fp) { if ( write_32 (fp, SSPtr->log_x) != 1 || @@ -349,7 +349,7 @@ SaveSisState (PSIS_STATE SSPtr, PVOID fp) } static BOOLEAN -SaveSummary (SUMMARY_DESC *SummPtr, PVOID fp) +SaveSummary (const SUMMARY_DESC *SummPtr, void *fp) { if (!SaveSisState (&SummPtr->SS, fp)) return FALSE; @@ -375,7 +375,7 @@ SaveSummary (SUMMARY_DESC *SummPtr, PVOID fp) } static void -SaveStarDesc (STAR_DESCPTR SDPtr, DECODE_REF fh) +SaveStarDesc (const STAR_DESC *SDPtr, DECODE_REF fh) { cwrite_16 (fh, SDPtr->star_pt.x); cwrite_16 (fh, SDPtr->star_pt.y); @@ -413,11 +413,10 @@ PrepareSummary (SUMMARY_DESC *SummPtr) for (hStarShip = GetHeadLink (&GLOBAL (built_ship_q)), SummPtr->NumShips = 0; hStarShip; hStarShip = hNextShip, ++SummPtr->NumShips) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (built_ship_q), hStarShip - ); + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); SummPtr->ShipList[SummPtr->NumShips] = GET_RACE_ID (StarShipPtr); UnlockStarShip (&GLOBAL (built_ship_q), hStarShip); @@ -438,7 +437,7 @@ PrepareSummary (SUMMARY_DESC *SummPtr) } static void -SaveProblemMessage (PSTAMP MsgStamp) +SaveProblemMessage (STAMP *MsgStamp) { #define MAX_MSG_LINES 1 RECT r; @@ -460,7 +459,7 @@ SaveProblemMessage (PSTAMP MsgStamp) if (*t.pStr == '\0') break; t.CharCount = (COUNT)~0; - TextRect (&t, &tr, NULL_PTR); + TextRect (&t, &tr, NULL); if (i == 0) r = tr; else @@ -546,7 +545,7 @@ BOOLEAN SaveGame (COUNT which_game, SUMMARY_DESC *SummPtr) { BOOLEAN success, made_room; - PVOID out_fp; + void *out_fp; MEM_HANDLE h; DECODE_REF fh; @@ -622,7 +621,7 @@ RetrySave: while (num_links--) { HEVENT hNextEvent; - EVENTPTR EventPtr; + EVENT *EventPtr; LockEvent (hEvent, &EventPtr); hNextEvent = GetSuccEvent (EventPtr); @@ -645,7 +644,7 @@ RetrySave: while (num_links--) { HENCOUNTER hNextEncounter; - ENCOUNTERPTR EncounterPtr; + ENCOUNTER *EncounterPtr; LockEncounter (hEncounter, &EncounterPtr); hNextEncounter = GetSuccEncounter (EncounterPtr); diff --git a/sc2/src/sc2code/settings.h b/sc2/src/sc2code/settings.h index c91393525..4641fb658 100644 --- a/sc2/src/sc2code/settings.h +++ b/sc2/src/sc2code/settings.h @@ -25,8 +25,7 @@ extern void ResumeMusic (void); extern void PauseMusic (void); extern void ToggleSoundEffect (void); -extern void PlayMusic (MUSIC_REF MusicRef, BOOLEAN Continuous, BYTE - Priority); +extern void PlayMusic (MUSIC_REF MusicRef, BOOLEAN Continuous, BYTE Priority); extern void PlaySoundEffect (SOUND S, COUNT Channel, SoundPosition Pos, void *PositionalObject, BYTE Priority); diff --git a/sc2/src/sc2code/setupmenu.c b/sc2/src/sc2code/setupmenu.c index 59690ac5d..e42671489 100644 --- a/sc2/src/sc2code/setupmenu.c +++ b/sc2/src/sc2code/setupmenu.c @@ -45,9 +45,7 @@ typedef struct setup_menu_state { DWORD NextTime; } SETUP_MENU_STATE; -typedef SETUP_MENU_STATE *PSETUP_MENU_STATE; - -static BOOLEAN DoSetupMenu (PSETUP_MENU_STATE pInputState); +static BOOLEAN DoSetupMenu (SETUP_MENU_STATE *pInputState); static BOOLEAN done; static WIDGET *current, *next; @@ -421,7 +419,7 @@ PropagateResults (void) } static BOOLEAN -DoSetupMenu (PSETUP_MENU_STATE pInputState) +DoSetupMenu (SETUP_MENU_STATE *pInputState) { if (!pInputState->initialized) { @@ -495,7 +493,7 @@ redraw_menu (void) } static BOOLEAN -OnTextEntryChange (PTEXTENTRY_STATE pTES) +OnTextEntryChange (TEXTENTRY_STATE *pTES) { WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam; @@ -513,7 +511,7 @@ OnTextEntryChange (PTEXTENTRY_STATE pTES) } static BOOLEAN -OnTextEntryFrame (PTEXTENTRY_STATE pTES) +OnTextEntryFrame (TEXTENTRY_STATE *pTES) { WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam; @@ -986,7 +984,7 @@ clean_up_widgets (void) { if (labels[i].lines) { - HFree (labels[i].lines); + HFree ((void *)labels[i].lines); } } @@ -1029,7 +1027,7 @@ SetupMenu (void) } done = FALSE; - DoInput ((PVOID)&s, TRUE); + DoInput (&s, TRUE); GLOBAL (CurrentActivity) &= ~CHECK_ABORT; PropagateResults (); if (SetupTab) diff --git a/sc2/src/sc2code/ship.c b/sc2/src/sc2code/ship.c index bc73f9b25..6144d19a1 100644 --- a/sc2/src/sc2code/ship.c +++ b/sc2/src/sc2code/ship.c @@ -28,7 +28,7 @@ void -animation_preprocess (PELEMENT ElementPtr) +animation_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -44,15 +44,15 @@ animation_preprocess (PELEMENT ElementPtr) UWORD -inertial_thrust (ELEMENTPTR ElementPtr) +inertial_thrust (ELEMENT *ElementPtr) { #define MAX_ALLOWED_SPEED WORLD_TO_VELOCITY (DISPLAY_TO_WORLD (18)) #define MAX_ALLOWED_SPEED_SQR ((DWORD)MAX_ALLOWED_SPEED * MAX_ALLOWED_SPEED) COUNT CurrentAngle, TravelAngle; COUNT max_thrust, thrust_increment; - VELOCITYPTR VelocityPtr; - STARSHIPPTR StarShipPtr; + VELOCITY_DESC *VelocityPtr; + STARSHIP *StarShipPtr; VelocityPtr = &ElementPtr->velocity; @@ -138,11 +138,11 @@ inertial_thrust (ELEMENTPTR ElementPtr) } void -ship_preprocess (PELEMENT ElementPtr) +ship_preprocess (ELEMENT *ElementPtr) { ELEMENT_FLAGS cur_status_flags; - STARSHIPPTR StarShipPtr; - RACE_DESCPTR RDPtr; + STARSHIP *StarShipPtr; + RACE_DESC *RDPtr; GetElementStarShip (ElementPtr, &StarShipPtr); RDPtr = StarShipPtr->RaceDescPtr; @@ -175,7 +175,7 @@ ship_preprocess (PELEMENT ElementPtr) { CONTEXT OldContext; - InitShipStatus (StarShipPtr, NULL_PTR); + InitShipStatus (StarShipPtr, NULL); OldContext = SetContext (StatusContext); DrawCaptainsWindow (StarShipPtr); SetContext (OldContext); @@ -184,14 +184,13 @@ ship_preprocess (PELEMENT ElementPtr) if (ElementPtr->hTarget == 0) { - extern void ship_transition (PELEMENT ElementPtr); + extern void ship_transition (ELEMENT *ElementPtr); ship_transition (ElementPtr); } else { - extern BOOLEAN OpponentAlive (STARSHIPPTR - TestStarShipPtr); + extern BOOLEAN OpponentAlive (STARSHIP *TestStarShipPtr); ElementPtr->hTarget = 0; if (!PLRPlaying ((MUSIC_REF)~0) && OpponentAlive (StarShipPtr)) @@ -222,7 +221,7 @@ ship_preprocess (PELEMENT ElementPtr) --StarShipPtr->energy_counter; else if (RDPtr->ship_info.energy_level < (BYTE)RDPtr->ship_info.max_energy || (SBYTE)RDPtr->characteristics.energy_regeneration < 0) - DeltaEnergy ((ELEMENTPTR)ElementPtr, + DeltaEnergy (ElementPtr, (SBYTE)RDPtr->characteristics.energy_regeneration); if (RDPtr->preprocess_func) @@ -255,7 +254,7 @@ ship_preprocess (PELEMENT ElementPtr) { UWORD thrust_status; - thrust_status = inertial_thrust ((ELEMENTPTR)ElementPtr); + thrust_status = inertial_thrust (ElementPtr); StarShipPtr->cur_status_flags &= ~(SHIP_AT_MAX_SPEED | SHIP_BEYOND_MAX_SPEED @@ -267,7 +266,7 @@ ship_preprocess (PELEMENT ElementPtr) if (!OBJECT_CLOAKED (ElementPtr) && LOBYTE (GLOBAL (CurrentActivity)) <= IN_ENCOUNTER) { - extern void spawn_ion_trail (PELEMENT ElementPtr); + extern void spawn_ion_trail (ELEMENT *ElementPtr); spawn_ion_trail (ElementPtr); } @@ -278,10 +277,10 @@ ship_preprocess (PELEMENT ElementPtr) } void -ship_postprocess (PELEMENT ElementPtr) +ship_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; - RACE_DESCPTR RDPtr; + STARSHIP *StarShipPtr; + RACE_DESC *RDPtr; if (ElementPtr->crew_level == 0) return; @@ -292,7 +291,7 @@ ship_postprocess (PELEMENT ElementPtr) if (StarShipPtr->weapon_counter) --StarShipPtr->weapon_counter; else if ((StarShipPtr->cur_status_flags - & WEAPON) && DeltaEnergy ((ELEMENTPTR)ElementPtr, + & WEAPON) && DeltaEnergy (ElementPtr, -RDPtr->characteristics.weapon_energy_cost)) { COUNT num_weapons; @@ -303,7 +302,7 @@ ship_postprocess (PELEMENT ElementPtr) if (num_weapons) { HELEMENT *WeaponPtr; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; BOOLEAN played_sfx = FALSE; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -314,7 +313,7 @@ ship_postprocess (PELEMENT ElementPtr) w = *WeaponPtr++; if (w) { - ELEMENTPTR EPtr; + ELEMENT *EPtr; LockElement (w, &EPtr); SetElementStarShip (EPtr, StarShipPtr); @@ -348,8 +347,8 @@ ship_postprocess (PELEMENT ElementPtr) } void -collision (PELEMENT ElementPtr0, PPOINT pPt0, - PELEMENT ElementPtr1, PPOINT pPt1) +collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (!(ElementPtr1->state_flags & FINITE_LIFE)) { @@ -362,7 +361,7 @@ collision (PELEMENT ElementPtr0, PPOINT pPt0, damage = ElementPtr0->hit_points >> 2; if (damage == 0) damage = 1; - do_damage ((ELEMENTPTR)ElementPtr0, damage); + do_damage (ElementPtr0, damage); damage = TARGET_DAMAGED_FOR_1_PT + (damage >> 1); if (damage > TARGET_DAMAGED_FOR_6_PLUS_PT) @@ -375,10 +374,10 @@ collision (PELEMENT ElementPtr0, PPOINT pPt0, } static BOOLEAN -spawn_ship (STARSHIPPTR StarShipPtr) +spawn_ship (STARSHIP *StarShipPtr) { HELEMENT hShip; - RACE_DESCPTR RDPtr; + RACE_DESC *RDPtr; if (!load_ship (StarShipPtr, TRUE)) return (FALSE); @@ -421,7 +420,7 @@ spawn_ship (STARSHIPPTR StarShipPtr) if (StarShipPtr->hShip != 0) { // Construct an ELEMENT for the STARSHIP - ELEMENTPTR ShipElementPtr; + ELEMENT *ShipElementPtr; LockElement (hShip, &ShipElementPtr); @@ -491,7 +490,7 @@ spawn_ship (STARSHIPPTR StarShipPtr) } BOOLEAN -GetNextStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_side) +GetNextStarShip (STARSHIP *LastStarShipPtr, COUNT which_side) { HSTARSHIP hBattleShip; @@ -502,7 +501,7 @@ GetNextStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_side) hBattleShip = GetEncounterStarShip (LastStarShipPtr, which_side); if (hBattleShip) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; StarShipPtr = LockStarShip (&race_q[which_side], hBattleShip); if (LastStarShipPtr) diff --git a/sc2/src/sc2code/shipcont.h b/sc2/src/sc2code/shipcont.h index fc7268d5a..e28283e53 100755 --- a/sc2/src/sc2code/shipcont.h +++ b/sc2/src/sc2code/shipcont.h @@ -23,9 +23,9 @@ #define FIELD_WIDTH (STATUS_WIDTH - 5) -extern void Cargo (PMENU_STATE pMS); +extern void Cargo (MENU_STATE *pMS); extern BOOLEAN Roster (void); -extern BOOLEAN Devices (PMENU_STATE pMS); +extern BOOLEAN Devices (MENU_STATE *pMS); extern void DrawCargoStrings (BYTE OldElement, BYTE NewElement); extern void ShowRemainingCapacity (void); diff --git a/sc2/src/sc2code/ships/androsyn/androsyn.c b/sc2/src/sc2code/ships/androsyn/androsyn.c index ef4f4e8f3..93758baa8 100644 --- a/sc2/src/sc2code/ships/androsyn/androsyn.c +++ b/sc2/src/sc2code/ships/androsyn/androsyn.c @@ -94,7 +94,7 @@ static RACE_DESC androsynth_desc = { 0, LONG_RANGE_WEAPON >> 2, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -107,7 +107,8 @@ static RACE_DESC androsynth_desc = #define BLAZER_MASS 1 static void -blazer_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +blazer_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { #define BLAZER_OFFSET 10 BYTE old_offs; @@ -132,7 +133,7 @@ blazer_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN #define MISSILE_SPEED DISPLAY_TO_WORLD (8) static void -bubble_preprocess (PELEMENT ElementPtr) +bubble_preprocess (ELEMENT *ElementPtr) { BYTE thrust_wait, turn_wait; @@ -157,8 +158,7 @@ bubble_preprocess (PELEMENT ElementPtr) SIZE delta_facing; facing = NORMALIZE_FACING (ANGLE_TO_FACING ( - GetVelocityTravelAngle (&ElementPtr->velocity) - )); + GetVelocityTravelAngle (&ElementPtr->velocity))); if ((delta_facing = TrackShip (ElementPtr, &facing)) == -1) facing = (COUNT)TFB_Random (); else if (delta_facing <= ANGLE_TO_FACING (HALF_CIRCLE)) @@ -179,12 +179,12 @@ bubble_preprocess (PELEMENT ElementPtr) #define MISSILE_LIFE 200 static COUNT -initialize_bubble (PELEMENT ShipPtr, HELEMENT BubbleArray[]) +initialize_bubble (ELEMENT *ShipPtr, HELEMENT BubbleArray[]) { #define ANDROSYNTH_OFFSET 14 #define MISSILE_OFFSET 3 #define MISSILE_HITS 3 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -206,7 +206,7 @@ initialize_bubble (PELEMENT ShipPtr, HELEMENT BubbleArray[]) if (BubbleArray[0]) { - ELEMENTPTR BubblePtr; + ELEMENT *BubblePtr; LockElement (BubbleArray[0], &BubblePtr); BubblePtr->turn_wait = 0; @@ -217,10 +217,11 @@ initialize_bubble (PELEMENT ShipPtr, HELEMENT BubbleArray[]) } static void -androsynth_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +androsynth_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -242,7 +243,7 @@ androsynth_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUN } else { - STARSHIPPTR pEnemyStarShip; + STARSHIP *pEnemyStarShip; lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; if (lpEvalDesc->ObjectPtr) @@ -316,15 +317,14 @@ androsynth_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUN } } -static void (*ship_collision_func[2]) (PELEMENT ElementPtr0, PPOINT pPt0, - PELEMENT ElementPtr1, PPOINT pPt1); +static CollisionFunc *ship_collision_func[2]; #define BLAZER_TURN_WAIT 1 static void -androsynth_postprocess (PELEMENT ElementPtr) +androsynth_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); /* take care of blazer effect */ @@ -369,9 +369,9 @@ androsynth_postprocess (PELEMENT ElementPtr) } static void -androsynth_preprocess (PELEMENT ElementPtr) +androsynth_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; ELEMENT_FLAGS cur_status_flags; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -455,17 +455,15 @@ androsynth_preprocess (PELEMENT ElementPtr) StarShipPtr->cur_status_flags = cur_status_flags; } -RACE_DESCPTR +RACE_DESC* init_androsynth (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; androsynth_desc.preprocess_func = androsynth_preprocess; androsynth_desc.postprocess_func = androsynth_postprocess; androsynth_desc.init_weapon_func = initialize_bubble; - androsynth_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) androsynth_intelligence; + androsynth_desc.cyborg_control.intelligence_func = androsynth_intelligence; RaceDescPtr = &androsynth_desc; diff --git a/sc2/src/sc2code/ships/arilou/arilou.c b/sc2/src/sc2code/ships/arilou/arilou.c index 4d912597f..c6956e5d9 100644 --- a/sc2/src/sc2code/ships/arilou/arilou.c +++ b/sc2/src/sc2code/ships/arilou/arilou.c @@ -96,7 +96,7 @@ static RACE_DESC arilou_desc = { 0, LASER_RANGE >> 1, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -106,11 +106,11 @@ static RACE_DESC arilou_desc = }; static COUNT -initialize_autoaim_laser (PELEMENT ShipPtr, HELEMENT LaserArray[]) +initialize_autoaim_laser (ELEMENT *ShipPtr, HELEMENT LaserArray[]) { COUNT orig_facing; SIZE delta_facing; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; LASER_BLOCK LaserBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -133,10 +133,10 @@ initialize_autoaim_laser (PELEMENT ShipPtr, HELEMENT LaserArray[]) } static void -arilou_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, +arilou_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); StarShipPtr->ship_input_state |= THRUST; @@ -146,7 +146,7 @@ arilou_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, if (StarShipPtr->special_counter == 0) { - PEVALUATE_DESC lpEvalDesc; + EVALUATE_DESC *lpEvalDesc; StarShipPtr->ship_input_state &= ~SPECIAL; @@ -154,7 +154,7 @@ arilou_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, if (lpEvalDesc->ObjectPtr && lpEvalDesc->which_turn <= 6) { BOOLEAN IsTrackingWeapon; - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr); if (((EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags @@ -185,9 +185,9 @@ arilou_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, } static void -arilou_preprocess (PELEMENT ElementPtr) +arilou_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (!(ElementPtr->state_flags & NONSOLID)) @@ -275,16 +275,14 @@ arilou_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_arilou (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; arilou_desc.preprocess_func = arilou_preprocess; arilou_desc.init_weapon_func = initialize_autoaim_laser; - arilou_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) arilou_intelligence; + arilou_desc.cyborg_control.intelligence_func = arilou_intelligence; RaceDescPtr = &arilou_desc; diff --git a/sc2/src/sc2code/ships/blackurq/blackurq.c b/sc2/src/sc2code/ships/blackurq/blackurq.c index 3450979fc..da55903ea 100644 --- a/sc2/src/sc2code/ships/blackurq/blackurq.c +++ b/sc2/src/sc2code/ships/blackurq/blackurq.c @@ -98,7 +98,7 @@ static RACE_DESC black_urquan_desc = { 0, CLOSE_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -111,10 +111,10 @@ static RACE_DESC black_urquan_desc = #define MAX_SAWS 8 static void -spin_preprocess (PELEMENT ElementPtr) +spin_preprocess (ELEMENT *ElementPtr) { - ELEMENTPTR ShipPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); LockElement (StarShipPtr->hShip, &ShipPtr); @@ -151,7 +151,7 @@ spin_preprocess (PELEMENT ElementPtr) #define TRACK_WAIT 4 static void -buzztrack_preprocess (PELEMENT ElementPtr) +buzztrack_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->thrust_wait) --ElementPtr->thrust_wait; @@ -168,7 +168,7 @@ buzztrack_preprocess (PELEMENT ElementPtr) { #define ACTIVATE_RANGE 224 /* Originally SPACE_WIDTH */ SIZE delta_x, delta_y; - ELEMENTPTR eptr; + ELEMENT *eptr; LockElement (ElementPtr->hTarget, &eptr); delta_x = eptr->current.location.x @@ -209,7 +209,7 @@ buzztrack_preprocess (PELEMENT ElementPtr) } static void -decelerate_preprocess (PELEMENT ElementPtr) +decelerate_preprocess (ELEMENT *ElementPtr) { SIZE dx, dy; @@ -226,7 +226,7 @@ decelerate_preprocess (PELEMENT ElementPtr) } static void -splinter_preprocess (PELEMENT ElementPtr) +splinter_preprocess (ELEMENT *ElementPtr) { ElementPtr->next.image.frame = IncFrameIndex (ElementPtr->current.image.frame); @@ -234,7 +234,8 @@ splinter_preprocess (PELEMENT ElementPtr) } static void -buzzsaw_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +buzzsaw_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { weapon_collision (ElementPtr0, pPt0, ElementPtr1, pPt1); @@ -251,9 +252,9 @@ buzzsaw_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI } static void -buzzsaw_preprocess (PELEMENT ElementPtr) +buzzsaw_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (!(StarShipPtr->cur_status_flags & WEAPON)) @@ -266,7 +267,7 @@ buzzsaw_preprocess (PELEMENT ElementPtr) } static void -buzzsaw_postprocess (PELEMENT ElementPtr) +buzzsaw_postprocess (ELEMENT *ElementPtr) { HELEMENT hElement; @@ -275,8 +276,8 @@ buzzsaw_postprocess (PELEMENT ElementPtr) if (hElement) { COUNT primIndex; - ELEMENTPTR ListElementPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ListElementPtr; + STARSHIP *StarShipPtr; LockElement (hElement, &ListElementPtr); primIndex = ListElementPtr->PrimIndex; @@ -302,13 +303,13 @@ buzzsaw_postprocess (PELEMENT ElementPtr) } static COUNT -initialize_buzzsaw (PELEMENT ShipPtr, HELEMENT SawArray[]) +initialize_buzzsaw (ELEMENT *ShipPtr, HELEMENT SawArray[]) { #define MISSILE_HITS 10 #define MISSILE_DAMAGE 4 #define MISSILE_OFFSET 9 #define KOHR_AH_OFFSET 28 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -330,7 +331,7 @@ initialize_buzzsaw (PELEMENT ShipPtr, HELEMENT SawArray[]) if (SawArray[0]) { - ELEMENTPTR SawPtr; + ELEMENT *SawPtr; LockElement (SawArray[0], &SawPtr); SawPtr->turn_wait = SAW_RATE; @@ -344,10 +345,11 @@ initialize_buzzsaw (PELEMENT ShipPtr, HELEMENT SawArray[]) } static void -black_urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +black_urquan_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; lpEvalDesc = &ObjectsOfConcern[ENEMY_WEAPON_INDEX]; if (lpEvalDesc->ObjectPtr @@ -375,7 +377,7 @@ black_urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, CO #define FRAGMENT_SPEED MISSILE_SPEED #define FRAGMENT_RANGE (FRAGMENT_LIFE * FRAGMENT_SPEED) HELEMENT h, hNext; - ELEMENTPTR BuzzSawPtr; + ELEMENT *BuzzSawPtr; h = (StarShipPtr->old_status_flags & WEAPON) ? GetSuccElement (ShipPtr) : (HELEMENT)0; @@ -429,7 +431,7 @@ black_urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, CO #define GAS_RATE 2 static void -gas_cloud_preprocess (PELEMENT ElementPtr) +gas_cloud_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait) --ElementPtr->turn_wait; @@ -446,7 +448,8 @@ gas_cloud_preprocess (PELEMENT ElementPtr) #define GAS_DAMAGE 3 static void -gas_cloud_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +gas_cloud_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (ElementPtr1->state_flags & PLAYER_SHIP) ElementPtr0->mass_points = GAS_DAMAGE; @@ -457,14 +460,14 @@ gas_cloud_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PP } static void -spawn_gas_cloud (PELEMENT ElementPtr) +spawn_gas_cloud (ELEMENT *ElementPtr) { #define GAS_SPEED 16 #define GAS_HITS 100 #define GAS_OFFSET 2 #define NUM_GAS_CLOUDS 16 SIZE dx, dy; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -495,7 +498,7 @@ spawn_gas_cloud (PELEMENT ElementPtr) hGasCloud = initialize_missile (&MissileBlock); if (hGasCloud) { - ELEMENTPTR GasCloudPtr; + ELEMENT *GasCloudPtr; LockElement (hGasCloud, &GasCloudPtr); SetElementStarShip (GasCloudPtr, StarShipPtr); @@ -510,9 +513,9 @@ spawn_gas_cloud (PELEMENT ElementPtr) } static void -black_urquan_postprocess (PELEMENT ElementPtr) +black_urquan_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -529,9 +532,9 @@ black_urquan_postprocess (PELEMENT ElementPtr) } static void -black_urquan_preprocess (PELEMENT ElementPtr) +black_urquan_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); /* no spinning disks */ @@ -542,17 +545,15 @@ black_urquan_preprocess (PELEMENT ElementPtr) ++StarShipPtr->weapon_counter; } -RACE_DESCPTR +RACE_DESC* init_black_urquan (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; black_urquan_desc.preprocess_func = black_urquan_preprocess; black_urquan_desc.postprocess_func = black_urquan_postprocess; black_urquan_desc.init_weapon_func = initialize_buzzsaw; - black_urquan_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) black_urquan_intelligence; + black_urquan_desc.cyborg_control.intelligence_func = black_urquan_intelligence; RaceDescPtr = &black_urquan_desc; diff --git a/sc2/src/sc2code/ships/chenjesu/chenjesu.c b/sc2/src/sc2code/ships/chenjesu/chenjesu.c index e2390a432..bc20657cd 100644 --- a/sc2/src/sc2code/ships/chenjesu/chenjesu.c +++ b/sc2/src/sc2code/ships/chenjesu/chenjesu.c @@ -101,7 +101,7 @@ static RACE_DESC chenjesu_desc = { 0, LONG_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -115,13 +115,13 @@ static RACE_DESC chenjesu_desc = #define FRAGMENT_RANGE (FRAGMENT_LIFE * FRAGMENT_SPEED) static void -crystal_postprocess (PELEMENT ElementPtr) +crystal_postprocess (ELEMENT *ElementPtr) { #define FRAGMENT_HITS 1 #define FRAGMENT_DAMAGE 2 #define FRAGMENT_OFFSET 2 #define NUM_FRAGMENTS 8 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -137,7 +137,7 @@ crystal_postprocess (PELEMENT ElementPtr) MissileBlock.hit_points = FRAGMENT_HITS; MissileBlock.damage = FRAGMENT_DAMAGE; MissileBlock.life = FRAGMENT_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = FRAGMENT_OFFSET; for (MissileBlock.face = 0; @@ -150,7 +150,7 @@ crystal_postprocess (PELEMENT ElementPtr) hFragment = initialize_missile (&MissileBlock); if (hFragment) { - ELEMENTPTR FragPtr; + ELEMENT *FragPtr; LockElement (hFragment, &FragPtr); SetElementStarShip (FragPtr, StarShipPtr); @@ -165,9 +165,9 @@ crystal_postprocess (PELEMENT ElementPtr) } static void -crystal_preprocess (PELEMENT ElementPtr) +crystal_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->cur_status_flags & WEAPON) @@ -181,7 +181,7 @@ crystal_preprocess (PELEMENT ElementPtr) } static void -animate (PELEMENT ElementPtr) +animate (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -196,7 +196,8 @@ animate (PELEMENT ElementPtr) } static void -crystal_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +crystal_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { HELEMENT hBlastElement; @@ -204,7 +205,7 @@ crystal_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI weapon_collision (ElementPtr0, pPt0, ElementPtr1, pPt1); if (hBlastElement) { - ELEMENTPTR BlastElementPtr; + ELEMENT *BlastElementPtr; #define NUM_SPARKLES 8 LockElement (hBlastElement, &BlastElementPtr); @@ -229,9 +230,9 @@ crystal_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI #define DOGGY_SPEED DISPLAY_TO_WORLD (8) static void -doggy_preprocess (PELEMENT ElementPtr) +doggy_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); ++StarShipPtr->special_counter; @@ -250,7 +251,7 @@ doggy_preprocess (PELEMENT ElementPtr) facing = NORMALIZE_FACING (TFB_Random ()); else { - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; LockElement (ElementPtr->hTarget, &ShipPtr); facing = NORMALIZE_FACING (ANGLE_TO_FACING ( @@ -282,9 +283,9 @@ doggy_preprocess (PELEMENT ElementPtr) } static void -doggy_death (PELEMENT ElementPtr) +doggy_death (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); ProcessSound (SetAbsSoundIndex ( @@ -297,15 +298,16 @@ doggy_death (PELEMENT ElementPtr) { ElementPtr->preprocess_func = animate; } - ElementPtr->death_func = NULL_PTR; - ElementPtr->collision_func = NULL_PTR; + ElementPtr->death_func = NULL; + ElementPtr->collision_func = NULL; ZeroVelocityComponents (&ElementPtr->velocity); ElementPtr->turn_wait = ElementPtr->next_turn = 0; } static void -doggy_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +doggy_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { #define ENERGY_DRAIN 10 collision (ElementPtr0, pPt0, ElementPtr1, pPt1); @@ -315,7 +317,7 @@ doggy_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT (ElementPtr1->state_flags & (GOOD_GUY | BAD_GUY))) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); ProcessSound (SetAbsSoundIndex ( @@ -334,15 +336,15 @@ doggy_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT #define CHENJESU_OFFSET 16 static void -spawn_doggy (PELEMENT ElementPtr) +spawn_doggy (ELEMENT *ElementPtr) { HELEMENT hDoggyElement; if ((hDoggyElement = AllocElement ()) != 0) { COUNT angle; - ELEMENTPTR DoggyElementPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *DoggyElementPtr; + STARSHIP *StarShipPtr; ElementPtr->state_flags |= DEFY_PHYSICS; @@ -358,7 +360,7 @@ spawn_doggy (PELEMENT ElementPtr) STAMP_PRIM); { DoggyElementPtr->preprocess_func = doggy_preprocess; - DoggyElementPtr->postprocess_func = NULL_PTR; + DoggyElementPtr->postprocess_func = NULL; DoggyElementPtr->collision_func = doggy_collision; DoggyElementPtr->death_func = doggy_death; } @@ -386,10 +388,11 @@ spawn_doggy (PELEMENT ElementPtr) } static void -chenjesu_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +chenjesu_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); StarShipPtr->ship_input_state &= ~SPECIAL; @@ -397,7 +400,7 @@ chenjesu_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; if (lpEvalDesc->ObjectPtr) { - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr); if ((lpEvalDesc->which_turn <= 16 @@ -427,7 +430,7 @@ chenjesu_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT if (lpEvalDesc->ObjectPtr) { HELEMENT h, hNext; - ELEMENTPTR CrystalPtr; + ELEMENT *CrystalPtr; h = (StarShipPtr->old_status_flags & WEAPON) ? GetTailElement () : (HELEMENT)0; @@ -493,12 +496,12 @@ chenjesu_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT } static COUNT -initialize_crystal (PELEMENT ShipPtr, HELEMENT CrystalArray[]) +initialize_crystal (ELEMENT *ShipPtr, HELEMENT CrystalArray[]) { #define MISSILE_HITS 10 #define MISSILE_DAMAGE 6 #define MISSILE_OFFSET 0 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -520,7 +523,7 @@ initialize_crystal (PELEMENT ShipPtr, HELEMENT CrystalArray[]) if (CrystalArray[0]) { - ELEMENTPTR CrystalPtr; + ELEMENT *CrystalPtr; LockElement (CrystalArray[0], &CrystalPtr); CrystalPtr->collision_func = crystal_collision; @@ -531,9 +534,9 @@ initialize_crystal (PELEMENT ShipPtr, HELEMENT CrystalArray[]) } static void -chenjesu_postprocess (PELEMENT ElementPtr) +chenjesu_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -549,9 +552,9 @@ chenjesu_postprocess (PELEMENT ElementPtr) } static void -chenjesu_preprocess (PELEMENT ElementPtr) +chenjesu_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->special_counter > 1) /* only when STANDARD @@ -564,17 +567,15 @@ chenjesu_preprocess (PELEMENT ElementPtr) ++StarShipPtr->weapon_counter; } -RACE_DESCPTR +RACE_DESC* init_chenjesu (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; chenjesu_desc.preprocess_func = chenjesu_preprocess; chenjesu_desc.postprocess_func = chenjesu_postprocess; chenjesu_desc.init_weapon_func = initialize_crystal; - chenjesu_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) chenjesu_intelligence; + chenjesu_desc.cyborg_control.intelligence_func = chenjesu_intelligence; RaceDescPtr = &chenjesu_desc; diff --git a/sc2/src/sc2code/ships/chmmr/chmmr.c b/sc2/src/sc2code/ships/chmmr/chmmr.c index 9c21a1ed3..85090b306 100644 --- a/sc2/src/sc2code/ships/chmmr/chmmr.c +++ b/sc2/src/sc2code/ships/chmmr/chmmr.c @@ -98,7 +98,7 @@ static RACE_DESC chmmr_desc = { 0, CLOSE_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -108,7 +108,7 @@ static RACE_DESC chmmr_desc = }; static void -animate (PELEMENT ElementPtr) +animate (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -123,9 +123,9 @@ animate (PELEMENT ElementPtr) } static void -laser_death (ELEMENTPTR ElementPtr) +laser_death (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); StarShipPtr->special_counter = ElementPtr->turn_wait; @@ -135,7 +135,7 @@ laser_death (ELEMENTPTR ElementPtr) SIZE dx, dy; long dist; HELEMENT hIonSpots; - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; LockElement (StarShipPtr->hShip, &ShipPtr); @@ -150,7 +150,7 @@ laser_death (ELEMENTPTR ElementPtr) && (hIonSpots = AllocElement ())) { COUNT angle, magnitude; - ELEMENTPTR IonSpotsPtr; + ELEMENT *IonSpotsPtr; LockElement (hIonSpots, &IonSpotsPtr); IonSpotsPtr->state_flags = @@ -194,11 +194,11 @@ laser_death (ELEMENTPTR ElementPtr) } static COUNT -initialize_megawatt_laser (PELEMENT ShipPtr, HELEMENT LaserArray[]) +initialize_megawatt_laser (ELEMENT *ShipPtr, HELEMENT LaserArray[]) { #define NUM_CYCLES 4 RECT r; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; LASER_BLOCK LaserBlock; static const COLOR cycle_array[] = { @@ -227,7 +227,7 @@ initialize_megawatt_laser (PELEMENT ShipPtr, HELEMENT LaserArray[]) if (LaserArray[0]) { - ELEMENTPTR LaserPtr; + ELEMENT *LaserPtr; LockElement (LaserArray[0], &LaserPtr); @@ -243,10 +243,11 @@ initialize_megawatt_laser (PELEMENT ShipPtr, HELEMENT LaserArray[]) } static void -chmmr_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +chmmr_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); @@ -266,19 +267,19 @@ chmmr_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con } static void -chmmr_postprocess (PELEMENT ElementPtr) +chmmr_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->cur_status_flags & WEAPON) { HELEMENT hMuzzleFlash; - ELEMENTPTR MuzzleFlashPtr; + ELEMENT *MuzzleFlashPtr; LockElement (GetTailElement (), &MuzzleFlashPtr); - if ((PELEMENT)MuzzleFlashPtr != ElementPtr + if (MuzzleFlashPtr != ElementPtr && (MuzzleFlashPtr->state_flags & (GOOD_GUY | BAD_GUY)) == (ElementPtr->state_flags & (GOOD_GUY | BAD_GUY)) && (MuzzleFlashPtr->state_flags & APPEARING) @@ -318,7 +319,7 @@ chmmr_postprocess (PELEMENT ElementPtr) && DeltaEnergy (ElementPtr, -SPECIAL_ENERGY_COST)) { COUNT facing; - ELEMENTPTR ShipElementPtr; + ELEMENT *ShipElementPtr; LockElement (ElementPtr->hTarget, &ShipElementPtr); @@ -333,14 +334,14 @@ chmmr_postprocess (PELEMENT ElementPtr) { #define NUM_SHADOWS 5 - ELEMENTPTR ShipElementPtr; + ELEMENT *ShipElementPtr; LockElement (ElementPtr->hTarget, &ShipElementPtr); if (!GRAVITY_MASS (ShipElementPtr->mass_points + 1)) { SIZE i, dx, dy; COUNT angle, magnitude; - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; static const SIZE shadow_offs[] = { DISPLAY_TO_WORLD (8), @@ -399,7 +400,7 @@ chmmr_postprocess (PELEMENT ElementPtr) hShadow = AllocElement (); if (hShadow) { - ELEMENTPTR ShadowElementPtr; + ELEMENT *ShadowElementPtr; LockElement (hShadow, &ShadowElementPtr); @@ -441,9 +442,9 @@ chmmr_postprocess (PELEMENT ElementPtr) #define SATELLITE_OFFSET DISPLAY_TO_WORLD (64) static void -satellite_preprocess (PELEMENT ElementPtr) +satellite_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; ++ElementPtr->life_span; @@ -460,7 +461,7 @@ satellite_preprocess (PELEMENT ElementPtr) if (StarShipPtr->hShip) { SIZE dx, dy; - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; StarShipPtr->RaceDescPtr->ship_info.ship_flags |= POINT_DEFENSE; @@ -494,15 +495,17 @@ satellite_preprocess (PELEMENT ElementPtr) } static void -spawn_point_defense (PELEMENT ElementPtr) +spawn_point_defense (ELEMENT *ElementPtr) { #define DEFENSE_RANGE (UWORD)64 #define DEFENSE_WAIT 2 BYTE weakest; UWORD best_dist; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; HELEMENT hObject, hNextObject, hBestObject; - ELEMENTPTR ShipPtr, SattPtr, ObjectPtr; + ELEMENT *ShipPtr; + ELEMENT *SattPtr; + ELEMENT *ObjectPtr; GetElementStarShip (ElementPtr, &StarShipPtr); hBestObject = 0; @@ -573,7 +576,7 @@ spawn_point_defense (PELEMENT ElementPtr) hPointDefense = initialize_laser (&LaserBlock); if (hPointDefense) { - ELEMENTPTR PDPtr; + ELEMENT *PDPtr; LockElement (hPointDefense, &PDPtr); SetElementStarShip (PDPtr, StarShipPtr); @@ -593,9 +596,9 @@ spawn_point_defense (PELEMENT ElementPtr) } static void -satellite_postprocess (PELEMENT ElementPtr) +satellite_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (ElementPtr->thrust_wait || ElementPtr->life_span == 0) --ElementPtr->thrust_wait; @@ -606,7 +609,7 @@ satellite_postprocess (PELEMENT ElementPtr) hDefense = AllocElement (); if (hDefense) { - ELEMENTPTR DefensePtr; + ELEMENT *DefensePtr; PutElement (hDefense); @@ -615,7 +618,7 @@ satellite_postprocess (PELEMENT ElementPtr) | (ElementPtr->state_flags & (GOOD_GUY | BAD_GUY)); { - ELEMENTPTR SuccPtr; + ELEMENT *SuccPtr; LockElement (GetSuccElement (ElementPtr), &SuccPtr); DefensePtr->hTarget = GetPredElement (SuccPtr); @@ -633,8 +636,8 @@ satellite_postprocess (PELEMENT ElementPtr) } static void -satellite_collision (PELEMENT ElementPtr0, PPOINT pPt0, - PELEMENT ElementPtr1, PPOINT pPt1) +satellite_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { (void) ElementPtr0; /* Satisfying compiler (unused parameter) */ (void) pPt0; /* Satisfying compiler (unused parameter) */ @@ -643,9 +646,9 @@ satellite_collision (PELEMENT ElementPtr0, PPOINT pPt0, } static void -satellite_death (PELEMENT ElementPtr) +satellite_death (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); StarShipPtr->RaceDescPtr->ship_info.ship_flags &= ~POINT_DEFENSE; @@ -659,17 +662,17 @@ satellite_death (PELEMENT ElementPtr) SetAbsFrameIndex (ElementPtr->current.image.frame, 8); ElementPtr->preprocess_func = animate; - ElementPtr->death_func = NULL_PTR; - ElementPtr->postprocess_func = NULL_PTR; - ElementPtr->collision_func = NULL_PTR; + ElementPtr->death_func = NULL; + ElementPtr->postprocess_func = NULL; + ElementPtr->collision_func = NULL; } static void -spawn_satellites (PELEMENT ElementPtr) +spawn_satellites (ELEMENT *ElementPtr) { #define NUM_SATELLITES 3 COUNT i; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->hShip) @@ -683,7 +686,7 @@ spawn_satellites (PELEMENT ElementPtr) if (hSatellite) { COUNT angle; - ELEMENTPTR SattPtr; + ELEMENT *SattPtr; LockElement (hSatellite, &SattPtr); SattPtr->state_flags = @@ -727,17 +730,17 @@ spawn_satellites (PELEMENT ElementPtr) } static void -chmmr_preprocess (PELEMENT ElementPtr) +chmmr_preprocess (ELEMENT *ElementPtr) { HELEMENT hSatellite; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); hSatellite = AllocElement (); if (hSatellite) { - ELEMENTPTR SattPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *SattPtr; + STARSHIP *StarShipPtr; LockElement (hSatellite, &SattPtr); SattPtr->state_flags = @@ -761,17 +764,15 @@ chmmr_preprocess (PELEMENT ElementPtr) StarShipPtr->RaceDescPtr->preprocess_func = 0; } -RACE_DESCPTR +RACE_DESC* init_chmmr (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; chmmr_desc.preprocess_func = chmmr_preprocess; chmmr_desc.postprocess_func = chmmr_postprocess; chmmr_desc.init_weapon_func = initialize_megawatt_laser; - chmmr_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) chmmr_intelligence; + chmmr_desc.cyborg_control.intelligence_func = chmmr_intelligence; RaceDescPtr = &chmmr_desc; diff --git a/sc2/src/sc2code/ships/druuge/druuge.c b/sc2/src/sc2code/ships/druuge/druuge.c index 0b32ba0a5..34051b045 100644 --- a/sc2/src/sc2code/ships/druuge/druuge.c +++ b/sc2/src/sc2code/ships/druuge/druuge.c @@ -94,7 +94,7 @@ static RACE_DESC druuge_desc = { 0, MISSILE_RANGE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -107,7 +107,8 @@ static RACE_DESC druuge_desc = #define MAX_RECOIL_VELOCITY (RECOIL_VELOCITY * 4) static void -cannon_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +cannon_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { weapon_collision (ElementPtr0, pPt0, ElementPtr1, pPt1); @@ -117,7 +118,7 @@ cannon_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN { COUNT angle; SIZE cur_delta_x, cur_delta_y; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr1, &StarShipPtr); StarShipPtr->cur_status_flags &= @@ -144,13 +145,13 @@ cannon_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN } static COUNT -initialize_cannon (PELEMENT ShipPtr, HELEMENT CannonArray[]) +initialize_cannon (ELEMENT *ShipPtr, HELEMENT CannonArray[]) { #define DRUUGE_OFFSET 24 #define MISSILE_OFFSET 6 #define MISSILE_HITS 4 #define MISSILE_DAMAGE 6 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -166,13 +167,13 @@ initialize_cannon (PELEMENT ShipPtr, HELEMENT CannonArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; CannonArray[0] = initialize_missile (&MissileBlock); if (CannonArray[0]) { - ELEMENTPTR CannonPtr; + ELEMENT *CannonPtr; LockElement (CannonArray[0], &CannonPtr); CannonPtr->collision_func = cannon_collision; @@ -183,11 +184,13 @@ initialize_cannon (PELEMENT ShipPtr, HELEMENT CannonArray[]) } static void -druuge_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +druuge_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { UWORD ship_flags; - STARSHIPPTR StarShipPtr, EnemyStarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + STARSHIP *EnemyStarShipPtr; + EVALUATE_DESC *lpEvalDesc; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -235,9 +238,9 @@ druuge_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Co } static void -druuge_postprocess (PELEMENT ElementPtr) +druuge_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); /* if just fired cannon */ @@ -269,9 +272,9 @@ druuge_postprocess (PELEMENT ElementPtr) } static void -druuge_preprocess (PELEMENT ElementPtr) +druuge_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->cur_status_flags & SPECIAL) @@ -296,17 +299,15 @@ druuge_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_druuge (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; druuge_desc.preprocess_func = druuge_preprocess; druuge_desc.postprocess_func = druuge_postprocess; druuge_desc.init_weapon_func = initialize_cannon; - druuge_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) druuge_intelligence; + druuge_desc.cyborg_control.intelligence_func = druuge_intelligence; RaceDescPtr = &druuge_desc; diff --git a/sc2/src/sc2code/ships/human/human.c b/sc2/src/sc2code/ships/human/human.c index ae5def14c..e07cae6fe 100644 --- a/sc2/src/sc2code/ships/human/human.c +++ b/sc2/src/sc2code/ships/human/human.c @@ -98,7 +98,7 @@ static RACE_DESC human_desc = { 0, LONG_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -112,7 +112,7 @@ static RACE_DESC human_desc = #define TRACK_WAIT 3 static void -nuke_preprocess (PELEMENT ElementPtr) +nuke_preprocess (ELEMENT *ElementPtr) { COUNT facing; @@ -146,9 +146,9 @@ nuke_preprocess (PELEMENT ElementPtr) } static void -spawn_point_defense (PELEMENT ElementPtr) +spawn_point_defense (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (ElementPtr->state_flags & PLAYER_SHIP) @@ -158,7 +158,7 @@ spawn_point_defense (PELEMENT ElementPtr) hDefense = AllocElement (); if (hDefense) { - ELEMENTPTR DefensePtr; + ELEMENT *DefensePtr; LockElement (hDefense, &DefensePtr); DefensePtr->state_flags = APPEARING | NONSOLID | FINITE_LIFE | @@ -177,14 +177,14 @@ spawn_point_defense (PELEMENT ElementPtr) { BOOLEAN PaidFor; HELEMENT hObject, hNextObject; - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; PaidFor = FALSE; LockElement (StarShipPtr->hShip, &ShipPtr); for (hObject = GetTailElement (); hObject; hObject = hNextObject) { - ELEMENTPTR ObjectPtr; + ELEMENT *ObjectPtr; LockElement (hObject, &ObjectPtr); hNextObject = GetPredElement (ObjectPtr); @@ -240,7 +240,7 @@ spawn_point_defense (PELEMENT ElementPtr) hPointDefense = initialize_laser (&LaserBlock); if (hPointDefense) { - ELEMENTPTR PDPtr; + ELEMENT *PDPtr; LockElement (hPointDefense, &PDPtr); SetElementStarShip (PDPtr, StarShipPtr); @@ -258,13 +258,13 @@ spawn_point_defense (PELEMENT ElementPtr) } static COUNT -initialize_nuke (PELEMENT ShipPtr, HELEMENT NukeArray[]) +initialize_nuke (ELEMENT *ShipPtr, HELEMENT NukeArray[]) { #define HUMAN_OFFSET 42 #define MISSILE_DAMAGE 4 #define MISSILE_HITS 1 #define NUKE_OFFSET 8 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -284,7 +284,7 @@ initialize_nuke (PELEMENT ShipPtr, HELEMENT NukeArray[]) if (NukeArray[0]) { - ELEMENTPTR NukePtr; + ELEMENT *NukePtr; LockElement (NukeArray[0], &NukePtr); NukePtr->turn_wait = TRACK_WAIT; @@ -295,20 +295,21 @@ initialize_nuke (PELEMENT ShipPtr, HELEMENT NukeArray[]) } static void -human_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +human_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); if (StarShipPtr->special_counter == 0 - && ((ObjectsOfConcern[ENEMY_WEAPON_INDEX].ObjectPtr != NULL_PTR + && ((ObjectsOfConcern[ENEMY_WEAPON_INDEX].ObjectPtr != NULL && ObjectsOfConcern[ENEMY_WEAPON_INDEX].which_turn <= 2) - || (ObjectsOfConcern[ENEMY_SHIP_INDEX].ObjectPtr != NULL_PTR + || (ObjectsOfConcern[ENEMY_SHIP_INDEX].ObjectPtr != NULL && ObjectsOfConcern[ENEMY_SHIP_INDEX].which_turn <= 4))) StarShipPtr->ship_input_state |= SPECIAL; else StarShipPtr->ship_input_state &= ~SPECIAL; - ObjectsOfConcern[ENEMY_WEAPON_INDEX].ObjectPtr = NULL_PTR; + ObjectsOfConcern[ENEMY_WEAPON_INDEX].ObjectPtr = NULL; ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); @@ -323,9 +324,9 @@ human_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con } static void -human_postprocess (PELEMENT ElementPtr) +human_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -335,16 +336,14 @@ human_postprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_human (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; human_desc.postprocess_func = human_postprocess; human_desc.init_weapon_func = initialize_nuke; - human_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) human_intelligence; + human_desc.cyborg_control.intelligence_func = human_intelligence; RaceDescPtr = &human_desc; diff --git a/sc2/src/sc2code/ships/ilwrath/ilwrath.c b/sc2/src/sc2code/ships/ilwrath/ilwrath.c index 57595e6fd..781ca153d 100644 --- a/sc2/src/sc2code/ships/ilwrath/ilwrath.c +++ b/sc2/src/sc2code/ships/ilwrath/ilwrath.c @@ -96,7 +96,7 @@ static RACE_DESC ilwrath_desc = { 0, CLOSE_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -106,7 +106,7 @@ static RACE_DESC ilwrath_desc = }; static void -flame_preprocess (PELEMENT ElementPtr) +flame_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -121,7 +121,8 @@ flame_preprocess (PELEMENT ElementPtr) } static void -flame_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +flame_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { weapon_collision (ElementPtr0, pPt0, ElementPtr1, pPt1); ElementPtr0->state_flags &= ~DISAPPEARING; @@ -129,10 +130,11 @@ flame_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT } static void -ilwrath_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +ilwrath_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; lpEvalDesc->MoveState = PURSUE; @@ -168,14 +170,14 @@ ilwrath_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT C } static COUNT -initialize_flame (PELEMENT ShipPtr, HELEMENT FlameArray[]) +initialize_flame (ELEMENT *ShipPtr, HELEMENT FlameArray[]) { #define ILWRATH_OFFSET 29 #define MISSILE_SPEED MAX_THRUST #define MISSILE_HITS 1 #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 0 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -198,7 +200,7 @@ initialize_flame (PELEMENT ShipPtr, HELEMENT FlameArray[]) if (FlameArray[0]) { SIZE dx, dy; - ELEMENTPTR FlamePtr; + ELEMENT *FlamePtr; LockElement (FlameArray[0], &FlamePtr); GetCurrentVelocityComponents (&ShipPtr->velocity, &dx, &dy); @@ -215,11 +217,11 @@ initialize_flame (PELEMENT ShipPtr, HELEMENT FlameArray[]) } static void -ilwrath_preprocess (PELEMENT ElementPtr) +ilwrath_preprocess (ELEMENT *ElementPtr) { ELEMENT_FLAGS status_flags; - STARSHIPPTR StarShipPtr; - PPRIMITIVE lpPrim; + STARSHIP *StarShipPtr; + PRIMITIVE *lpPrim; GetElementStarShip (ElementPtr, &StarShipPtr); status_flags = StarShipPtr->cur_status_flags; @@ -261,7 +263,7 @@ ilwrath_preprocess (PELEMENT ElementPtr) if (TrackShip (ElementPtr, &facing) >= 0) { #define LOOK_AHEAD 4 - ELEMENTPTR eptr; + ELEMENT *eptr; SIZE dx0, dy0, dx1, dy1; VELOCITY_DESC v; @@ -359,16 +361,14 @@ ilwrath_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_ilwrath (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; ilwrath_desc.preprocess_func = ilwrath_preprocess; ilwrath_desc.init_weapon_func = initialize_flame; - ilwrath_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) ilwrath_intelligence; + ilwrath_desc.cyborg_control.intelligence_func = ilwrath_intelligence; RaceDescPtr = &ilwrath_desc; diff --git a/sc2/src/sc2code/ships/lastbat/lastbat.c b/sc2/src/sc2code/ships/lastbat/lastbat.c index a032c263d..b2ba1706a 100644 --- a/sc2/src/sc2code/ships/lastbat/lastbat.c +++ b/sc2/src/sc2code/ships/lastbat/lastbat.c @@ -101,7 +101,7 @@ static RACE_DESC samatra_desc = { 0, 0, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -110,10 +110,10 @@ static RACE_DESC samatra_desc = 0, }; -static HELEMENT spawn_comet (PELEMENT ElementPtr); +static HELEMENT spawn_comet (ELEMENT *ElementPtr); static void -comet_preprocess (PELEMENT ElementPtr) +comet_preprocess (ELEMENT *ElementPtr) { COUNT frame_index; @@ -123,7 +123,7 @@ comet_preprocess (PELEMENT ElementPtr) if (frame_index == 25) { SIZE cur_delta_x, cur_delta_y; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); ++StarShipPtr->RaceDescPtr->characteristics.weapon_wait; @@ -148,7 +148,8 @@ comet_preprocess (PELEMENT ElementPtr) #define COMET_DAMAGE 2 static void -comet_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +comet_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (ElementPtr1->state_flags & GOOD_GUY) { @@ -179,7 +180,7 @@ comet_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT if (ElementPtr0->state_flags & DISAPPEARING) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); --StarShipPtr->RaceDescPtr->characteristics.weapon_wait; @@ -188,7 +189,7 @@ comet_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT } static HELEMENT -spawn_comet (PELEMENT ElementPtr) +spawn_comet (ELEMENT *ElementPtr) { #define COMET_OFFSET 0 #define COMET_HITS 12 @@ -196,7 +197,7 @@ spawn_comet (PELEMENT ElementPtr) #define COMET_LIFE 2 MISSILE_BLOCK MissileBlock; HELEMENT hComet; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); MissileBlock.cx = ElementPtr->next.location.x; @@ -216,7 +217,7 @@ spawn_comet (PELEMENT ElementPtr) if (hComet) { - ELEMENTPTR CometPtr; + ELEMENT *CometPtr; PutElement (hComet); @@ -263,7 +264,7 @@ spawn_comet (PELEMENT ElementPtr) } static void -turret_preprocess (PELEMENT ElementPtr) +turret_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -283,11 +284,12 @@ turret_preprocess (PELEMENT ElementPtr) #define GATE_HITS 100 static void -gate_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +gate_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (ElementPtr1->state_flags & GOOD_GUY) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); if (StarShipPtr->RaceDescPtr->num_generators == 0) @@ -328,9 +330,9 @@ gate_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT } static void -gate_preprocess (PELEMENT ElementPtr) +gate_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->RaceDescPtr->num_generators == 0) @@ -364,11 +366,11 @@ gate_preprocess (PELEMENT ElementPtr) } static void -generator_death (PELEMENT ElementPtr) +generator_death (ELEMENT *ElementPtr) { if (!(ElementPtr->state_flags & FINITE_LIFE)) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); --StarShipPtr->RaceDescPtr->num_generators; @@ -405,7 +407,7 @@ generator_death (PELEMENT ElementPtr) #define GENERATOR_HITS 15 static void -generator_preprocess (PELEMENT ElementPtr) +generator_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -421,8 +423,8 @@ generator_preprocess (PELEMENT ElementPtr) } static void -generator_collision (PELEMENT ElementPtr0, PPOINT pPt0, - PELEMENT ElementPtr1, PPOINT pPt1) +generator_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (!(ElementPtr1->state_flags & FINITE_LIFE)) { @@ -435,9 +437,9 @@ generator_collision (PELEMENT ElementPtr0, PPOINT pPt0, #define TRACK_WAIT 1 static void -sentinel_preprocess (PELEMENT ElementPtr) +sentinel_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); ++StarShipPtr->RaceDescPtr->characteristics.special_wait; @@ -490,7 +492,8 @@ sentinel_preprocess (PELEMENT ElementPtr) else { SIZE delta_x0, delta_y0, delta_x1, delta_y1; - ELEMENTPTR ShipPtr, EnemyShipPtr; + ELEMENT *ShipPtr; + ELEMENT *EnemyShipPtr; LockElement (ElementPtr->hTarget, &EnemyShipPtr); @@ -521,7 +524,7 @@ sentinel_preprocess (PELEMENT ElementPtr) { COUNT num_frames; SIZE delta_x, delta_y; - ELEMENTPTR TargetPtr; + ELEMENT *TargetPtr; VELOCITY_DESC TargetVelocity; LockElement (hTarget, &TargetPtr); @@ -576,10 +579,11 @@ sentinel_preprocess (PELEMENT ElementPtr) #define MAX_RECOIL_VELOCITY (RECOIL_VELOCITY * 4) static void -sentinel_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +sentinel_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { COUNT angle; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (ElementPtr1->state_flags & BAD_GUY) { @@ -654,7 +658,7 @@ sentinel_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPO --StarShipPtr->RaceDescPtr->characteristics.special_wait; if (hBlastElement) { - ELEMENTPTR BlastElementPtr; + ELEMENT *BlastElementPtr; LockElement (hBlastElement, &BlastElementPtr); BlastElementPtr->life_span = 6; @@ -669,7 +673,8 @@ sentinel_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPO } static void -samatra_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +samatra_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); } @@ -678,9 +683,9 @@ samatra_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT C #define MAX_SENTINELS 4 static void -samatra_postprocess (PELEMENT ElementPtr) +samatra_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->RaceDescPtr->num_generators) @@ -719,7 +724,7 @@ samatra_postprocess (PELEMENT ElementPtr) if (hSentinel) { - ELEMENTPTR SentinelPtr; + ELEMENT *SentinelPtr; LockElement (hSentinel, &SentinelPtr); SentinelPtr->collision_func = sentinel_collision; @@ -736,9 +741,9 @@ samatra_postprocess (PELEMENT ElementPtr) } static void -samatra_preprocess (PELEMENT ElementPtr) +samatra_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); StarShipPtr->RaceDescPtr->characteristics.weapon_wait = 0; @@ -772,7 +777,7 @@ samatra_preprocess (PELEMENT ElementPtr) hGenerator = AllocElement (); if (hGenerator) { - ELEMENTPTR GeneratorPtr; + ELEMENT *GeneratorPtr; LockElement (hGenerator, &GeneratorPtr); GeneratorPtr->hit_points = GENERATOR_HITS; @@ -817,7 +822,7 @@ samatra_preprocess (PELEMENT ElementPtr) hTurret = AllocElement (); if (hTurret) { - ELEMENTPTR TurretPtr; + ELEMENT *TurretPtr; LockElement (hTurret, &TurretPtr); TurretPtr->hit_points = 1; @@ -852,7 +857,7 @@ samatra_preprocess (PELEMENT ElementPtr) hGate = AllocElement (); if (hGate) { - ELEMENTPTR GatePtr; + ELEMENT *GatePtr; LockElement (hGate, &GatePtr); GatePtr->hit_points = GATE_HITS; @@ -888,16 +893,14 @@ samatra_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_samatra (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; samatra_desc.preprocess_func = samatra_preprocess; samatra_desc.postprocess_func = samatra_postprocess; - samatra_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) samatra_intelligence; + samatra_desc.cyborg_control.intelligence_func = samatra_intelligence; RaceDescPtr = &samatra_desc; diff --git a/sc2/src/sc2code/ships/melnorme/melnorme.c b/sc2/src/sc2code/ships/melnorme/melnorme.c index a86baa054..61f3539d3 100644 --- a/sc2/src/sc2code/ships/melnorme/melnorme.c +++ b/sc2/src/sc2code/ships/melnorme/melnorme.c @@ -97,7 +97,7 @@ static RACE_DESC melnorme_desc = { 0, PUMPUP_SPEED * PUMPUP_LIFE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -110,7 +110,7 @@ static RACE_DESC melnorme_desc = #define REVERSE_DIR (BYTE)(1 << 7) static void -pump_up_preprocess (PELEMENT ElementPtr) +pump_up_preprocess (ELEMENT *ElementPtr) { if (--ElementPtr->thrust_wait & 1) { @@ -138,8 +138,7 @@ pump_up_preprocess (PELEMENT ElementPtr) } } -static COUNT initialize_pump_up (PELEMENT ShipPtr, HELEMENT - PumpUpArray[]); +static COUNT initialize_pump_up (ELEMENT *ShipPtr, HELEMENT PumpUpArray[]); #define MELNORME_OFFSET 24 #define LEVEL_COUNTER 72 @@ -147,7 +146,7 @@ static COUNT initialize_pump_up (PELEMENT ShipPtr, HELEMENT #define PUMPUP_DAMAGE 2 static void -pump_up_postprocess (PELEMENT ElementPtr) +pump_up_postprocess (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & APPEARING) { @@ -156,8 +155,9 @@ pump_up_postprocess (PELEMENT ElementPtr) else { HELEMENT hPumpUp; - ELEMENTPTR EPtr, ShipPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *EPtr; + ELEMENT *ShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); LockElement (StarShipPtr->hShip, &ShipPtr); @@ -243,7 +243,7 @@ pump_up_postprocess (PELEMENT ElementPtr) } static void -animate (PELEMENT ElementPtr) +animate (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -258,7 +258,8 @@ animate (PELEMENT ElementPtr) } static void -pump_up_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +pump_up_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { RECT r; BYTE old_thrust_wait; @@ -273,7 +274,7 @@ pump_up_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI if (hBlastElement) { - ELEMENTPTR BlastElementPtr; + ELEMENT *BlastElementPtr; #define MIN_PUMPITUDE_ANIMS 3 LockElement (hBlastElement, &BlastElementPtr); @@ -296,9 +297,9 @@ pump_up_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI } static COUNT -initialize_pump_up (PELEMENT ShipPtr, HELEMENT PumpUpArray[]) +initialize_pump_up (ELEMENT *ShipPtr, HELEMENT PumpUpArray[]) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -320,7 +321,7 @@ initialize_pump_up (PELEMENT ShipPtr, HELEMENT PumpUpArray[]) if (PumpUpArray[0]) { - ELEMENTPTR PumpUpPtr; + ELEMENT *PumpUpPtr; LockElement (PumpUpArray[0], &PumpUpPtr); PumpUpPtr->postprocess_func = pump_up_postprocess; @@ -333,7 +334,7 @@ initialize_pump_up (PELEMENT ShipPtr, HELEMENT PumpUpArray[]) } static void -confuse_preprocess (PELEMENT ElementPtr) +confuse_preprocess (ELEMENT *ElementPtr) { if (!(ElementPtr->state_flags & NONSOLID)) { @@ -349,7 +350,7 @@ confuse_preprocess (PELEMENT ElementPtr) } else { - ELEMENTPTR eptr; + ELEMENT *eptr; LockElement (ElementPtr->hTarget, &eptr); @@ -358,7 +359,7 @@ confuse_preprocess (PELEMENT ElementPtr) if (ElementPtr->turn_wait) { HELEMENT hEffect; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (GetFrameIndex (ElementPtr->next.image.frame = IncFrameIndex (ElementPtr->current.image.frame)) == 0) @@ -398,13 +399,14 @@ confuse_preprocess (PELEMENT ElementPtr) } static void -confusion_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +confusion_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (ElementPtr1->state_flags & PLAYER_SHIP) { HELEMENT hConfusionElement, hNextElement; - ELEMENTPTR ConfusionPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ConfusionPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); for (hConfusionElement = GetHeadElement (); @@ -466,14 +468,14 @@ confusion_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PP } static COUNT -initialize_confusion (PELEMENT ShipPtr, HELEMENT ConfusionArray[]) +initialize_confusion (ELEMENT *ShipPtr, HELEMENT ConfusionArray[]) { #define CMISSILE_SPEED DISPLAY_TO_WORLD (30) #define CMISSILE_HITS 200 #define CMISSILE_DAMAGE 0 #define CMISSILE_LIFE 20 #define CMISSILE_OFFSET 4 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK ConfusionBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -495,7 +497,7 @@ initialize_confusion (PELEMENT ShipPtr, HELEMENT ConfusionArray[]) if (ConfusionArray[0]) { - ELEMENTPTR CMissilePtr; + ELEMENT *CMissilePtr; LockElement (ConfusionArray[0], &CMissilePtr); CMissilePtr->collision_func = confusion_collision; @@ -506,11 +508,11 @@ initialize_confusion (PELEMENT ShipPtr, HELEMENT ConfusionArray[]) } static COUNT -initialize_test_pump_up (PELEMENT ShipPtr, HELEMENT PumpUpArray[]) +initialize_test_pump_up (ELEMENT *ShipPtr, HELEMENT PumpUpArray[]) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; - //ELEMENTPTR PumpUpPtr; + //ELEMENT *PumpUpPtr; GetElementStarShip (ShipPtr, &StarShipPtr); MissileBlock.cx = ShipPtr->next.location.x; @@ -533,11 +535,12 @@ initialize_test_pump_up (PELEMENT ShipPtr, HELEMENT PumpUpArray[]) } static void -melnorme_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +melnorme_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { BYTE old_count; - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -556,7 +559,7 @@ melnorme_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT lpEvalDesc->MoveState = ENTICE; else { - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr); if (!(EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags @@ -606,9 +609,9 @@ melnorme_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT } static void -melnorme_postprocess (PELEMENT ElementPtr) +melnorme_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -620,7 +623,7 @@ melnorme_postprocess (PELEMENT ElementPtr) initialize_confusion (ElementPtr, &Confusion); if (Confusion) { - ELEMENTPTR CMissilePtr; + ELEMENT *CMissilePtr; LockElement (Confusion, &CMissilePtr); ProcessSound (SetAbsSoundIndex ( @@ -634,16 +637,14 @@ melnorme_postprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_melnorme (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; melnorme_desc.postprocess_func = melnorme_postprocess; melnorme_desc.init_weapon_func = initialize_pump_up; - melnorme_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) melnorme_intelligence; + melnorme_desc.cyborg_control.intelligence_func = melnorme_intelligence; RaceDescPtr = &melnorme_desc; diff --git a/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c b/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c index ae9e126c9..c0284f479 100644 --- a/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c +++ b/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c @@ -109,7 +109,7 @@ static RACE_DESC mmrnmhrm_desc = { 0, CLOSE_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -122,7 +122,7 @@ static RACE_DESC mmrnmhrm_desc = #define TRACK_WAIT 5 static void -missile_preprocess (PELEMENT ElementPtr) +missile_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -147,11 +147,13 @@ missile_preprocess (PELEMENT ElementPtr) } static void -mmrnmhrm_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +mmrnmhrm_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { BOOLEAN CanTransform; - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr, EnemyStarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); CanTransform = (BOOLEAN)(StarShipPtr->special_counter == 0 @@ -237,7 +239,8 @@ mmrnmhrm_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT } static void -twin_laser_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +twin_laser_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (!(ElementPtr1->state_flags & PLAYER_SHIP) || !(ElementPtr0->state_flags & ElementPtr1->state_flags @@ -246,13 +249,13 @@ twin_laser_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, P } static COUNT -initialize_dual_weapons (PELEMENT ShipPtr, HELEMENT WeaponArray[]) +initialize_dual_weapons (ELEMENT *ShipPtr, HELEMENT WeaponArray[]) { #define CENTER_OFFS DISPLAY_TO_WORLD (4) COORD cx, cy; COUNT facing, angle; SIZE offs_x, offs_y; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); facing = StarShipPtr->ShipFacing; @@ -265,7 +268,7 @@ initialize_dual_weapons (PELEMENT ShipPtr, HELEMENT WeaponArray[]) #define WING_OFFS DISPLAY_TO_WORLD (10) COORD ex, ey; LASER_BLOCK LaserBlock; - ELEMENTPTR LaserPtr; + ELEMENT *LaserPtr; LaserBlock.sender = ShipPtr->state_flags & (GOOD_GUY | BAD_GUY); LaserBlock.pixoffs = 0; @@ -307,7 +310,7 @@ initialize_dual_weapons (PELEMENT ShipPtr, HELEMENT WeaponArray[]) #define MISSILE_LIFE 40 #define LAUNCH_OFFS DISPLAY_TO_WORLD (4) MISSILE_BLOCK TorpBlock; - ELEMENTPTR TorpPtr; + ELEMENT *TorpPtr; TorpBlock.farray = StarShipPtr->RaceDescPtr->ship_data.weapon; TorpBlock.sender = (ShipPtr->state_flags & (GOOD_GUY | BAD_GUY)) @@ -349,9 +352,9 @@ initialize_dual_weapons (PELEMENT ShipPtr, HELEMENT WeaponArray[]) } static void -mmrnmhrm_postprocess (PELEMENT ElementPtr) +mmrnmhrm_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); /* take care of transform effect */ @@ -400,7 +403,7 @@ mmrnmhrm_postprocess (PELEMENT ElementPtr) } static void -mmrnmhrm_preprocess (PELEMENT ElementPtr) +mmrnmhrm_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & APPEARING) { @@ -421,7 +424,7 @@ mmrnmhrm_preprocess (PELEMENT ElementPtr) } else { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -451,17 +454,15 @@ mmrnmhrm_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_mmrnmhrm (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; mmrnmhrm_desc.preprocess_func = mmrnmhrm_preprocess; mmrnmhrm_desc.postprocess_func = mmrnmhrm_postprocess; mmrnmhrm_desc.init_weapon_func = initialize_dual_weapons; - mmrnmhrm_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) mmrnmhrm_intelligence; + mmrnmhrm_desc.cyborg_control.intelligence_func = mmrnmhrm_intelligence; RaceDescPtr = &mmrnmhrm_desc; diff --git a/sc2/src/sc2code/ships/mycon/mycon.c b/sc2/src/sc2code/ships/mycon/mycon.c index 1157bd02a..39712d179 100644 --- a/sc2/src/sc2code/ships/mycon/mycon.c +++ b/sc2/src/sc2code/ships/mycon/mycon.c @@ -97,7 +97,7 @@ static RACE_DESC mycon_desc = { 0, DISPLAY_TO_WORLD (800), - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -111,7 +111,7 @@ static RACE_DESC mycon_desc = #define TRACK_WAIT 1 static void -plasma_preprocess (PELEMENT ElementPtr) +plasma_preprocess (ELEMENT *ElementPtr) { COUNT plasma_index; @@ -149,7 +149,7 @@ plasma_preprocess (PELEMENT ElementPtr) } static void -plasma_blast_preprocess (PELEMENT ElementPtr) +plasma_blast_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->life_span >= ElementPtr->thrust_wait) ElementPtr->next.image.frame = @@ -159,7 +159,7 @@ plasma_blast_preprocess (PELEMENT ElementPtr) DecFrameIndex (ElementPtr->next.image.frame); if (ElementPtr->hTarget) { - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; LockElement (ElementPtr->hTarget, &ShipPtr); ElementPtr->next.location = ShipPtr->next.location; @@ -170,7 +170,8 @@ plasma_blast_preprocess (PELEMENT ElementPtr) } static void -plasma_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +plasma_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { SIZE old_mass; HELEMENT hBlastElement; @@ -182,7 +183,7 @@ plasma_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN weapon_collision (ElementPtr0, pPt0, ElementPtr1, pPt1))) { SIZE num_animations; - ELEMENTPTR BlastElementPtr; + ELEMENT *BlastElementPtr; LockElement (hBlastElement, &BlastElementPtr); BlastElementPtr->pParent = ElementPtr0->pParent; @@ -190,7 +191,7 @@ plasma_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN BlastElementPtr->hTarget = 0; else { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr1, &StarShipPtr); BlastElementPtr->hTarget = StarShipPtr->hShip; @@ -218,10 +219,11 @@ plasma_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN } static void -mycon_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +mycon_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; lpEvalDesc = &ObjectsOfConcern[ENEMY_WEAPON_INDEX]; if (lpEvalDesc->ObjectPtr && lpEvalDesc->MoveState == ENTICE) @@ -287,11 +289,11 @@ mycon_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con } static COUNT -initialize_plasma (PELEMENT ShipPtr, HELEMENT PlasmaArray[]) +initialize_plasma (ELEMENT *ShipPtr, HELEMENT PlasmaArray[]) { #define MYCON_OFFSET 24 #define MISSILE_OFFSET 0 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -312,7 +314,7 @@ initialize_plasma (PELEMENT ShipPtr, HELEMENT PlasmaArray[]) if (PlasmaArray[0]) { - ELEMENTPTR PlasmaPtr; + ELEMENT *PlasmaPtr; LockElement (PlasmaArray[0], &PlasmaPtr); PlasmaPtr->collision_func = plasma_collision; @@ -324,9 +326,9 @@ initialize_plasma (PELEMENT ShipPtr, HELEMENT PlasmaArray[]) } static void -mycon_postprocess (PELEMENT ElementPtr) +mycon_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -350,16 +352,14 @@ mycon_postprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_mycon (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; mycon_desc.postprocess_func = mycon_postprocess; mycon_desc.init_weapon_func = initialize_plasma; - mycon_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) mycon_intelligence; + mycon_desc.cyborg_control.intelligence_func = mycon_intelligence; RaceDescPtr = &mycon_desc; diff --git a/sc2/src/sc2code/ships/orz/orz.c b/sc2/src/sc2code/ships/orz/orz.c index b03a96edc..33858e915 100644 --- a/sc2/src/sc2code/ships/orz/orz.c +++ b/sc2/src/sc2code/ships/orz/orz.c @@ -99,7 +99,7 @@ static RACE_DESC orz_desc = { 0, MISSILE_SPEED * MISSILE_LIFE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -109,7 +109,8 @@ static RACE_DESC orz_desc = }; static void -howitzer_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +howitzer_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if ((ElementPtr0->state_flags & (GOOD_GUY | BAD_GUY)) != (ElementPtr1->state_flags & (GOOD_GUY | BAD_GUY))) @@ -120,13 +121,13 @@ howitzer_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPO #define TURRET_WAIT 3 static COUNT -initialize_turret_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) +initialize_turret_missile (ELEMENT *ShipPtr, HELEMENT MissileArray[]) { #define MISSILE_HITS 2 #define MISSILE_DAMAGE 3 #define MISSILE_OFFSET 1 - ELEMENTPTR TurretPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *TurretPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -158,13 +159,13 @@ initialize_turret_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; MissileArray[0] = initialize_missile (&MissileBlock); if (MissileArray[0]) { - ELEMENTPTR HowitzerPtr; + ELEMENT *HowitzerPtr; LockElement (MissileArray[0], &HowitzerPtr); HowitzerPtr->collision_func = howitzer_collision; @@ -177,7 +178,7 @@ initialize_turret_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) #define MAX_MARINES 8 static BYTE -count_marines (STARSHIPPTR StarShipPtr, BOOLEAN FindSpot) +count_marines (STARSHIP *StarShipPtr, BOOLEAN FindSpot) { BYTE num_marines, id_use[MAX_MARINES]; HELEMENT hElement, hNextElement; @@ -189,7 +190,7 @@ count_marines (STARSHIPPTR StarShipPtr, BOOLEAN FindSpot) num_marines = 0; for (hElement = GetTailElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = GetPredElement (ElementPtr); @@ -223,12 +224,12 @@ count_marines (STARSHIPPTR StarShipPtr, BOOLEAN FindSpot) } static void -orz_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, +orz_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter) { - ELEMENTPTR TurretPtr; - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + ELEMENT *TurretPtr; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; LockElement (GetSuccElement (ShipPtr), &TurretPtr); @@ -242,7 +243,7 @@ orz_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, StarShipPtr->ship_input_state &= ~SPECIAL; else if (StarShipPtr->special_counter != 1) { - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; if (ShipPtr->turn_wait == 0 && lpEvalDesc->MoveState == ENTICE @@ -307,7 +308,7 @@ orz_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, #define START_ION_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A) void -ion_preprocess (PELEMENT ElementPtr) +ion_preprocess (ELEMENT *ElementPtr) { static const COLOR color_tab[] = { @@ -352,16 +353,16 @@ ion_preprocess (PELEMENT ElementPtr) } } -static void marine_preprocess (PELEMENT ElementPtr); +static void marine_preprocess (ELEMENT *ElementPtr); #define MARINE_WAIT 12 void -intruder_preprocess (PELEMENT ElementPtr) +intruder_preprocess (ELEMENT *ElementPtr) { HELEMENT hElement, hNextElement; - ELEMENTPTR ShipPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); LockElement (StarShipPtr->hShip, &ShipPtr); @@ -469,11 +470,10 @@ LeftShip: } static void -marine_preprocess (ElementPtr) -PELEMENT ElementPtr; +marine_preprocess (ELEMENT *ElementPtr) { - ELEMENTPTR ShipPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); LockElement (StarShipPtr->hShip, &ShipPtr); @@ -495,7 +495,7 @@ PELEMENT ElementPtr; COUNT facing, pfacing; SIZE delta_x, delta_y, delta_facing; HELEMENT hObject, hNextObject, hTarget; - ELEMENTPTR ObjectPtr; + ELEMENT *ObjectPtr; ElementPtr->thrust_wait &= ~(SHIP_IN_GRAVITY_WELL >> 6); @@ -633,7 +633,7 @@ PELEMENT ElementPtr; COUNT OldFacing; UWORD OldStatus; COUNT OldIncrement, OldThrust; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -668,7 +668,7 @@ PELEMENT ElementPtr; { #define ION_LIFE 1 COUNT angle; - ELEMENTPTR IonElementPtr; + ELEMENT *IonElementPtr; angle = FACING_TO_ANGLE (facing) + HALF_CIRCLE; @@ -712,7 +712,8 @@ PELEMENT ElementPtr; } void -marine_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +marine_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (ElementPtr0->life_span && !(ElementPtr0->state_flags & (NONSOLID | COLLISION)) @@ -757,7 +758,7 @@ marine_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN ) { STAMP s; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); if (!DeltaCrew (ElementPtr1, -1)) @@ -796,7 +797,7 @@ marine_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN } static void -animate (PELEMENT ElementPtr) +animate (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -811,11 +812,11 @@ animate (PELEMENT ElementPtr) } static void -turret_postprocess (PELEMENT ElementPtr) +turret_postprocess (ELEMENT *ElementPtr) { if (ElementPtr->life_span == 0) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; SetPrimType (&(GLOBAL (DisplayArray))[ ElementPtr->PrimIndex], NO_PRIM); @@ -825,13 +826,13 @@ turret_postprocess (PELEMENT ElementPtr) { COUNT facing; HELEMENT hTurret, hSpaceMarine; - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; LockElement (StarShipPtr->hShip, &ShipPtr); hTurret = AllocElement (); if (hTurret) { - ELEMENTPTR TurretPtr; + ELEMENT *TurretPtr; LockElement (hTurret, &TurretPtr); TurretPtr->state_flags = @@ -869,10 +870,10 @@ turret_postprocess (PELEMENT ElementPtr) if (StarShipPtr->cur_status_flags & WEAPON) { HELEMENT hTurretEffect; - ELEMENTPTR TurretEffectPtr; + ELEMENT *TurretEffectPtr; LockElement (GetTailElement (), &TurretEffectPtr); - if ((PELEMENT)TurretEffectPtr != ElementPtr + if (TurretEffectPtr != ElementPtr && (TurretEffectPtr->state_flags & (GOOD_GUY | BAD_GUY)) == (ElementPtr->state_flags & (GOOD_GUY | BAD_GUY)) @@ -948,7 +949,7 @@ turret_postprocess (PELEMENT ElementPtr) && TrackShip (ShipPtr, &facing) >= 0 && (hSpaceMarine = AllocElement ())) { - ELEMENTPTR SpaceMarinePtr; + ELEMENT *SpaceMarinePtr; LockElement (hSpaceMarine, &SpaceMarinePtr); SpaceMarinePtr->state_flags = @@ -999,9 +1000,9 @@ turret_postprocess (PELEMENT ElementPtr) } static void -orz_preprocess (PELEMENT ElementPtr) +orz_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (!(ElementPtr->state_flags & APPEARING)) @@ -1028,7 +1029,7 @@ orz_preprocess (PELEMENT ElementPtr) hTurret = AllocElement (); if (hTurret) { - ELEMENTPTR TurretPtr; + ELEMENT *TurretPtr; LockElement (hTurret, &TurretPtr); TurretPtr->state_flags = @@ -1050,16 +1051,14 @@ orz_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_orz (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; orz_desc.preprocess_func = orz_preprocess; orz_desc.init_weapon_func = initialize_turret_missile; - orz_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) orz_intelligence; + orz_desc.cyborg_control.intelligence_func = orz_intelligence; RaceDescPtr = &orz_desc; diff --git a/sc2/src/sc2code/ships/pkunk/pkunk.c b/sc2/src/sc2code/ships/pkunk/pkunk.c index 886c99c15..5e1ac8a92 100644 --- a/sc2/src/sc2code/ships/pkunk/pkunk.c +++ b/sc2/src/sc2code/ships/pkunk/pkunk.c @@ -97,7 +97,7 @@ static RACE_DESC pkunk_desc = { 0, CLOSE_RANGE_WEAPON + 1, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -107,7 +107,7 @@ static RACE_DESC pkunk_desc = }; static void -animate (PELEMENT ElementPtr) +animate (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -122,14 +122,14 @@ animate (PELEMENT ElementPtr) } static COUNT -initialize_bug_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) +initialize_bug_missile (ELEMENT *ShipPtr, HELEMENT MissileArray[]) { #define PKUNK_OFFSET 15 #define MISSILE_HITS 1 #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 1 COUNT i; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -144,7 +144,7 @@ initialize_bug_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; for (i = 0; i < 3; ++i) @@ -159,7 +159,7 @@ initialize_bug_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) if ((MissileArray[i] = initialize_missile (&MissileBlock))) { SIZE dx, dy; - ELEMENTPTR MissilePtr; + ELEMENT *MissilePtr; LockElement (MissileArray[i], &MissilePtr); GetCurrentVelocityComponents (&ShipPtr->velocity, &dx, &dy); @@ -178,9 +178,10 @@ initialize_bug_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) static HELEMENT hPhoenix = 0; static void -pkunk_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +pkunk_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); if (hPhoenix && StarShipPtr->special_counter) @@ -200,18 +201,18 @@ pkunk_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); } -static void pkunk_preprocess (PELEMENT ElementPtr); -static void pkunk_postprocess (PELEMENT ElementPtr); +static void pkunk_preprocess (ELEMENT *ElementPtr); +static void pkunk_postprocess (ELEMENT *ElementPtr); static void -new_pkunk (PELEMENT ElementPtr) +new_pkunk (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (!(ElementPtr->state_flags & PLAYER_SHIP)) { - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; LockElement (StarShipPtr->hShip, &ShipPtr); ShipPtr->death_func = new_pkunk; @@ -226,7 +227,7 @@ new_pkunk (PELEMENT ElementPtr) ElementPtr->preprocess_func = StarShipPtr->RaceDescPtr->preprocess_func; ElementPtr->postprocess_func = StarShipPtr->RaceDescPtr->postprocess_func; ElementPtr->death_func = - (void (*) (PELEMENT ElementPtr)) + (void (*) (ELEMENT *ElementPtr)) StarShipPtr->RaceDescPtr->init_weapon_func; StarShipPtr->RaceDescPtr->preprocess_func = pkunk_preprocess; StarShipPtr->RaceDescPtr->postprocess_func = pkunk_postprocess; @@ -273,9 +274,9 @@ new_pkunk (PELEMENT ElementPtr) } static void -intercept_pkunk_death (PELEMENT ElementPtr) +intercept_pkunk_death (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; ElementPtr->state_flags &= ~DISAPPEARING; ElementPtr->life_span = 1; @@ -283,7 +284,7 @@ intercept_pkunk_death (PELEMENT ElementPtr) GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->RaceDescPtr->ship_info.crew_level == 0) { - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; LockElement (StarShipPtr->hShip, &ShipPtr); if (GRAVITY_MASS (ShipPtr->mass_points + 1)) @@ -297,8 +298,7 @@ intercept_pkunk_death (PELEMENT ElementPtr) StarShipPtr->RaceDescPtr->preprocess_func = ShipPtr->preprocess_func; StarShipPtr->RaceDescPtr->postprocess_func = ShipPtr->postprocess_func; StarShipPtr->RaceDescPtr->init_weapon_func = - (COUNT (*) (PELEMENT ElementPtr, - HELEMENT Weapon[])) + (COUNT (*) (ELEMENT *ElementPtr, HELEMENT Weapon[])) ShipPtr->death_func; ElementPtr->death_func = new_pkunk; @@ -311,8 +311,7 @@ intercept_pkunk_death (PELEMENT ElementPtr) #define TRANSITION_LIFE 1 void -spawn_phoenix_trail (PELEMENT - ElementPtr) +spawn_phoenix_trail (ELEMENT *ElementPtr) { static const COLOR color_tab[] = { @@ -362,19 +361,18 @@ spawn_phoenix_trail (PELEMENT #define PHOENIX_LIFE 12 void -phoenix_transition (PELEMENT - ElementPtr) +phoenix_transition (ELEMENT *ElementPtr) { HELEMENT hShipImage; - ELEMENTPTR ShipImagePtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ShipImagePtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); LockElement (StarShipPtr->hShip, &ShipImagePtr); if (!(ShipImagePtr->state_flags & NONSOLID)) { - ElementPtr->preprocess_func = NULL_PTR; + ElementPtr->preprocess_func = NULL; } else if ((hShipImage = AllocElement ())) { @@ -402,7 +400,7 @@ phoenix_transition (PELEMENT COSINE (angle, TRANSITION_SPEED); ShipImagePtr->current.location.y += SINE (angle, TRANSITION_SPEED); - ElementPtr->preprocess_func = NULL_PTR; + ElementPtr->preprocess_func = NULL; } else { @@ -433,15 +431,14 @@ phoenix_transition (PELEMENT } static void -pkunk_preprocess (ElementPtr) -PELEMENT ElementPtr; +pkunk_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (ElementPtr->state_flags & APPEARING) { - ELEMENTPTR PhoenixPtr; + ELEMENT *PhoenixPtr; if (((BYTE)TFB_Random () & 1) && (hPhoenix = AllocElement ())) @@ -505,7 +502,7 @@ PELEMENT ElementPtr; InitIntersectStartPoint (ElementPtr); InitIntersectEndPoint (ElementPtr); InitIntersectFrame (ElementPtr); - ZeroVelocityComponents (&((ELEMENTPTR)ElementPtr)->velocity); + ZeroVelocityComponents (&ElementPtr->velocity); ElementPtr->state_flags &= ~(NONSOLID | FINITE_LIFE); ElementPtr->state_flags |= CHANGING; @@ -515,10 +512,9 @@ PELEMENT ElementPtr; } static void -pkunk_postprocess (ElementPtr) -PELEMENT ElementPtr; +pkunk_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->RaceDescPtr->characteristics.special_wait) @@ -547,21 +543,15 @@ PELEMENT ElementPtr; } } -RACE_DESCPTR +RACE_DESC* init_pkunk (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; pkunk_desc.preprocess_func = pkunk_preprocess; pkunk_desc.postprocess_func = pkunk_postprocess; pkunk_desc.init_weapon_func = initialize_bug_missile; - pkunk_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, - PVOID - ObjectsOfConcern, - COUNT - ConcernCounter)) - pkunk_intelligence; + pkunk_desc.cyborg_control.intelligence_func = pkunk_intelligence; RaceDescPtr = &pkunk_desc; diff --git a/sc2/src/sc2code/ships/probe/probe.c b/sc2/src/sc2code/ships/probe/probe.c index a801c7404..f8d62278e 100644 --- a/sc2/src/sc2code/ships/probe/probe.c +++ b/sc2/src/sc2code/ships/probe/probe.c @@ -91,7 +91,7 @@ static RACE_DESC probe_desc = { 0, 0, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -100,10 +100,10 @@ static RACE_DESC probe_desc = 0, }; -RACE_DESCPTR +RACE_DESC* init_probe (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; RaceDescPtr = &probe_desc; diff --git a/sc2/src/sc2code/ships/shofixti/shofixti.c b/sc2/src/sc2code/ships/shofixti/shofixti.c index 50800f11d..390cc7cdb 100644 --- a/sc2/src/sc2code/ships/shofixti/shofixti.c +++ b/sc2/src/sc2code/ships/shofixti/shofixti.c @@ -97,7 +97,7 @@ static RACE_DESC shofixti_desc = { 0, MISSILE_SPEED * MISSILE_LIFE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -107,13 +107,13 @@ static RACE_DESC shofixti_desc = }; static COUNT -initialize_standard_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) +initialize_standard_missile (ELEMENT *ShipPtr, HELEMENT MissileArray[]) { #define SHOFIXTI_OFFSET 15 #define MISSILE_HITS 1 #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 1 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -128,7 +128,7 @@ initialize_standard_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; MissileArray[0] = initialize_missile (&MissileBlock); @@ -136,10 +136,10 @@ initialize_standard_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) } static void -destruct_preprocess (PELEMENT ElementPtr) +destruct_preprocess (ELEMENT *ElementPtr) { #define DESTRUCT_SWITCH ((NUM_EXPLOSION_FRAMES * 3) - 3) - PPRIMITIVE lpPrim; + PRIMITIVE *lpPrim; lpPrim = &(GLOBAL (DisplayArray))[ElementPtr->PrimIndex]; ElementPtr->state_flags |= CHANGING; @@ -169,13 +169,13 @@ destruct_preprocess (PELEMENT ElementPtr) HELEMENT hDestruct; SetPrimType (lpPrim, NO_PRIM); - ElementPtr->preprocess_func = NULL_PTR; + ElementPtr->preprocess_func = NULL; hDestruct = AllocElement (); if (hDestruct) { - ELEMENTPTR DestructPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *DestructPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -200,7 +200,7 @@ destruct_preprocess (PELEMENT ElementPtr) DestructPtr->preprocess_func = destruct_preprocess; } DestructPtr->postprocess_func = - DestructPtr->death_func = NULL_PTR; + DestructPtr->death_func = NULL; ZeroVelocityComponents (&DestructPtr->velocity); UnlockElement (hDestruct); } @@ -209,15 +209,15 @@ destruct_preprocess (PELEMENT ElementPtr) /* In order to detect any Orz Marines that have boarded the ship when it self-destructs, we'll need to see these Orz functions */ -void intruder_preprocess (PELEMENT); -void marine_collision (PELEMENT, PPOINT, PELEMENT, PPOINT); +extern void intruder_preprocess (ELEMENT*); +extern void marine_collision (ELEMENT*, POINT*, ELEMENT*, POINT*); #define ORZ_MARINE(ptr) (ptr->preprocess_func == intruder_preprocess && \ ptr->collision_func == marine_collision) static void -self_destruct (PELEMENT ElementPtr) +self_destruct (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (ElementPtr->state_flags & PLAYER_SHIP) @@ -227,7 +227,7 @@ self_destruct (PELEMENT ElementPtr) hDestruct = AllocElement (); if (hDestruct) { - ELEMENTPTR DestructPtr; + ELEMENT *DestructPtr; LockElement (hDestruct, &DestructPtr); DestructPtr->state_flags = APPEARING | NONSOLID | FINITE_LIFE | @@ -256,7 +256,7 @@ self_destruct (PELEMENT ElementPtr) for (hElement = GetHeadElement (); hElement != 0; hElement = hNextElement) { - ELEMENTPTR ObjPtr; + ELEMENT *ObjPtr; LockElement (hElement, &ObjPtr); hNextElement = GetSuccElement (ObjPtr); @@ -311,9 +311,10 @@ self_destruct (PELEMENT ElementPtr) } static void -shofixti_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +shofixti_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); @@ -325,16 +326,17 @@ shofixti_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT StarShipPtr->ship_input_state &= ~SPECIAL; else { - PEVALUATE_DESC lpWeaponEvalDesc, lpShipEvalDesc; + EVALUATE_DESC *lpWeaponEvalDesc; + EVALUATE_DESC *lpShipEvalDesc; lpWeaponEvalDesc = &ObjectsOfConcern[ENEMY_WEAPON_INDEX]; lpShipEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; if (StarShipPtr->RaceDescPtr->ship_data.special[0] && (GetFrameCount (StarShipPtr->RaceDescPtr->ship_data.captain_control.special) - GetFrameIndex (StarShipPtr->RaceDescPtr->ship_data.captain_control.special) > 5 - || (lpShipEvalDesc->ObjectPtr != NULL_PTR + || (lpShipEvalDesc->ObjectPtr != NULL && lpShipEvalDesc->which_turn <= 4) - || (lpWeaponEvalDesc->ObjectPtr != NULL_PTR + || (lpWeaponEvalDesc->ObjectPtr != NULL /* means IMMEDIATE WEAPON */ && (((lpWeaponEvalDesc->ObjectPtr->state_flags & PLAYER_SHIP) && ShipPtr->crew_level == 1) @@ -347,9 +349,9 @@ shofixti_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT } static void -shofixti_postprocess (PELEMENT ElementPtr) +shofixti_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags @@ -363,18 +365,16 @@ shofixti_postprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_shofixti (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; static RACE_DESC new_shofixti_desc; shofixti_desc.postprocess_func = shofixti_postprocess; shofixti_desc.init_weapon_func = initialize_standard_missile; - shofixti_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) shofixti_intelligence; + shofixti_desc.cyborg_control.intelligence_func = shofixti_intelligence; new_shofixti_desc = shofixti_desc; if (LOBYTE (GLOBAL (CurrentActivity)) == IN_ENCOUNTER diff --git a/sc2/src/sc2code/ships/sis_ship/sis_ship.c b/sc2/src/sc2code/ships/sis_ship/sis_ship.c index f9c0a37b1..068487032 100644 --- a/sc2/src/sc2code/ships/sis_ship/sis_ship.c +++ b/sc2/src/sc2code/ships/sis_ship/sis_ship.c @@ -103,7 +103,7 @@ static RACE_DESC sis_desc = { 0, BLASTER_SPEED * BLASTER_LIFE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -112,22 +112,22 @@ static RACE_DESC sis_desc = 0, }; -static void InitModuleSlots (RACE_DESCPTR RaceDescPtr, +static void InitModuleSlots (RACE_DESC *RaceDescPtr, const BYTE *ModuleSlots); -static void InitDriveSlots (RACE_DESCPTR RaceDescPtr, +static void InitDriveSlots (RACE_DESC *RaceDescPtr, const BYTE *DriveSlots); -static void InitJetSlots (RACE_DESCPTR RaceDescPtr, +static void InitJetSlots (RACE_DESC *RaceDescPtr, const BYTE *JetSlots); -void uninit_sis (RACE_DESCPTR pRaceDesc); +void uninit_sis (RACE_DESC *pRaceDesc); static BYTE num_trackers = 0; static void -sis_hyper_preprocess (PELEMENT ElementPtr) +sis_hyper_preprocess (ELEMENT *ElementPtr) { SIZE udx, udy, dx, dy; SIZE AccelerateDirection; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (ElementPtr->state_flags & APPEARING) ElementPtr->velocity = GLOBAL (velocity); @@ -276,9 +276,9 @@ LeaveAutoPilot: } static void -sis_hyper_postprocess (PELEMENT ElementPtr) +sis_hyper_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GLOBAL (velocity) = ElementPtr->velocity; @@ -295,9 +295,9 @@ sis_hyper_postprocess (PELEMENT ElementPtr) } static void -spawn_point_defense (PELEMENT ElementPtr) +spawn_point_defense (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (ElementPtr->state_flags & PLAYER_SHIP) @@ -307,7 +307,7 @@ spawn_point_defense (PELEMENT ElementPtr) hDefense = AllocElement (); if (hDefense) { - ELEMENTPTR DefensePtr; + ELEMENT *DefensePtr; LockElement (hDefense, &DefensePtr); DefensePtr->state_flags = APPEARING | NONSOLID | FINITE_LIFE | @@ -326,7 +326,7 @@ spawn_point_defense (PELEMENT ElementPtr) { BOOLEAN PaidFor; HELEMENT hObject, hNextObject; - ELEMENTPTR ShipPtr; + ELEMENT *ShipPtr; COLOR LaserColor; static const COLOR ColorRange[] = { @@ -348,7 +348,7 @@ spawn_point_defense (PELEMENT ElementPtr) LockElement (StarShipPtr->hShip, &ShipPtr); for (hObject = GetTailElement (); hObject; hObject = hNextObject) { - ELEMENTPTR ObjectPtr; + ELEMENT *ObjectPtr; LockElement (hObject, &ObjectPtr); hNextObject = GetPredElement (ObjectPtr); @@ -406,7 +406,7 @@ spawn_point_defense (PELEMENT ElementPtr) hPointDefense = initialize_laser (&LaserBlock); if (hPointDefense) { - ELEMENTPTR PDPtr; + ELEMENT *PDPtr; LockElement (hPointDefense, &PDPtr); PDPtr->mass_points = @@ -426,9 +426,9 @@ spawn_point_defense (PELEMENT ElementPtr) } static void -sis_battle_preprocess (PELEMENT ElementPtr) +sis_battle_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->RaceDescPtr->characteristics.special_energy_cost == 0) @@ -445,9 +445,9 @@ sis_battle_preprocess (PELEMENT ElementPtr) } static void -sis_battle_postprocess (PELEMENT ElementPtr) +sis_battle_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -461,14 +461,15 @@ sis_battle_postprocess (PELEMENT ElementPtr) #define BLASTER_DAMAGE 2 static void -blaster_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +blaster_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { HELEMENT hBlastElement; hBlastElement = weapon_collision (ElementPtr0, pPt0, ElementPtr1, pPt1); if (hBlastElement) { - ELEMENTPTR BlastElementPtr; + ELEMENT *BlastElementPtr; LockElement (hBlastElement, &BlastElementPtr); switch (ElementPtr0->mass_points) @@ -477,7 +478,7 @@ blaster_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI BlastElementPtr->life_span = 2; BlastElementPtr->current.image.frame = SetAbsFrameIndex (ElementPtr0->current.image.frame, 0); - BlastElementPtr->preprocess_func = NULL_PTR; + BlastElementPtr->preprocess_func = NULL; break; case BLASTER_DAMAGE * 2: BlastElementPtr->life_span = 6; @@ -495,7 +496,7 @@ blaster_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI } static void -blaster_preprocess (PELEMENT ElementPtr) +blaster_preprocess (ELEMENT *ElementPtr) { BYTE wait; @@ -536,7 +537,7 @@ blaster_preprocess (PELEMENT ElementPtr) } static COUNT -initialize_blasters (PELEMENT ShipPtr, HELEMENT BlasterArray[]) +initialize_blasters (ELEMENT *ShipPtr, HELEMENT BlasterArray[]) { #define SIS_VERT_OFFSET 28 #define SIS_HORZ_OFFSET 20 @@ -546,9 +547,9 @@ initialize_blasters (PELEMENT ShipPtr, HELEMENT BlasterArray[]) BYTE nt; COUNT i; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock[6]; - PMISSILE_BLOCK lpMB; + MISSILE_BLOCK *lpMB; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -628,7 +629,7 @@ initialize_blasters (PELEMENT ShipPtr, HELEMENT BlasterArray[]) { if ((BlasterArray[i] = initialize_missile (lpMB))) { - ELEMENTPTR BlasterPtr; + ELEMENT *BlasterPtr; LockElement (BlasterArray[i], &BlasterPtr); BlasterPtr->collision_func = blaster_collision; @@ -641,11 +642,11 @@ initialize_blasters (PELEMENT ShipPtr, HELEMENT BlasterArray[]) } static void -sis_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, +sis_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -657,12 +658,12 @@ sis_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, if (StarShipPtr->special_counter == 0 && ((lpEvalDesc->ObjectPtr && lpEvalDesc->which_turn <= 2) - || (ObjectsOfConcern[ENEMY_SHIP_INDEX].ObjectPtr != NULL_PTR + || (ObjectsOfConcern[ENEMY_SHIP_INDEX].ObjectPtr != NULL && ObjectsOfConcern[ENEMY_SHIP_INDEX].which_turn <= 4))) StarShipPtr->ship_input_state |= SPECIAL; else StarShipPtr->ship_input_state &= ~SPECIAL; - lpEvalDesc->ObjectPtr = NULL_PTR; + lpEvalDesc->ObjectPtr = NULL; } else if (MANEUVERABILITY (&StarShipPtr->RaceDescPtr->cyborg_control) < MEDIUM_SHIP @@ -714,7 +715,8 @@ sis_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, } static void -InitModuleSlots (RACE_DESCPTR RaceDescPtr, const BYTE *ModuleSlots) { +InitModuleSlots (RACE_DESC *RaceDescPtr, const BYTE *ModuleSlots) +{ COUNT i; RaceDescPtr->ship_info.max_crew = 0; @@ -771,7 +773,8 @@ InitModuleSlots (RACE_DESCPTR RaceDescPtr, const BYTE *ModuleSlots) { } static void -InitDriveSlots (RACE_DESCPTR RaceDescPtr, const BYTE *DriveSlots) { +InitDriveSlots (RACE_DESC *RaceDescPtr, const BYTE *DriveSlots) +{ COUNT i; // NB. RaceDescPtr->characteristics.max_thrust is already initialised. @@ -795,7 +798,8 @@ InitDriveSlots (RACE_DESCPTR RaceDescPtr, const BYTE *DriveSlots) { } static void -InitJetSlots (RACE_DESCPTR RaceDescPtr, const BYTE *JetSlots) { +InitJetSlots (RACE_DESC *RaceDescPtr, const BYTE *JetSlots) +{ COUNT i; for (i = 0; i < NUM_JET_SLOTS; ++i) @@ -809,10 +813,10 @@ InitJetSlots (RACE_DESCPTR RaceDescPtr, const BYTE *JetSlots) { } } -RACE_DESCPTR +RACE_DESC* init_sis (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; COUNT i; static RACE_DESC new_sis_desc; @@ -847,9 +851,7 @@ init_sis (void) new_sis_desc.preprocess_func = sis_battle_preprocess; new_sis_desc.postprocess_func = sis_battle_postprocess; new_sis_desc.init_weapon_func = initialize_blasters; - new_sis_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, - COUNT ConcernCounter)) sis_intelligence; + new_sis_desc.cyborg_control.intelligence_func = sis_intelligence; if (GET_GAME_STATE (CHMMR_BOMB_STATE) == 3) SET_GAME_STATE (BOMB_CARRIER, 1); @@ -879,7 +881,7 @@ init_sis (void) } void -uninit_sis (RACE_DESCPTR pRaceDesc) +uninit_sis (RACE_DESC *pRaceDesc) { if (LOBYTE (GLOBAL (CurrentActivity)) != IN_HYPERSPACE) { diff --git a/sc2/src/sc2code/ships/slylandr/slylandr.c b/sc2/src/sc2code/ships/slylandr/slylandr.c index e3c13c6d0..2c71a8d32 100644 --- a/sc2/src/sc2code/ships/slylandr/slylandr.c +++ b/sc2/src/sc2code/ships/slylandr/slylandr.c @@ -96,7 +96,7 @@ static RACE_DESC slylandro_desc = { 0, CLOSE_RANGE_WEAPON << 1, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -105,11 +105,11 @@ static RACE_DESC slylandro_desc = 0, }; -static COUNT initialize_lightning (PELEMENT ElementPtr, HELEMENT - LaserArray[]); +static COUNT initialize_lightning (ELEMENT *ElementPtr, + HELEMENT LaserArray[]); static void -lightning_postprocess (PELEMENT ElementPtr) +lightning_postprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait && !(ElementPtr->state_flags & COLLISION)) @@ -123,9 +123,10 @@ lightning_postprocess (PELEMENT ElementPtr) } static void -lightning_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +lightning_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); if (StarShipPtr->weapon_counter > WEAPON_WAIT >> 1) @@ -138,7 +139,7 @@ lightning_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PP } static COUNT -initialize_lightning (PELEMENT ElementPtr, HELEMENT LaserArray[]) +initialize_lightning (ELEMENT *ElementPtr, HELEMENT LaserArray[]) { LASER_BLOCK LaserBlock; @@ -158,8 +159,8 @@ initialize_lightning (PELEMENT ElementPtr, HELEMENT LaserArray[]) SIZE delta; COUNT angle, facing; DWORD rand_val; - ELEMENTPTR LaserPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *LaserPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -246,10 +247,11 @@ initialize_lightning (PELEMENT ElementPtr, HELEMENT LaserArray[]) } static void -slylandro_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +slylandro_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; if (LOBYTE (GLOBAL (CurrentActivity)) == IN_ENCOUNTER) /* no dodging in role playing game */ @@ -286,7 +288,7 @@ slylandro_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT } static BOOLEAN -harvest_space_junk (PELEMENT ElementPtr) +harvest_space_junk (ELEMENT *ElementPtr) { BOOLEAN retval; HELEMENT hElement, hNextElement; @@ -295,7 +297,7 @@ harvest_space_junk (PELEMENT ElementPtr) for (hElement = GetHeadElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ObjPtr; + ELEMENT *ObjPtr; LockElement (hElement, &ObjPtr); hNextElement = GetSuccElement (ObjPtr); @@ -326,7 +328,7 @@ harvest_space_junk (PELEMENT ElementPtr) if (!retval) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; retval = TRUE; @@ -345,9 +347,9 @@ harvest_space_junk (PELEMENT ElementPtr) } static void -slylandro_postprocess (PELEMENT ElementPtr) +slylandro_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->weapon_counter @@ -370,11 +372,11 @@ slylandro_postprocess (PELEMENT ElementPtr) } static void -slylandro_preprocess (PELEMENT ElementPtr) +slylandro_preprocess (ELEMENT *ElementPtr) { if (!(ElementPtr->state_flags & (APPEARING | NONSOLID))) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & THRUST) @@ -410,17 +412,15 @@ slylandro_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_slylandro (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; slylandro_desc.preprocess_func = slylandro_preprocess; slylandro_desc.postprocess_func = slylandro_postprocess; slylandro_desc.init_weapon_func = initialize_lightning; - slylandro_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) slylandro_intelligence; + slylandro_desc.cyborg_control.intelligence_func = slylandro_intelligence; RaceDescPtr = &slylandro_desc; diff --git a/sc2/src/sc2code/ships/spathi/spathi.c b/sc2/src/sc2code/ships/spathi/spathi.c index f9ea02679..bb4a0aaad 100644 --- a/sc2/src/sc2code/ships/spathi/spathi.c +++ b/sc2/src/sc2code/ships/spathi/spathi.c @@ -94,7 +94,7 @@ static RACE_DESC spathi_desc = { 0, MISSILE_RANGE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -107,7 +107,7 @@ static RACE_DESC spathi_desc = #define TRACK_WAIT 1 static void -butt_missile_preprocess (PELEMENT ElementPtr) +butt_missile_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -132,7 +132,7 @@ butt_missile_preprocess (PELEMENT ElementPtr) } static void -spawn_butt_missile (PELEMENT ShipPtr) +spawn_butt_missile (ELEMENT *ShipPtr) { #define SPATHI_REAR_OFFSET 20 #define DISCRIMINATOR_LIFE 30 @@ -140,7 +140,7 @@ spawn_butt_missile (PELEMENT ShipPtr) #define DISCRIMINATOR_DAMAGE 2 #define DISCRIMINATOR_OFFSET 4 HELEMENT ButtMissile; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK ButtMissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -161,7 +161,7 @@ spawn_butt_missile (PELEMENT ShipPtr) ButtMissile = initialize_missile (&ButtMissileBlock); if (ButtMissile) { - ELEMENTPTR ButtPtr; + ELEMENT *ButtPtr; LockElement (ButtMissile, &ButtPtr); ButtPtr->turn_wait = TRACK_WAIT; @@ -177,10 +177,11 @@ spawn_butt_missile (PELEMENT ShipPtr) } static void -spathi_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +spathi_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); @@ -229,13 +230,13 @@ spathi_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Co } static COUNT -initialize_standard_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) +initialize_standard_missile (ELEMENT *ShipPtr, HELEMENT MissileArray[]) { #define SPATHI_FORWARD_OFFSET 16 #define MISSILE_HITS 1 #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 1 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -250,7 +251,7 @@ initialize_standard_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; MissileArray[0] = initialize_missile (&MissileBlock); @@ -258,9 +259,9 @@ initialize_standard_missile (PELEMENT ShipPtr, HELEMENT MissileArray[]) } static void -spathi_postprocess (PELEMENT ElementPtr) +spathi_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -274,16 +275,14 @@ spathi_postprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_spathi (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; spathi_desc.postprocess_func = spathi_postprocess; spathi_desc.init_weapon_func = initialize_standard_missile; - spathi_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) spathi_intelligence; + spathi_desc.cyborg_control.intelligence_func = spathi_intelligence; RaceDescPtr = &spathi_desc; diff --git a/sc2/src/sc2code/ships/supox/supox.c b/sc2/src/sc2code/ships/supox/supox.c index 437e7c54f..87ae839fe 100644 --- a/sc2/src/sc2code/ships/supox/supox.c +++ b/sc2/src/sc2code/ships/supox/supox.c @@ -96,7 +96,7 @@ static RACE_DESC supox_desc = { 0, (MISSILE_SPEED * MISSILE_LIFE) >> 1, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -106,10 +106,11 @@ static RACE_DESC supox_desc = }; static void -supox_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +supox_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -170,13 +171,13 @@ supox_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con } static COUNT -initialize_horn (PELEMENT ShipPtr, HELEMENT HornArray[]) +initialize_horn (ELEMENT *ShipPtr, HELEMENT HornArray[]) { #define MISSILE_HITS 1 #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 2 #define SUPOX_OFFSET 23 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -191,16 +192,16 @@ initialize_horn (PELEMENT ShipPtr, HELEMENT HornArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; HornArray[0] = initialize_missile (&MissileBlock); return (1); } static void -supox_preprocess (PELEMENT ElementPtr) +supox_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -260,16 +261,14 @@ supox_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_supox (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; supox_desc.preprocess_func = supox_preprocess; supox_desc.init_weapon_func = initialize_horn; - supox_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) supox_intelligence; + supox_desc.cyborg_control.intelligence_func = supox_intelligence; RaceDescPtr = &supox_desc; diff --git a/sc2/src/sc2code/ships/syreen/syreen.c b/sc2/src/sc2code/ships/syreen/syreen.c index 2f8320e40..2618a6366 100644 --- a/sc2/src/sc2code/ships/syreen/syreen.c +++ b/sc2/src/sc2code/ships/syreen/syreen.c @@ -97,7 +97,7 @@ static RACE_DESC syreen_desc = { 0, (MISSILE_SPEED * MISSILE_LIFE * 2 / 3), - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -107,13 +107,13 @@ static RACE_DESC syreen_desc = }; static COUNT -initialize_dagger (PELEMENT ShipPtr, HELEMENT DaggerArray[]) +initialize_dagger (ELEMENT *ShipPtr, HELEMENT DaggerArray[]) { #define SYREEN_OFFSET 30 #define MISSILE_HITS 1 #define MISSILE_DAMAGE 2 #define MISSILE_OFFSET 3 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -128,7 +128,7 @@ initialize_dagger (PELEMENT ShipPtr, HELEMENT DaggerArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; DaggerArray[0] = initialize_missile (&MissileBlock); @@ -136,7 +136,7 @@ initialize_dagger (PELEMENT ShipPtr, HELEMENT DaggerArray[]) } static void -spawn_crew (PELEMENT ElementPtr) +spawn_crew (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & PLAYER_SHIP) { @@ -145,7 +145,7 @@ spawn_crew (PELEMENT ElementPtr) hCrew = AllocElement (); if (hCrew != 0) { - ELEMENTPTR CrewPtr; + ELEMENT *CrewPtr; LockElement (hCrew, &CrewPtr); CrewPtr->next.location = ElementPtr->next.location; @@ -167,7 +167,7 @@ spawn_crew (PELEMENT ElementPtr) for (hElement = GetHeadElement (); hElement != 0; hElement = hNextElement) { - ELEMENTPTR ObjPtr; + ELEMENT *ObjPtr; LockElement (hElement, &ObjPtr); hNextElement = GetSuccElement (ObjPtr); @@ -214,17 +214,19 @@ spawn_crew (PELEMENT ElementPtr) } static void -syreen_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +syreen_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; + EVALUATE_DESC *lpEvalDesc; ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; - if (lpEvalDesc->ObjectPtr != NULL_PTR) + if (lpEvalDesc->ObjectPtr != NULL) { - STARSHIPPTR StarShipPtr, EnemyStarShipPtr; + STARSHIP *StarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr); @@ -239,9 +241,9 @@ syreen_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Co } static void -syreen_postprocess (PELEMENT ElementPtr) +syreen_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -258,16 +260,14 @@ syreen_postprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_syreen (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; syreen_desc.postprocess_func = syreen_postprocess; syreen_desc.init_weapon_func = initialize_dagger; - syreen_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) syreen_intelligence; + syreen_desc.cyborg_control.intelligence_func = syreen_intelligence; RaceDescPtr = &syreen_desc; diff --git a/sc2/src/sc2code/ships/thradd/thradd.c b/sc2/src/sc2code/ships/thradd/thradd.c index 7f3ffd52f..3c1355e3f 100644 --- a/sc2/src/sc2code/ships/thradd/thradd.c +++ b/sc2/src/sc2code/ships/thradd/thradd.c @@ -97,7 +97,7 @@ static RACE_DESC thraddash_desc = { 0, (MISSILE_SPEED * MISSILE_LIFE) >> 1, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -107,11 +107,12 @@ static RACE_DESC thraddash_desc = }; static void -thraddash_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +thraddash_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; if (lpEvalDesc->ObjectPtr) @@ -198,7 +199,7 @@ thraddash_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT #define NAPALM_WAIT 1 static void -flame_napalm_preprocess (PELEMENT ElementPtr) +flame_napalm_preprocess (ELEMENT *ElementPtr) { ZeroVelocityComponents (&ElementPtr->velocity); @@ -236,12 +237,12 @@ flame_napalm_preprocess (PELEMENT ElementPtr) } static COUNT -initialize_horn (PELEMENT ShipPtr, HELEMENT HornArray[]) +initialize_horn (ELEMENT *ShipPtr, HELEMENT HornArray[]) { #define MISSILE_HITS 2 #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 3 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -256,7 +257,7 @@ initialize_horn (PELEMENT ShipPtr, HELEMENT HornArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; HornArray[0] = initialize_missile (&MissileBlock); @@ -264,9 +265,9 @@ initialize_horn (PELEMENT ShipPtr, HELEMENT HornArray[]) } static void -thraddash_preprocess (PELEMENT ElementPtr) +thraddash_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (!(StarShipPtr->cur_status_flags & SPECIAL)) @@ -336,7 +337,7 @@ thraddash_preprocess (PELEMENT ElementPtr) hTrailElement = initialize_missile (&MissileBlock); if (hTrailElement) { - ELEMENTPTR TrailElementPtr; + ELEMENT *TrailElementPtr; LockElement (hTrailElement, &TrailElementPtr); SetElementStarShip (TrailElementPtr, StarShipPtr); @@ -366,16 +367,14 @@ thraddash_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_thraddash (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; thraddash_desc.preprocess_func = thraddash_preprocess; thraddash_desc.init_weapon_func = initialize_horn; - thraddash_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) thraddash_intelligence; + thraddash_desc.cyborg_control.intelligence_func = thraddash_intelligence; RaceDescPtr = &thraddash_desc; diff --git a/sc2/src/sc2code/ships/umgah/umgah.c b/sc2/src/sc2code/ships/umgah/umgah.c index 381f2e310..80c89a98e 100644 --- a/sc2/src/sc2code/ships/umgah/umgah.c +++ b/sc2/src/sc2code/ships/umgah/umgah.c @@ -96,7 +96,7 @@ static RACE_DESC umgah_desc = { 0, (LONG_RANGE_WEAPON << 2), - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -106,9 +106,9 @@ static RACE_DESC umgah_desc = }; static void -cone_preprocess (PELEMENT ElementPtr) +cone_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); StarShipPtr->RaceDescPtr->ship_data.special[0] = @@ -119,7 +119,8 @@ cone_preprocess (PELEMENT ElementPtr) } static void -cone_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +cone_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { HELEMENT hBlastElement; @@ -136,10 +137,12 @@ cone_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT #define JUMP_DIST DISPLAY_TO_WORLD (40) static void -umgah_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +umgah_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr, EnemyStarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); lpEvalDesc = &ObjectsOfConcern[ENEMY_WEAPON_INDEX]; @@ -248,7 +251,7 @@ umgah_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con StarShipPtr->RaceDescPtr->characteristics.special_wait = 0xFF; } static COUNT -initialize_cone (PELEMENT ShipPtr, HELEMENT ConeArray[]) +initialize_cone (ELEMENT *ShipPtr, HELEMENT ConeArray[]) { #define UMGAH_OFFSET 0 #define MISSILE_SPEED 0 @@ -256,7 +259,7 @@ initialize_cone (PELEMENT ShipPtr, HELEMENT ConeArray[]) #define MISSILE_DAMAGE 1 #define MISSILE_LIFE 1 #define MISSILE_OFFSET 0 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -290,7 +293,7 @@ initialize_cone (PELEMENT ShipPtr, HELEMENT ConeArray[]) if (ConeArray[0]) { - ELEMENTPTR ConePtr; + ELEMENT *ConePtr; LockElement (ConeArray[0], &ConePtr); ConePtr->collision_func = cone_collision; @@ -307,9 +310,9 @@ initialize_cone (PELEMENT ShipPtr, HELEMENT ConeArray[]) } static void -umgah_postprocess (PELEMENT ElementPtr) +umgah_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (StarShipPtr->special_counter > 0) @@ -321,13 +324,13 @@ umgah_postprocess (PELEMENT ElementPtr) } static void -umgah_preprocess (PELEMENT ElementPtr) +umgah_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & APPEARING) LastShipFrame[WHICH_SIDE(ElementPtr->state_flags)] = 0; else { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if (ElementPtr->thrust_wait == 0 @@ -351,17 +354,15 @@ umgah_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_umgah (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; umgah_desc.preprocess_func = umgah_preprocess; umgah_desc.postprocess_func = umgah_postprocess; umgah_desc.init_weapon_func = initialize_cone; - umgah_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) umgah_intelligence; + umgah_desc.cyborg_control.intelligence_func = umgah_intelligence; RaceDescPtr = &umgah_desc; diff --git a/sc2/src/sc2code/ships/urquan/urquan.c b/sc2/src/sc2code/ships/urquan/urquan.c index 1528b65d1..ad8cedc09 100644 --- a/sc2/src/sc2code/ships/urquan/urquan.c +++ b/sc2/src/sc2code/ships/urquan/urquan.c @@ -98,7 +98,7 @@ static RACE_DESC urquan_desc = { 0, MISSILE_SPEED * MISSILE_LIFE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -108,13 +108,13 @@ static RACE_DESC urquan_desc = }; static COUNT -initialize_fusion (PELEMENT ShipPtr, HELEMENT FusionArray[]) +initialize_fusion (ELEMENT *ShipPtr, HELEMENT FusionArray[]) { #define MISSILE_HITS 10 #define MISSILE_DAMAGE 6 #define MISSILE_OFFSET 8 #define URQUAN_OFFSET 32 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -129,7 +129,7 @@ initialize_fusion (PELEMENT ShipPtr, HELEMENT FusionArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; FusionArray[0] = initialize_missile (&MissileBlock); @@ -146,10 +146,10 @@ initialize_fusion (PELEMENT ShipPtr, HELEMENT FusionArray[]) #define LASER_RANGE DISPLAY_TO_WORLD (40 + FIGHTER_OFFSET) static void -fighter_postprocess (PELEMENT ElementPtr) +fighter_postprocess (ELEMENT *ElementPtr) { HELEMENT Laser; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; LASER_BLOCK LaserBlock; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -165,7 +165,7 @@ fighter_postprocess (PELEMENT ElementPtr) Laser = initialize_laser (&LaserBlock); if (Laser) { - ELEMENTPTR LaserPtr; + ELEMENT *LaserPtr; LockElement (Laser, &LaserPtr); SetElementStarShip (LaserPtr, StarShipPtr); @@ -183,9 +183,9 @@ fighter_postprocess (PELEMENT ElementPtr) } static void -fighter_preprocess (PELEMENT ElementPtr) +fighter_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -196,7 +196,7 @@ fighter_preprocess (PELEMENT ElementPtr) BOOLEAN Enroute; COUNT orig_facing, facing; SIZE delta_x, delta_y; - ELEMENTPTR eptr; + ELEMENT *eptr; Enroute = TRUE; @@ -297,9 +297,10 @@ fighter_preprocess (PELEMENT ElementPtr) } static void -fighter_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +fighter_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); if (GRAVITY_MASS (ElementPtr1->mass_points)) @@ -311,7 +312,7 @@ fighter_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI { COUNT primIndex, travel_facing; SIZE delta_facing; - ELEMENTPTR FighterElementPtr; + ELEMENT *FighterElementPtr; LockElement (hFighterElement, &FighterElementPtr); primIndex = FighterElementPtr->PrimIndex; @@ -383,13 +384,13 @@ fighter_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI } static void -spawn_fighters (PELEMENT ElementPtr) +spawn_fighters (ELEMENT *ElementPtr) { SIZE i; COUNT facing; SIZE delta_x, delta_y; HELEMENT hFighterElement; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); facing = StarShipPtr->ShipFacing + ANGLE_TO_FACING (HALF_CIRCLE); @@ -401,7 +402,7 @@ spawn_fighters (PELEMENT ElementPtr) { SIZE sx, sy; COUNT fighter_facing; - ELEMENTPTR FighterElementPtr; + ELEMENT *FighterElementPtr; DeltaCrew (ElementPtr, -1); @@ -420,7 +421,7 @@ spawn_fighters (PELEMENT ElementPtr) FighterElementPtr->preprocess_func = fighter_preprocess; FighterElementPtr->postprocess_func = 0; FighterElementPtr->collision_func = fighter_collision; - FighterElementPtr->death_func = NULL_PTR; + FighterElementPtr->death_func = NULL; } FighterElementPtr->current.location = ElementPtr->next.location; @@ -456,10 +457,11 @@ spawn_fighters (PELEMENT ElementPtr) } static void -urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +urquan_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -480,7 +482,7 @@ urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Co lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; { - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; if (lpEvalDesc->ObjectPtr) GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr); @@ -508,9 +510,9 @@ urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Co } static void -urquan_postprocess (PELEMENT ElementPtr) +urquan_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -527,16 +529,14 @@ urquan_postprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_urquan (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; urquan_desc.postprocess_func = urquan_postprocess; urquan_desc.init_weapon_func = initialize_fusion; - urquan_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) urquan_intelligence; + urquan_desc.cyborg_control.intelligence_func = urquan_intelligence; RaceDescPtr = &urquan_desc; diff --git a/sc2/src/sc2code/ships/utwig/utwig.c b/sc2/src/sc2code/ships/utwig/utwig.c index 645062b23..2fd918cd0 100644 --- a/sc2/src/sc2code/ships/utwig/utwig.c +++ b/sc2/src/sc2code/ships/utwig/utwig.c @@ -98,7 +98,7 @@ static RACE_DESC utwig_desc = { 0, CLOSE_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -108,7 +108,7 @@ static RACE_DESC utwig_desc = }; static COUNT -initialize_lance (PELEMENT ShipPtr, HELEMENT WeaponArray[]) +initialize_lance (ELEMENT *ShipPtr, HELEMENT WeaponArray[]) { #define LAUNCH_XOFFS0 DISPLAY_TO_WORLD (5) #define LAUNCH_YOFFS0 -DISPLAY_TO_WORLD (18) @@ -120,7 +120,7 @@ initialize_lance (PELEMENT ShipPtr, HELEMENT WeaponArray[]) #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 1 COUNT i; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -132,7 +132,7 @@ initialize_lance (PELEMENT ShipPtr, HELEMENT WeaponArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; MissileBlock.pixoffs = 0; @@ -180,11 +180,12 @@ initialize_lance (PELEMENT ShipPtr, HELEMENT WeaponArray[]) } static void -utwig_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +utwig_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { SIZE ShieldStatus; - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -239,7 +240,7 @@ utwig_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con if (StarShipPtr->RaceDescPtr->ship_info.energy_level && (lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX])->ObjectPtr) { - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr); if (!(EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags @@ -250,7 +251,8 @@ utwig_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con } static void -utwig_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +utwig_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (ElementPtr0->life_span > NORMAL_LIFE && (ElementPtr1->state_flags & FINITE_LIFE) @@ -261,10 +263,10 @@ utwig_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT } static void -utwig_preprocess (PELEMENT ElementPtr) +utwig_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; - PPRIMITIVE lpPrim; + STARSHIP *StarShipPtr; + PRIMITIVE *lpPrim; if (ElementPtr->state_flags & APPEARING) { @@ -354,16 +356,14 @@ utwig_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_utwig (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; utwig_desc.preprocess_func = utwig_preprocess; utwig_desc.init_weapon_func = initialize_lance; - utwig_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) utwig_intelligence; + utwig_desc.cyborg_control.intelligence_func = utwig_intelligence; RaceDescPtr = &utwig_desc; diff --git a/sc2/src/sc2code/ships/vux/vux.c b/sc2/src/sc2code/ships/vux/vux.c index 551363e8b..51679542b 100644 --- a/sc2/src/sc2code/ships/vux/vux.c +++ b/sc2/src/sc2code/ships/vux/vux.c @@ -99,7 +99,7 @@ static RACE_DESC vux_desc = { 0, CLOSE_RANGE_WEAPON, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -111,7 +111,7 @@ static RACE_DESC vux_desc = #define LIMPET_SPEED 25 static void -limpet_preprocess (PELEMENT ElementPtr) +limpet_preprocess (ELEMENT *ElementPtr) { COUNT facing, orig_facing; SIZE delta_facing; @@ -132,14 +132,14 @@ limpet_preprocess (PELEMENT ElementPtr) } static void -limpet_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT - ElementPtr1, PPOINT pPt1) +limpet_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { if (ElementPtr1->state_flags & PLAYER_SHIP) { STAMP s; - STARSHIPPTR StarShipPtr; - RACE_DESCPTR RDPtr; + STARSHIP *StarShipPtr; + RACE_DESC *RDPtr; GetElementStarShip (ElementPtr1, &StarShipPtr); RDPtr = StarShipPtr->RaceDescPtr; @@ -185,14 +185,14 @@ limpet_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT } static void -spawn_limpets (PELEMENT ElementPtr) +spawn_limpets (ELEMENT *ElementPtr) { #define LIMPET_OFFSET 8 #define LIMPET_LIFE 80 #define LIMPET_HITS 1 #define LIMPET_DAMAGE 0 HELEMENT Limpet; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ElementPtr, &StarShipPtr); @@ -214,7 +214,7 @@ spawn_limpets (PELEMENT ElementPtr) Limpet = initialize_missile (&MissileBlock); if (Limpet) { - ELEMENTPTR LimpetPtr; + ELEMENT *LimpetPtr; LockElement (Limpet, &LimpetPtr); LimpetPtr->collision_func = limpet_collision; @@ -226,9 +226,9 @@ spawn_limpets (PELEMENT ElementPtr) } static COUNT -initialize_horrific_laser (PELEMENT ShipPtr, HELEMENT LaserArray[]) +initialize_horrific_laser (ELEMENT *ShipPtr, HELEMENT LaserArray[]) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; LASER_BLOCK LaserBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -247,11 +247,11 @@ initialize_horrific_laser (PELEMENT ShipPtr, HELEMENT LaserArray[]) } static void -vux_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, +vux_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter) { - PEVALUATE_DESC lpEvalDesc; - STARSHIPPTR StarShipPtr; + EVALUATE_DESC *lpEvalDesc; + STARSHIP *StarShipPtr; lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX]; lpEvalDesc->MoveState = PURSUE; @@ -283,9 +283,9 @@ vux_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, } static void -vux_postprocess (PELEMENT ElementPtr) +vux_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -303,19 +303,19 @@ vux_postprocess (PELEMENT ElementPtr) } static void -vux_preprocess (PELEMENT ElementPtr) +vux_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & APPEARING) { COUNT facing; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); facing = StarShipPtr->ShipFacing; if (LOBYTE (GLOBAL (CurrentActivity)) != IN_ENCOUNTER && TrackShip (ElementPtr, &facing) >= 0) { - ELEMENTPTR OtherShipPtr; + ELEMENT *OtherShipPtr; LockElement (ElementPtr->hTarget, &OtherShipPtr); @@ -370,17 +370,15 @@ vux_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_vux (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; vux_desc.preprocess_func = vux_preprocess; vux_desc.postprocess_func = vux_postprocess; vux_desc.init_weapon_func = initialize_horrific_laser; - vux_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) vux_intelligence; + vux_desc.cyborg_control.intelligence_func = vux_intelligence; RaceDescPtr = &vux_desc; diff --git a/sc2/src/sc2code/ships/yehat/yehat.c b/sc2/src/sc2code/ships/yehat/yehat.c index bd083daf7..d2e165d03 100644 --- a/sc2/src/sc2code/ships/yehat/yehat.c +++ b/sc2/src/sc2code/ships/yehat/yehat.c @@ -96,7 +96,7 @@ static RACE_DESC yehat_desc = { 0, MISSILE_SPEED * MISSILE_LIFE / 3, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -106,7 +106,7 @@ static RACE_DESC yehat_desc = }; static COUNT -initialize_standard_missiles (PELEMENT ShipPtr, HELEMENT MissileArray[]) +initialize_standard_missiles (ELEMENT *ShipPtr, HELEMENT MissileArray[]) { #define YEHAT_OFFSET 16 #define LAUNCH_OFFS DISPLAY_TO_WORLD (8) @@ -114,7 +114,7 @@ initialize_standard_missiles (PELEMENT ShipPtr, HELEMENT MissileArray[]) #define MISSILE_DAMAGE 1 #define MISSILE_OFFSET 1 SIZE offs_x, offs_y; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -127,7 +127,7 @@ initialize_standard_missiles (PELEMENT ShipPtr, HELEMENT MissileArray[]) MissileBlock.hit_points = MISSILE_HITS; MissileBlock.damage = MISSILE_DAMAGE; MissileBlock.life = MISSILE_LIFE; - MissileBlock.preprocess_func = NULL_PTR; + MissileBlock.preprocess_func = NULL; MissileBlock.blast_offs = MISSILE_OFFSET; offs_x = -SINE (FACING_TO_ANGLE (MissileBlock.face), LAUNCH_OFFS); @@ -145,11 +145,12 @@ initialize_standard_missiles (PELEMENT ShipPtr, HELEMENT MissileArray[]) } static void -yehat_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +yehat_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { SIZE ShieldStatus; - STARSHIPPTR StarShipPtr; - PEVALUATE_DESC lpEvalDesc; + STARSHIP *StarShipPtr; + EVALUATE_DESC *lpEvalDesc; ShieldStatus = -1; lpEvalDesc = &ObjectsOfConcern[ENEMY_WEAPON_INDEX]; @@ -202,7 +203,7 @@ yehat_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con if ((lpEvalDesc = &ObjectsOfConcern[ENEMY_SHIP_INDEX])->ObjectPtr) { - STARSHIPPTR EnemyStarShipPtr; + STARSHIP *EnemyStarShipPtr; GetElementStarShip (lpEvalDesc->ObjectPtr, &EnemyStarShipPtr); if (!(EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags @@ -217,11 +218,11 @@ yehat_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT Con } static void -yehat_postprocess (PELEMENT ElementPtr) +yehat_postprocess (ELEMENT *ElementPtr) { if (!(ElementPtr->state_flags & NONSOLID)) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); /* take care of shield effect */ @@ -256,7 +257,7 @@ yehat_postprocess (PELEMENT ElementPtr) if (hShipElement = AllocElement ()) { - ELEMENTPTR ShipElementPtr; + ELEMENT *ShipElementPtr; InsertElement (hShipElement, GetSuccElement (ElementPtr)); LockElement (hShipElement, &ShipElementPtr); @@ -282,7 +283,7 @@ yehat_postprocess (PELEMENT ElementPtr) ShipElementPtr->next = ShipElementPtr->current; ShipElementPtr->preprocess_func = ShipElementPtr->postprocess_func = - ShipElementPtr->death_func = NULL_PTR; + ShipElementPtr->death_func = NULL; ZeroVelocityComponents (&ShipElementPtr->velocity); UnlockElement (hShipElement); @@ -293,11 +294,11 @@ yehat_postprocess (PELEMENT ElementPtr) } static void -yehat_preprocess (PELEMENT ElementPtr) +yehat_preprocess (ELEMENT *ElementPtr) { if (!(ElementPtr->state_flags & APPEARING)) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((ElementPtr->life_span > NORMAL_LIFE @@ -344,17 +345,15 @@ yehat_preprocess (PELEMENT ElementPtr) } } -RACE_DESCPTR +RACE_DESC* init_yehat (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; yehat_desc.preprocess_func = yehat_preprocess; yehat_desc.postprocess_func = yehat_postprocess; yehat_desc.init_weapon_func = initialize_standard_missiles; - yehat_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) yehat_intelligence; + yehat_desc.cyborg_control.intelligence_func = yehat_intelligence; RaceDescPtr = &yehat_desc; diff --git a/sc2/src/sc2code/ships/zoqfot/zoqfot.c b/sc2/src/sc2code/ships/zoqfot/zoqfot.c index 039b0dfec..f55c30374 100644 --- a/sc2/src/sc2code/ships/zoqfot/zoqfot.c +++ b/sc2/src/sc2code/ships/zoqfot/zoqfot.c @@ -97,7 +97,7 @@ static RACE_DESC zoqfotpik_desc = { 0, MISSILE_RANGE, - NULL_PTR, + NULL, }, (UNINIT_FUNC *) NULL, (PREPROCESS_FUNC *) NULL, @@ -110,7 +110,7 @@ static RACE_DESC zoqfotpik_desc = #define SPIT_WAIT 2 static void -spit_preprocess (PELEMENT ElementPtr) +spit_preprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait > 0) --ElementPtr->turn_wait; @@ -136,12 +136,12 @@ spit_preprocess (PELEMENT ElementPtr) } static COUNT -initialize_spit (PELEMENT ShipPtr, HELEMENT SpitArray[]) +initialize_spit (ELEMENT *ShipPtr, HELEMENT SpitArray[]) { #define MISSILE_DAMAGE 1 #define MISSILE_HITS 1 #define MISSILE_OFFSET 0 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK MissileBlock; GetElementStarShip (ShipPtr, &StarShipPtr); @@ -165,19 +165,20 @@ initialize_spit (PELEMENT ShipPtr, HELEMENT SpitArray[]) return (1); } -static void spawn_tongue (PELEMENT ElementPtr); +static void spawn_tongue (ELEMENT *ElementPtr); static void -tongue_postprocess (PELEMENT ElementPtr) +tongue_postprocess (ELEMENT *ElementPtr) { if (ElementPtr->turn_wait) spawn_tongue (ElementPtr); } static void -tongue_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT pPt1) +tongue_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr0, &StarShipPtr); if (StarShipPtr->special_counter == @@ -190,14 +191,13 @@ tongue_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN } static void -spawn_tongue (ElementPtr) -PELEMENT ElementPtr; +spawn_tongue (ELEMENT *ElementPtr) { #define TONGUE_SPEED 0 #define TONGUE_HITS 1 #define TONGUE_DAMAGE 12 #define TONGUE_OFFSET 4 - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; MISSILE_BLOCK TongueBlock; HELEMENT Tongue; @@ -218,7 +218,7 @@ PELEMENT ElementPtr; Tongue = initialize_missile (&TongueBlock); if (Tongue) { - ELEMENTPTR TonguePtr; + ELEMENT *TonguePtr; LockElement (Tongue, &TonguePtr); TonguePtr->postprocess_func = tongue_postprocess; @@ -255,17 +255,18 @@ PELEMENT ElementPtr; } static void -zoqfotpik_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter) +zoqfotpik_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern, + COUNT ConcernCounter) { BOOLEAN GiveTongueJob; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); GiveTongueJob = FALSE; if (StarShipPtr->special_counter == 0) { - PEVALUATE_DESC lpEnemyEvalDesc; + EVALUATE_DESC *lpEnemyEvalDesc; StarShipPtr->ship_input_state &= ~SPECIAL; @@ -326,9 +327,9 @@ zoqfotpik_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT } static void -zoqfotpik_postprocess (PELEMENT ElementPtr) +zoqfotpik_postprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); if ((StarShipPtr->cur_status_flags & SPECIAL) @@ -347,16 +348,14 @@ zoqfotpik_postprocess (PELEMENT ElementPtr) spawn_tongue (ElementPtr); } -RACE_DESCPTR +RACE_DESC* init_zoqfotpik (void) { - RACE_DESCPTR RaceDescPtr; + RACE_DESC *RaceDescPtr; zoqfotpik_desc.postprocess_func = zoqfotpik_postprocess; zoqfotpik_desc.init_weapon_func = initialize_spit; - zoqfotpik_desc.cyborg_control.intelligence_func = - (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT - ConcernCounter)) zoqfotpik_intelligence; + zoqfotpik_desc.cyborg_control.intelligence_func = zoqfotpik_intelligence; RaceDescPtr = &zoqfotpik_desc; diff --git a/sc2/src/sc2code/shipstat.c b/sc2/src/sc2code/shipstat.c index 4ccc62873..d63da5fac 100644 --- a/sc2/src/sc2code/shipstat.c +++ b/sc2/src/sc2code/shipstat.c @@ -133,13 +133,13 @@ OutlineShipStatus (COORD y) } void -InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect) +InitShipStatus (STARSHIP *StarShipPtr, RECT *pClipRect) { RECT r; COORD y, y_stat; STAMP Stamp; CONTEXT OldContext; - SHIP_INFOPTR SIPtr; + SHIP_INFO *SIPtr; SIPtr = &StarShipPtr->RaceDescPtr->ship_info; y_stat = (SIPtr->ship_flags & GOOD_GUY) ? @@ -306,12 +306,11 @@ InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect) // Pre: -crew_delta <= StarShipPtr->crew_level // crew_delta <= StarShipPtr->max_crew - StarShipPtr->crew_level void -DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, SIZE - energy_delta) +DeltaStatistics (STARSHIP *StarShipPtr, SIZE crew_delta, SIZE energy_delta) { COORD x, y; RECT r; - SHIP_INFOPTR ShipInfoPtr; + SHIP_INFO *ShipInfoPtr; if (crew_delta == 0 && energy_delta == 0) return; diff --git a/sc2/src/sc2code/shipyard.c b/sc2/src/sc2code/shipyard.c index 75acf5e9e..515b1ada8 100644 --- a/sc2/src/sc2code/shipyard.c +++ b/sc2/src/sc2code/shipyard.c @@ -125,7 +125,7 @@ SpinStarShip (HSTARSHIP hStarShip) { COUNT Index; HSTARSHIP hNextShip, hShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; extern QUEUE master_q; StarShipPtr = LockStarShip (&GLOBAL (built_ship_q), hStarShip); @@ -133,7 +133,7 @@ SpinStarShip (HSTARSHIP hStarShip) for (Index = 0, hShip = GetHeadLink (&master_q); hShip; hShip = hNextShip, ++Index) { - STARSHIPPTR SSPtr; + STARSHIP *SSPtr; SSPtr = LockStarShip (&master_q, hShip); if (StarShipPtr->RaceResIndex == SSPtr->RaceResIndex) @@ -160,9 +160,9 @@ GetAvailableRaceCount (void) for (hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip; hStarShip = hNextShip) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); if (StarShipPtr->ShipInfo.ship_flags & GOOD_GUY) ++Index; @@ -182,9 +182,9 @@ GetAvailableRaceFromIndex (BYTE Index) for (hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip; hStarShip = hNextShip) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip (&GLOBAL (avail_race_q), + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (&GLOBAL (avail_race_q), hStarShip); if ((StarShipPtr->ShipInfo.ship_flags & GOOD_GUY) && Index-- == 0) { @@ -231,7 +231,7 @@ DrawRaceStrings (BYTE NewRaceItem) { TEXT t; HSTARSHIP hStarShip; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; UNICODE buf[30]; COUNT ShipCost[] = { @@ -275,17 +275,17 @@ DrawRaceStrings (BYTE NewRaceItem) #define SHIP_WIN_FRAMES ((SHIP_WIN_WIDTH >> 1) + 1) static void -ShowShipCrew (SHIP_FRAGMENTPTR StarShipPtr, PRECT pRect) +ShowShipCrew (SHIP_FRAGMENT *StarShipPtr, RECT *pRect) { RECT r; TEXT t; UNICODE buf[80]; HSTARSHIP hTemplate; - SHIP_FRAGMENTPTR TemplatePtr; + SHIP_FRAGMENT *TemplatePtr; hTemplate = GetStarShipFromIndex (&GLOBAL (avail_race_q), GET_RACE_ID (StarShipPtr)); - TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hTemplate); if (StarShipPtr->ShipInfo.crew_level >= TemplatePtr->RaceDescPtr->ship_info.crew_level) @@ -319,14 +319,14 @@ ShowShipCrew (SHIP_FRAGMENTPTR StarShipPtr, PRECT pRect) } static void -ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr) +ShowCombatShip (COUNT which_window, SHIP_FRAGMENT *YankedStarShipPtr) { COUNT i, num_ships; HSTARSHIP hStarShip, hNextShip; - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; struct { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; POINT finished_s; STAMP ship_s, lfdoor_s, rtdoor_s; } ship_win_info[MAX_COMBAT_SHIPS], *pship_win_info; @@ -373,7 +373,7 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr) hStarShip = GetHeadLink (&GLOBAL (built_ship_q)); while (hStarShip) { - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); if (GET_GROUP_LOC (StarShipPtr) > which_window) { @@ -388,7 +388,7 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr) InsertQueue (&GLOBAL (built_ship_q), hTailShip, hStarShip); hStarShip = hTailShip; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); SET_GROUP_LOC (StarShipPtr, which_window); UnlockStarShip (&GLOBAL (built_ship_q), hStarShip); @@ -396,7 +396,7 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr) for (i = 0; i < num_ships; ++i) { - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -501,7 +501,7 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr) } UnbatchGraphics (); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContext (OldContext); UnlockMutex (GraphicsLock); } @@ -565,12 +565,12 @@ CrewTransaction (SIZE crew_delta) * ships per row number must divide 0xf0 without remainder */ static BOOLEAN -DoModifyShips (PMENU_STATE pMS) +DoModifyShips (MENU_STATE *pMS) { #define MODIFY_CREW_FLAG (1 << 8) RECT r; HSTARSHIP hStarShip, hNextShip; - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; BOOLEAN select, cancel; #ifdef WANT_SHIP_SPINS BOOLEAN special; @@ -656,7 +656,7 @@ DoModifyShips (PMENU_STATE pMS) for (hStarShip = GetHeadLink (&GLOBAL (built_ship_q)); hStarShip; hStarShip = hNextShip) { - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); if (GET_GROUP_LOC (StarShipPtr) == pMS->CurState) @@ -690,7 +690,7 @@ DoModifyShips (PMENU_STATE pMS) && (hSpinShip = GetAvailableRaceFromIndex ( LOBYTE (pMS->delta_item))))) { - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); SpinStarShip (hSpinShip); if (hStarShip) goto ChangeFlashRect; @@ -711,7 +711,7 @@ DoModifyShips (PMENU_STATE pMS) { COUNT Index; -// SetFlashRect (NULL_PTR, (FRAME)0); +// SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); if (!(pMS->delta_item & MODIFY_CREW_FLAG)) { @@ -739,7 +739,7 @@ DoModifyShips (PMENU_STATE pMS) &GLOBAL (built_ship_q), 1)) { ShowCombatShip ((COUNT)pMS->CurState, - (SHIP_FRAGMENTPTR) 0); + (SHIP_FRAGMENT*)0); //Reset flash rectangle LockMutex (GraphicsLock); SetFlashRect (SFR_MENU_3DO, (FRAME)0); @@ -798,11 +798,11 @@ DoModifyShips (PMENU_STATE pMS) if ((pMS->delta_item & MODIFY_CREW_FLAG) && hStarShip != 0) { - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); if (StarShipPtr->ShipInfo.crew_level == 0) { - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); ShowCombatShip ((COUNT)pMS->CurState, StarShipPtr); @@ -860,7 +860,7 @@ DoModifyShips (PMENU_STATE pMS) SIZE crew_delta, crew_bought; if (hStarShip) - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (built_ship_q), hStarShip); else StarShipPtr = NULL; // Keeping compiler quiet. @@ -893,12 +893,12 @@ DoModifyShips (PMENU_STATE pMS) else { HSTARSHIP hTemplate; - SHIP_FRAGMENTPTR TemplatePtr; + SHIP_FRAGMENT *TemplatePtr; hTemplate = GetStarShipFromIndex ( &GLOBAL (avail_race_q), GET_RACE_ID (StarShipPtr)); - TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( + TemplatePtr = (SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hTemplate); if (GLOBAL_SIS (ResUnits) >= (DWORD)GLOBAL (CrewCost) @@ -1044,7 +1044,7 @@ ChangeFlashRect: } static void -DrawBluePrint (PMENU_STATE pMS) +DrawBluePrint (MENU_STATE *pMS) { COUNT num_frames; STAMP s; @@ -1167,7 +1167,7 @@ DrawBluePrint (PMENU_STATE pMS) } static void -BeginHangarAnim (PMENU_STATE pMS) +BeginHangarAnim (MENU_STATE *pMS) { #ifdef WANT_HANGAR_ANIMATION CONTEXT OldContext; @@ -1188,7 +1188,7 @@ BeginHangarAnim (PMENU_STATE pMS) } static void -EndHangarAnim (PMENU_STATE pMS) +EndHangarAnim (MENU_STATE *pMS) { if (pMS->flash_task) { @@ -1198,7 +1198,7 @@ EndHangarAnim (PMENU_STATE pMS) } BOOLEAN -DoShipyard (PMENU_STATE pMS) +DoShipyard (MENU_STATE *pMS) { BOOLEAN select, cancel; if (GLOBAL (CurrentActivity) & CHECK_ABORT) @@ -1269,7 +1269,7 @@ DoShipyard (PMENU_STATE pMS) BeginHangarAnim (pMS); UnlockMutex (GraphicsLock); - ShowCombatShip ((COUNT)~0, (SHIP_FRAGMENTPTR)0); + ShowCombatShip ((COUNT)~0, (SHIP_FRAGMENT*)0); LockMutex (GraphicsLock); SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); diff --git a/sc2/src/sc2code/sis.c b/sc2/src/sc2code/sis.c index 887eb7b30..a8195780a 100644 --- a/sc2/src/sc2code/sis.c +++ b/sc2/src/sc2code/sis.c @@ -141,7 +141,7 @@ SetContextClipRect (&r); font_DrawText (&t); UnbatchGraphics (); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContext (OldContext); } @@ -228,7 +228,7 @@ DrawSISMessageEx (const UNICODE *pStr, SIZE CurPos, SIZE ExPos, COUNT flags) if (flags & DSME_CLEARFR) { - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); } if (CurPos < 0 && ExPos < 0) @@ -243,7 +243,7 @@ DrawSISMessageEx (const UNICODE *pStr, SIZE CurPos, SIZE ExPos, COUNT flags) int i; RECT text_r; BYTE char_deltas[MAX_DESC_CHARS]; - PBYTE pchar_deltas; + BYTE *pchar_deltas; t.baseline.x = 3; t.align = ALIGN_LEFT; @@ -254,7 +254,7 @@ DrawSISMessageEx (const UNICODE *pStr, SIZE CurPos, SIZE ExPos, COUNT flags) // will not fit when displayed later // disallow the change UnbatchGraphics (); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContext (OldContext); return (FALSE); } @@ -327,7 +327,7 @@ DrawSISMessageEx (const UNICODE *pStr, SIZE CurPos, SIZE ExPos, COUNT flags) UnbatchGraphics (); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContext (OldContext); return (TRUE); @@ -406,7 +406,7 @@ DrawStatusMessage (const UNICODE *pStr) font_DrawText (&t); UnbatchGraphics (); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); SetContext (OldContext); } @@ -797,7 +797,7 @@ DrawStorageBays (BOOLEAN Refresh) } void -GetGaugeRect (PRECT pRect, BOOLEAN IsCrewRect) +GetGaugeRect (RECT *pRect, BOOLEAN IsCrewRect) { pRect->extent.width = 24; pRect->corner.x = (STATUS_WIDTH >> 1) - (pRect->extent.width >> 1); @@ -933,7 +933,7 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta) { HSTARSHIP hStarShip, hNextShip; - PPOINT pship_pos; + POINT *pship_pos; POINT ship_pos[MAX_COMBAT_SHIPS] = { SUPPORT_SHIP_PTS @@ -944,12 +944,10 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta) pship_pos = ship_pos; hStarShip; hStarShip = hNextShip, ++pship_pos) { - SHIP_FRAGMENTPTR StarShipPtr; + SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (built_ship_q), - hStarShip - ); + StarShipPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (built_ship_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); s.origin.x = pship_pos->x; @@ -983,7 +981,7 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta) && GLOBAL_SIS (CrewEnlisted) <= (COUNT)-crew_delta) GLOBAL_SIS (CrewEnlisted) = 0; else if ((GLOBAL_SIS (CrewEnlisted) += crew_delta) > - (CrewCapacity = GetCPodCapacity (NULL_PTR))) + (CrewCapacity = GetCPodCapacity (NULL))) GLOBAL_SIS (CrewEnlisted) = CrewCapacity; } @@ -1015,7 +1013,7 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta) && GLOBAL_SIS (FuelOnBoard) <= (DWORD)-fuel_delta) GLOBAL_SIS (FuelOnBoard) = 0; else if ((GLOBAL_SIS (FuelOnBoard) += fuel_delta) > - (FuelCapacity = GetFTankCapacity (NULL_PTR))) + (FuelCapacity = GetFTankCapacity (NULL))) GLOBAL_SIS (FuelOnBoard) = FuelCapacity; } @@ -1075,7 +1073,7 @@ DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta) || pMenuState->InputFunc == DoShipyard))) DrawStatusMessage ((UNICODE *)~0); else - DrawStatusMessage (NULL_PTR); + DrawStatusMessage (NULL); } } UnbatchGraphics (); @@ -1090,7 +1088,7 @@ GetCrewCount (void) } COUNT -GetCPodCapacity (PPOINT ppt) +GetCPodCapacity (POINT *ppt) { COORD x; COUNT slot, capacity; @@ -1146,7 +1144,7 @@ GetCPodCapacity (PPOINT ppt) } COUNT -GetSBayCapacity (PPOINT ppt) +GetSBayCapacity (POINT *ppt) { COORD x; COUNT slot, capacity; @@ -1198,7 +1196,7 @@ GetSBayCapacity (PPOINT ppt) } DWORD -GetFTankCapacity (PPOINT ppt) +GetFTankCapacity (POINT *ppt) { COORD x; COUNT slot; @@ -1453,7 +1451,7 @@ flash_rect_func (void *data) // flash changed_can't be modified while GraphicSem is held if (! flash_changed) DrawStamp (pStamp); - SetContextClipRect (NULL_PTR); // this will flush whatever + SetContextClipRect (NULL); // this will flush whatever SetContext (OldContext); UnlockMutex (GraphicsLock); } @@ -1480,7 +1478,7 @@ flash_rect_func (void *data) } void -SetFlashRect (PRECT pRect, FRAME f) +SetFlashRect (RECT *pRect, FRAME f) { RECT clip_r, temp_r, flash_rect1, old_r; CONTEXT OldContext; @@ -1598,13 +1596,13 @@ SaveFlagshipState (void) for (hElement = GetHeadElement (); hElement != 0; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = GetSuccElement (ElementPtr); if (ElementPtr->state_flags & PLAYER_SHIP) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); GLOBAL (ShipStamp.frame) = (FRAME)MAKE_DWORD ( diff --git a/sc2/src/sc2code/sis.h b/sc2/src/sc2code/sis.h index 4865f359a..ef86e1b96 100644 --- a/sc2/src/sc2code/sis.h +++ b/sc2/src/sc2code/sis.h @@ -222,7 +222,6 @@ typedef struct UNICODE CommanderName[SIS_NAME_SIZE]; UNICODE PlanetName[SIS_NAME_SIZE]; } SIS_STATE; -typedef SIS_STATE *PSIS_STATE; #define MAX_EXCLUSIVE_DEVICES 16 @@ -248,14 +247,14 @@ extern void UninitSIS (void); extern void SeedUniverse (void); extern BOOLEAN LoadHyperspace (void); extern BOOLEAN FreeHyperspace (void); -extern void MoveSIS (PSIZE pdx, PSIZE pdy); +extern void MoveSIS (SIZE *pdx, SIZE *pdy); extern void RepairSISBorder (void); extern void InitSISContexts (void); extern void DrawSISFrame (void); extern void ClearSISRect (BYTE ClearFlags); -extern void SetFlashRect (PRECT pRect, FRAME f); -#define SFR_MENU_3DO ((PRECT)~0L) -#define SFR_MENU_ANY ((PRECT)~1L) +extern void SetFlashRect (RECT *pRect, FRAME f); +#define SFR_MENU_3DO ((RECT*)~0L) +#define SFR_MENU_ANY ((RECT*)~1L) extern void DrawHyperCoords (POINT puniverse); extern void DrawSISTitle (UNICODE *pStr); extern BOOLEAN DrawSISMessageEx (const UNICODE *pStr, SIZE CurPos, @@ -271,20 +270,20 @@ extern void DateToString (unsigned char *buf, size_t bufLen, extern void DrawStatusMessage (const UNICODE *pStr); extern void DrawLanders (void); extern void DrawStorageBays (BOOLEAN Refresh); -extern void GetGaugeRect (PRECT pRect, BOOLEAN IsCrewRect); +extern void GetGaugeRect (RECT *pRect, BOOLEAN IsCrewRect); extern void DrawFlagshipStats (void); extern void SaveFlagshipState (void); extern void DeltaSISGauges (SIZE crew_delta, SIZE fuel_delta, int resunit_delta); extern COUNT GetCrewCount (void); -extern COUNT GetCPodCapacity (PPOINT ppt); -extern COUNT GetLBayCapacity (PPOINT ppt); -extern COUNT GetSBayCapacity (PPOINT ppt); -extern DWORD GetFTankCapacity (PPOINT ppt); +extern COUNT GetCPodCapacity (POINT *ppt); +extern COUNT GetLBayCapacity (POINT *ppt); +extern COUNT GetSBayCapacity (POINT *ppt); +extern DWORD GetFTankCapacity (POINT *ppt); extern COUNT CountSISPieces (BYTE piece_type); -extern BOOLEAN DoMenuChooser (PMENU_STATE pMS, BYTE BaseState); +extern BOOLEAN DoMenuChooser (MENU_STATE *pMS, BYTE BaseState); extern void DrawMenuStateStrings (BYTE beg_index, SWORD NewState); extern void DoMenuOptions (void); extern void DrawFlagshipName (BOOLEAN InStatusArea); diff --git a/sc2/src/sc2code/sounds.c b/sc2/src/sc2code/sounds.c index 494f12d48..be14c84dd 100644 --- a/sc2/src/sc2code/sounds.c +++ b/sc2/src/sc2code/sounds.c @@ -25,10 +25,10 @@ SOUND GameSounds; #define MAX_SOUNDS 8 static BYTE num_sounds = 0; static SOUND sound_buf[MAX_SOUNDS]; -static ELEMENTPTR sound_posobj[MAX_SOUNDS]; +static ELEMENT *sound_posobj[MAX_SOUNDS]; void -PlaySound (SOUND S, SoundPosition Pos, ELEMENTPTR PositionalObject, +PlaySound (SOUND S, SoundPosition Pos, ELEMENT *PositionalObject, BYTE Priority) { BYTE chan, c; @@ -62,7 +62,7 @@ PlaySound (SOUND S, SoundPosition Pos, ELEMENTPTR PositionalObject, { if (lru_channel[c] == chan) { - memmove ((PBYTE)&lru_channel[c], (PBYTE)&lru_channel[c + 1], + memmove (&lru_channel[c], &lru_channel[c + 1], (NUM_FX_CHANNELS - 1) - c); break; } @@ -81,7 +81,7 @@ PlayMenuSound (MENU_SOUND_EFFECT S) } void -ProcessSound (SOUND Sound, ELEMENTPTR PositionalObject) +ProcessSound (SOUND Sound, ELEMENT *PositionalObject) { if (Sound == (SOUND)~0) { @@ -97,7 +97,7 @@ ProcessSound (SOUND Sound, ELEMENTPTR PositionalObject) } SoundPosition -CalcSoundPosition (ELEMENTPTR ElementPtr) +CalcSoundPosition (ELEMENT *ElementPtr) { SoundPosition pos; @@ -144,7 +144,7 @@ UpdateSoundPositions (void) for (i = FIRST_SFX_CHANNEL; i <= LAST_SFX_CHANNEL; ++i) { - ELEMENTPTR posobj; + ELEMENT *posobj; if (!ChannelPlaying(i)) continue; @@ -165,7 +165,7 @@ FlushSounds (void) if (num_sounds > 0) { SOUND *pSound; - ELEMENTPTR *pSoundPosObj; + ELEMENT **pSoundPosObj; pSound = sound_buf; pSoundPosObj = sound_posobj; @@ -179,7 +179,7 @@ FlushSounds (void) } void -RemoveSoundsForObject (ELEMENTPTR PosObj) +RemoveSoundsForObject (ELEMENT *PosObj) { int i; diff --git a/sc2/src/sc2code/sounds.h b/sc2/src/sc2code/sounds.h index c8892c46f..74750b203 100644 --- a/sc2/src/sc2code/sounds.h +++ b/sc2/src/sc2code/sounds.h @@ -65,14 +65,14 @@ extern void GetMenuSounds (MENU_SOUND_FLAGS *sound_0, MENU_SOUND_FLAGS *sound_1); extern void PlaySound (SOUND S, SoundPosition Pos, - ELEMENTPTR PositionalObject, BYTE Priority); + ELEMENT *PositionalObject, BYTE Priority); extern void PlayMenuSound (MENU_SOUND_EFFECT S); -extern void ProcessSound (SOUND Sound, ELEMENTPTR PositionalObject); -extern SoundPosition CalcSoundPosition (ELEMENTPTR ElementPtr); +extern void ProcessSound (SOUND Sound, ELEMENT *PositionalObject); +extern SoundPosition CalcSoundPosition (ELEMENT *ElementPtr); extern SoundPosition NotPositional (void); extern void UpdateSoundPositions (void); extern void FlushSounds (void); -extern void RemoveSoundsForObject (ELEMENTPTR PosObj); +extern void RemoveSoundsForObject (ELEMENT *PosObj); #endif /* _SOUNDS_H */ diff --git a/sc2/src/sc2code/starbase.c b/sc2/src/sc2code/starbase.c index 3431d805d..2fcfcd061 100644 --- a/sc2/src/sc2code/starbase.c +++ b/sc2/src/sc2code/starbase.c @@ -33,7 +33,7 @@ #include "libs/inplib.h" -PMENU_STATE pMenuState; +MENU_STATE *pMenuState; static void DrawBaseStateStrings (STARBASE_STATE OldState, STARBASE_STATE NewState) @@ -77,7 +77,7 @@ DrawBaseStateStrings (STARBASE_STATE OldState, STARBASE_STATE NewState) } void -DrawShipPiece (PMENU_STATE pMS, COUNT which_piece, COUNT which_slot, +DrawShipPiece (MENU_STATE *pMS, COUNT which_piece, COUNT which_slot, BOOLEAN DrawBluePrint) { COLOR OldColor = 0; // Initialisation is to keep the compiler silent. @@ -287,7 +287,7 @@ rotate_starbase(void *data) } BOOLEAN -DoStarBase (PMENU_STATE pMS) +DoStarBase (MENU_STATE *pMS) { if (GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)) { @@ -304,7 +304,7 @@ DoStarBase (PMENU_STATE pMS) pMS->InputFunc = DoStarBase; LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); if (pMS->hMusic) { @@ -403,7 +403,7 @@ ExitStarBase: } SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); - DoInput ((PVOID)pMS, TRUE); + DoInput (pMS, TRUE); pMS->Initialized = FALSE; pMS->CurState = OldState; @@ -472,7 +472,7 @@ VisitStarBase (void) else if (!GET_GAME_STATE (STARBASE_AVAILABLE)) { HSTARSHIP hStarShip; - SHIP_FRAGMENTPTR FragPtr; + SHIP_FRAGMENT *FragPtr; pMenuState = 0; @@ -481,17 +481,12 @@ VisitStarBase (void) || (GLOBAL (CurrentActivity) & CHECK_ABORT)) goto ExitStarBase; - hStarShip = CloneShipFragment ( - ILWRATH_SHIP, - &GLOBAL (npc_built_ship_q), 7 - ); - FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + hStarShip = CloneShipFragment (ILWRATH_SHIP, + &GLOBAL (npc_built_ship_q), 7); + FragPtr = (SHIP_FRAGMENT*) LockStarShip ( + &GLOBAL (npc_built_ship_q), hStarShip); SET_RACE_ID (FragPtr, (BYTE)~0); - UnlockStarShip ( - &GLOBAL (npc_built_ship_q), hStarShip - ); + UnlockStarShip (&GLOBAL (npc_built_ship_q), hStarShip); InitCommunication (ILWRATH_CONVERSATION); if (GLOBAL_SIS (CrewEnlisted) == (COUNT)~0 @@ -513,7 +508,7 @@ TimePassage: pMenuState = &MenuState; - memset ((PMENU_STATE)&MenuState, 0, sizeof (MenuState)); + memset (&MenuState, 0, sizeof (MenuState)); MenuState.InputFunc = DoStarBase; if (GET_GAME_STATE (MOONBASE_ON_SHIP) @@ -524,7 +519,7 @@ TimePassage: } OldContext = SetContext (ScreenContext); - DoInput ((PVOID)pMenuState, TRUE); + DoInput (pMenuState, TRUE); SetContext (OldContext); pMenuState = 0; @@ -585,7 +580,7 @@ WrapText (const UNICODE *pStr, COUNT len, TEXT *tarray, SIZE field_width) while (*++pStr != ' ' && (COUNT)(pStr - tarray->pStr) < len) ; tarray->CharCount = pStr - tarray->pStr; - TextRect (tarray, &r, NULL_PTR); + TextRect (tarray, &r, NULL); } while (tarray->CharCount < len && r.extent.width < field_width); if (r.extent.width >= field_width) @@ -595,7 +590,7 @@ WrapText (const UNICODE *pStr, COUNT len, TEXT *tarray, SIZE field_width) do { ++tarray->CharCount; - TextRect (tarray, &r, NULL_PTR); + TextRect (tarray, &r, NULL); } while (r.extent.width < field_width); --tarray->CharCount; } diff --git a/sc2/src/sc2code/starbase.h b/sc2/src/sc2code/starbase.h index d62bd34ff..d0aa00b01 100644 --- a/sc2/src/sc2code/starbase.h +++ b/sc2/src/sc2code/starbase.h @@ -33,10 +33,10 @@ typedef BYTE STARBASE_STATE; extern void InstallBombAtEarth (void); extern void VisitStarBase (void); -extern BOOLEAN DoStarBase (PMENU_STATE pMS); -extern BOOLEAN DoOutfit (PMENU_STATE pMS); -extern BOOLEAN DoShipyard (PMENU_STATE pMS); -extern void DrawShipPiece (PMENU_STATE pMS, COUNT which_piece, COUNT +extern BOOLEAN DoStarBase (MENU_STATE *pMS); +extern BOOLEAN DoOutfit (MENU_STATE *pMS); +extern BOOLEAN DoShipyard (MENU_STATE *pMS); +extern void DrawShipPiece (MENU_STATE *pMS, COUNT which_piece, COUNT which_slot, BOOLEAN DrawBluePrint); extern COUNT WrapText (const UNICODE *pStr, COUNT len, TEXT *tarray, SIZE diff --git a/sc2/src/sc2code/starcon.c b/sc2/src/sc2code/starcon.c index bd7caed06..e208243e4 100644 --- a/sc2/src/sc2code/starcon.c +++ b/sc2/src/sc2code/starcon.c @@ -221,7 +221,7 @@ while (--ac > 0) && GLOBAL_SIS (CrewEnlisted) != (COUNT)~0) { if (!(GLOBAL (CurrentActivity) & START_ENCOUNTER) - && (CurStarDescPtr = FindStar (NULL_PTR, + && (CurStarDescPtr = FindStar (NULL, &GLOBAL (autopilot), 0, 0))) { GLOBAL (autopilot.x) = ~0; @@ -249,7 +249,7 @@ while (--ac > 0) } LockMutex (GraphicsLock); - SetFlashRect (NULL_PTR, (FRAME)0); + SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); LastActivity = GLOBAL (CurrentActivity); diff --git a/sc2/src/sc2code/starmap.c b/sc2/src/sc2code/starmap.c index 915250bde..f372d2295 100644 --- a/sc2/src/sc2code/starmap.c +++ b/sc2/src/sc2code/starmap.c @@ -23,16 +23,16 @@ #include "libs/gfxlib.h" -STAR_DESCPTR star_array; -STAR_DESCPTR CurStarDescPtr = 0; +STAR_DESC *star_array; +STAR_DESC *CurStarDescPtr = 0; -STAR_DESCPTR -FindStar (STAR_DESCPTR LastSDPtr, PPOINT puniverse, SIZE xbounds, SIZE - ybounds) +STAR_DESC* +FindStar (STAR_DESC *LastSDPtr, POINT *puniverse, SIZE xbounds, + SIZE ybounds) { COORD min_y, max_y; SIZE lo, hi; - STAR_DESCPTR BaseSDPtr; + STAR_DESC *BaseSDPtr; if (GET_GAME_STATE (ARILOU_SPACE_SIDE) <= 1) { @@ -46,12 +46,12 @@ FindStar (STAR_DESCPTR LastSDPtr, PPOINT puniverse, SIZE xbounds, SIZE hi = (NUM_HYPER_VORTICES + 1) - 1; } - if (LastSDPtr == NULL_PTR) + if (LastSDPtr == NULL) lo = 0; else if ((lo = LastSDPtr - BaseSDPtr + 1) > hi) return (0); else - hi = lo; + hi = lo; if (ybounds <= 0) min_y = max_y = puniverse->y; @@ -100,7 +100,7 @@ FindStar (STAR_DESCPTR LastSDPtr, PPOINT puniverse, SIZE xbounds, SIZE } void -GetClusterName (STAR_DESCPTR pSD, UNICODE buf[]) +GetClusterName (const STAR_DESC *pSD, UNICODE buf[]) { UNICODE *pBuf, *pStr; diff --git a/sc2/src/sc2code/state.c b/sc2/src/sc2code/state.c index 5c630e16c..5e5799da2 100644 --- a/sc2/src/sc2code/state.c +++ b/sc2/src/sc2code/state.c @@ -132,7 +132,7 @@ LengthStateFile (GAME_STATE_FILE *fp) } int -ReadStateFile (PVOID lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp) +ReadStateFile (void *lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp) { DWORD bytes = size * count; @@ -155,7 +155,7 @@ ReadStateFile (PVOID lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp) } int -WriteStateFile (PVOID lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp) +WriteStateFile (const void *lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp) { DWORD bytes = size * count; @@ -211,7 +211,7 @@ InitPlanetInfo (void) fp = OpenStateFile (STARINFO_FILE, "wb"); if (fp) { - STAR_DESCPTR pSD; + STAR_DESC *pSD; // Set record offsets for all stars to 0 (not present) pSD = &star_array[0]; @@ -238,7 +238,7 @@ UninitPlanetInfo (void) void GetPlanetInfo (void) { - PVOID fp; + void *fp; pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[BIOLOGICAL_SCAN] = 0; pSolarSysState->SysInfo.PlanetInfo.ScanRetrieveMask[MINERAL_SCAN] = 0; @@ -286,7 +286,7 @@ GetPlanetInfo (void) void PutPlanetInfo (void) { - PVOID fp; + void *fp; fp = OpenStateFile (STARINFO_FILE, "r+b"); if (fp) diff --git a/sc2/src/sc2code/state.h b/sc2/src/sc2code/state.h index f81ceb3ef..034890a4f 100644 --- a/sc2/src/sc2code/state.h +++ b/sc2/src/sc2code/state.h @@ -67,12 +67,12 @@ GAME_STATE_FILE* OpenStateFile (int stateFile, const char *mode); void CloseStateFile (GAME_STATE_FILE *fp); void DeleteStateFile (int stateFile); DWORD LengthStateFile (GAME_STATE_FILE *fp); -int ReadStateFile (PVOID lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp); -int WriteStateFile (PVOID lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp); +int ReadStateFile (void *lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp); +int WriteStateFile (const void *lpBuf, COUNT size, COUNT count, GAME_STATE_FILE *fp); int SeekStateFile (GAME_STATE_FILE *fp, long offset, int whence); static inline COUNT -sread_8 (PVOID fp, PBYTE v) +sread_8 (void *fp, BYTE *v) { BYTE t; if (!v) /* read value ignored */ @@ -81,7 +81,7 @@ sread_8 (PVOID fp, PBYTE v) } static inline COUNT -sread_16 (PVOID fp, PUWORD v) +sread_16 (void *fp, UWORD *v) { UWORD t; if (!v) /* read value ignored */ @@ -90,7 +90,7 @@ sread_16 (PVOID fp, PUWORD v) } static inline COUNT -sread_32 (PVOID fp, PDWORD v) +sread_32 (void *fp, DWORD *v) { DWORD t; if (!v) /* read value ignored */ @@ -99,7 +99,7 @@ sread_32 (PVOID fp, PDWORD v) } static inline COUNT -sread_a32 (PVOID fp, PDWORD ar, COUNT count) +sread_a32 (void *fp, DWORD *ar, COUNT count) { assert (ar != NULL); @@ -112,25 +112,25 @@ sread_a32 (PVOID fp, PDWORD ar, COUNT count) } static inline COUNT -swrite_8 (PVOID fp, BYTE v) +swrite_8 (void *fp, BYTE v) { return WriteStateFile (&v, 1, 1, fp); } static inline COUNT -swrite_16 (PVOID fp, UWORD v) +swrite_16 (void *fp, UWORD v) { return WriteStateFile (&v, 2, 1, fp); } static inline COUNT -swrite_32 (PVOID fp, DWORD v) +swrite_32 (void *fp, DWORD v) { return WriteStateFile (&v, 4, 1, fp); } static inline COUNT -swrite_a32 (PVOID fp, PDWORD ar, COUNT count) +swrite_a32 (void *fp, const DWORD *ar, COUNT count) { for ( ; count > 0; --count, ++ar) { diff --git a/sc2/src/sc2code/status.c b/sc2/src/sc2code/status.c index a9f66027d..c0ffb5855 100644 --- a/sc2/src/sc2code/status.c +++ b/sc2/src/sc2code/status.c @@ -27,7 +27,7 @@ #include static void -CaptainsWindow (CAPTAIN_STUFFPTR CSPtr, COORD y, ELEMENT_FLAGS +CaptainsWindow (CAPTAIN_STUFF *CSPtr, COORD y, ELEMENT_FLAGS delta_status_flags, ELEMENT_FLAGS cur_status_flags, COUNT Pass) { @@ -114,7 +114,7 @@ CaptainsWindow (CAPTAIN_STUFFPTR CSPtr, COORD y, ELEMENT_FLAGS } void -DrawBattleCrewAmount (STARSHIPPTR StarShipPtr) +DrawBattleCrewAmount (STARSHIP *StarShipPtr) { #define MAX_CREW_DIGITS 3 RECT r; @@ -147,13 +147,13 @@ DrawBattleCrewAmount (STARSHIPPTR StarShipPtr) } void -DrawCaptainsWindow (STARSHIPPTR StarShipPtr) +DrawCaptainsWindow (STARSHIP *StarShipPtr) { COORD y, y_offs; RECT r; STAMP s; FRAME Frame; - RACE_DESCPTR RDPtr; + RACE_DESC *RDPtr; RDPtr = StarShipPtr->RaceDescPtr; Frame = RDPtr->ship_data.captain_control.background; @@ -279,11 +279,11 @@ DrawCaptainsWindow (STARSHIPPTR StarShipPtr) } BOOLEAN -DeltaEnergy (ELEMENTPTR ElementPtr, SIZE energy_delta) +DeltaEnergy (ELEMENT *ElementPtr, SIZE energy_delta) { BOOLEAN retval; - STARSHIPPTR StarShipPtr; - SHIP_INFOPTR ShipInfoPtr; + STARSHIP *StarShipPtr; + SHIP_INFO *ShipInfoPtr; retval = TRUE; @@ -319,10 +319,10 @@ DeltaEnergy (ELEMENTPTR ElementPtr, SIZE energy_delta) } BOOLEAN -DeltaCrew (ELEMENTPTR ElementPtr, SIZE crew_delta) +DeltaCrew (ELEMENT *ElementPtr, SIZE crew_delta) { BOOLEAN retval; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (LOBYTE (GLOBAL (CurrentActivity)) == IN_LAST_BATTLE && (ElementPtr->state_flags & BAD_GUY)) @@ -332,9 +332,7 @@ DeltaCrew (ELEMENTPTR ElementPtr, SIZE crew_delta) GetElementStarShip (ElementPtr, &StarShipPtr); if (crew_delta > 0) { - SHIP_INFOPTR ShipInfoPtr; - - ShipInfoPtr = &StarShipPtr->RaceDescPtr->ship_info; + SHIP_INFO *ShipInfoPtr = &StarShipPtr->RaceDescPtr->ship_info; ElementPtr->crew_level += crew_delta; if (ElementPtr->crew_level > ShipInfoPtr->max_crew) @@ -361,16 +359,16 @@ DeltaCrew (ELEMENTPTR ElementPtr, SIZE crew_delta) } void -PreProcessStatus (PELEMENT ShipPtr) +PreProcessStatus (ELEMENT *ShipPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); if (StarShipPtr->captains_name_index || (StarShipPtr->RaceDescPtr->ship_info.ship_flags & GOOD_GUY)) { ELEMENT_FLAGS old_status_flags, cur_status_flags; - CAPTAIN_STUFFPTR CSPtr; + CAPTAIN_STUFF *CSPtr; cur_status_flags = StarShipPtr->cur_status_flags; old_status_flags = StarShipPtr->old_status_flags; @@ -389,9 +387,9 @@ PreProcessStatus (PELEMENT ShipPtr) } void -PostProcessStatus (PELEMENT ShipPtr) +PostProcessStatus (ELEMENT *ShipPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ShipPtr, &StarShipPtr); if (StarShipPtr->captains_name_index diff --git a/sc2/src/sc2code/tactrans.c b/sc2/src/sc2code/tactrans.c index 80608a655..4aec39f4a 100644 --- a/sc2/src/sc2code/tactrans.c +++ b/sc2/src/sc2code/tactrans.c @@ -35,14 +35,14 @@ BOOLEAN -OpponentAlive (STARSHIPPTR TestStarShipPtr) +OpponentAlive (STARSHIP *TestStarShipPtr) { HELEMENT hElement, hSuccElement; for (hElement = GetHeadElement (); hElement; hElement = hSuccElement) { - ELEMENTPTR ElementPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ElementPtr; + STARSHIP *StarShipPtr; LockElement (hElement, &ElementPtr); hSuccElement = GetSuccElement (ElementPtr); @@ -222,9 +222,9 @@ readyForBattleEnd (COUNT side) } void -new_ship (PELEMENT DeadShipPtr) +new_ship (ELEMENT *DeadShipPtr) { - STARSHIPPTR DeadStarShipPtr; + STARSHIP *DeadStarShipPtr; ProcessSound ((SOUND)~0, NULL); @@ -264,8 +264,8 @@ new_ship (PELEMENT DeadShipPtr) // set up for deletion below. for (hElement = GetHeadElement (); hElement; hElement = hSuccElement) { - ELEMENTPTR ElementPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ElementPtr; + STARSHIP *StarShipPtr; LockElement (hElement, &ElementPtr); hSuccElement = GetSuccElement (ElementPtr); @@ -403,7 +403,7 @@ BatchGraphics (); } void -explosion_preprocess (PELEMENT ShipPtr) +explosion_preprocess (ELEMENT *ShipPtr) { BYTE i; @@ -411,7 +411,7 @@ explosion_preprocess (PELEMENT ShipPtr) switch (i) { case 25: - ShipPtr->preprocess_func = NULL_PTR; + ShipPtr->preprocess_func = NULL; case 0: case 1: case 2: @@ -446,7 +446,7 @@ explosion_preprocess (PELEMENT ShipPtr) { COUNT angle, dist; DWORD rand_val; - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; extern FRAME explosion[]; PutElement (hElement); @@ -478,11 +478,12 @@ explosion_preprocess (PELEMENT ShipPtr) } void -ship_death (PELEMENT ShipPtr) +ship_death (ELEMENT *ShipPtr) { - STARSHIPPTR StarShipPtr, VictoriousStarShipPtr; + STARSHIP *StarShipPtr; + STARSHIP *VictoriousStarShipPtr; HELEMENT hElement, hNextElement; - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; StopMusic (); @@ -499,7 +500,7 @@ ship_death (PELEMENT ShipPtr) { LockElement (hElement, &ElementPtr); if ((ElementPtr->state_flags & PLAYER_SHIP) - && ElementPtr != (ELEMENTPTR)ShipPtr + && ElementPtr != ShipPtr /* and not running away */ && ElementPtr->mass_points <= MAX_SHIP_MASS) { @@ -519,7 +520,7 @@ ship_death (PELEMENT ShipPtr) GetElementStarShip (ShipPtr, &StarShipPtr); StarShipPtr->cur_status_flags &= ~PLAY_VICTORY_DITTY; - DeltaEnergy ((ELEMENTPTR)ShipPtr, + DeltaEnergy (ShipPtr, -(SIZE)StarShipPtr->RaceDescPtr->ship_info.energy_level); ShipPtr->life_span = NUM_EXPLOSION_FRAMES * 3; @@ -528,7 +529,7 @@ ship_death (PELEMENT ShipPtr) ShipPtr->postprocess_func = PostProcessStatus; ShipPtr->death_func = new_ship; ShipPtr->hTarget = 0; - ZeroVelocityComponents (&((ELEMENTPTR)ShipPtr)->velocity); + ZeroVelocityComponents (&ShipPtr->velocity); if (ShipPtr->crew_level) /* only happens for shofixti self-destruct */ { @@ -537,7 +538,7 @@ ship_death (PELEMENT ShipPtr) CalcSoundPosition (ShipPtr), ShipPtr, GAME_SOUND_PRIORITY + 1); - DeltaCrew ((ELEMENTPTR)ShipPtr, -(SIZE)ShipPtr->crew_level); + DeltaCrew (ShipPtr, -(SIZE)ShipPtr->crew_level); if (VictoriousStarShipPtr == 0) StarShipPtr->cur_status_flags |= PLAY_VICTORY_DITTY; } @@ -553,7 +554,7 @@ ship_death (PELEMENT ShipPtr) #define START_ION_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A) void -spawn_ion_trail (PELEMENT ElementPtr) +spawn_ion_trail (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & PLAYER_SHIP) @@ -566,8 +567,8 @@ spawn_ion_trail (PELEMENT ElementPtr) #define ION_LIFE 1 COUNT angle; RECT r; - ELEMENTPTR IonElementPtr; - STARSHIPPTR StarShipPtr; + ELEMENT *IonElementPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); angle = FACING_TO_ANGLE (StarShipPtr->ShipFacing) + HALF_CIRCLE; @@ -653,7 +654,7 @@ spawn_ion_trail (PELEMENT ElementPtr) // Used when a new ship warps in, or a ship escapes by warping out, but not // when a Pkunk ship is reborn. void -ship_transition (PELEMENT ElementPtr) +ship_transition (ELEMENT *ElementPtr) { if (ElementPtr->state_flags & PLAYER_SHIP) { @@ -661,7 +662,7 @@ ship_transition (PELEMENT ElementPtr) { ElementPtr->life_span = HYPERJUMP_LIFE; ElementPtr->preprocess_func = ship_transition; - ElementPtr->postprocess_func = NULL_PTR; + ElementPtr->postprocess_func = NULL; SetPrimType (&DisplayArray[ElementPtr->PrimIndex], NO_PRIM); ElementPtr->state_flags |= NONSOLID | FINITE_LIFE | CHANGING; } @@ -679,7 +680,7 @@ ship_transition (PELEMENT ElementPtr) InitIntersectStartPoint (ElementPtr); InitIntersectEndPoint (ElementPtr); InitIntersectFrame (ElementPtr); - ZeroVelocityComponents (&((ELEMENTPTR)ElementPtr)->velocity); + ZeroVelocityComponents (&ElementPtr->velocity); ElementPtr->state_flags &= ~(NONSOLID | FINITE_LIFE); ElementPtr->state_flags |= CHANGING; @@ -693,15 +694,15 @@ ship_transition (PELEMENT ElementPtr) { HELEMENT hShipImage; - ELEMENTPTR ShipImagePtr; - STARSHIPPTR StarShipPtr; + ELEMENT *ShipImagePtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); LockElement (StarShipPtr->hShip, &ShipImagePtr); if (!(ShipImagePtr->state_flags & NONSOLID)) { - ElementPtr->preprocess_func = NULL_PTR; + ElementPtr->preprocess_func = NULL; } else if ((hShipImage = AllocElement ())) { @@ -729,7 +730,7 @@ ship_transition (PELEMENT ElementPtr) COSINE (angle, TRANSITION_SPEED); ShipImagePtr->current.location.y += SINE (angle, TRANSITION_SPEED); - ElementPtr->preprocess_func = NULL_PTR; + ElementPtr->preprocess_func = NULL; } else if (ElementPtr->crew_level) { @@ -757,9 +758,9 @@ ship_transition (PELEMENT ElementPtr) } void -flee_preprocess (PELEMENT ElementPtr) +flee_preprocess (ELEMENT *ElementPtr) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; if (--ElementPtr->turn_wait == 0) { @@ -814,7 +815,7 @@ flee_preprocess (PELEMENT ElementPtr) ElementPtr->life_span = HYPERJUMP_LIFE + 1; ElementPtr->preprocess_func = ship_transition; - ElementPtr->postprocess_func = NULL_PTR; + ElementPtr->postprocess_func = NULL; SetPrimType (&DisplayArray[ElementPtr->PrimIndex], NO_PRIM); ElementPtr->state_flags |= NONSOLID | FINITE_LIFE | CHANGING; } diff --git a/sc2/src/sc2code/uqmdebug.c b/sc2/src/sc2code/uqmdebug.c index 35f5aab4b..89bb0d284 100644 --- a/sc2/src/sc2code/uqmdebug.c +++ b/sc2/src/sc2code/uqmdebug.c @@ -35,7 +35,7 @@ #include -static void dumpEventCallback (const EVENTPTR eventPtr, void *arg); +static void dumpEventCallback (const EVENT *eventPtr, void *arg); static void starRecurse (STAR_DESC *star, void *arg); static void planetRecurse (STAR_DESC *star, SOLARSYS_STATE *system, @@ -93,7 +93,7 @@ void forwardToNextEvent (BOOLEAN skipHEE) { HEVENT hEvent; - EVENTPTR EventPtr; + EVENT *EventPtr; COUNT year, month, day; // time of next event BOOLEAN done; @@ -183,14 +183,14 @@ eventName (BYTE func_index) } static void -dumpEventCallback (const EVENTPTR eventPtr, void *arg) +dumpEventCallback (const EVENT *eventPtr, void *arg) { FILE *out = (FILE *) arg; dumpEvent (out, eventPtr); } void -dumpEvent (FILE *out, EVENTPTR eventPtr) +dumpEvent (FILE *out, EVENT *eventPtr) { fprintf (out, "%4u/%02u/%02u: %s\n", eventPtr->year_index, @@ -335,7 +335,7 @@ static HELEMENT findFlagshipElement (void) { HELEMENT hElement, hNextElement; - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; // Find the ship element. for (hElement = GetTailElement (); hElement != 0; @@ -399,9 +399,9 @@ showSpheres (void) for (hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip != NULL; hStarShip = hNextShip) { - EXTENDED_SHIP_FRAGMENTPTR StarShipPtr; + EXTENDED_SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (EXTENDED_SHIP_FRAGMENTPTR) LockStarShip ( + StarShipPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -428,9 +428,9 @@ activateAllShips (void) for (hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); hStarShip != NULL; hStarShip = hNextShip) { - EXTENDED_SHIP_FRAGMENTPTR StarShipPtr; + EXTENDED_SHIP_FRAGMENT *StarShipPtr; - StarShipPtr = (EXTENDED_SHIP_FRAGMENTPTR) LockStarShip ( + StarShipPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip ( &GLOBAL (avail_race_q), hStarShip); hNextShip = _GetSuccLink (StarShipPtr); @@ -518,11 +518,11 @@ starRecurse (STAR_DESC *star, void *arg) UniverseRecurseArg *universeRecurseArg = (UniverseRecurseArg *) arg; SOLARSYS_STATE SolarSysState; - PSOLARSYS_STATE oldPSolarSysState = pSolarSysState; + SOLARSYS_STATE *oldPSolarSysState = pSolarSysState; DWORD oldSeed = TFB_SeedRandom (MAKE_DWORD (star->star_pt.x, star->star_pt.y)); - STAR_DESCPTR oldStarDescPtr = CurStarDescPtr; + STAR_DESC *oldStarDescPtr = CurStarDescPtr; CurStarDescPtr = star; memset (&SolarSysState, 0, sizeof (SolarSysState)); @@ -678,7 +678,7 @@ dumpSystem (FILE *out, const STAR_DESC *star, const SOLARSYS_STATE *system) UNICODE name[256]; UNICODE buf[40]; - GetClusterName ((STAR_DESCPTR) star, name); + GetClusterName (star, name); snprintf (buf, sizeof buf, "%s %s", bodyColorString (STAR_COLOR(star->Type)), starTypeString (STAR_TYPE(star->Type))); @@ -1080,7 +1080,7 @@ dumpPlanetType (FILE *out, int index, const PlanetFrame *planetType) ); for (i = 0; i < NUM_USEFUL_ELEMENTS; i++) { - const ElementEntry *entry; + const ELEMENT_ENTRY *entry; entry = &planetType->UsefulElements[i]; if (entry->Density == 0) continue; @@ -1239,13 +1239,13 @@ depositQualityString (BYTE quality) //////////////////////////////////////////////////////////////////////////// // Which should be GOOD_GUY or BAD_GUY -STARSHIPPTR +STARSHIP* findPlayerShip(ELEMENT_FLAGS which) { HELEMENT hElement, hNextElement; for (hElement = GetHeadElement (); hElement; hElement = hNextElement) { - ELEMENTPTR ElementPtr; + ELEMENT *ElementPtr; LockElement (hElement, &ElementPtr); hNextElement = GetSuccElement (ElementPtr); @@ -1253,7 +1253,7 @@ findPlayerShip(ELEMENT_FLAGS which) { if ((ElementPtr->state_flags & PLAYER_SHIP) && (ElementPtr->state_flags & (GOOD_GUY | BAD_GUY)) == which) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; GetElementStarShip (ElementPtr, &StarShipPtr); UnlockElement (hElement); return StarShipPtr; @@ -1268,7 +1268,7 @@ findPlayerShip(ELEMENT_FLAGS which) { void resetCrewBattle(void) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; COUNT delta; CONTEXT OldContext; @@ -1290,7 +1290,7 @@ resetCrewBattle(void) { void resetEnergyBattle(void) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; COUNT delta; CONTEXT OldContext; diff --git a/sc2/src/sc2code/uqmdebug.h b/sc2/src/sc2code/uqmdebug.h index 4c42017d4..3862ec27f 100644 --- a/sc2/src/sc2code/uqmdebug.h +++ b/sc2/src/sc2code/uqmdebug.h @@ -43,7 +43,7 @@ void forwardToNextEvent (BOOLEAN skipHEE); // Generate a list of all events in the event queue. void dumpEvents (FILE *out); // Describe one event. -void dumpEvent (FILE *out, EVENTPTR eventPtr); +void dumpEvent (FILE *out, EVENT *eventPtr); // Get the name of one event. const char *eventName (BYTE func_index); @@ -143,7 +143,7 @@ const char *depositQualityString (BYTE quality); // Find a player ship. Setting which to BAD_GUY is only meaningful in battle. -STARSHIPPTR findPlayerShip(ELEMENT_FLAGS which); +STARSHIP* findPlayerShip(ELEMENT_FLAGS which); // Resets the crew of the first player (the bottom one) to its maximum. void resetCrewBattle(void); diff --git a/sc2/src/sc2code/util.c b/sc2/src/sc2code/util.c index 949f22b77..9b97e6f1a 100644 --- a/sc2/src/sc2code/util.c +++ b/sc2/src/sc2code/util.c @@ -27,7 +27,7 @@ void -DrawStarConBox (PRECT pRect, SIZE BorderWidth, COLOR TopLeftColor, COLOR +DrawStarConBox (RECT *pRect, SIZE BorderWidth, COLOR TopLeftColor, COLOR BottomRightColor, BOOLEAN FillInterior, COLOR InteriorColor) { RECT locRect; @@ -170,7 +170,7 @@ PauseGame (void) OldContext = SetContext (ScreenContext); OldHot = SetFrameHot (Screen, MAKE_HOT_SPOT (0, 0)); GetContextClipRect (&OldRect); - SetContextClipRect (NULL_PTR); + SetContextClipRect (NULL); GetFrameRect (ActivityFrame, &r); r.corner.x = (SCREEN_WIDTH - r.extent.width) >> 1; diff --git a/sc2/src/sc2code/util.h b/sc2/src/sc2code/util.h index ea8b66e3b..5a92214f7 100644 --- a/sc2/src/sc2code/util.h +++ b/sc2/src/sc2code/util.h @@ -20,7 +20,7 @@ #include "libs/compiler.h" #include "libs/gfxlib.h" -extern void DrawStarConBox (PRECT pRect, SIZE BorderWidth, +extern void DrawStarConBox (RECT *pRect, SIZE BorderWidth, COLOR TopLeftColor, COLOR BottomRightColor, BOOLEAN FillInterior, COLOR InteriorColor); extern DWORD SeedRandomNumbers (void); diff --git a/sc2/src/sc2code/velocity.c b/sc2/src/sc2code/velocity.c index e47944a44..5e39f0283 100644 --- a/sc2/src/sc2code/velocity.c +++ b/sc2/src/sc2code/velocity.c @@ -25,8 +25,7 @@ #define VELOCITY_REMAINDER(v) ((v) & (VELOCITY_SCALE - 1)) void -GetCurrentVelocityComponents (VELOCITYPTR velocityptr, PSIZE pdx, PSIZE - pdy) +GetCurrentVelocityComponents (VELOCITY_DESC *velocityptr, SIZE *pdx, SIZE *pdy) { *pdx = WORLD_TO_VELOCITY (velocityptr->vector.width) + (velocityptr->fract.width - (SIZE)HIBYTE (velocityptr->incr.width)); @@ -35,7 +34,7 @@ GetCurrentVelocityComponents (VELOCITYPTR velocityptr, PSIZE pdx, PSIZE } void -GetNextVelocityComponents (VELOCITYPTR velocityptr, PSIZE pdx, PSIZE pdy, +GetNextVelocityComponents (VELOCITY_DESC *velocityptr, SIZE *pdx, SIZE *pdy, COUNT num_frames) { COUNT e; @@ -56,8 +55,7 @@ GetNextVelocityComponents (VELOCITYPTR velocityptr, PSIZE pdx, PSIZE pdy, } void -SetVelocityVector (VELOCITYPTR velocityptr, SIZE - magnitude, COUNT facing) +SetVelocityVector (VELOCITY_DESC *velocityptr, SIZE magnitude, COUNT facing) { COUNT angle; SIZE dx, dy; @@ -98,7 +96,7 @@ SetVelocityVector (VELOCITYPTR velocityptr, SIZE } void -SetVelocityComponents (VELOCITYPTR velocityptr, SIZE dx, SIZE dy) +SetVelocityComponents (VELOCITY_DESC *velocityptr, SIZE dx, SIZE dy) { COUNT angle; @@ -142,7 +140,7 @@ SetVelocityComponents (VELOCITYPTR velocityptr, SIZE dx, SIZE dy) } void -DeltaVelocityComponents (VELOCITYPTR velocityptr, SIZE dx, SIZE dy) +DeltaVelocityComponents (VELOCITY_DESC *velocityptr, SIZE dx, SIZE dy) { dx += WORLD_TO_VELOCITY (velocityptr->vector.width) diff --git a/sc2/src/sc2code/velocity.h b/sc2/src/sc2code/velocity.h index 469e6d3d2..29d19cf6e 100644 --- a/sc2/src/sc2code/velocity.h +++ b/sc2/src/sc2code/velocity.h @@ -30,21 +30,19 @@ typedef struct velocity_desc EXTENT error; EXTENT incr; } VELOCITY_DESC; -typedef VELOCITY_DESC *PVELOCITY; -typedef PVELOCITY VELOCITYPTR; #define ZeroVelocityComponents(pv) memset(pv,0,sizeof (*(pv))) #define GetVelocityTravelAngle(pv) (pv)->TravelAngle -extern void GetCurrentVelocityComponents (VELOCITYPTR velocityptr, PSIZE - pdx, PSIZE pdy); -extern void GetNextVelocityComponents (VELOCITYPTR velocityptr, PSIZE - pdx, PSIZE pdy, COUNT num_frames); -extern void SetVelocityVector (VELOCITYPTR velocityptr, SIZE magnitude, +extern void GetCurrentVelocityComponents (VELOCITY_DESC *velocityptr, + SIZE *pdx, SIZE *pdy); +extern void GetNextVelocityComponents (VELOCITY_DESC *velocityptr, + SIZE *pdx, SIZE *pdy, COUNT num_frames); +extern void SetVelocityVector (VELOCITY_DESC *velocityptr, SIZE magnitude, COUNT facing); -extern void SetVelocityComponents (VELOCITYPTR velocityptr, SIZE dx, SIZE - dy); -extern void DeltaVelocityComponents (VELOCITYPTR velocityptr, SIZE dx, +extern void SetVelocityComponents (VELOCITY_DESC *velocityptr, SIZE dx, + SIZE dy); +extern void DeltaVelocityComponents (VELOCITY_DESC *velocityptr, SIZE dx, SIZE dy); static inline DWORD diff --git a/sc2/src/sc2code/weapon.c b/sc2/src/sc2code/weapon.c index 4bf636fef..993e7119b 100644 --- a/sc2/src/sc2code/weapon.c +++ b/sc2/src/sc2code/weapon.c @@ -32,7 +32,7 @@ HELEMENT -initialize_laser (PLASER_BLOCK pLaserBlock) +initialize_laser (LASER_BLOCK *pLaserBlock) { HELEMENT hLaserElement; @@ -40,7 +40,7 @@ initialize_laser (PLASER_BLOCK pLaserBlock) if (hLaserElement) { #define LASER_LIFE 1 - ELEMENTPTR LaserElementPtr; + ELEMENT *LaserElementPtr; LockElement (hLaserElement, &LaserElementPtr); LaserElementPtr->hit_points = 1; @@ -48,9 +48,7 @@ initialize_laser (PLASER_BLOCK pLaserBlock) LaserElementPtr->state_flags = APPEARING | FINITE_LIFE | pLaserBlock->sender; LaserElementPtr->life_span = LASER_LIFE; - LaserElementPtr->collision_func = - (void (*) (struct element *ElementPtr0, PPOINT pPt0, - struct element *ElementPtr1, PPOINT pPt1)) weapon_collision; + LaserElementPtr->collision_func = (CollisionFunc*)weapon_collision; LaserElementPtr->blast_offset = 1; LaserElementPtr->current.location.x = pLaserBlock->cx @@ -76,7 +74,7 @@ initialize_laser (PLASER_BLOCK pLaserBlock) } HELEMENT -initialize_missile (PMISSILE_BLOCK pMissileBlock) +initialize_missile (MISSILE_BLOCK *pMissileBlock) { HELEMENT hMissileElement; @@ -85,7 +83,7 @@ initialize_missile (PMISSILE_BLOCK pMissileBlock) { SIZE delta_x, delta_y; COUNT angle; - ELEMENTPTR MissileElementPtr; + ELEMENT *MissileElementPtr; LockElement (hMissileElement, &MissileElementPtr); MissileElementPtr->hit_points = (BYTE)pMissileBlock->hit_points; @@ -99,9 +97,7 @@ initialize_missile (PMISSILE_BLOCK pMissileBlock) SetAbsFrameIndex (pMissileBlock->farray[0], pMissileBlock->index); MissileElementPtr->preprocess_func = pMissileBlock->preprocess_func; - MissileElementPtr->collision_func = - (void (*) (struct element *ElementPtr0, PPOINT pPt0, - struct element *ElementPtr1, PPOINT pPt1)) weapon_collision; + MissileElementPtr->collision_func = (CollisionFunc*)weapon_collision; MissileElementPtr->blast_offset = (BYTE)pMissileBlock->blast_offs; angle = FACING_TO_ANGLE (pMissileBlock->face); @@ -124,8 +120,8 @@ initialize_missile (PMISSILE_BLOCK pMissileBlock) } HELEMENT -weapon_collision (PELEMENT WeaponElementPtr, PPOINT pWPt, - PELEMENT HitElementPtr, PPOINT pHPt) +weapon_collision (ELEMENT *WeaponElementPtr, POINT *pWPt, + ELEMENT *HitElementPtr, POINT *pHPt) { SIZE damage; HELEMENT hBlastElement; @@ -146,7 +142,7 @@ weapon_collision (PELEMENT WeaponElementPtr, PPOINT pWPt, (WeaponElementPtr->state_flags & (GOOD_GUY | BAD_GUY)))) #endif /* NEVER */ { - do_damage ((ELEMENTPTR)HitElementPtr, damage); + do_damage (HitElementPtr, damage); if (HitElementPtr->hit_points) WeaponElementPtr->state_flags |= COLLISION; } @@ -179,7 +175,7 @@ weapon_collision (PELEMENT WeaponElementPtr, PPOINT pWPt, COUNT blast_index; SIZE blast_offs; COUNT angle, num_blast_frames; - ELEMENTPTR BlastElementPtr; + ELEMENT *BlastElementPtr; extern FRAME blast[]; PutElement (hBlastElement); @@ -239,13 +235,13 @@ weapon_collision (PELEMENT WeaponElementPtr, PPOINT pWPt, } FRAME -ModifySilhouette (ELEMENTPTR ElementPtr, PSTAMP modify_stamp, +ModifySilhouette (ELEMENT *ElementPtr, STAMP *modify_stamp, BYTE modify_flags) { FRAME f; RECT r, or; INTERSECT_CONTROL ShipIntersect, ObjectIntersect; - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; CONTEXT OldContext; f = 0; @@ -308,11 +304,11 @@ ModifySilhouette (ELEMENTPTR ElementPtr, PSTAMP modify_stamp, // Cloaked ships won't be detected, except when the APPEARING flag is // set for the Tracker. SIZE -TrackShip (ELEMENTPTR Tracker, PCOUNT pfacing) +TrackShip (ELEMENT *Tracker, COUNT *pfacing) { SIZE best_delta_facing, best_delta; HELEMENT hShip, hNextShip; - ELEMENTPTR Trackee; + ELEMENT *Trackee; best_delta = 0; best_delta_facing = -1; @@ -338,7 +334,7 @@ TrackShip (ELEMENTPTR Tracker, PCOUNT pfacing) && (Tracker->state_flags & APPEARING)) )) { - STARSHIPPTR StarShipPtr; + STARSHIP *StarShipPtr; CheckTracking: GetElementStarShip (Trackee, &StarShipPtr); diff --git a/sc2/src/sc2code/weapon.h b/sc2/src/sc2code/weapon.h index fae446523..50ca705bd 100644 --- a/sc2/src/sc2code/weapon.h +++ b/sc2/src/sc2code/weapon.h @@ -30,7 +30,6 @@ typedef struct COUNT face; COLOR color; } LASER_BLOCK; -typedef LASER_BLOCK *PLASER_BLOCK; typedef struct { @@ -38,24 +37,23 @@ typedef struct ELEMENT_FLAGS sender; SIZE pixoffs, speed, hit_points, damage; COUNT face, index, life; - PFRAME farray; - void (*preprocess_func) (PELEMENT ElementPtr); + FRAME *farray; + void (*preprocess_func) (ELEMENT *ElementPtr); SIZE blast_offs; } MISSILE_BLOCK; -typedef MISSILE_BLOCK *PMISSILE_BLOCK; -extern HELEMENT initialize_laser (PLASER_BLOCK pLaserBlock); -extern HELEMENT initialize_missile (PMISSILE_BLOCK pMissileBlock); -extern HELEMENT weapon_collision (PELEMENT ElementPtr0, PPOINT pPt0, - PELEMENT ElementPtr1, PPOINT pPt1); -extern SIZE TrackShip (ELEMENTPTR Tracker, PCOUNT pfacing); -extern void Untarget (ELEMENTPTR ElementPtr); +extern HELEMENT initialize_laser (LASER_BLOCK *pLaserBlock); +extern HELEMENT initialize_missile (MISSILE_BLOCK *pMissileBlock); +extern HELEMENT weapon_collision (ELEMENT *ElementPtr0, POINT *pPt0, + ELEMENT *ElementPtr1, POINT *pPt1); +extern SIZE TrackShip (ELEMENT *Tracker, COUNT *pfacing); +extern void Untarget (ELEMENT *ElementPtr); #define MODIFY_IMAGE (1 << 0) #define MODIFY_SWAP (1 << 1) -extern FRAME ModifySilhouette (ELEMENTPTR ElementPtr, PSTAMP - modify_stamp, BYTE modify_flags); +extern FRAME ModifySilhouette (ELEMENT *ElementPtr, STAMP *modify_stamp, + BYTE modify_flags); #endif /* _WEAPON_H */