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

Code refactoring: removed PFOO/FOOPTR types; removed NULL_PTR; removed some redundant casts

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2708 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2007-02-15 23:45:39 +00:00
parent 4c1de2ed14
commit b85cff3ae2
229 changed files with 2546 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/battle.c
+8 -8
View File
@@ -66,9 +66,9 @@ RunAwayAllowed (void)
} }
static void static void
DoRunAway (STARSHIPPTR StarShipPtr) DoRunAway (STARSHIP *StarShipPtr)
{ {
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
LockElement (StarShipPtr->hShip, &ElementPtr); LockElement (StarShipPtr->hShip, &ElementPtr);
if (GetPrimType (&DisplayArray[ElementPtr->PrimIndex]) == STAMP_PRIM if (GetPrimType (&DisplayArray[ElementPtr->PrimIndex]) == STAMP_PRIM
@@ -77,7 +77,7 @@ DoRunAway (STARSHIPPTR StarShipPtr)
&& ElementPtr->mass_points != MAX_SHIP_MASS * 10 && ElementPtr->mass_points != MAX_SHIP_MASS * 10
&& !(ElementPtr->state_flags & APPEARING)) && !(ElementPtr->state_flags & APPEARING))
{ {
extern void flee_preprocess (PELEMENT); extern void flee_preprocess (ELEMENT *);
battle_counter -= MAKE_WORD (1, 0); battle_counter -= MAKE_WORD (1, 0);
@@ -150,7 +150,7 @@ ProcessInput (void)
hBattleShip != 0; hBattleShip = hNextShip) hBattleShip != 0; hBattleShip = hNextShip)
{ {
BATTLE_INPUT_STATE InputState; BATTLE_INPUT_STATE InputState;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
StarShipPtr = LockStarShip (&race_q[cur_player], hBattleShip); StarShipPtr = LockStarShip (&race_q[cur_player], hBattleShip);
hNextShip = _GetSuccLink (StarShipPtr); hNextShip = _GetSuccLink (StarShipPtr);
@@ -345,7 +345,7 @@ selectAllShips (SIZE num_ships)
#ifndef NETPLAY #ifndef NETPLAY
while (num_ships--) while (num_ships--)
{ {
if (!GetNextStarShip (NULL_PTR, num_ships == 1)) if (!GetNextStarShip (NULL, num_ships == 1))
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@@ -357,7 +357,7 @@ selectAllShips (SIZE num_ships)
if (num_ships == 1) { if (num_ships == 1) {
// HyperSpace in full game. // HyperSpace in full game.
return GetNextStarShip (NULL_PTR, 0); return GetNextStarShip (NULL, 0);
} }
if (num_ships != 2) if (num_ships != 2)
@@ -395,7 +395,7 @@ selectAllShips (SIZE num_ships)
size_t i; size_t i;
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
if (!GetNextStarShip (NULL_PTR, order[i])) if (!GetNextStarShip (NULL, order[i]))
return FALSE; return FALSE;
} }
} }
@@ -478,7 +478,7 @@ Battle (void)
IN_HYPERSPACE); IN_HYPERSPACE);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
DoInput ((PVOID)&bs, FALSE); DoInput (&bs, FALSE);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
AbortBattle: AbortBattle:
sc2/src/sc2code/build.c
+27 -28
View File
@@ -25,14 +25,14 @@
HSTARSHIP HSTARSHIP
Build (PQUEUE pQueue, DWORD RaceResIndex, COUNT which_player, BYTE Build (QUEUE *pQueue, DWORD RaceResIndex, COUNT which_player, BYTE
captains_name_index) captains_name_index)
{ {
HSTARSHIP hNewShip; HSTARSHIP hNewShip;
if ((hNewShip = AllocStarShip (pQueue)) != 0) if ((hNewShip = AllocStarShip (pQueue)) != 0)
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
StarShipPtr = LockStarShip (pQueue, hNewShip); StarShipPtr = LockStarShip (pQueue, hNewShip);
memset (StarShipPtr, 0, GetLinkSize (pQueue)); memset (StarShipPtr, 0, GetLinkSize (pQueue));
@@ -48,14 +48,14 @@ Build (PQUEUE pQueue, DWORD RaceResIndex, COUNT which_player, BYTE
} }
HSTARSHIP HSTARSHIP
GetStarShipFromIndex (PQUEUE pShipQ, COUNT Index) GetStarShipFromIndex (QUEUE *pShipQ, COUNT Index)
{ {
HSTARSHIP hStarShip, hNextShip; HSTARSHIP hStarShip, hNextShip;
for (hStarShip = GetHeadLink (pShipQ); for (hStarShip = GetHeadLink (pShipQ);
Index > 0 && hStarShip; hStarShip = hNextShip, --Index) Index > 0 && hStarShip; hStarShip = hNextShip, --Index)
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
StarShipPtr = LockStarShip (pShipQ, hStarShip); StarShipPtr = LockStarShip (pShipQ, hStarShip);
hNextShip = _GetSuccLink (StarShipPtr); hNextShip = _GetSuccLink (StarShipPtr);
@@ -113,9 +113,9 @@ ActivateStarShip (COUNT which_ship, SIZE state)
case SPHERE_TRACKING: case SPHERE_TRACKING:
case SPHERE_KNOWN: 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); &GLOBAL (avail_race_q), hStarShip);
if (state == SPHERE_KNOWN) if (state == SPHERE_KNOWN)
which_ship = StarShipPtr->ShipInfo.known_strength; which_ship = StarShipPtr->ShipInfo.known_strength;
@@ -146,9 +146,9 @@ ActivateStarShip (COUNT which_ship, SIZE state)
for (hStarShip = GetHeadLink (&GLOBAL (built_ship_q)); for (hStarShip = GetHeadLink (&GLOBAL (built_ship_q));
hStarShip; hStarShip = hNextShip) hStarShip; hStarShip = hNextShip)
{ {
SHIP_FRAGMENTPTR StarShipPtr; SHIP_FRAGMENT *StarShipPtr;
StarShipPtr = (SHIP_FRAGMENTPTR) LockStarShip ( StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (built_ship_q), hStarShip); &GLOBAL (built_ship_q), hStarShip);
hNextShip = _GetSuccLink (StarShipPtr); hNextShip = _GetSuccLink (StarShipPtr);
total += ShipCost[GET_RACE_ID (StarShipPtr)]; total += ShipCost[GET_RACE_ID (StarShipPtr)];
@@ -162,9 +162,9 @@ ActivateStarShip (COUNT which_ship, SIZE state)
hStarShip; hStarShip = hNextShip) hStarShip; hStarShip = hNextShip)
{ {
BYTE ship_type; BYTE ship_type;
SHIP_FRAGMENTPTR StarShipPtr; SHIP_FRAGMENT *StarShipPtr;
StarShipPtr = (SHIP_FRAGMENTPTR) LockStarShip ( StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (built_ship_q), hStarShip); &GLOBAL (built_ship_q), hStarShip);
hNextShip = _GetSuccLink (StarShipPtr); hNextShip = _GetSuccLink (StarShipPtr);
ship_type = GET_RACE_ID (StarShipPtr); ship_type = GET_RACE_ID (StarShipPtr);
@@ -180,13 +180,12 @@ ActivateStarShip (COUNT which_ship, SIZE state)
- CountLinks (&GLOBAL (built_ship_q))); - CountLinks (&GLOBAL (built_ship_q)));
default: default:
{ {
SHIP_FRAGMENTPTR StarShipPtr; SHIP_FRAGMENT *StarShipPtr;
if (state <= 0) if (state <= 0)
{ {
StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hStarShip &GLOBAL (avail_race_q), hStarShip);
);
if (state == CHECK_ALLIANCE) if (state == CHECK_ALLIANCE)
{ {
state = StarShipPtr->ShipInfo.ship_flags state = StarShipPtr->ShipInfo.ship_flags
@@ -213,10 +212,10 @@ ActivateStarShip (COUNT which_ship, SIZE state)
hStarShip; hStarShip = hNextShip) hStarShip; hStarShip = hNextShip)
{ {
BOOLEAN RemoveShip; BOOLEAN RemoveShip;
SHIP_FRAGMENTPTR StarShipPtr2; SHIP_FRAGMENT *StarShipPtr2;
StarShipPtr2 = StarShipPtr2 =
(SHIP_FRAGMENTPTR)LockStarShip ( (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (built_ship_q), hStarShip); &GLOBAL (built_ship_q), hStarShip);
hNextShip = _GetSuccLink (StarShipPtr2); hNextShip = _GetSuccLink (StarShipPtr2);
RemoveShip = (BOOLEAN) ( RemoveShip = (BOOLEAN) (
@@ -278,7 +277,7 @@ ActivateStarShip (COUNT which_ship, SIZE state)
{ {
BYTE win_loc; BYTE win_loc;
StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (built_ship_q), hOldShip); &GLOBAL (built_ship_q), hOldShip);
win_loc = GET_GROUP_LOC (StarShipPtr); win_loc = GET_GROUP_LOC (StarShipPtr);
UnlockStarShip (&GLOBAL (built_ship_q), UnlockStarShip (&GLOBAL (built_ship_q),
@@ -287,7 +286,7 @@ ActivateStarShip (COUNT which_ship, SIZE state)
break; break;
} }
StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (built_ship_q), hStarShip); &GLOBAL (built_ship_q), hStarShip);
SET_GROUP_LOC (StarShipPtr, which_window - 1); SET_GROUP_LOC (StarShipPtr, which_window - 1);
if (which_ship == SPATHI_SHIP if (which_ship == SPATHI_SHIP
@@ -319,7 +318,7 @@ ActivateStarShip (COUNT which_ship, SIZE state)
} }
COUNT COUNT
GetIndexFromStarShip (PQUEUE pShipQ, HSTARSHIP hStarShip) GetIndexFromStarShip (QUEUE *pShipQ, HSTARSHIP hStarShip)
{ {
COUNT Index; COUNT Index;
@@ -327,7 +326,7 @@ GetIndexFromStarShip (PQUEUE pShipQ, HSTARSHIP hStarShip)
while (hStarShip != GetHeadLink (pShipQ)) while (hStarShip != GetHeadLink (pShipQ))
{ {
HSTARSHIP hNextShip; HSTARSHIP hNextShip;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
StarShipPtr = LockStarShip (pShipQ, hStarShip); StarShipPtr = LockStarShip (pShipQ, hStarShip);
hNextShip = _GetPredLink (StarShipPtr); hNextShip = _GetPredLink (StarShipPtr);
@@ -341,7 +340,7 @@ GetIndexFromStarShip (PQUEUE pShipQ, HSTARSHIP hStarShip)
} }
BYTE BYTE
NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr) NameCaptain (QUEUE *pQueue, STARSHIP *StarShipPtr)
{ {
BYTE name_index; BYTE name_index;
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
@@ -353,7 +352,7 @@ NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr)
name_index = PickCaptainName (); name_index = PickCaptainName ();
for (hStarShip = GetHeadLink (pQueue); hStarShip; hStarShip = hNextShip) for (hStarShip = GetHeadLink (pQueue); hStarShip; hStarShip = hNextShip)
{ {
STARSHIPPTR TestShipPtr; STARSHIP *TestShipPtr;
TestShipPtr = LockStarShip (pQueue, hStarShip); TestShipPtr = LockStarShip (pQueue, hStarShip);
hNextShip = _GetSuccLink (TestShipPtr); 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 // crew_level can be set to INFINITE_FLEET for a ship which is to
// represent an infinite number of ships. // represent an infinite number of ships.
HSTARSHIP HSTARSHIP
CloneShipFragment (COUNT shipIndex, PQUEUE pDstQueue, COUNT crew_level) CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level)
{ {
HSTARSHIP hStarShip, hBuiltShip; HSTARSHIP hStarShip, hBuiltShip;
SHIP_FRAGMENTPTR TemplatePtr; SHIP_FRAGMENT *TemplatePtr;
hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), shipIndex); hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), shipIndex);
if (hStarShip == 0) if (hStarShip == 0)
return 0; return 0;
TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( TemplatePtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hStarShip); &GLOBAL (avail_race_q), hStarShip);
hBuiltShip = hBuiltShip =
Build (pDstQueue, Build (pDstQueue,
TemplatePtr->RaceResIndex, TemplatePtr->RaceResIndex,
TemplatePtr->ShipInfo.ship_flags & (GOOD_GUY | BAD_GUY), TemplatePtr->ShipInfo.ship_flags & (GOOD_GUY | BAD_GUY),
(BYTE)(shipIndex == SAMATRA_SHIP ? (BYTE)(shipIndex == SAMATRA_SHIP ?
0 : NameCaptain (pDstQueue, (STARSHIPPTR)TemplatePtr))); 0 : NameCaptain (pDstQueue, (STARSHIP*)TemplatePtr)));
if (hBuiltShip) if (hBuiltShip)
{ {
SHIP_FRAGMENTPTR ShipFragPtr; SHIP_FRAGMENT *ShipFragPtr;
ShipFragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pDstQueue, hBuiltShip); ShipFragPtr = (SHIP_FRAGMENT*) LockStarShip (pDstQueue, hBuiltShip);
ShipFragPtr->ShipInfo = TemplatePtr->ShipInfo; ShipFragPtr->ShipInfo = TemplatePtr->ShipInfo;
if (crew_level) if (crew_level)
ShipFragPtr->ShipInfo.crew_level = crew_level; ShipFragPtr->ShipInfo.crew_level = crew_level;
sc2/src/sc2code/build.h
+10 -10
View File
@@ -44,12 +44,12 @@
& (NUM_CAPTAINS_NAMES - 1)) \ & (NUM_CAPTAINS_NAMES - 1)) \
+ NAME_OFFSET) + NAME_OFFSET)
extern HSTARSHIP Build (PQUEUE pQueue, DWORD RaceResIndex, COUNT extern HSTARSHIP Build (QUEUE *pQueue, DWORD RaceResIndex, COUNT
which_player, BYTE captains_name_index); which_player, BYTE captains_name_index);
extern HSTARSHIP CloneShipFragment (COUNT shipIndex, PQUEUE pDstQueue, extern HSTARSHIP CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue,
COUNT crew_level); COUNT crew_level);
extern HSTARSHIP GetStarShipFromIndex (PQUEUE pShipQ, COUNT Index); extern HSTARSHIP GetStarShipFromIndex (QUEUE *pShipQ, COUNT Index);
extern BYTE NameCaptain (PQUEUE pQueue, STARSHIPPTR StarShipPtr); extern BYTE NameCaptain (QUEUE *pQueue, STARSHIP *StarShipPtr);
/* Possible values for the 'state' argument of /* Possible values for the 'state' argument of
* COUNT ActivateStarShip (COUNT which_ship, SIZE state) * 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 */ /* Check for how many escort ships there's still space */
extern COUNT ActivateStarShip (COUNT which_ship, SIZE state); 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); 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 DrawCrewFuelString (COORD y, SIZE state);
extern void ClearShipStatus (COORD y); extern void ClearShipStatus (COORD y);
extern void OutlineShipStatus (COORD y); extern void OutlineShipStatus (COORD y);
extern void InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect); extern void InitShipStatus (STARSHIP *StarShipPtr, RECT *pClipRect);
extern void DeltaStatistics (STARSHIPPTR StarShipPtr, SIZE crew_delta, extern void DeltaStatistics (STARSHIP *StarShipPtr, SIZE crew_delta,
SIZE energy_delta); SIZE energy_delta);
extern void DrawBattleCrewAmount (STARSHIPPTR StarShipPtr); extern void DrawBattleCrewAmount (STARSHIP *StarShipPtr);
#endif /* _BUILD_H */ #endif /* _BUILD_H */
sc2/src/sc2code/clock.c
+6 -6
View File
@@ -113,13 +113,13 @@ clock_task_func(void* data)
} }
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
DrawStatusMessage (NULL_PTR); DrawStatusMessage (NULL);
{ {
HEVENT hEvent; HEVENT hEvent;
while ((hEvent = GetHeadEvent ())) while ((hEvent = GetHeadEvent ()))
{ {
EVENTPTR EventPtr; EVENT *EventPtr;
LockEvent (hEvent, &EventPtr); LockEvent (hEvent, &EventPtr);
@@ -153,7 +153,7 @@ clock_task_func(void* data)
num_ticks = GetTimeCounter () - LastTime; num_ticks = GetTimeCounter () - LastTime;
if (!OnAutoPilot) if (!OnAutoPilot)
{ {
DrawSISMessage (NULL_PTR); DrawSISMessage (NULL);
cycle_index = delay_count = 0; cycle_index = delay_count = 0;
} }
else if (delay_count > num_ticks) else if (delay_count > num_ticks)
@@ -301,8 +301,8 @@ SetGameClockRate (COUNT seconds_per_day)
} }
BOOLEAN BOOLEAN
ValidateEvent (EVENT_TYPE type, PCOUNT pmonth_index, PCOUNT pday_index, ValidateEvent (EVENT_TYPE type, COUNT *pmonth_index, COUNT *pday_index,
PCOUNT pyear_index) COUNT *pyear_index)
{ {
COUNT month_index, day_index, year_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) else if (ValidateEvent (type, &month_index, &day_index, &year_index)
&& (hNewEvent = AllocEvent ())) && (hNewEvent = AllocEvent ()))
{ {
EVENTPTR EventPtr; EVENT *EventPtr;
LockEvent (hNewEvent, &EventPtr); LockEvent (hNewEvent, &EventPtr);
EventPtr->day_index = (BYTE)day_index; EventPtr->day_index = (BYTE)day_index;
sc2/src/sc2code/clock.h
+4 -9
View File
@@ -40,7 +40,6 @@ typedef struct
QUEUE event_q; QUEUE event_q;
} CLOCK_STATE; } CLOCK_STATE;
typedef CLOCK_STATE *PCLOCK_STATE;
typedef QUEUE_HANDLE HEVENT; typedef QUEUE_HANDLE HEVENT;
@@ -52,7 +51,6 @@ typedef struct event
COUNT year_index; COUNT year_index;
BYTE func_index; BYTE func_index;
} EVENT; } EVENT;
typedef EVENT *PEVENT;
typedef enum typedef enum
{ {
@@ -60,22 +58,19 @@ typedef enum
RELATIVE_EVENT RELATIVE_EVENT
} EVENT_TYPE; } EVENT_TYPE;
#define EVENTPTR PEVENT
#define AllocEvent() AllocLink (&GLOBAL (GameClock.event_q)) #define AllocEvent() AllocLink (&GLOBAL (GameClock.event_q))
#define PutEvent(h) PutQueue (&GLOBAL (GameClock.event_q), (h)) #define PutEvent(h) PutQueue (&GLOBAL (GameClock.event_q), (h))
#define InsertEvent(h,i) InsertQueue (&GLOBAL (GameClock.event_q), (h), (i)) #define InsertEvent(h,i) InsertQueue (&GLOBAL (GameClock.event_q), (h), (i))
#define GetHeadEvent() GetHeadLink (&GLOBAL (GameClock.event_q)) #define GetHeadEvent() GetHeadLink (&GLOBAL (GameClock.event_q))
#define GetTailEvent() GetTailLink (&GLOBAL (GameClock.event_q)) #define GetTailEvent() GetTailLink (&GLOBAL (GameClock.event_q))
#define LockEvent(h,eptr) *(eptr) = (EVENTPTR)LockLink ( \ #define LockEvent(h,ppe) (*(ppe) = (EVENT*)LockLink (&GLOBAL (GameClock.event_q), h))
&GLOBAL (GameClock.event_q), (h))
#define UnlockEvent(h) UnlockLink (&GLOBAL (GameClock.event_q), (h)) #define UnlockEvent(h) UnlockLink (&GLOBAL (GameClock.event_q), (h))
#define RemoveEvent(h) RemoveQueue (&GLOBAL (GameClock.event_q), (h)) #define RemoveEvent(h) RemoveQueue (&GLOBAL (GameClock.event_q), (h))
#define FreeEvent(h) FreeLink (&GLOBAL (GameClock.event_q), (h)) #define FreeEvent(h) FreeLink (&GLOBAL (GameClock.event_q), (h))
#define GetPredEvent(l) _GetPredLink (l) #define GetPredEvent(l) _GetPredLink (l)
#define GetSuccEvent(l) _GetSuccLink (l) #define GetSuccEvent(l) _GetSuccLink (l)
#define ForAllEvents(callback, arg) ForAllLinks(&GLOBAL (GameClock.event_q), \ #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 */ /* rates are in seconds per game day */
#define HYPERSPACE_CLOCK_RATE 5 #define HYPERSPACE_CLOCK_RATE 5
@@ -87,8 +82,8 @@ extern void SuspendGameClock (void);
extern void ResumeGameClock (void); extern void ResumeGameClock (void);
extern BOOLEAN GameClockRunning (void); extern BOOLEAN GameClockRunning (void);
extern void SetGameClockRate (COUNT seconds_per_day); extern void SetGameClockRate (COUNT seconds_per_day);
extern BOOLEAN ValidateEvent (EVENT_TYPE type, PCOUNT pmonth_index, extern BOOLEAN ValidateEvent (EVENT_TYPE type, COUNT *pmonth_index,
PCOUNT pday_index, PCOUNT pyear_index); COUNT *pday_index, COUNT *pyear_index);
extern HEVENT AddEvent (EVENT_TYPE type, COUNT month_index, COUNT extern HEVENT AddEvent (EVENT_TYPE type, COUNT month_index, COUNT
day_index, COUNT year_index, BYTE func_index); day_index, COUNT year_index, BYTE func_index);
extern void EventHandler (BYTE selector); extern void EventHandler (BYTE selector);
sc2/src/sc2code/cnctdlg.c
+6 -8
View File
@@ -47,8 +47,6 @@ typedef struct connect_dialog_state
static void DrawConnectDialog (void); static void DrawConnectDialog (void);
typedef CONNECT_DIALOG_STATE *PCONNECT_DIALOG_STATE;
static WIDGET_MENU_SCREEN menu; static WIDGET_MENU_SCREEN menu;
static WIDGET_BUTTON buttons[3]; static WIDGET_BUTTON buttons[3];
static WIDGET_SLIDER slider; static WIDGET_SLIDER slider;
@@ -67,7 +65,7 @@ static BOOLEAN done;
/* This kind of sucks, but the Button callbacks need access to the /* This kind of sucks, but the Button callbacks need access to the
* CONNECT_DIALOG_STATE, so we need a pointer to it */ * 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; static FONT PlayerFont;
@@ -232,7 +230,7 @@ MCD_DrawTextEntry (WIDGET *_self, int x, int y)
COUNT i; COUNT i;
RECT text_r; RECT text_r;
BYTE char_deltas[WIDGET_TEXTENTRY_WIDTH]; BYTE char_deltas[WIDGET_TEXTENTRY_WIDTH];
PBYTE pchar_deltas; BYTE *pchar_deltas;
RECT r; RECT r;
SIZE leading; SIZE leading;
@@ -311,7 +309,7 @@ MCD_DrawTextEntry (WIDGET *_self, int x, int y)
* refactoring, as redraw_menu () is the only real change. */ * refactoring, as redraw_menu () is the only real change. */
static BOOLEAN static BOOLEAN
OnTextEntryChange (PTEXTENTRY_STATE pTES) OnTextEntryChange (TEXTENTRY_STATE *pTES)
{ {
WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam; WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam;
@@ -329,7 +327,7 @@ OnTextEntryChange (PTEXTENTRY_STATE pTES)
} }
static BOOLEAN static BOOLEAN
OnTextEntryFrame (PTEXTENTRY_STATE pTES) OnTextEntryFrame (TEXTENTRY_STATE *pTES)
{ {
WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam; WIDGET_TEXTENTRY *widget = (WIDGET_TEXTENTRY *) pTES->CbParam;
@@ -546,7 +544,7 @@ DrawConnectDialog (void)
} }
static BOOLEAN static BOOLEAN
DoMeleeConnectDialog (PCONNECT_DIALOG_STATE state) DoMeleeConnectDialog (CONNECT_DIALOG_STATE *state)
{ {
BOOLEAN changed; BOOLEAN changed;
@@ -620,7 +618,7 @@ MeleeConnectDialog (int side)
current_state = &state; current_state = &state;
DoInput ((PVOID)&state, TRUE); DoInput (&state, TRUE);
current_state = NULL; current_state = NULL;
sc2/src/sc2code/coderes.h
+3 -4
View File
@@ -21,11 +21,11 @@
#include "reslib.h" #include "reslib.h"
extern MEM_HANDLE LoadCodeResFile (PSTR pStr); extern MEM_HANDLE LoadCodeResFile (const char *pStr);
extern BOOLEAN InstallCodeResType (COUNT code_type); extern BOOLEAN InstallCodeResType (COUNT code_type);
extern MEM_HANDLE LoadCodeResInstance (RESOURCE res); extern MEM_HANDLE LoadCodeResInstance (RESOURCE res);
extern PVOID CaptureCodeRes (MEM_HANDLE hCode, PVOID pData, PVOID *ppLocData); extern void* CaptureCodeRes (MEM_HANDLE hCode, void *pData, void **ppLocData);
extern MEM_HANDLE ReleaseCodeRes (PVOID CodeRef); extern MEM_HANDLE ReleaseCodeRes (void *CodeRef);
extern BOOLEAN DestroyCodeRes (MEM_HANDLE hCode); extern BOOLEAN DestroyCodeRes (MEM_HANDLE hCode);
typedef struct typedef struct
@@ -33,7 +33,6 @@ typedef struct
MEM_HANDLE hCode; MEM_HANDLE hCode;
UWORD size; UWORD size;
} CODE_REF; } CODE_REF;
typedef CODE_REF *PCODE_REF;
#endif /* _CODERES_H */ #endif /* _CODERES_H */
sc2/src/sc2code/collide.c
+3 -3
View File
@@ -27,7 +27,7 @@
//#define DEBUG_COLLIDE //#define DEBUG_COLLIDE
void void
collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1) collide (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1)
{ {
SIZE speed; SIZE speed;
SIZE dx0, dy0, dx1, dy1, dx_rel, dy_rel; SIZE dx0, dy0, dx1, dy1, dx_rel, dy_rel;
@@ -103,7 +103,7 @@ collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1)
{ {
if (ElementPtr0->state_flags & PLAYER_SHIP) if (ElementPtr0->state_flags & PLAYER_SHIP)
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
GetElementStarShip (ElementPtr0, &StarShipPtr); GetElementStarShip (ElementPtr0, &StarShipPtr);
StarShipPtr->cur_status_flags &= StarShipPtr->cur_status_flags &=
@@ -140,7 +140,7 @@ collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1)
{ {
if (ElementPtr1->state_flags & PLAYER_SHIP) if (ElementPtr1->state_flags & PLAYER_SHIP)
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
GetElementStarShip (ElementPtr1, &StarShipPtr); GetElementStarShip (ElementPtr1, &StarShipPtr);
StarShipPtr->cur_status_flags &= StarShipPtr->cur_status_flags &=
sc2/src/sc2code/collide.h
+1 -1
View File
@@ -57,7 +57,7 @@
(eptr)->next.image.frame); \ (eptr)->next.image.frame); \
} }
extern void collide (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1); extern void collide (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1);
#endif /* _COLLIDE_H */ #endif /* _COLLIDE_H */
sc2/src/sc2code/comm.c
+31 -34
View File
@@ -59,7 +59,6 @@ typedef struct response_entry
TEXT response_text; TEXT response_text;
RESPONSE_FUNC response_func; RESPONSE_FUNC response_func;
} RESPONSE_ENTRY; } RESPONSE_ENTRY;
typedef RESPONSE_ENTRY *PRESPONSE_ENTRY;
typedef struct encounter_state typedef struct encounter_state
{ {
@@ -75,9 +74,8 @@ typedef struct encounter_state
COUNT phrase_buf_index; COUNT phrase_buf_index;
UNICODE phrase_buf[512]; UNICODE phrase_buf[512];
} ENCOUNTER_STATE; } ENCOUNTER_STATE;
typedef ENCOUNTER_STATE *PENCOUNTER_STATE;
static PENCOUNTER_STATE pCurInputState; static ENCOUNTER_STATE *pCurInputState;
static SUBTITLE_STATE subtitle_state = DONE_SUBTITLE; static SUBTITLE_STATE subtitle_state = DONE_SUBTITLE;
static Mutex subtitle_mutex; static Mutex subtitle_mutex;
@@ -97,7 +95,7 @@ RECT CommWndRect = {
* display given the line wrapping information * display given the line wrapping information
*/ */
static int static int
_count_lines (PTEXT pText) _count_lines (TEXT *pText)
{ {
SIZE text_width; SIZE text_width;
const unsigned char *pStr; const unsigned char *pStr;
@@ -124,11 +122,11 @@ _count_lines (PTEXT pText)
// status == -4: use current context, and baseline from pTextIn // status == -4: use current context, and baseline from pTextIn
// status == 1: draw alien speech; subtitle cache is used // status == 1: draw alien speech; subtitle cache is used
static COORD static COORD
add_text (int status, PTEXT pTextIn) add_text (int status, TEXT *pTextIn)
{ {
COUNT maxchars, numchars; COUNT maxchars, numchars;
TEXT locText; TEXT locText;
PTEXT pText; TEXT *pText;
SIZE leading; SIZE leading;
const unsigned char *pStr; const unsigned char *pStr;
SIZE text_width; SIZE text_width;
@@ -357,7 +355,7 @@ getLineWithinWidth(TEXT *pText, const unsigned char **startNext,
oldCount = pText->CharCount; oldCount = pText->CharCount;
pText->CharCount = charCount; pText->CharCount = charCount;
TextRect (pText, &rect, NULL_PTR); TextRect (pText, &rect, NULL);
if (rect.extent.width >= maxWidth) if (rect.extent.width >= maxWidth)
{ {
@@ -422,7 +420,7 @@ DrawSISComWindow (void)
OldStrings = SetRelStringTableIndex (OldStrings, 1); OldStrings = SetRelStringTableIndex (OldStrings, 1);
font_DrawText (&t); font_DrawText (&t);
SetContextForeGroundColor (WHITE_COLOR); SetContextForeGroundColor (WHITE_COLOR);
t.pStr = (PBYTE)GetStringAddress (CreditStrings); t.pStr = (BYTE*)GetStringAddress (CreditStrings);
t.CharCount = GetStringLength (CreditStrings); t.CharCount = GetStringLength (CreditStrings);
CreditStrings = SetRelStringTableIndex (CreditStrings, 1); CreditStrings = SetRelStringTableIndex (CreditStrings, 1);
font_DrawText (&t); font_DrawText (&t);
@@ -443,11 +441,11 @@ DrawSISComWindow (void)
} }
void void
DrawAlienFrame (FRAME aframe, PSEQUENCE pSeq) DrawAlienFrame (FRAME aframe, SEQUENCE *pSeq)
{ {
COUNT i; COUNT i;
STAMP s; STAMP s;
ANIMATION_DESCPTR ADPtr; ANIMATION_DESC *ADPtr;
s.origin.x = -SAFE_X; s.origin.x = -SAFE_X;
s.origin.y = 0; s.origin.y = 0;
@@ -504,7 +502,7 @@ volatile BOOLEAN ClearSummary;
static volatile BOOLEAN ClearSubtitle; static volatile BOOLEAN ClearSubtitle;
static void static void
RefreshResponses (PENCOUNTER_STATE pES) RefreshResponses (ENCOUNTER_STATE *pES)
{ {
COORD y; COORD y;
BYTE response; BYTE response;
@@ -827,7 +825,7 @@ AlienTalkSegue (COUNT wait_track)
if (!pCurInputState->Initialized) if (!pCurInputState->Initialized)
{ {
SetColorMap (GetColorMapAddress (CommData.AlienColorMap)); SetColorMap (GetColorMapAddress (CommData.AlienColorMap));
DrawAlienFrame (CommData.AlienFrame, NULL_PTR); DrawAlienFrame (CommData.AlienFrame, NULL);
UpdateSpeechGraphics (TRUE); UpdateSpeechGraphics (TRUE);
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE
@@ -920,10 +918,9 @@ typedef struct summary_state
const UNICODE *LeftOver; const UNICODE *LeftOver;
} SUMMARY_STATE; } SUMMARY_STATE;
typedef SUMMARY_STATE *PSUMMARY_STATE;
static BOOLEAN static BOOLEAN
DoConvSummary (PSUMMARY_STATE pSS) DoConvSummary (SUMMARY_STATE *pSS)
{ {
#define DELTA_Y_SUMMARY 8 #define DELTA_Y_SUMMARY 8
#define MAX_SUMM_ROWS ((SIS_SCREEN_HEIGHT - SLIDER_Y - SLIDER_HEIGHT) \ #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. // Called when the player presses the select button on a response.
static void static void
SelectResponse (PENCOUNTER_STATE pES) SelectResponse (ENCOUNTER_STATE *pES)
{ {
const unsigned char *end; const unsigned char *end;
PTEXT response_text = TEXT *response_text =
&pES->response_list[pES->cur_response].response_text; &pES->response_list[pES->cur_response].response_text;
end = skipUTF8Chars(response_text->pStr, response_text->CharCount); end = skipUTF8Chars(response_text->pStr, response_text->CharCount);
pES->phrase_buf_index = end - response_text->pStr; 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. // Called when the player presses the cancel button in comm.
static void static void
SelectConversationSummary (PENCOUNTER_STATE pES) SelectConversationSummary (ENCOUNTER_STATE *pES)
{ {
SUMMARY_STATE SummaryState; SUMMARY_STATE SummaryState;
@@ -1099,7 +1096,7 @@ SelectConversationSummary (PENCOUNTER_STATE pES)
} }
static void static void
PlayerResponseInput (PENCOUNTER_STATE pES) PlayerResponseInput (ENCOUNTER_STATE *pES)
{ {
BYTE response; BYTE response;
@@ -1181,7 +1178,7 @@ PlayerResponseInput (PENCOUNTER_STATE pES)
} }
static BOOLEAN static BOOLEAN
DoCommunication (PENCOUNTER_STATE pES) DoCommunication (ENCOUNTER_STATE *pES)
{ {
SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT); SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT);
@@ -1261,8 +1258,8 @@ void
DoResponsePhrase (RESPONSE_REF R, RESPONSE_FUNC response_func, DoResponsePhrase (RESPONSE_REF R, RESPONSE_FUNC response_func,
UNICODE *ConstructStr) UNICODE *ConstructStr)
{ {
PENCOUNTER_STATE pES = pCurInputState; ENCOUNTER_STATE *pES = pCurInputState;
PRESPONSE_ENTRY pEntry; RESPONSE_ENTRY *pEntry;
if (GLOBAL (CurrentActivity) & CHECK_ABORT) if (GLOBAL (CurrentActivity) & CHECK_ABORT)
return; return;
@@ -1397,7 +1394,7 @@ HailAlien (void)
} }
else else
{ {
DrawSISMessage (NULL_PTR); DrawSISMessage (NULL);
DrawSISTitle (GLOBAL_SIS (PlanetName)); DrawSISTitle (GLOBAL_SIS (PlanetName));
} }
} }
@@ -1410,7 +1407,7 @@ HailAlien (void)
LastActivity |= CHECK_LOAD; /* prevent spurious input */ LastActivity |= CHECK_LOAD; /* prevent spurious input */
(*CommData.init_encounter_func) (); (*CommData.init_encounter_func) ();
DoInput ((PVOID)&ES, FALSE); DoInput (&ES, FALSE);
if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD))) if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
(*CommData.post_encounter_func) (); (*CommData.post_encounter_func) ();
(*CommData.uninit_encounter_func) (); (*CommData.uninit_encounter_func) ();
@@ -1439,7 +1436,7 @@ InitCommunication (RESOURCE which_comm)
{ {
COUNT status; COUNT status;
MEM_HANDLE hOldIndex, hIndex; MEM_HANDLE hOldIndex, hIndex;
LOCDATAPTR LocDataPtr; LOCDATA *LocDataPtr;
#ifdef DEBUG #ifdef DEBUG
if (disableInteractivity) if (disableInteractivity)
@@ -1464,7 +1461,7 @@ InitCommunication (RESOURCE which_comm)
ClearSISRect (DRAW_SIS_DISPLAY); ClearSISRect (DRAW_SIS_DISPLAY);
RepairSISBorder (); RepairSISBorder ();
} }
DrawSISMessage (NULL_PTR); DrawSISMessage (NULL);
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE) if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE)
DrawHyperCoords (GLOBAL (ShipStamp.origin)); DrawHyperCoords (GLOBAL (ShipStamp.origin));
else if (HIWORD (GLOBAL (ShipStamp.frame)) == 0) else if (HIWORD (GLOBAL (ShipStamp.frame)) == 0)
@@ -1518,7 +1515,7 @@ InitCommunication (RESOURCE which_comm)
{ {
SetResourceIndex (hIndex); SetResourceIndex (hIndex);
LocDataPtr = (LOCDATAPTR)init_race ( LocDataPtr = init_race (
status != YEHAT_REBEL_SHIP ? which_comm : status != YEHAT_REBEL_SHIP ? which_comm :
(RESOURCE)YEHAT_REBEL_CONVERSATION); (RESOURCE)YEHAT_REBEL_CONVERSATION);
if (LocDataPtr) if (LocDataPtr)
@@ -1597,7 +1594,7 @@ RaceCommunication (void)
{ {
COUNT i, status; COUNT i, status;
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
SHIP_FRAGMENTPTR FragPtr; SHIP_FRAGMENT *FragPtr;
RESOURCE RaceComm[] = RESOURCE RaceComm[] =
{ {
RACE_COMMUNICATION RACE_COMMUNICATION
@@ -1655,7 +1652,7 @@ RaceCommunication (void)
{ {
COUNT NumShips; COUNT NumShips;
HENCOUNTER hEncounter; HENCOUNTER hEncounter;
ENCOUNTERPTR EncounterPtr; ENCOUNTER *EncounterPtr;
hEncounter = GetHeadEncounter (); hEncounter = GetHeadEncounter ();
LockEncounter (hEncounter, &EncounterPtr); LockEncounter (hEncounter, &EncounterPtr);
@@ -1667,13 +1664,13 @@ RaceCommunication (void)
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
} }
CurStarDescPtr = (STAR_DESCPTR)&EncounterPtr->SD; CurStarDescPtr = (STAR_DESC*)&EncounterPtr->SD;
UnlockEncounter (hEncounter); UnlockEncounter (hEncounter);
} }
} }
hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q));
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( FragPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip); &GLOBAL (npc_built_ship_q), hStarShip);
i = GET_RACE_ID (FragPtr); i = GET_RACE_ID (FragPtr);
UnlockStarShip (&GLOBAL (npc_built_ship_q), hStarShip); UnlockStarShip (&GLOBAL (npc_built_ship_q), hStarShip);
@@ -1694,9 +1691,9 @@ RaceCommunication (void)
} }
else else
{ {
PEXTENDED_STAR_DESC pESD; EXTENDED_STAR_DESC *pESD;
pESD = (PEXTENDED_STAR_DESC)CurStarDescPtr; pESD = (EXTENDED_STAR_DESC*)CurStarDescPtr;
if (pESD) if (pESD)
{ {
BYTE i, NumShips; BYTE i, NumShips;
@@ -1710,11 +1707,11 @@ RaceCommunication (void)
for (i = 0; i < NumShips; ++i) for (i = 0; i < NumShips; ++i)
{ {
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
SHIP_FRAGMENTPTR TemplatePtr; SHIP_FRAGMENT *TemplatePtr;
hStarShip = GetStarShipFromIndex ( hStarShip = GetStarShipFromIndex (
&GLOBAL (npc_built_ship_q), i); &GLOBAL (npc_built_ship_q), i);
TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( TemplatePtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip); &GLOBAL (npc_built_ship_q), hStarShip);
pESD->ShipList[i] = TemplatePtr->ShipInfo; pESD->ShipList[i] = TemplatePtr->ShipInfo;
pESD->ShipList[i].var1 = GET_RACE_ID (TemplatePtr); pESD->ShipList[i].var1 = GET_RACE_ID (TemplatePtr);
sc2/src/sc2code/comm.h
+1 -1
View File
@@ -38,7 +38,7 @@ typedef enum
#include "commanim.h" #include "commanim.h"
void DrawAlienFrame (FRAME aframe, PSEQUENCE pSeq); void DrawAlienFrame (FRAME aframe, SEQUENCE *pSeq);
BOOLEAN SetClearSubtitle (BOOLEAN flag, SUBTITLE_STATE *sub_state); BOOLEAN SetClearSubtitle (BOOLEAN flag, SUBTITLE_STATE *sub_state);
extern LOCDATA CommData; extern LOCDATA CommData;
sc2/src/sc2code/comm/arilou/arilouc.c
+6 -6
View File
@@ -25,9 +25,9 @@
static LOCDATA arilou_desc = static LOCDATA arilou_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)ARILOU_PMAP_ANIM, /* AlienFrame */ (FRAME)ARILOU_PMAP_ANIM, /* AlienFrame */
(FONT)ARILOU_FONT, /* AlienFont */ (FONT)ARILOU_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -220,7 +220,7 @@ static LOCDATA arilou_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -822,10 +822,10 @@ post_arilou_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_arilou_comm (void) init_arilou_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
arilou_desc.init_encounter_func = Intro; arilou_desc.init_encounter_func = Intro;
arilou_desc.post_encounter_func = post_arilou_enc; arilou_desc.post_encounter_func = post_arilou_enc;
sc2/src/sc2code/comm/blackur/blackurc.c
+6 -6
View File
@@ -22,9 +22,9 @@
static LOCDATA blackurq_desc = static LOCDATA blackurq_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)BLACKURQ_PMAP_ANIM, /* AlienFrame */ (FRAME)BLACKURQ_PMAP_ANIM, /* AlienFrame */
(FONT)BLACKURQ_FONT, /* AlienFont */ (FONT)BLACKURQ_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -122,7 +122,7 @@ static LOCDATA blackurq_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -535,10 +535,10 @@ post_blackurq_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_blackurq_comm (void) init_blackurq_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
blackurq_desc.init_encounter_func = Intro; blackurq_desc.init_encounter_func = Intro;
blackurq_desc.post_encounter_func = post_blackurq_enc; blackurq_desc.post_encounter_func = post_blackurq_enc;
sc2/src/sc2code/comm/chmmr/chmmrc.c
+7 -7
View File
@@ -25,9 +25,9 @@
static LOCDATA chmmr_desc = static LOCDATA chmmr_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)CHMMR_PMAP_ANIM, /* AlienFrame */ (FRAME)CHMMR_PMAP_ANIM, /* AlienFrame */
(FONT)CHMMR_FONT, /* AlienFont */ (FONT)CHMMR_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -108,7 +108,7 @@ static LOCDATA chmmr_desc =
ONE_SECOND / 60, 0, /* RestartRate */ ONE_SECOND / 60, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -587,7 +587,7 @@ Intro (void)
i_am_captain1, i_am_captain1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
i_am_captain2, i_am_captain2,
NULL_PTR); (UNICODE*)NULL);
DoResponsePhrase (i_am_captain0, ChmmrFree, shared_phrase_buf); DoResponsePhrase (i_am_captain0, ChmmrFree, shared_phrase_buf);
Response (i_am_savior, ChmmrFree); Response (i_am_savior, ChmmrFree);
Response (i_am_silly, ChmmrFree); Response (i_am_silly, ChmmrFree);
@@ -611,10 +611,10 @@ post_chmmr_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_chmmr_comm (void) init_chmmr_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
chmmr_desc.init_encounter_func = Intro; chmmr_desc.init_encounter_func = Intro;
chmmr_desc.post_encounter_func = post_chmmr_enc; chmmr_desc.post_encounter_func = post_chmmr_enc;
sc2/src/sc2code/comm/comandr/comandr.c
+16 -17
View File
@@ -24,9 +24,9 @@
static LOCDATA commander_desc = static LOCDATA commander_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */ (FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */
(FONT)COMMANDER_FONT, /* AlienFont */ (FONT)COMMANDER_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -83,7 +83,7 @@ static LOCDATA commander_desc =
ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */ ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -140,7 +140,7 @@ ByeBye (RESPONSE_REF R)
name_40, name_40,
GLOBAL_SIS (CommanderName), GLOBAL_SIS (CommanderName),
name_41, name_41,
NULL_PTR); (UNICODE*)NULL);
NPCPhrase (THIS_MAY_SEEM_SILLY); NPCPhrase (THIS_MAY_SEEM_SILLY);
@@ -194,7 +194,7 @@ NoRadioactives (RESPONSE_REF R)
NPCPhrase (ABOUT_TIME); NPCPhrase (ABOUT_TIME);
if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE])) if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE]))
GiveRadios (NULL_PTR); GiveRadios (0);
else else
{ {
Response (i_lied, NoRadioactives); Response (i_lied, NoRadioactives);
@@ -255,7 +255,7 @@ NoRadioactives (RESPONSE_REF R)
} }
if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE])) if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE]))
GiveRadios (NULL_PTR); GiveRadios (0);
else else
{ {
if (GLOBAL_SIS (NumLanders) == 0 if (GLOBAL_SIS (NumLanders) == 0
@@ -559,7 +559,7 @@ RevealSelf (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
NULL_PTR); (UNICODE*)NULL);
DoResponsePhrase (we_are_vindicator0, RevealSelf, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, RevealSelf, shared_phrase_buf);
} }
else if (PHRASE_ENABLED (our_mission_was_secret)) else if (PHRASE_ENABLED (our_mission_was_secret))
@@ -596,7 +596,7 @@ GiveRadios (RESPONSE_REF R)
AlienTalkSegue ((COUNT)~0); AlienTalkSegue ((COUNT)~0);
RevealSelf (NULL_PTR); RevealSelf (0);
} }
else else
{ {
@@ -628,11 +628,11 @@ Intro (void)
{ {
if (GET_GAME_STATE (MOONBASE_DESTROYED) == 0) if (GET_GAME_STATE (MOONBASE_DESTROYED) == 0)
{ {
TellMoonBase (NULL_PTR); TellMoonBase (0);
} }
else else
{ {
BaseDestroyed (NULL_PTR); BaseDestroyed (0);
} }
} }
else else
@@ -642,9 +642,9 @@ Intro (void)
NPCPhrase (DO_YOU_HAVE_RADIO_THIS_TIME); NPCPhrase (DO_YOU_HAVE_RADIO_THIS_TIME);
if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE])) if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE]))
GiveRadios (NULL_PTR); GiveRadios (0);
else else
AskAfterRadios (NULL_PTR); AskAfterRadios (0);
} }
} }
else /* first visit */ else /* first visit */
@@ -660,8 +660,7 @@ Intro (void)
no_but_well_help0, no_but_well_help0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
no_but_well_help1, no_but_well_help1,
NULL_PTR (UNICODE*)NULL);
);
DoResponsePhrase (no_but_well_help0, NoRadioactives, shared_phrase_buf); DoResponsePhrase (no_but_well_help0, NoRadioactives, shared_phrase_buf);
Response (yes_this_is_supply_ship, NoRadioactives); Response (yes_this_is_supply_ship, NoRadioactives);
Response (what_slave_planet, NoRadioactives); Response (what_slave_planet, NoRadioactives);
@@ -680,10 +679,10 @@ post_commander_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_commander_comm () init_commander_comm ()
{ {
LOCDATAPTR retval; LOCDATA *retval;
commander_desc.init_encounter_func = Intro; commander_desc.init_encounter_func = Intro;
commander_desc.post_encounter_func = post_commander_enc; commander_desc.post_encounter_func = post_commander_enc;
sc2/src/sc2code/comm/druuge/druugec.c
+6 -6
View File
@@ -26,9 +26,9 @@
static LOCDATA druuge_desc = static LOCDATA druuge_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)DRUUGE_PMAP_ANIM, /* AlienFrame */ (FRAME)DRUUGE_PMAP_ANIM, /* AlienFrame */
(FONT)DRUUGE_FONT, /* AlienFont */ (FONT)DRUUGE_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -149,7 +149,7 @@ static LOCDATA druuge_desc =
ONE_SECOND / 12, ONE_SECOND / 12, /* RestartRate */ ONE_SECOND / 12, ONE_SECOND / 12, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static COUNT SlaveryCount = 0; static COUNT SlaveryCount = 0;
@@ -897,10 +897,10 @@ post_druuge_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_druuge_comm (void) init_druuge_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
druuge_desc.init_encounter_func = Intro; druuge_desc.init_encounter_func = Intro;
druuge_desc.post_encounter_func = post_druuge_enc; druuge_desc.post_encounter_func = post_druuge_enc;
sc2/src/sc2code/comm/ilwrath/ilwrathc.c
+6 -6
View File
@@ -25,9 +25,9 @@
static LOCDATA ilwrath_desc = static LOCDATA ilwrath_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)ILWRATH_PMAP_ANIM, /* AlienFrame */ (FRAME)ILWRATH_PMAP_ANIM, /* AlienFrame */
(FONT)ILWRATH_FONT, /* AlienFont */ (FONT)ILWRATH_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -92,7 +92,7 @@ static LOCDATA ilwrath_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -615,10 +615,10 @@ post_ilwrath_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_ilwrath_comm (void) init_ilwrath_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
ilwrath_desc.init_encounter_func = Intro; ilwrath_desc.init_encounter_func = Intro;
ilwrath_desc.post_encounter_func = post_ilwrath_enc; ilwrath_desc.post_encounter_func = post_ilwrath_enc;
sc2/src/sc2code/comm/melnorm/melnorm.c
+6 -7
View File
@@ -36,9 +36,9 @@ static NUMBER_SPEECH_DESC melnorme_numbers_english;
static LOCDATA melnorme_desc = static LOCDATA melnorme_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)MELNORME_PMAP_ANIM, /* AlienFrame */ (FRAME)MELNORME_PMAP_ANIM, /* AlienFrame */
(FONT)MELNORME_FONT, /* AlienFont */ (FONT)MELNORME_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -1501,8 +1501,7 @@ yack0_respond (void)
shared_phrase_buf, shared_phrase_buf,
we_are_from_alliance0, we_are_from_alliance0,
buf, buf,
(RESPONSE_REF)-1 (RESPONSE_REF)-1);
);
DoResponsePhrase (we_are_from_alliance0, DoFirstMeeting, shared_phrase_buf); DoResponsePhrase (we_are_from_alliance0, DoFirstMeeting, shared_phrase_buf);
break; break;
} }
@@ -1849,10 +1848,10 @@ post_melnorme_enc (void)
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
LOCDATAPTR LOCDATA*
init_melnorme_comm (void) init_melnorme_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
melnorme_desc.init_encounter_func = Intro; melnorme_desc.init_encounter_func = Intro;
melnorme_desc.post_encounter_func = post_melnorme_enc; melnorme_desc.post_encounter_func = post_melnorme_enc;
sc2/src/sc2code/comm/mycon/myconc.c
+6 -6
View File
@@ -26,9 +26,9 @@
static LOCDATA mycon_desc = static LOCDATA mycon_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)MYCON_PMAP_ANIM, /* AlienFrame */ (FRAME)MYCON_PMAP_ANIM, /* AlienFrame */
(FONT)MYCON_FONT, /* AlienFont */ (FONT)MYCON_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -101,7 +101,7 @@ static LOCDATA mycon_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static BYTE MadeChoice; static BYTE MadeChoice;
@@ -610,10 +610,10 @@ post_mycon_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_mycon_comm (void) init_mycon_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
mycon_desc.init_encounter_func = Intro; mycon_desc.init_encounter_func = Intro;
mycon_desc.post_encounter_func = post_mycon_enc; mycon_desc.post_encounter_func = post_mycon_enc;
sc2/src/sc2code/comm/orz/orzc.c
+7 -7
View File
@@ -24,9 +24,9 @@
static LOCDATA orz_desc = static LOCDATA orz_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)ORZ_PMAP_ANIM, /* AlienFrame */ (FRAME)ORZ_PMAP_ANIM, /* AlienFrame */
(FONT)ORZ_FONT, /* AlienFont */ (FONT)ORZ_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -163,7 +163,7 @@ static LOCDATA orz_desc =
ONE_SECOND / 12, ONE_SECOND * 3 / 8, /* RestartRate */ ONE_SECOND / 12, ONE_SECOND * 3 / 8, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -540,7 +540,7 @@ OrzNeutral (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
NULL_PTR); (UNICODE*)NULL);
pStr[1] = we_are_vindicator0; pStr[1] = we_are_vindicator0;
} }
else else
@@ -867,10 +867,10 @@ post_orz_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_orz_comm (void) init_orz_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
orz_desc.init_encounter_func = Intro; orz_desc.init_encounter_func = Intro;
orz_desc.post_encounter_func = post_orz_enc; orz_desc.post_encounter_func = post_orz_enc;
sc2/src/sc2code/comm/pkunk/pkunkc.c
+8 -9
View File
@@ -26,9 +26,9 @@
static LOCDATA pkunk_desc = static LOCDATA pkunk_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)PKUNK_PMAP_ANIM, /* AlienFrame */ (FRAME)PKUNK_PMAP_ANIM, /* AlienFrame */
(FONT)PKUNK_FONT, /* AlienFont */ (FONT)PKUNK_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -88,7 +88,7 @@ static LOCDATA pkunk_desc =
ONE_SECOND / 12, ONE_SECOND / 2, /* RestartRate */ ONE_SECOND / 12, ONE_SECOND / 2, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static BOOLEAN static BOOLEAN
@@ -306,8 +306,7 @@ DiscussConquer (RESPONSE_REF R)
shared_phrase_buf, shared_phrase_buf,
conquer_because_1, conquer_because_1,
buf, buf,
(RESPONSE_REF)-1 (RESPONSE_REF)-1);
);
DoResponsePhrase (conquer_because_1, DiscussConquer, shared_phrase_buf); DoResponsePhrase (conquer_because_1, DiscussConquer, shared_phrase_buf);
#endif #endif
Response(conquer_because_1, DiscussConquer); Response(conquer_because_1, DiscussConquer);
@@ -624,7 +623,7 @@ PkunkHome (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
NULL_PTR); (UNICODE*)NULL);
DoResponsePhrase (we_are_vindicator0, OfferAlliance, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, OfferAlliance, shared_phrase_buf);
} }
if (PHRASE_ENABLED (what_about_you)) if (PHRASE_ENABLED (what_about_you))
@@ -1113,10 +1112,10 @@ post_pkunk_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_pkunk_comm (void) init_pkunk_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
pkunk_desc.init_encounter_func = Intro; pkunk_desc.init_encounter_func = Intro;
pkunk_desc.post_encounter_func = post_pkunk_enc; pkunk_desc.post_encounter_func = post_pkunk_enc;
sc2/src/sc2code/comm/rebel/rebel.c
+6 -6
View File
@@ -25,9 +25,9 @@
static LOCDATA yehat_desc = static LOCDATA yehat_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */ (FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */
(FONT)YEHAT_FONT, /* AlienFont */ (FONT)YEHAT_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -185,7 +185,7 @@ static LOCDATA yehat_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -422,10 +422,10 @@ post_yehat_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_rebel_yehat_comm (void) init_rebel_yehat_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
yehat_desc.init_encounter_func = Intro; yehat_desc.init_encounter_func = Intro;
yehat_desc.post_encounter_func = post_yehat_enc; yehat_desc.post_encounter_func = post_yehat_enc;
sc2/src/sc2code/comm/shofixt/shofixt.c
+11 -16
View File
@@ -25,9 +25,9 @@
static LOCDATA shofixti_desc = static LOCDATA shofixti_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)SHOFIXTI_PMAP_ANIM, /* AlienFrame */ (FRAME)SHOFIXTI_PMAP_ANIM, /* AlienFrame */
(FONT)SHOFIXTI_FONT, /* AlienFont */ (FONT)SHOFIXTI_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -149,7 +149,7 @@ static LOCDATA shofixti_desc =
ONE_SECOND / 15, 0, /* RestartRate */ ONE_SECOND / 15, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static RESPONSE_REF shofixti_name; static RESPONSE_REF shofixti_name;
@@ -353,8 +353,7 @@ RealizeMistake (RESPONSE_REF R)
i_am_captain2, i_am_captain2,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
i_am_captain3, i_am_captain3,
NULL_PTR (UNICODE*)NULL);
);
} }
DoResponsePhrase (i_am_captain0, ExplainDefeat, shared_phrase_buf); DoResponsePhrase (i_am_captain0, ExplainDefeat, shared_phrase_buf);
Response (i_am_nice, ExplainDefeat); Response (i_am_nice, ExplainDefeat);
@@ -403,8 +402,7 @@ Hostile (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
look1, look1,
NULL_PTR (UNICODE*)NULL);
);
DoResponsePhrase (look0, ExitConversation, shared_phrase_buf); DoResponsePhrase (look0, ExitConversation, shared_phrase_buf);
break; break;
} }
@@ -477,8 +475,7 @@ Friendly (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
report1, report1,
NULL_PTR (UNICODE*)NULL);
);
Resp[0].pStr = report0; Resp[0].pStr = report0;
Resp[0].c_buf = buf0; Resp[0].c_buf = buf0;
} }
@@ -493,8 +490,7 @@ Friendly (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
why_here1, why_here1,
NULL_PTR (UNICODE*)NULL);
);
Resp[1].pStr = why_here0; Resp[1].pStr = why_here0;
Resp[1].c_buf = buf1; Resp[1].c_buf = buf1;
break; break;
@@ -535,8 +531,7 @@ Friendly (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
bye1, bye1,
NULL_PTR (UNICODE*)NULL);
);
DoResponsePhrase (bye0, ExitConversation, shared_phrase_buf); DoResponsePhrase (bye0, ExitConversation, shared_phrase_buf);
} }
@@ -632,10 +627,10 @@ post_shofixti_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_shofixti_comm (void) init_shofixti_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
shofixti_desc.init_encounter_func = Intro; shofixti_desc.init_encounter_func = Intro;
shofixti_desc.post_encounter_func = post_shofixti_enc; shofixti_desc.post_encounter_func = post_shofixti_enc;
sc2/src/sc2code/comm/slyhome/slyhome.c
+7 -7
View File
@@ -24,9 +24,9 @@
static LOCDATA slylandro_desc = static LOCDATA slylandro_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)SLYLANDRO_PMAP_ANIM, /* AlienFrame */ (FRAME)SLYLANDRO_PMAP_ANIM, /* AlienFrame */
(FONT)SLYLANDRO_FONT, /* AlienFont */ (FONT)SLYLANDRO_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -163,7 +163,7 @@ static LOCDATA slylandro_desc =
0, 0, /* RestartRate */ 0, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -756,7 +756,7 @@ HomeWorld (RESPONSE_REF R)
we_are_us1, we_are_us1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_us2, we_are_us2,
NULL_PTR); (UNICODE*)NULL);
pStr[0] = we_are_us0; pStr[0] = we_are_us0;
break; break;
case 1: case 1:
@@ -896,10 +896,10 @@ post_slylandro_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_slylandro_comm (void) init_slylandro_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
slylandro_desc.init_encounter_func = Intro; slylandro_desc.init_encounter_func = Intro;
slylandro_desc.post_encounter_func = post_slylandro_enc; slylandro_desc.post_encounter_func = post_slylandro_enc;
sc2/src/sc2code/comm/slyland/slyland.c
+6 -6
View File
@@ -27,9 +27,9 @@
static LOCDATA slylandro_desc = static LOCDATA slylandro_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)SLYLAND_PMAP_ANIM, /* AlienFrame */ (FRAME)SLYLAND_PMAP_ANIM, /* AlienFrame */
(FONT)SLYLAND_FONT, /* AlienFont */ (FONT)SLYLAND_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -110,7 +110,7 @@ static LOCDATA slylandro_desc =
0, 0, /* RestartRate */ 0, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static RESPONSE_REF threat, static RESPONSE_REF threat,
@@ -394,10 +394,10 @@ post_slyland_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_slyland_comm (void) init_slyland_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
slylandro_desc.init_encounter_func = Intro; slylandro_desc.init_encounter_func = Intro;
slylandro_desc.post_encounter_func = post_slyland_enc; slylandro_desc.post_encounter_func = post_slyland_enc;
sc2/src/sc2code/comm/spahome/spahome.c
+7 -7
View File
@@ -26,9 +26,9 @@
static LOCDATA spahome_desc = static LOCDATA spahome_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)SPATHI_HOME_PMAP_ANIM, /* AlienFrame */ (FRAME)SPATHI_HOME_PMAP_ANIM, /* AlienFrame */
(FONT)SPATHI_FONT, /* AlienFont */ (FONT)SPATHI_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -176,7 +176,7 @@ static LOCDATA spahome_desc =
0, 0, /* RestartRate */ 0, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -883,7 +883,7 @@ SpathiPassword (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
NULL_PTR); (UNICODE*)NULL);
DoResponsePhrase (we_are_vindicator0, ExitConversation, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, ExitConversation, shared_phrase_buf);
Response (gort_merenga, ExitConversation); Response (gort_merenga, ExitConversation);
Response (guph_florp, ExitConversation); Response (guph_florp, ExitConversation);
@@ -982,10 +982,10 @@ post_spahome_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_spahome_comm () init_spahome_comm ()
{ {
LOCDATAPTR retval; LOCDATA *retval;
spahome_desc.init_encounter_func = Intro; spahome_desc.init_encounter_func = Intro;
spahome_desc.post_encounter_func = post_spahome_enc; spahome_desc.post_encounter_func = post_spahome_enc;
sc2/src/sc2code/comm/spathi/spathic.c
+6 -6
View File
@@ -25,9 +25,9 @@
static LOCDATA spathi_desc = static LOCDATA spathi_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)SPATHI_PMAP_ANIM, /* AlienFrame */ (FRAME)SPATHI_PMAP_ANIM, /* AlienFrame */
(FONT)SPATHI_FONT, /* AlienFont */ (FONT)SPATHI_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -137,7 +137,7 @@ static LOCDATA spathi_desc =
0, /* BlockMask */ 0, /* BlockMask */
}, },
#endif /* NEVER */ #endif /* NEVER */
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -788,10 +788,10 @@ post_spathi_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_spathi_comm (void) init_spathi_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
spathi_desc.init_encounter_func = Intro; spathi_desc.init_encounter_func = Intro;
spathi_desc.post_encounter_func = post_spathi_enc; spathi_desc.post_encounter_func = post_spathi_enc;
sc2/src/sc2code/comm/starbas/starbas.c
+12 -14
View File
@@ -36,9 +36,9 @@ static void SellMinerals (RESPONSE_REF R);
static LOCDATA commander_desc = static LOCDATA commander_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */ (FRAME)COMMANDER_PMAP_ANIM, /* AlienFrame */
(FONT)COMMANDER_FONT, /* AlienFont */ (FONT)COMMANDER_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -151,7 +151,7 @@ static LOCDATA commander_desc =
ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */ ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static DWORD CurBulletinMask; static DWORD CurBulletinMask;
@@ -935,8 +935,7 @@ TellStarBase (RESPONSE_REF R)
tell_me_about_modules0, tell_me_about_modules0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
tell_me_about_modules1, tell_me_about_modules1,
NULL_PTR (UNICODE*)NULL);
);
pstack[0] = tell_me_about_modules0; pstack[0] = tell_me_about_modules0;
break; break;
default: default:
@@ -951,8 +950,7 @@ TellStarBase (RESPONSE_REF R)
tell_me_about_fuel0, tell_me_about_fuel0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
tell_me_about_fuel1, tell_me_about_fuel1,
NULL_PTR (UNICODE*)NULL);
);
pstack[1] = tell_me_about_fuel0; pstack[1] = tell_me_about_fuel0;
break; break;
default: default:
@@ -1155,7 +1153,7 @@ DiscussDevices (BOOLEAN TalkAbout)
if (GET_GAME_STATE (DATA_PLATE_1_ON_SHIP) if (GET_GAME_STATE (DATA_PLATE_1_ON_SHIP)
&& !GET_GAME_STATE (DISCUSSED_DATA_PLATE_1)) && !GET_GAME_STATE (DISCUSSED_DATA_PLATE_1))
{ {
pStr = (PSTR)ABOUT_DATAPLATE_1; pStr = ABOUT_DATAPLATE_1;
SET_GAME_STATE (DISCUSSED_DATA_PLATE_1, TalkAbout); SET_GAME_STATE (DISCUSSED_DATA_PLATE_1, TalkAbout);
} }
break; break;
@@ -1163,7 +1161,7 @@ DiscussDevices (BOOLEAN TalkAbout)
if (GET_GAME_STATE (DATA_PLATE_2_ON_SHIP) if (GET_GAME_STATE (DATA_PLATE_2_ON_SHIP)
&& !GET_GAME_STATE (DISCUSSED_DATA_PLATE_2)) && !GET_GAME_STATE (DISCUSSED_DATA_PLATE_2))
{ {
pStr = (PSTR)ABOUT_DATAPLATE_2; pStr = ABOUT_DATAPLATE_2;
SET_GAME_STATE (DISCUSSED_DATA_PLATE_2, TalkAbout); SET_GAME_STATE (DISCUSSED_DATA_PLATE_2, TalkAbout);
} }
break; break;
@@ -1171,7 +1169,7 @@ DiscussDevices (BOOLEAN TalkAbout)
if (GET_GAME_STATE (DATA_PLATE_3_ON_SHIP) if (GET_GAME_STATE (DATA_PLATE_3_ON_SHIP)
&& !GET_GAME_STATE (DISCUSSED_DATA_PLATE_3)) && !GET_GAME_STATE (DISCUSSED_DATA_PLATE_3))
{ {
pStr = (PSTR)ABOUT_DATAPLATE_3; pStr = ABOUT_DATAPLATE_3;
SET_GAME_STATE (DISCUSSED_DATA_PLATE_3, TalkAbout); SET_GAME_STATE (DISCUSSED_DATA_PLATE_3, TalkAbout);
} }
break; break;
@@ -1911,7 +1909,7 @@ SellMinerals (RESPONSE_REF R)
static void static void
Intro (void) Intro (void)
{ {
NormalStarbase (NULL_PTR); NormalStarbase (0);
} }
static COUNT static COUNT
@@ -1930,10 +1928,10 @@ post_starbase_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_starbase_comm () init_starbase_comm ()
{ {
LOCDATAPTR retval; LOCDATA *retval;
commander_desc.init_encounter_func = Intro; commander_desc.init_encounter_func = Intro;
commander_desc.post_encounter_func = post_starbase_enc; commander_desc.post_encounter_func = post_starbase_enc;
sc2/src/sc2code/comm/supox/supoxc.c
+9 -10
View File
@@ -25,9 +25,9 @@
static LOCDATA supox_desc = static LOCDATA supox_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)SUPOX_PMAP_ANIM, /* AlienFrame */ (FRAME)SUPOX_PMAP_ANIM, /* AlienFrame */
(FONT)SUPOX_FONT, /* AlienFont */ (FONT)SUPOX_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -93,7 +93,7 @@ static LOCDATA supox_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -422,7 +422,7 @@ NeutralSupox (RESPONSE_REF R)
i_am0, i_am0,
GLOBAL_SIS (CommanderName), GLOBAL_SIS (CommanderName),
i_am1, i_am1,
NULL_PTR); (UNICODE*)NULL);
pStr[0] = i_am0; pStr[0] = i_am0;
pStr[1] = 0; pStr[1] = 0;
break; break;
@@ -431,7 +431,7 @@ NeutralSupox (RESPONSE_REF R)
my_ship0, my_ship0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
my_ship1, my_ship1,
NULL_PTR); (UNICODE*)NULL);
pStr[0] = my_ship0; pStr[0] = my_ship0;
pStr[1] = 0; pStr[1] = 0;
break; break;
@@ -445,8 +445,7 @@ NeutralSupox (RESPONSE_REF R)
from_alliance0, from_alliance0,
buf, buf,
from_alliance1, from_alliance1,
NULL_PTR (UNICODE*)NULL);
);
} }
pStr[0] = from_alliance0; pStr[0] = from_alliance0;
pStr[1] = 0; pStr[1] = 0;
@@ -677,10 +676,10 @@ post_supox_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_supox_comm (void) init_supox_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
supox_desc.init_encounter_func = Intro; supox_desc.init_encounter_func = Intro;
supox_desc.post_encounter_func = post_supox_enc; supox_desc.post_encounter_func = post_supox_enc;
sc2/src/sc2code/comm/syreen/syreenc.c
+7 -7
View File
@@ -26,9 +26,9 @@
static LOCDATA syreen_desc = static LOCDATA syreen_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)SYREEN_PMAP_ANIM, /* AlienFrame */ (FRAME)SYREEN_PMAP_ANIM, /* AlienFrame */
(FONT)SYREEN_FONT, /* AlienFont */ (FONT)SYREEN_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -183,7 +183,7 @@ static LOCDATA syreen_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -791,7 +791,7 @@ Intro (void)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
NULL_PTR); (UNICODE*)NULL);
Response (we_are_vice_squad, InitialSyreen); Response (we_are_vice_squad, InitialSyreen);
Response (we_are_the_one_for_you_baby, InitialSyreen); Response (we_are_the_one_for_you_baby, InitialSyreen);
DoResponsePhrase (we_are_vindicator0, InitialSyreen, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, InitialSyreen, shared_phrase_buf);
@@ -846,10 +846,10 @@ post_syreen_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_syreen_comm (void) init_syreen_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
syreen_desc.init_encounter_func = Intro; syreen_desc.init_encounter_func = Intro;
syreen_desc.post_encounter_func = post_syreen_enc; syreen_desc.post_encounter_func = post_syreen_enc;
sc2/src/sc2code/comm/talkpet/talkpet.c
+7 -8
View File
@@ -24,9 +24,9 @@
static LOCDATA talkpet_desc = static LOCDATA talkpet_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)TALKING_PET_PMAP_ANIM, /* AlienFrame */ (FRAME)TALKING_PET_PMAP_ANIM, /* AlienFrame */
(FONT)TALKING_PET_FONT, /* AlienFont */ (FONT)TALKING_PET_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -190,7 +190,7 @@ static LOCDATA talkpet_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
#define STROBE_RATE 15 #define STROBE_RATE 15
@@ -520,8 +520,7 @@ CompelPlayer (RESPONSE_REF R)
we_are_vindicator0, we_are_vindicator0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator1, we_are_vindicator1,
NULL_PTR (UNICODE*)NULL);
);
pStr[2] = we_are_vindicator0; pStr[2] = we_are_vindicator0;
} }
else else
@@ -792,10 +791,10 @@ post_talkpet_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_talkpet_comm (void) init_talkpet_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
talkpet_desc.init_encounter_func = Intro; talkpet_desc.init_encounter_func = Intro;
talkpet_desc.post_encounter_func = post_talkpet_enc; talkpet_desc.post_encounter_func = post_talkpet_enc;
sc2/src/sc2code/comm/thradd/thraddc.c
+7 -7
View File
@@ -26,9 +26,9 @@
static LOCDATA thradd_desc = static LOCDATA thradd_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)THRADD_PMAP_ANIM, /* AlienFrame */ (FRAME)THRADD_PMAP_ANIM, /* AlienFrame */
(FONT)THRADD_FONT, /* AlienFont */ (FONT)THRADD_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -126,7 +126,7 @@ static LOCDATA thradd_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static int static int
@@ -485,7 +485,7 @@ ThraddCulture (RESPONSE_REF R)
the_slave_empire0, the_slave_empire0,
GLOBAL_SIS (CommanderName), GLOBAL_SIS (CommanderName),
the_slave_empire1, the_slave_empire1,
NULL_PTR); (UNICODE*)NULL);
Response (you_decide, ThraddDemeanor); Response (you_decide, ThraddDemeanor);
Response (fat, ThraddDemeanor); Response (fat, ThraddDemeanor);
@@ -920,10 +920,10 @@ post_thradd_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_thradd_comm (void) init_thradd_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
thradd_desc.init_encounter_func = Intro; thradd_desc.init_encounter_func = Intro;
thradd_desc.post_encounter_func = post_thradd_enc; thradd_desc.post_encounter_func = post_thradd_enc;
sc2/src/sc2code/comm/umgah/umgahc.c
+7 -7
View File
@@ -25,9 +25,9 @@
static LOCDATA umgah_desc = static LOCDATA umgah_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)UMGAH_PMAP_ANIM, /* AlienFrame */ (FRAME)UMGAH_PMAP_ANIM, /* AlienFrame */
(FONT)UMGAH_FONT, /* AlienFont */ (FONT)UMGAH_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -188,7 +188,7 @@ static LOCDATA umgah_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -368,7 +368,7 @@ Zombies (RESPONSE_REF R)
we_vindicator1, we_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_vindicator2, we_vindicator2,
NULL_PTR); (UNICODE*)NULL);
pStr[1] = we_vindicator0; pStr[1] = we_vindicator0;
} }
else if (PHRASE_ENABLED (come_in_peace)) else if (PHRASE_ENABLED (come_in_peace))
@@ -697,10 +697,10 @@ post_umgah_enc (void)
} }
} }
LOCDATAPTR LOCDATA*
init_umgah_comm (void) init_umgah_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
umgah_desc.init_encounter_func = Intro; umgah_desc.init_encounter_func = Intro;
umgah_desc.post_encounter_func = post_umgah_enc; umgah_desc.post_encounter_func = post_umgah_enc;
sc2/src/sc2code/comm/urquan/urquanc.c
+6 -6
View File
@@ -22,9 +22,9 @@
static LOCDATA urquan_desc = static LOCDATA urquan_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)URQUAN_PMAP_ANIM, /* AlienFrame */ (FRAME)URQUAN_PMAP_ANIM, /* AlienFrame */
(FONT)URQUAN_FONT, /* AlienFont */ (FONT)URQUAN_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -113,7 +113,7 @@ static LOCDATA urquan_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -518,10 +518,10 @@ post_urquan_enc (void)
SET_GAME_STATE (PLAYER_HYPNOTIZED, 0); SET_GAME_STATE (PLAYER_HYPNOTIZED, 0);
} }
LOCDATAPTR LOCDATA*
init_urquan_comm (void) init_urquan_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
DWORD GrpOffs; DWORD GrpOffs;
sc2/src/sc2code/comm/utwig/utwigc.c
+7 -8
View File
@@ -26,9 +26,9 @@
static LOCDATA utwig_desc = static LOCDATA utwig_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)UTWIG_PMAP_ANIM, /* AlienFrame */ (FRAME)UTWIG_PMAP_ANIM, /* AlienFrame */
(FONT)UTWIG_FONT, /* AlienFont */ (FONT)UTWIG_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -190,7 +190,7 @@ static LOCDATA utwig_desc =
ONE_SECOND * 7 / 60, ONE_SECOND / 2, /* RestartRate */ ONE_SECOND * 7 / 60, ONE_SECOND / 2, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -558,8 +558,7 @@ NeutralUtwig (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
buf, buf,
we_are_vindicator2, we_are_vindicator2,
NULL_PTR (UNICODE*)NULL);
);
} }
pStr[0] = we_are_vindicator0; pStr[0] = we_are_vindicator0;
break; break;
@@ -955,10 +954,10 @@ post_utwig_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_utwig_comm (void) init_utwig_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
utwig_desc.init_encounter_func = Intro; utwig_desc.init_encounter_func = Intro;
utwig_desc.post_encounter_func = post_utwig_enc; utwig_desc.post_encounter_func = post_utwig_enc;
sc2/src/sc2code/comm/vux/vuxc.c
+6 -6
View File
@@ -22,9 +22,9 @@
static LOCDATA vux_desc = static LOCDATA vux_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)VUX_PMAP_ANIM, /* AlienFrame */ (FRAME)VUX_PMAP_ANIM, /* AlienFrame */
(FONT)VUX_FONT, /* AlienFont */ (FONT)VUX_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -193,7 +193,7 @@ static LOCDATA vux_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -763,10 +763,10 @@ post_vux_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_vux_comm (void) init_vux_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
vux_desc.init_encounter_func = Intro; vux_desc.init_encounter_func = Intro;
vux_desc.post_encounter_func = post_vux_enc; vux_desc.post_encounter_func = post_vux_enc;
sc2/src/sc2code/comm/yehat/yehatc.c
+8 -10
View File
@@ -27,9 +27,9 @@
static LOCDATA yehat_desc = static LOCDATA yehat_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */ (FRAME)YEHAT_PMAP_ANIM, /* AlienFrame */
(FONT)YEHAT_FONT, /* AlienFont */ (FONT)YEHAT_FONT, /* AlienFont */
WHITE_COLOR, /* AlienTextFColor */ WHITE_COLOR, /* AlienTextFColor */
@@ -184,7 +184,7 @@ static LOCDATA yehat_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
static void static void
@@ -381,8 +381,7 @@ YehatHome (RESPONSE_REF R)
i_demand_you_ally_homeworld2, i_demand_you_ally_homeworld2,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
i_demand_you_ally_homeworld3, i_demand_you_ally_homeworld3,
NULL_PTR (UNICODE*)NULL);
);
DoResponsePhrase (i_demand_you_ally_homeworld0, DoResponsePhrase (i_demand_you_ally_homeworld0,
ExitConversation, shared_phrase_buf); ExitConversation, shared_phrase_buf);
} }
@@ -508,8 +507,7 @@ YehatSpace (RESPONSE_REF R)
i_demand_you_ally_space2, i_demand_you_ally_space2,
buf, buf,
i_demand_you_ally_space3, i_demand_you_ally_space3,
NULL_PTR (UNICODE*)NULL);
);
pStr[2] = i_demand_you_ally_space0; pStr[2] = i_demand_you_ally_space0;
break; break;
} }
@@ -656,10 +654,10 @@ post_yehat_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_yehat_comm (void) init_yehat_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
yehat_desc.init_encounter_func = Intro; yehat_desc.init_encounter_func = Intro;
yehat_desc.post_encounter_func = post_yehat_enc; yehat_desc.post_encounter_func = post_yehat_enc;
sc2/src/sc2code/comm/zoqfot/zoqfotc.c
+7 -8
View File
@@ -42,9 +42,9 @@
static LOCDATA zoqfot_desc = static LOCDATA zoqfot_desc =
{ {
NULL_PTR, /* init_encounter_func */ NULL, /* init_encounter_func */
NULL_PTR, /* post_encounter_func */ NULL, /* post_encounter_func */
NULL_PTR, /* uninit_encounter_func */ NULL, /* uninit_encounter_func */
(FRAME)ZOQFOTPIK_PMAP_ANIM, /* AlienFrame */ (FRAME)ZOQFOTPIK_PMAP_ANIM, /* AlienFrame */
(FONT)ZOQFOTPIK_FONT, /* AlienFont */ (FONT)ZOQFOTPIK_FONT, /* AlienFont */
0, /* AlienTextFColor */ 0, /* AlienTextFColor */
@@ -102,7 +102,7 @@ static LOCDATA zoqfot_desc =
ONE_SECOND / 12, 0, /* RestartRate */ ONE_SECOND / 12, 0, /* RestartRate */
0, /* BlockMask */ 0, /* BlockMask */
}, },
NULL_PTR, /* AlienNumberSpeech - none */ NULL, /* AlienNumberSpeech - none */
}; };
enum enum
@@ -413,8 +413,7 @@ AquaintZoqFot (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
NULL_PTR (UNICODE*)NULL);
);
} }
if (PHRASE_ENABLED (which_fot)) if (PHRASE_ENABLED (which_fot))
@@ -932,10 +931,10 @@ post_zoqfot_enc (void)
// nothing defined so far // nothing defined so far
} }
LOCDATAPTR LOCDATA*
init_zoqfot_comm (void) init_zoqfot_comm (void)
{ {
LOCDATAPTR retval; LOCDATA *retval;
zoqfot_desc.init_encounter_func = Intro; zoqfot_desc.init_encounter_func = Intro;
zoqfot_desc.post_encounter_func = post_zoqfot_enc; zoqfot_desc.post_encounter_func = post_zoqfot_enc;
sc2/src/sc2code/commanim.c
+5 -5
View File
@@ -46,10 +46,10 @@ volatile BOOLEAN PauseAnimTask = FALSE;
static void static void
SetUpSequence (PSEQUENCE pSeq) SetUpSequence (SEQUENCE *pSeq)
{ {
COUNT i; COUNT i;
ANIMATION_DESCPTR ADPtr; ANIMATION_DESC *ADPtr;
i = CommData.NumAnimations; i = CommData.NumAnimations;
pSeq = &pSeq[i]; pSeq = &pSeq[i];
@@ -112,8 +112,8 @@ ambient_anim_task (void *data)
FRAME CommFrame; FRAME CommFrame;
SEQUENCE Sequencer[MAX_ANIMATIONS]; SEQUENCE Sequencer[MAX_ANIMATIONS];
ANIMATION_DESC TalkBuffer = CommData.AlienTalkDesc; ANIMATION_DESC TalkBuffer = CommData.AlienTalkDesc;
PSEQUENCE pSeq; SEQUENCE *pSeq;
ANIMATION_DESCPTR ADPtr; ANIMATION_DESC *ADPtr;
DWORD ActiveMask; DWORD ActiveMask;
DWORD LastOscillTime; DWORD LastOscillTime;
Task task = (Task) data; Task task = (Task) data;
@@ -127,7 +127,7 @@ ambient_anim_task (void *data)
TaskSwitch (); TaskSwitch ();
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
memset ((PSTR)&DisplayArray[0], 0, sizeof (DisplayArray)); memset (&DisplayArray[0], 0, sizeof (DisplayArray));
SetUpSequence (Sequencer); SetUpSequence (Sequencer);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
sc2/src/sc2code/commanim.h
-1
View File
@@ -50,7 +50,6 @@ struct SEQUENCE
#endif #endif
typedef struct SEQUENCE SEQUENCE; typedef struct SEQUENCE SEQUENCE;
typedef SEQUENCE *PSEQUENCE;
void UpdateSpeechGraphics (BOOLEAN Initialize); void UpdateSpeechGraphics (BOOLEAN Initialize);
Task StartCommAnimTask(void); Task StartCommAnimTask(void);
sc2/src/sc2code/commglue.c
+29 -29
View File
@@ -292,68 +292,68 @@ construct_response (UNICODE *buf, int R /* promoted from RESPONSE_REF */, ...)
} }
} }
LOCDATAPTR LOCDATA*
init_race (RESOURCE comm_id) init_race (RESOURCE comm_id)
{ {
switch (comm_id) switch (comm_id)
{ {
case ARILOU_CONVERSATION: case ARILOU_CONVERSATION:
return ((LOCDATAPTR)init_arilou_comm ()); return init_arilou_comm ();
case BLACKURQ_CONVERSATION: case BLACKURQ_CONVERSATION:
return ((LOCDATAPTR)init_blackurq_comm ()); return init_blackurq_comm ();
case CHMMR_CONVERSATION: case CHMMR_CONVERSATION:
return ((LOCDATAPTR)init_chmmr_comm ()); return init_chmmr_comm ();
case COMMANDER_CONVERSATION: case COMMANDER_CONVERSATION:
if (!GET_GAME_STATE (STARBASE_AVAILABLE)) if (!GET_GAME_STATE (STARBASE_AVAILABLE))
return ((LOCDATAPTR)init_commander_comm ()); return init_commander_comm ();
else else
return ((LOCDATAPTR)init_starbase_comm ()); return init_starbase_comm ();
case DRUUGE_CONVERSATION: case DRUUGE_CONVERSATION:
return ((LOCDATAPTR)init_druuge_comm ()); return init_druuge_comm ();
case ILWRATH_CONVERSATION: case ILWRATH_CONVERSATION:
return ((LOCDATAPTR)init_ilwrath_comm ()); return init_ilwrath_comm ();
case MELNORME_CONVERSATION: case MELNORME_CONVERSATION:
return ((LOCDATAPTR)init_melnorme_comm ()); return init_melnorme_comm ();
case MYCON_CONVERSATION: case MYCON_CONVERSATION:
return ((LOCDATAPTR)init_mycon_comm ()); return init_mycon_comm ();
case ORZ_CONVERSATION: case ORZ_CONVERSATION:
return ((LOCDATAPTR)init_orz_comm ()); return init_orz_comm ();
case PKUNK_CONVERSATION: case PKUNK_CONVERSATION:
return ((LOCDATAPTR)init_pkunk_comm ()); return init_pkunk_comm ();
case SHOFIXTI_CONVERSATION: case SHOFIXTI_CONVERSATION:
return ((LOCDATAPTR)init_shofixti_comm ()); return init_shofixti_comm ();
case SLYLANDRO_CONVERSATION: case SLYLANDRO_CONVERSATION:
return ((LOCDATAPTR)init_slyland_comm ()); return init_slyland_comm ();
case SLYLANDRO_HOME_CONVERSATION: case SLYLANDRO_HOME_CONVERSATION:
return ((LOCDATAPTR)init_slylandro_comm ()); return init_slylandro_comm ();
case SPATHI_CONVERSATION: case SPATHI_CONVERSATION:
if (!(GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 7))) if (!(GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 7)))
return ((LOCDATAPTR)init_spathi_comm ()); return init_spathi_comm ();
else else
return ((LOCDATAPTR)init_spahome_comm ()); return init_spahome_comm ();
case SUPOX_CONVERSATION: case SUPOX_CONVERSATION:
return ((LOCDATAPTR)init_supox_comm ()); return init_supox_comm ();
case SYREEN_CONVERSATION: case SYREEN_CONVERSATION:
return ((LOCDATAPTR)init_syreen_comm ()); return init_syreen_comm ();
case TALKING_PET_CONVERSATION: case TALKING_PET_CONVERSATION:
return ((LOCDATAPTR)init_talkpet_comm ()); return init_talkpet_comm ();
case THRADD_CONVERSATION: case THRADD_CONVERSATION:
return ((LOCDATAPTR)init_thradd_comm ()); return init_thradd_comm ();
case UMGAH_CONVERSATION: case UMGAH_CONVERSATION:
return ((LOCDATAPTR)init_umgah_comm ()); return init_umgah_comm ();
case URQUAN_CONVERSATION: case URQUAN_CONVERSATION:
return ((LOCDATAPTR)init_urquan_comm ()); return init_urquan_comm ();
case UTWIG_CONVERSATION: case UTWIG_CONVERSATION:
return ((LOCDATAPTR)init_utwig_comm ()); return init_utwig_comm ();
case VUX_CONVERSATION: case VUX_CONVERSATION:
return ((LOCDATAPTR)init_vux_comm ()); return init_vux_comm ();
case YEHAT_REBEL_CONVERSATION: case YEHAT_REBEL_CONVERSATION:
return ((LOCDATAPTR)init_rebel_yehat_comm ()); return init_rebel_yehat_comm ();
case YEHAT_CONVERSATION: case YEHAT_CONVERSATION:
return ((LOCDATAPTR)init_yehat_comm ()); return init_yehat_comm ();
case ZOQFOTPIK_CONVERSATION: case ZOQFOTPIK_CONVERSATION:
return ((LOCDATAPTR)init_zoqfot_comm ()); return init_zoqfot_comm ();
default: default:
return ((LOCDATAPTR)init_chmmr_comm ()); return init_chmmr_comm ();
} }
} }
sc2/src/sc2code/commglue.h
+29 -29
View File
@@ -69,63 +69,63 @@ extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1);
extern void construct_response (UNICODE *buf, int R /* promoted from extern void construct_response (UNICODE *buf, int R /* promoted from
RESPONSE_REF */, ...); 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 */ #endif /* _COMMGLUE_H */
sc2/src/sc2code/confirm.c
+2 -2
View File
@@ -110,7 +110,7 @@ DoConfirmExit (void)
in_confirm = TRUE; in_confirm = TRUE;
oldContext = SetContext (ScreenContext); oldContext = SetContext (ScreenContext);
GetContextClipRect (&oldRect); GetContextClipRect (&oldRect);
SetContextClipRect (NULL_PTR); SetContextClipRect (NULL);
r.extent.width = CONFIRM_WIN_WIDTH + 4; r.extent.width = CONFIRM_WIN_WIDTH + 4;
r.extent.height = CONFIRM_WIN_HEIGHT + 4; r.extent.height = CONFIRM_WIN_HEIGHT + 4;
@@ -245,7 +245,7 @@ DoPopupWindow(const char *msg)
oldContext = SetContext (ScreenContext); oldContext = SetContext (ScreenContext);
GetContextClipRect (&oldRect); GetContextClipRect (&oldRect);
SetContextClipRect (NULL_PTR); SetContextClipRect (NULL);
/* TODO: Better measure of dimensions than this */ /* TODO: Better measure of dimensions than this */
r.extent.width = SCREEN_WIDTH; r.extent.width = SCREEN_WIDTH;
sc2/src/sc2code/controls.h
+6 -7
View File
@@ -20,7 +20,7 @@
#define _CONTROLS_H_ #define _CONTROLS_H_
#include "races.h" #include "races.h"
// For STARSHIPPTR // For STARSHIP
#include "libs/compiler.h" #include "libs/compiler.h"
#include "libs/strlib.h" #include "libs/strlib.h"
@@ -89,7 +89,7 @@ typedef UBYTE BATTLE_INPUT_STATE;
#define BATTLE_DOWN ((BATTLE_INPUT_STATE)(1 << 6)) #define BATTLE_DOWN ((BATTLE_INPUT_STATE)(1 << 6))
typedef BATTLE_INPUT_STATE (*battle_summary_func) (COUNT player, typedef BATTLE_INPUT_STATE (*battle_summary_func) (COUNT player,
STARSHIPPTR StarShipPtr); STARSHIP *StarShipPtr);
extern battle_summary_func ComputerInput, HumanInput[], NetworkInput; extern battle_summary_func ComputerInput, HumanInput[], NetworkInput;
extern battle_summary_func PlayerInput[]; extern battle_summary_func PlayerInput[];
@@ -110,10 +110,10 @@ BOOLEAN WaitAnyButtonOrQuit (BOOLEAN CheckSpecial);
void WaitForNoInput (SIZE Duration); void WaitForNoInput (SIZE Duration);
BOOLEAN ConfirmExit (void); BOOLEAN ConfirmExit (void);
void DoPopupWindow(const char *msg); 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 p1_combat_summary (COUNT player, STARSHIP *StarShipPtr);
BATTLE_INPUT_STATE p2_combat_summary (COUNT player, STARSHIPPTR StarShipPtr); BATTLE_INPUT_STATE p2_combat_summary (COUNT player, STARSHIP *StarShipPtr);
extern volatile BOOLEAN GamePaused, ExitRequested; extern volatile BOOLEAN GamePaused, ExitRequested;
@@ -152,9 +152,8 @@ typedef struct textentry_state
void *CbParam; // callback parameter, use as you like void *CbParam; // callback parameter, use as you like
} TEXTENTRY_STATE; } TEXTENTRY_STATE;
typedef TEXTENTRY_STATE *PTEXTENTRY_STATE;
BOOLEAN DoTextEntry (PTEXTENTRY_STATE pTES); BOOLEAN DoTextEntry (TEXTENTRY_STATE *pTES);
#endif #endif
sc2/src/sc2code/credits.c
+4 -4
View File
@@ -214,7 +214,7 @@ Credits_RenderTextFrame (CONTEXT TempContext, int *istr, int dir,
SetContextFont (fdef->font); SetContextFont (fdef->font);
GetContextFontLeading (&leading); GetContextFontLeading (&leading);
// get left/right margin // get left/right margin
TextRect (&t, &r, NULL_PTR); TextRect (&t, &r, NULL);
// parse text column alignment // parse text column alignment
for (i = 0, scol = strtok (salign, ","); for (i = 0, scol = strtok (salign, ",");
@@ -627,7 +627,7 @@ OutTakes (void)
typedef struct typedef struct
{ {
// standard state required by DoInput // standard state required by DoInput
BOOLEAN (*InputFunc) (PVOID pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay; COUNT MenuRepeatDelay;
BOOLEAN AllowCancel; BOOLEAN AllowCancel;
@@ -638,7 +638,7 @@ typedef struct
} CREDITS_INPUT_STATE; } CREDITS_INPUT_STATE;
static BOOLEAN static BOOLEAN
DoCreditsInput (PVOID pIS) DoCreditsInput (void *pIS)
{ {
CREDITS_INPUT_STATE *pCIS = (CREDITS_INPUT_STATE *) pIS; CREDITS_INPUT_STATE *pCIS = (CREDITS_INPUT_STATE *) pIS;
@@ -716,7 +716,7 @@ Credits (BOOLEAN WithOuttakes)
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetContext (ScreenContext); SetContext (ScreenContext);
SetContextClipRect (NULL_PTR); SetContextClipRect (NULL);
SetContextBackGroundColor ( SetContextBackGroundColor (
BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00)); BUILD_COLOR (MAKE_RGB15 (0x00, 0x00, 0x00), 0x00));
ClearDrawable (); ClearDrawable ();
sc2/src/sc2code/cyborg.c
+34 -33
View File
@@ -31,8 +31,8 @@
//#define DEBUG_CYBORG //#define DEBUG_CYBORG
COUNT COUNT
PlotIntercept (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, COUNT PlotIntercept (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1,
max_turns, COUNT margin_of_error) COUNT max_turns, COUNT margin_of_error)
{ {
SIZE dy; SIZE dy;
SIZE time_y_0, time_y_1; SIZE time_y_0, time_y_1;
@@ -289,10 +289,10 @@ PlotIntercept (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, COUNT
return (0); return (0);
} }
STARSHIPPTR CyborgDescPtr; STARSHIP *CyborgDescPtr;
static void static void
InitCyborg (STARSHIPPTR StarShipPtr) InitCyborg (STARSHIP *StarShipPtr)
{ {
COUNT Index, Divisor; COUNT Index, Divisor;
@@ -318,7 +318,7 @@ InitCyborg (STARSHIPPTR StarShipPtr)
} }
static void static void
ship_movement (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) ship_movement (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr)
{ {
if (EvalDescPtr->which_turn == 0) if (EvalDescPtr->which_turn == 0)
EvalDescPtr->which_turn = 1; EvalDescPtr->which_turn = 1;
@@ -342,14 +342,13 @@ ship_movement (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr)
} }
BOOLEAN BOOLEAN
ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, COUNT ship_weapons (ELEMENT *ShipPtr, ELEMENT *OtherPtr, COUNT margin_of_error)
margin_of_error)
{ {
SIZE delta_x, delta_y; SIZE delta_x, delta_y;
COUNT n, num_weapons; COUNT n, num_weapons;
ELEMENT Ship; ELEMENT Ship;
HELEMENT Weapon[6]; HELEMENT Weapon[6];
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
if (OBJECT_CLOAKED (OtherPtr)) if (OBJECT_CLOAKED (OtherPtr))
margin_of_error += DISPLAY_TO_WORLD (40); margin_of_error += DISPLAY_TO_WORLD (40);
@@ -370,8 +369,8 @@ ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, COUNT
if ((n = num_weapons)) if ((n = num_weapons))
{ {
HELEMENT *WeaponPtr, w; HELEMENT *WeaponPtr, w;
//STARSHIPPTR StarShipPtr; //STARSHIP *StarShipPtr;
ELEMENTPTR EPtr; ELEMENT *EPtr;
WeaponPtr = &Weapon[0]; WeaponPtr = &Weapon[0];
do do
@@ -416,12 +415,12 @@ ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, COUNT
} }
void void
ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR ObjectsOfConcern, ship_intelligence (ELEMENT *ShipPtr, EVALUATE_DESC *ObjectsOfConcern,
COUNT ConcernCounter) COUNT ConcernCounter)
{ {
BOOLEAN ShipMoved, ShipFired; BOOLEAN ShipMoved, ShipFired;
COUNT margin_of_error; COUNT margin_of_error;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
GetElementStarShip (ShipPtr, &StarShipPtr); GetElementStarShip (ShipPtr, &StarShipPtr);
@@ -455,7 +454,7 @@ ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR ObjectsOfConcern,
if (!ShipMoved if (!ShipMoved
&& (ConcernCounter != ENEMY_WEAPON_INDEX && (ConcernCounter != ENEMY_WEAPON_INDEX
|| ObjectsOfConcern->MoveState == PURSUE || ObjectsOfConcern->MoveState == PURSUE
|| (ObjectsOfConcern->ObjectPtr->state_flags & CREW_OBJECT) || (ObjectsOfConcern->ObjectPtr->state_flags & CREW_OBJECT)
|| MANEUVERABILITY ( || MANEUVERABILITY (
&StarShipPtr->RaceDescPtr->cyborg_control &StarShipPtr->RaceDescPtr->cyborg_control
) >= MEDIUM_SHIP)) ) >= MEDIUM_SHIP))
@@ -482,10 +481,10 @@ ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR ObjectsOfConcern,
} }
BOOLEAN BOOLEAN
TurnShip (ELEMENTPTR ShipPtr, COUNT angle) TurnShip (ELEMENT *ShipPtr, COUNT angle)
{ {
COUNT f, ship_delta_facing; COUNT f, ship_delta_facing;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
GetElementStarShip (ShipPtr, &StarShipPtr); GetElementStarShip (ShipPtr, &StarShipPtr);
f = StarShipPtr->ShipFacing; f = StarShipPtr->ShipFacing;
@@ -531,10 +530,10 @@ TurnShip (ELEMENTPTR ShipPtr, COUNT angle)
} }
BOOLEAN BOOLEAN
ThrustShip (ELEMENTPTR ShipPtr, COUNT angle) ThrustShip (ELEMENT *ShipPtr, COUNT angle)
{ {
BOOLEAN ShouldThrust; BOOLEAN ShouldThrust;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
GetElementStarShip (ShipPtr, &StarShipPtr); GetElementStarShip (ShipPtr, &StarShipPtr);
if (StarShipPtr->ship_input_state & THRUST) if (StarShipPtr->ship_input_state & THRUST)
@@ -571,14 +570,14 @@ ThrustShip (ELEMENTPTR ShipPtr, COUNT angle)
} }
void void
Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) Pursue (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr)
{ {
INPUT_STATE maneuver_state; INPUT_STATE maneuver_state;
COUNT desired_thrust_angle, desired_turn_angle; COUNT desired_thrust_angle, desired_turn_angle;
SIZE delta_x, delta_y; SIZE delta_x, delta_y;
SIZE ship_delta_x, ship_delta_y; SIZE ship_delta_x, ship_delta_y;
SIZE other_delta_x, other_delta_y; SIZE other_delta_x, other_delta_y;
ELEMENTPTR OtherObjPtr; ELEMENT *OtherObjPtr;
VELOCITY_DESC ShipVelocity, OtherVelocity; VELOCITY_DESC ShipVelocity, OtherVelocity;
ShipVelocity = ShipPtr->velocity; ShipVelocity = ShipPtr->velocity;
@@ -617,7 +616,8 @@ Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr)
if ((OtherObjPtr->state_flags & PLAYER_SHIP) if ((OtherObjPtr->state_flags & PLAYER_SHIP)
&& OtherObjPtr->mass_points <= MAX_SHIP_MASS) && OtherObjPtr->mass_points <= MAX_SHIP_MASS)
{ {
STARSHIPPTR StarShipPtr, EnemyStarShipPtr; STARSHIP *StarShipPtr;
STARSHIP *EnemyStarShipPtr;
GetElementStarShip (ShipPtr, &StarShipPtr); GetElementStarShip (ShipPtr, &StarShipPtr);
GetElementStarShip (OtherObjPtr, &EnemyStarShipPtr); GetElementStarShip (OtherObjPtr, &EnemyStarShipPtr);
@@ -701,7 +701,7 @@ Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr)
} }
void void
Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) Entice (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr)
{ {
INPUT_STATE maneuver_state; INPUT_STATE maneuver_state;
COUNT desired_thrust_angle, desired_turn_angle; COUNT desired_thrust_angle, desired_turn_angle;
@@ -709,10 +709,10 @@ Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr)
SIZE delta_x, delta_y; SIZE delta_x, delta_y;
SIZE ship_delta_x, ship_delta_y; SIZE ship_delta_x, ship_delta_y;
SIZE other_delta_x, other_delta_y; SIZE other_delta_x, other_delta_y;
ELEMENTPTR OtherObjPtr; ELEMENT *OtherObjPtr;
VELOCITY_DESC ShipVelocity, OtherVelocity; VELOCITY_DESC ShipVelocity, OtherVelocity;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
RACE_DESCPTR RDPtr; RACE_DESC *RDPtr;
ShipVelocity = ShipPtr->velocity; ShipVelocity = ShipPtr->velocity;
GetNextVelocityComponents (&ShipVelocity, GetNextVelocityComponents (&ShipVelocity,
@@ -722,7 +722,7 @@ Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr)
ShipPtr->next.location.y = ShipPtr->next.location.y =
ShipPtr->current.location.y + ship_delta_y; ShipPtr->current.location.y + ship_delta_y;
OtherObjPtr = (ELEMENTPTR)EvalDescPtr->ObjectPtr; OtherObjPtr = EvalDescPtr->ObjectPtr;
OtherVelocity = OtherObjPtr->velocity; OtherVelocity = OtherObjPtr->velocity;
GetNextVelocityComponents (&OtherVelocity, GetNextVelocityComponents (&OtherVelocity,
&other_delta_x, &other_delta_y, EvalDescPtr->which_turn); &other_delta_x, &other_delta_y, EvalDescPtr->which_turn);
@@ -840,7 +840,7 @@ Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr)
{ {
UWORD fire_flags, ship_flags; UWORD fire_flags, ship_flags;
COUNT facing; COUNT facing;
STARSHIPPTR EnemyStarShipPtr; STARSHIP *EnemyStarShipPtr;
GetElementStarShip (OtherObjPtr, &EnemyStarShipPtr); GetElementStarShip (OtherObjPtr, &EnemyStarShipPtr);
ship_flags = EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags; ship_flags = EnemyStarShipPtr->RaceDescPtr->ship_info.ship_flags;
@@ -1003,24 +1003,25 @@ DoManeuver:
} }
void void
Avoid (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr) Avoid (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr)
{ {
(void) ShipPtr; /* Satisfying compiler (unused parameter) */ (void) ShipPtr; /* Satisfying compiler (unused parameter) */
(void) EvalDescPtr; /* Satisfying compiler (unused parameter) */ (void) EvalDescPtr; /* Satisfying compiler (unused parameter) */
} }
BATTLE_INPUT_STATE BATTLE_INPUT_STATE
tactical_intelligence (COUNT player, STARSHIPPTR StarShipPtr) tactical_intelligence (COUNT player, STARSHIP *StarShipPtr)
{ {
ELEMENTPTR ShipPtr; ELEMENT *ShipPtr;
ELEMENT Ship; ELEMENT Ship;
COUNT ShipFacing; COUNT ShipFacing;
HELEMENT hElement, hNextElement; HELEMENT hElement, hNextElement;
COUNT ConcernCounter; COUNT ConcernCounter;
EVALUATE_DESC ObjectsOfConcern[10]; EVALUATE_DESC ObjectsOfConcern[10];
BOOLEAN ShipMoved, UltraManeuverable; BOOLEAN ShipMoved, UltraManeuverable;
STARSHIPPTR EnemyStarShipPtr; STARSHIP *EnemyStarShipPtr;
RACE_DESCPTR RDPtr, EnemyRDPtr; RACE_DESC *RDPtr;
RACE_DESC *EnemyRDPtr;
RDPtr = StarShipPtr->RaceDescPtr; RDPtr = StarShipPtr->RaceDescPtr;
@@ -1313,8 +1314,8 @@ if (!(ShipPtr->state_flags & FINITE_LIFE)
UnlockElement (hElement); UnlockElement (hElement);
} }
(*RDPtr->cyborg_control.intelligence_func) RDPtr->cyborg_control.intelligence_func (&Ship, ObjectsOfConcern,
(&Ship, ObjectsOfConcern, ConcernCounter); ConcernCounter);
#ifdef DEBUG_CYBORG #ifdef DEBUG_CYBORG
StarShipPtr->ship_input_state &= ~SPECIAL; StarShipPtr->ship_input_state &= ~SPECIAL;
#endif /* DEBUG_CYBORG */ #endif /* DEBUG_CYBORG */
sc2/src/sc2code/demo.c
+4 -4
View File
@@ -39,7 +39,7 @@ INPUT_STATE
demo_input (INPUT_REF InputRef, INPUT_STATE InputState) demo_input (INPUT_REF InputRef, INPUT_STATE InputState)
{ {
if (InputState || AnyButtonPress () || cread ( if (InputState || AnyButtonPress () || cread (
(PBYTE)&InputState, sizeof (InputState), 1, journal_fh &InputState, sizeof (InputState), 1, journal_fh
) == 0) ) == 0)
{ {
cclose (journal_fh); cclose (journal_fh);
@@ -63,7 +63,7 @@ void
JournalInput (INPUT_STATE InputState) JournalInput (INPUT_STATE InputState)
{ {
if (ArrowInput != DemoInput && journal_fh) if (ArrowInput != DemoInput && journal_fh)
cwrite ((PBYTE)&InputState, sizeof (InputState), 1, journal_fh); cwrite (&InputState, sizeof (InputState), 1, journal_fh);
} }
#endif /* CREATE_JOURNAL */ #endif /* CREATE_JOURNAL */
@@ -81,7 +81,7 @@ OpenJournal (void)
if (journal_fh = copen (journal_buf, MEMORY_STREAM, STREAM_WRITE)) if (journal_fh = copen (journal_buf, MEMORY_STREAM, STREAM_WRITE))
{ {
start_seed = SeedRandomNumbers (); start_seed = SeedRandomNumbers ();
cwrite ((PBYTE)&start_seed, sizeof (start_seed), 1, journal_fh); cwrite (&start_seed, sizeof (start_seed), 1, journal_fh);
} }
} }
else else
@@ -102,7 +102,7 @@ OpenJournal (void)
FlushInput (); FlushInput ();
cread ((PBYTE)&start_seed, sizeof (start_seed), 1, journal_fh); cread (&start_seed, sizeof (start_seed), 1, journal_fh);
TFB_SeedRandom (start_seed); TFB_SeedRandom (start_seed);
} }
} }
sc2/src/sc2code/displist.c
+22 -21
View File
@@ -27,7 +27,7 @@
*/ */
BOOLEAN BOOLEAN
InitQueue (PQUEUE pq, COUNT num_elements, OBJ_SIZE size) InitQueue (QUEUE *pq, COUNT num_elements, OBJ_SIZE size)
{ {
SetHeadLink (pq, NULL_HANDLE); SetHeadLink (pq, NULL_HANDLE);
SetTailLink (pq, NULL_HANDLE); SetTailLink (pq, NULL_HANDLE);
@@ -54,7 +54,7 @@ InitQueue (PQUEUE pq, COUNT num_elements, OBJ_SIZE size)
} }
BOOLEAN BOOLEAN
UninitQueue (PQUEUE pq) UninitQueue (QUEUE *pq)
{ {
#ifdef QUEUE_TABLE #ifdef QUEUE_TABLE
SetHeadLink (pq, NULL_HANDLE); SetHeadLink (pq, NULL_HANDLE);
@@ -79,7 +79,7 @@ UninitQueue (PQUEUE pq)
} }
void void
ReinitQueue (PQUEUE pq) ReinitQueue (QUEUE *pq)
{ {
SetHeadLink (pq, NULL_HANDLE); SetHeadLink (pq, NULL_HANDLE);
SetTailLink (pq, NULL_HANDLE); SetTailLink (pq, NULL_HANDLE);
@@ -102,14 +102,14 @@ ReinitQueue (PQUEUE pq)
#ifdef QUEUE_TABLE #ifdef QUEUE_TABLE
HLINK HLINK
AllocLink (PQUEUE pq) AllocLink (QUEUE *pq)
{ {
HLINK hLink; HLINK hLink;
hLink = GetFreeList (pq); hLink = GetFreeList (pq);
if (hLink) if (hLink)
{ {
LINKPTR LinkPtr; LINK *LinkPtr;
LinkPtr = LockLink (pq, hLink); LinkPtr = LockLink (pq, hLink);
SetFreeList (pq, _GetSuccLink (LinkPtr)); SetFreeList (pq, _GetSuccLink (LinkPtr));
@@ -122,9 +122,9 @@ AllocLink (PQUEUE pq)
} }
void void
FreeLink (PQUEUE pq, HLINK hLink) FreeLink (QUEUE *pq, HLINK hLink)
{ {
LINKPTR LinkPtr; LINK *LinkPtr;
LinkPtr = LockLink (pq, hLink); LinkPtr = LockLink (pq, hLink);
_SetSuccLink (LinkPtr, GetFreeList (pq)); _SetSuccLink (LinkPtr, GetFreeList (pq));
@@ -135,16 +135,16 @@ FreeLink (PQUEUE pq, HLINK hLink)
#endif /* QUEUE_TABLE */ #endif /* QUEUE_TABLE */
void void
PutQueue (PQUEUE pq, HLINK hLink) PutQueue (QUEUE *pq, HLINK hLink)
{ {
LINKPTR LinkPtr; LINK *LinkPtr;
if (GetHeadLink (pq) == 0) if (GetHeadLink (pq) == 0)
SetHeadLink (pq, hLink); SetHeadLink (pq, hLink);
else else
{ {
HLINK hTail; HLINK hTail;
LINKPTR lpTail; LINK *lpTail;
hTail = GetTailLink (pq); hTail = GetTailLink (pq);
lpTail = LockLink (pq, hTail); lpTail = LockLink (pq, hTail);
@@ -161,13 +161,14 @@ PutQueue (PQUEUE pq, HLINK hLink)
} }
void void
InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink) InsertQueue (QUEUE *pq, HLINK hLink, HLINK hRefLink)
{ {
if (hRefLink == 0) if (hRefLink == 0)
PutQueue (pq, hLink); PutQueue (pq, hLink);
else else
{ {
LINKPTR LinkPtr, RefLinkPtr; LINK *LinkPtr;
LINK *RefLinkPtr;
LinkPtr = LockLink (pq, hLink); LinkPtr = LockLink (pq, hLink);
RefLinkPtr = LockLink (pq, hRefLink); RefLinkPtr = LockLink (pq, hRefLink);
@@ -180,7 +181,7 @@ InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink)
else else
{ {
HLINK hPredLink; HLINK hPredLink;
LINKPTR PredLinkPtr; LINK *PredLinkPtr;
hPredLink = _GetPredLink (LinkPtr); hPredLink = _GetPredLink (LinkPtr);
PredLinkPtr = LockLink (pq, hPredLink); PredLinkPtr = LockLink (pq, hPredLink);
@@ -193,9 +194,9 @@ InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink)
} }
void void
RemoveQueue (PQUEUE pq, HLINK hLink) RemoveQueue (QUEUE *pq, HLINK hLink)
{ {
LINKPTR LinkPtr; LINK *LinkPtr;
LinkPtr = LockLink (pq, hLink); LinkPtr = LockLink (pq, hLink);
if (GetHeadLink (pq) == hLink) if (GetHeadLink (pq) == hLink)
@@ -205,7 +206,7 @@ RemoveQueue (PQUEUE pq, HLINK hLink)
else else
{ {
HLINK hPredLink; HLINK hPredLink;
LINKPTR PredLinkPtr; LINK *PredLinkPtr;
hPredLink = _GetPredLink (LinkPtr); hPredLink = _GetPredLink (LinkPtr);
PredLinkPtr = LockLink (pq, hPredLink); PredLinkPtr = LockLink (pq, hPredLink);
@@ -219,7 +220,7 @@ RemoveQueue (PQUEUE pq, HLINK hLink)
else else
{ {
HLINK hSuccLink, hPredLink; HLINK hSuccLink, hPredLink;
LINKPTR SuccLinkPtr; LINK *SuccLinkPtr;
hSuccLink = _GetSuccLink (LinkPtr); hSuccLink = _GetSuccLink (LinkPtr);
SuccLinkPtr = LockLink (pq, hSuccLink); SuccLinkPtr = LockLink (pq, hSuccLink);
@@ -231,7 +232,7 @@ RemoveQueue (PQUEUE pq, HLINK hLink)
} }
COUNT COUNT
CountLinks (PQUEUE pq) CountLinks (QUEUE *pq)
{ {
COUNT LinkCount; COUNT LinkCount;
HLINK hLink, hNextLink; HLINK hLink, hNextLink;
@@ -239,7 +240,7 @@ CountLinks (PQUEUE pq)
LinkCount = 0; LinkCount = 0;
for (hLink = GetHeadLink (pq); hLink; hLink = hNextLink) for (hLink = GetHeadLink (pq); hLink; hLink = hNextLink)
{ {
LINKPTR LinkPtr; LINK *LinkPtr;
++LinkCount; ++LinkCount;
@@ -252,13 +253,13 @@ CountLinks (PQUEUE pq)
} }
void void
ForAllLinks (PQUEUE pq, void (*callback)(LINKPTR, void *), void *arg) ForAllLinks (QUEUE *pq, void (*callback)(LINK *, void *), void *arg)
{ {
HLINK hLink, hNextLink; HLINK hLink, hNextLink;
for (hLink = GetHeadLink (pq); hLink; hLink = hNextLink) for (hLink = GetHeadLink (pq); hLink; hLink = hNextLink)
{ {
LINKPTR LinkPtr; LINK *LinkPtr;
LinkPtr = LockLink (pq, hLink); LinkPtr = LockLink (pq, hLink);
hNextLink = _GetSuccLink (LinkPtr); hNextLink = _GetSuccLink (LinkPtr);
(*callback) (LinkPtr, arg); (*callback) (LinkPtr, arg);
sc2/src/sc2code/displist.h
+15 -24
View File
@@ -24,7 +24,7 @@
#define QUEUE_TABLE #define QUEUE_TABLE
#ifdef QUEUE_TABLE #ifdef QUEUE_TABLE
typedef PVOID QUEUE_HANDLE; typedef void* QUEUE_HANDLE;
#else /* !QUEUE_TABLE */ #else /* !QUEUE_TABLE */
typedef MEM_HANDLE QUEUE_HANDLE; typedef MEM_HANDLE QUEUE_HANDLE;
#endif /* QUEUE_TABLE */ #endif /* QUEUE_TABLE */
@@ -37,15 +37,9 @@ typedef struct link
HLINK pred; HLINK pred;
HLINK succ; HLINK succ;
} LINK; } LINK;
typedef LINK *PLINK;
typedef PBYTE BYTEPTR;
typedef PUWORD WORDPTR;
typedef PVOID VOIDPTR;
typedef PLINK LINKPTR;
#ifdef QUEUE_TABLE #ifdef QUEUE_TABLE
#define LockLink(pq, h) (LINKPTR)(h) #define LockLink(pq, h) (LINK*)(h)
#define UnlockLink(pq, h) #define UnlockLink(pq, h)
#define GetFreeList(pq) (pq)->free_list #define GetFreeList(pq) (pq)->free_list
#define SetFreeList(pq, h) (pq)->free_list = (h) #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 * \ ((pq)->hq_tab = mem_allocate ((MEM_SIZE)((COUNT)(pq)->object_size * \
(COUNT)((pq)->num_objects = (BYTE)(n))), \ (COUNT)((pq)->num_objects = (BYTE)(n))), \
MEM_PRIMARY, DEFAULT_MEM_PRIORITY, MEM_SIMPLE)) 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 UnlockQueueTab(pq) mem_unlock ((pq)->hq_tab)
#define FreeQueueTab(pq) mem_release ((pq)->hq_tab); (pq)->hq_tab = 0 #define FreeQueueTab(pq) mem_release ((pq)->hq_tab); (pq)->hq_tab = 0
#define SizeQueueTab(pq) (COUNT)((pq)->num_objects) #define SizeQueueTab(pq) (COUNT)((pq)->num_objects)
#define GetLinkAddr(pq,i) (HLINK)((pq)->pq_tab + ((pq)->object_size * ((i) - 1))) #define GetLinkAddr(pq,i) (HLINK)((pq)->pq_tab + ((pq)->object_size * ((i) - 1)))
#else /* !QUEUE_TABLE */ #else /* !QUEUE_TABLE */
#define AllocLink(pq) (HLINK)mem_request ((pq)->object_size) #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 UnlockLink(pq, h) mem_unlock (h)
#define FreeLink(pq,h) mem_release (h) #define FreeLink(pq,h) mem_release (h)
#endif /* QUEUE_TABLE */ #endif /* QUEUE_TABLE */
@@ -70,19 +64,16 @@ typedef struct queue
HLINK head; HLINK head;
HLINK tail; HLINK tail;
#ifdef QUEUE_TABLE #ifdef QUEUE_TABLE
BYTEPTR pq_tab; BYTE *pq_tab;
HLINK free_list; HLINK free_list;
MEM_HANDLE hq_tab; MEM_HANDLE hq_tab;
#endif #endif
// BYTE object_size;
COUNT object_size; COUNT object_size;
#ifdef QUEUE_TABLE #ifdef QUEUE_TABLE
BYTE num_objects; BYTE num_objects;
#endif /* QUEUE_TABLE */ #endif /* QUEUE_TABLE */
} QUEUE; } QUEUE;
typedef QUEUE *PQUEUE;
// #define SetLinkSize(pq,s) ((pq)->object_size = (BYTE)(s))
#define SetLinkSize(pq,s) ((pq)->object_size = (COUNT)(s)) #define SetLinkSize(pq,s) ((pq)->object_size = (COUNT)(s))
#define GetLinkSize(pq) (COUNT)((pq)->object_size) #define GetLinkSize(pq) (COUNT)((pq)->object_size)
#define GetHeadLink(pq) ((pq)->head) #define GetHeadLink(pq) ((pq)->head)
@@ -94,17 +85,17 @@ typedef QUEUE *PQUEUE;
#define _GetSuccLink(lpE) ((lpE)->succ) #define _GetSuccLink(lpE) ((lpE)->succ)
#define _SetSuccLink(lpE,h) ((lpE)->succ = (h)) #define _SetSuccLink(lpE,h) ((lpE)->succ = (h))
extern BOOLEAN InitQueue (PQUEUE pq, COUNT num_elements, OBJ_SIZE size); extern BOOLEAN InitQueue (QUEUE *pq, COUNT num_elements, OBJ_SIZE size);
extern BOOLEAN UninitQueue (PQUEUE pq); extern BOOLEAN UninitQueue (QUEUE *pq);
extern void ReinitQueue (PQUEUE pq); extern void ReinitQueue (QUEUE *pq);
extern void PutQueue (PQUEUE pq, HLINK hLink); extern void PutQueue (QUEUE *pq, HLINK hLink);
extern void InsertQueue (PQUEUE pq, HLINK hLink, HLINK hRefLink); extern void InsertQueue (QUEUE *pq, HLINK hLink, HLINK hRefLink);
extern void RemoveQueue (PQUEUE pq, HLINK hLink); extern void RemoveQueue (QUEUE *pq, HLINK hLink);
extern COUNT CountLinks (PQUEUE pq); extern COUNT CountLinks (QUEUE *pq);
void ForAllLinks(PQUEUE pq, void (*callback)(LINKPTR, void *), void *arg); void ForAllLinks(QUEUE *pq, void (*callback)(LINK *, void *), void *arg);
#ifdef QUEUE_TABLE #ifdef QUEUE_TABLE
extern HLINK AllocLink (PQUEUE pq); extern HLINK AllocLink (QUEUE *pq);
extern void FreeLink (PQUEUE pq, HLINK hLink); extern void FreeLink (QUEUE *pq, HLINK hLink);
#endif /* QUEUE_TABLE */ #endif /* QUEUE_TABLE */
#endif /* _DISPLIST_H */ #endif /* _DISPLIST_H */
sc2/src/sc2code/dummy.c
+36 -36
View File
@@ -38,7 +38,7 @@ typedef struct
} CODERES_STRUCT; } CODERES_STRUCT;
MEM_HANDLE MEM_HANDLE
LoadCodeResFile (PSTR pStr) LoadCodeResFile (const char *pStr)
{ {
(void) pStr; /* Satisfying compiler (unused parameter) */ (void) pStr; /* Satisfying compiler (unused parameter) */
return (0); return (0);
@@ -87,56 +87,56 @@ enum
hData = mem_request (sizeof (CODERES_STRUCT)); hData = mem_request (sizeof (CODERES_STRUCT));
if (hData) if (hData)
{ {
RACE_DESCPTR RDPtr; RACE_DESC *RDPtr;
RDPtr = 0; RDPtr = 0;
switch (which_res) switch (which_res)
{ {
case ANDROSYN_CODE_RES: case ANDROSYN_CODE_RES:
{ {
extern RACE_DESCPTR init_androsynth (void); extern RACE_DESC* init_androsynth (void);
RDPtr = init_androsynth (); RDPtr = init_androsynth ();
break; break;
} }
case ARILOU_CODE_RES: case ARILOU_CODE_RES:
{ {
extern RACE_DESCPTR init_arilou (void); extern RACE_DESC* init_arilou (void);
RDPtr = init_arilou (); RDPtr = init_arilou ();
break; break;
} }
case BLACKURQ_CODE_RES: case BLACKURQ_CODE_RES:
{ {
extern RACE_DESCPTR init_black_urquan (void); extern RACE_DESC* init_black_urquan (void);
RDPtr = init_black_urquan (); RDPtr = init_black_urquan ();
break; break;
} }
case CHENJESU_CODE_RES: case CHENJESU_CODE_RES:
{ {
extern RACE_DESCPTR init_chenjesu (void); extern RACE_DESC* init_chenjesu (void);
RDPtr = init_chenjesu (); RDPtr = init_chenjesu ();
break; break;
} }
case CHMMR_CODE_RES: case CHMMR_CODE_RES:
{ {
extern RACE_DESCPTR init_chmmr (void); extern RACE_DESC* init_chmmr (void);
RDPtr = init_chmmr (); RDPtr = init_chmmr ();
break; break;
} }
case DRUUGE_CODE_RES: case DRUUGE_CODE_RES:
{ {
extern RACE_DESCPTR init_druuge (void); extern RACE_DESC* init_druuge (void);
RDPtr = init_druuge (); RDPtr = init_druuge ();
break; break;
} }
case HUMAN_CODE_RES: case HUMAN_CODE_RES:
{ {
extern RACE_DESCPTR init_human (void); extern RACE_DESC* init_human (void);
RDPtr = init_human (); RDPtr = init_human ();
break; break;
@@ -144,49 +144,49 @@ enum
case ILWRATH_CODE_RES: case ILWRATH_CODE_RES:
{ {
extern RACE_DESCPTR init_ilwrath (void); extern RACE_DESC* init_ilwrath (void);
RDPtr = init_ilwrath (); RDPtr = init_ilwrath ();
break; break;
} }
case MELNORME_CODE_RES: case MELNORME_CODE_RES:
{ {
extern RACE_DESCPTR init_melnorme (void); extern RACE_DESC* init_melnorme (void);
RDPtr = init_melnorme (); RDPtr = init_melnorme ();
break; break;
} }
case MMRNMHRM_CODE_RES: case MMRNMHRM_CODE_RES:
{ {
extern RACE_DESCPTR init_mmrnmhrm (void); extern RACE_DESC* init_mmrnmhrm (void);
RDPtr = init_mmrnmhrm (); RDPtr = init_mmrnmhrm ();
break; break;
} }
case MYCON_CODE_RES: case MYCON_CODE_RES:
{ {
extern RACE_DESCPTR init_mycon (void); extern RACE_DESC* init_mycon (void);
RDPtr = init_mycon (); RDPtr = init_mycon ();
break; break;
} }
case ORZ_CODE_RES: case ORZ_CODE_RES:
{ {
extern RACE_DESCPTR init_orz (void); extern RACE_DESC* init_orz (void);
RDPtr = init_orz (); RDPtr = init_orz ();
break; break;
} }
case PKUNK_CODE_RES: case PKUNK_CODE_RES:
{ {
extern RACE_DESCPTR init_pkunk (void); extern RACE_DESC* init_pkunk (void);
RDPtr = init_pkunk (); RDPtr = init_pkunk ();
break; break;
} }
case SHOFIXTI_CODE_RES: case SHOFIXTI_CODE_RES:
{ {
extern RACE_DESCPTR init_shofixti (void); extern RACE_DESC* init_shofixti (void);
RDPtr = init_shofixti (); RDPtr = init_shofixti ();
break; break;
@@ -194,56 +194,56 @@ enum
case SLYLANDR_CODE_RES: case SLYLANDR_CODE_RES:
{ {
extern RACE_DESCPTR init_slylandro (void); extern RACE_DESC* init_slylandro (void);
RDPtr = init_slylandro (); RDPtr = init_slylandro ();
break; break;
} }
case SPATHI_CODE_RES: case SPATHI_CODE_RES:
{ {
extern RACE_DESCPTR init_spathi (void); extern RACE_DESC* init_spathi (void);
RDPtr = init_spathi (); RDPtr = init_spathi ();
break; break;
} }
case SUPOX_CODE_RES: case SUPOX_CODE_RES:
{ {
extern RACE_DESCPTR init_supox (void); extern RACE_DESC* init_supox (void);
RDPtr = init_supox (); RDPtr = init_supox ();
break; break;
} }
case SYREEN_CODE_RES: case SYREEN_CODE_RES:
{ {
extern RACE_DESCPTR init_syreen (void); extern RACE_DESC* init_syreen (void);
RDPtr = init_syreen (); RDPtr = init_syreen ();
break; break;
} }
case THRADD_CODE_RES: case THRADD_CODE_RES:
{ {
extern RACE_DESCPTR init_thraddash (void); extern RACE_DESC* init_thraddash (void);
RDPtr = init_thraddash (); RDPtr = init_thraddash ();
break; break;
} }
case UMGAH_CODE_RES: case UMGAH_CODE_RES:
{ {
extern RACE_DESCPTR init_umgah (void); extern RACE_DESC* init_umgah (void);
RDPtr = init_umgah (); RDPtr = init_umgah ();
break; break;
} }
case URQUAN_CODE_RES: case URQUAN_CODE_RES:
{ {
extern RACE_DESCPTR init_urquan (void); extern RACE_DESC* init_urquan (void);
RDPtr = init_urquan (); RDPtr = init_urquan ();
break; break;
} }
case UTWIG_CODE_RES: case UTWIG_CODE_RES:
{ {
extern RACE_DESCPTR init_utwig (void); extern RACE_DESC* init_utwig (void);
RDPtr = init_utwig (); RDPtr = init_utwig ();
break; break;
@@ -251,42 +251,42 @@ enum
case VUX_CODE_RES: case VUX_CODE_RES:
{ {
extern RACE_DESCPTR init_vux (void); extern RACE_DESC* init_vux (void);
RDPtr = init_vux (); RDPtr = init_vux ();
break; break;
} }
case YEHAT_CODE_RES: case YEHAT_CODE_RES:
{ {
extern RACE_DESCPTR init_yehat (void); extern RACE_DESC* init_yehat (void);
RDPtr = init_yehat (); RDPtr = init_yehat ();
break; break;
} }
case ZOQFOT_CODE_RES: case ZOQFOT_CODE_RES:
{ {
extern RACE_DESCPTR init_zoqfotpik (void); extern RACE_DESC* init_zoqfotpik (void);
RDPtr = init_zoqfotpik (); RDPtr = init_zoqfotpik ();
break; break;
} }
case SAMATRA_CODE_RES: case SAMATRA_CODE_RES:
{ {
extern RACE_DESCPTR init_samatra (void); extern RACE_DESC* init_samatra (void);
RDPtr = init_samatra (); RDPtr = init_samatra ();
break; break;
} }
case SIS_CODE_RES: case SIS_CODE_RES:
{ {
extern RACE_DESCPTR init_sis (void); extern RACE_DESC* init_sis (void);
RDPtr = init_sis (); RDPtr = init_sis ();
break; break;
} }
case PROBE_CODE_RES: case PROBE_CODE_RES:
{ {
extern RACE_DESCPTR init_probe (void); extern RACE_DESC* init_probe (void);
RDPtr = init_probe (); RDPtr = init_probe ();
break; break;
@@ -341,8 +341,8 @@ DestroyCodeRes (MEM_HANDLE hCode)
} }
PVOID void*
CaptureCodeRes (MEM_HANDLE hCode, PVOID pData, PVOID *ppLocData) CaptureCodeRes (MEM_HANDLE hCode, void *pData, void **ppLocData)
{ {
CODERES_STRUCT *cs; CODERES_STRUCT *cs;
@@ -354,15 +354,15 @@ CaptureCodeRes (MEM_HANDLE hCode, PVOID pData, PVOID *ppLocData)
cs = (CODERES_STRUCT *) mem_lock (hCode); cs = (CODERES_STRUCT *) mem_lock (hCode);
cs->handle = hCode; cs->handle = hCode;
*ppLocData = (void *) &cs->data; *ppLocData = &cs->data;
(void) pData; /* Satisfying compiler (unused parameter) */ (void) pData; /* Satisfying compiler (unused parameter) */
return (void *) cs; return cs;
} }
MEM_HANDLE MEM_HANDLE
ReleaseCodeRes (PVOID CodeRef) ReleaseCodeRes (void *CodeRef)
{ {
if (CodeRef) if (CodeRef)
{ {
@@ -376,7 +376,7 @@ ReleaseCodeRes (PVOID CodeRef)
} }
DRAWABLE 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) lpOrg; /* Satisfying compiler (unused parameter) */
(void) width; /* Satisfying compiler (unused parameter) */ (void) width; /* Satisfying compiler (unused parameter) */
sc2/src/sc2code/element.h
+34 -45
View File
@@ -90,10 +90,12 @@ typedef struct state
struct struct
{ {
FRAME frame; FRAME frame;
PFRAME farray; FRAME *farray;
} image; } image;
} STATE; } STATE;
typedef STATE *PSTATE;
typedef void (CollisionFunc) (struct element *ElementPtr0, POINT *pPt0,
struct element *ElementPtr1, POINT *pPt1);
// Any physical object in the simulation. // Any physical object in the simulation.
typedef struct element typedef struct element
@@ -102,8 +104,7 @@ typedef struct element
void (*preprocess_func) (struct element *ElementPtr); void (*preprocess_func) (struct element *ElementPtr);
void (*postprocess_func) (struct element *ElementPtr); void (*postprocess_func) (struct element *ElementPtr);
void (*collision_func) (struct element *ElementPtr0, PPOINT CollisionFunc *collision_func;
pPt0, struct element *ElementPtr1, PPOINT pPt1);
void (*death_func) (struct element *ElementPtr); void (*death_func) (struct element *ElementPtr);
ELEMENT_FLAGS state_flags; ELEMENT_FLAGS state_flags;
@@ -116,11 +117,10 @@ typedef struct element
COUNT PrimIndex; COUNT PrimIndex;
STATE current, next; STATE current, next;
PVOID pParent; void *pParent;
// The ship this element belongs to. // The ship this element belongs to.
HELEMENT hTarget; HELEMENT hTarget;
} ELEMENT; } ELEMENT;
typedef ELEMENT *PELEMENT;
#define MAX_DISPLAY_PRIMS 280 #define MAX_DISPLAY_PRIMS 280
extern COUNT DisplayFreeList; extern COUNT DisplayFreeList;
@@ -131,11 +131,8 @@ extern PRIMITIVE DisplayArray[MAX_DISPLAY_PRIMS];
#define FreeDisplayPrim(p) SetPrimLinks (&DisplayArray[p], END_OF_LIST, DisplayFreeList); \ #define FreeDisplayPrim(p) SetPrimLinks (&DisplayArray[p], END_OF_LIST, DisplayFreeList); \
DisplayFreeList = (p) DisplayFreeList = (p)
#define STATEPTR PSTATE #define GetElementStarShip(e,ppsd) do { *(ppsd) = (e)->pParent; } while (0)
#define ELEMENTPTR PELEMENT #define SetElementStarShip(e,psd) do { (e)->pParent = psd; } while (0)
#define GetElementStarShip(e,psd) *(psd) = (PVOID)(e)->pParent
#define SetElementStarShip(e,psd) ((e)->pParent = (PVOID)(psd))
#define blast_offset thrust_wait #define blast_offset thrust_wait
#define hit_points crew_level #define hit_points crew_level
@@ -159,58 +156,50 @@ extern void FreeElement (HELEMENT hElement);
#define InsertElement(h,i) InsertQueue (&disp_q, h, i) #define InsertElement(h,i) InsertQueue (&disp_q, h, i)
#define GetHeadElement() GetHeadLink (&disp_q) #define GetHeadElement() GetHeadLink (&disp_q)
#define GetTailElement() GetTailLink (&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 UnlockElement(h) UnlockLink (&disp_q, h)
#define GetPredElement(l) _GetPredLink (l) #define GetPredElement(l) _GetPredLink (l)
#define GetSuccElement(l) _GetSuccLink (l) #define GetSuccElement(l) _GetSuccLink (l)
extern void RemoveElement (HLINK hLink); extern void RemoveElement (HLINK hLink);
extern void RedrawQueue (BOOLEAN clear); extern void RedrawQueue (BOOLEAN clear);
extern BOOLEAN DeltaEnergy (ELEMENTPTR ElementPtr, SIZE extern BOOLEAN DeltaEnergy (ELEMENT *ElementPtr, SIZE energy_delta);
energy_delta); extern BOOLEAN DeltaCrew (ELEMENT *ElementPtr, SIZE crew_delta);
extern BOOLEAN DeltaCrew (ELEMENTPTR ElementPtr, SIZE
crew_delta);
extern void PreProcessStatus (PELEMENT ShipPtr); extern void PreProcessStatus (ELEMENT *ShipPtr);
extern void PostProcessStatus (PELEMENT ShipPtr); extern void PostProcessStatus (ELEMENT *ShipPtr);
extern void load_gravity_well (BYTE selector); extern void load_gravity_well (BYTE selector);
extern void free_gravity_well (void); extern void free_gravity_well (void);
extern void spawn_planet (void); extern void spawn_planet (void);
extern void spawn_asteroid (PELEMENT ElementPtr); extern void spawn_asteroid (ELEMENT *ElementPtr);
extern void animation_preprocess (PELEMENT ElementPtr); extern void animation_preprocess (ELEMENT *ElementPtr);
extern void do_damage (ELEMENTPTR ElementPtr, SIZE extern void do_damage (ELEMENT *ElementPtr, SIZE damage);
damage); extern void collision (ELEMENT *ElementPtr0, POINT *pPt0,
extern void collision (PELEMENT ElementPtr0, PPOINT pPt0, ELEMENT *ElementPtr1, POINT *pPt1);
PELEMENT ElementPtr1, PPOINT pPt1); extern void crew_preprocess (ELEMENT *ElementPtr);
extern void crew_preprocess (PELEMENT ElementPtr); extern void crew_collision (ELEMENT *ElementPtr0, POINT *pPt0,
extern void crew_collision (PELEMENT ElementPtr0, PPOINT ELEMENT *ElementPtr1, POINT *pPt1);
pPt0, PELEMENT ElementPtr1, PPOINT pPt1); extern void AbandonShip (ELEMENT *ShipPtr, ELEMENT *TargetPtr,
extern void AbandonShip (ELEMENTPTR ShipPtr, ELEMENTPTR COUNT crew_loss);
TargetPtr, COUNT crew_loss); extern BOOLEAN TimeSpaceMatterConflict (ELEMENT *ElementPtr);
extern BOOLEAN TimeSpaceMatterConflict (ELEMENTPTR extern COUNT PlotIntercept (ELEMENT *ElementPtr0,
ElementPtr); ELEMENT *ElementPtr1, COUNT max_turns, COUNT margin_of_error);
extern COUNT PlotIntercept (ELEMENTPTR ElementPtr0,
ELEMENTPTR ElementPtr1, COUNT max_turns, COUNT
margin_of_error);
extern BOOLEAN LoadKernel (int argc, char *argv[]); extern BOOLEAN LoadKernel (int argc, char *argv[]);
extern void FreeKernel (void); extern void FreeKernel (void);
extern void InitDisplayList (void); extern void InitDisplayList (void);
extern void InitGalaxy (void); extern void InitGalaxy (void);
extern void MoveGalaxy (VIEW_STATE view_state, extern void MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy);
SIZE dx, SIZE dy); extern void ship_preprocess (ELEMENT *ElementPtr);
extern void ship_preprocess (PELEMENT ElementPtr); extern void ship_postprocess (ELEMENT *ElementPtr);
extern void ship_postprocess (PELEMENT extern void ship_death (ELEMENT *ShipPtr);
ElementPtr); extern BOOLEAN hyper_transition (ELEMENT *ElementPtr);
extern void ship_death (PELEMENT ShipPtr);
extern BOOLEAN hyper_transition (PELEMENT ElementPtr);
extern BOOLEAN CalculateGravity (PELEMENT ElementPtr); extern BOOLEAN CalculateGravity (ELEMENT *ElementPtr);
extern UWORD inertial_thrust (ELEMENTPTR ElementPtr); extern UWORD inertial_thrust (ELEMENT *ElementPtr);
extern void SetUpElement (ELEMENTPTR extern void SetUpElement (ELEMENT *ElementPtr);
ElementPtr);
extern void BattleSong (BOOLEAN DoPlay); extern void BattleSong (BOOLEAN DoPlay);
extern void FreeBattleSong (void); extern void FreeBattleSong (void);
sc2/src/sc2code/encount.c
+17 -17
View File
@@ -38,11 +38,11 @@
static void DrawFadeText (const UNICODE *str1, const UNICODE *str2, static void DrawFadeText (const UNICODE *str1, const UNICODE *str2,
BOOLEAN fade_in, PRECT pRect); BOOLEAN fade_in, RECT *pRect);
static BOOLEAN static BOOLEAN
DoSelectAction (PMENU_STATE pMS) DoSelectAction (MENU_STATE *pMS)
{ {
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
if (GLOBAL (CurrentActivity) & CHECK_ABORT) if (GLOBAL (CurrentActivity) & CHECK_ABORT)
@@ -85,10 +85,10 @@ DoSelectAction (PMENU_STATE pMS)
void void
BuildBattle (COUNT which_player) BuildBattle (COUNT which_player)
{ {
PQUEUE pQueue; QUEUE *pQueue;
HSTARSHIP hStarShip, hNextShip; HSTARSHIP hStarShip, hNextShip;
HSTARSHIP hBuiltShip; HSTARSHIP hBuiltShip;
STARSHIPPTR BuiltShipPtr; STARSHIP *BuiltShipPtr;
EncounterRace = -1; EncounterRace = -1;
@@ -123,9 +123,9 @@ BuildBattle (COUNT which_player)
for (hStarShip = GetHeadLink (pQueue); for (hStarShip = GetHeadLink (pQueue);
hStarShip != 0; hStarShip = hNextShip) 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); hNextShip = _GetSuccLink (FragPtr);
hBuiltShip = Build (&race_q[which_player], hBuiltShip = Build (&race_q[which_player],
@@ -143,7 +143,7 @@ BuildBattle (COUNT which_player)
BuiltShipPtr->special_counter = FragPtr->ShipInfo.crew_level; BuiltShipPtr->special_counter = FragPtr->ShipInfo.crew_level;
else /* if infinite ships */ else /* if infinite ships */
BuiltShipPtr->special_counter = FragPtr->ShipInfo.max_crew; 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); UnlockStarShip (&race_q[which_player], hBuiltShip);
} }
@@ -271,7 +271,7 @@ InitEncounter (void)
hStarShip && i < 60; hStarShip = hNextShip, ++i) hStarShip && i < 60; hStarShip = hNextShip, ++i)
{ {
RECT r; RECT r;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
StarShipPtr = LockStarShip (&race_q[1], hStarShip); StarShipPtr = LockStarShip (&race_q[1], hStarShip);
if (StarShipPtr->RaceDescPtr->ship_info.crew_level != if (StarShipPtr->RaceDescPtr->ship_info.crew_level !=
@@ -323,10 +323,10 @@ InitEncounter (void)
SetFlashRect (SFR_MENU_3DO, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
DoInput ((PVOID)&MenuState, TRUE); DoInput (&MenuState, TRUE);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
return (MenuState.CurState); return (MenuState.CurState);
@@ -335,7 +335,7 @@ InitEncounter (void)
static void static void
DrawFadeText (const UNICODE *str1, const UNICODE *str2, BOOLEAN fade_in, DrawFadeText (const UNICODE *str1, const UNICODE *str2, BOOLEAN fade_in,
PRECT pRect) RECT *pRect)
{ {
SIZE i; SIZE i;
DWORD TimeIn; DWORD TimeIn;
@@ -436,7 +436,7 @@ UninitEncounter (void)
const UNICODE *str2 = NULL; const UNICODE *str2 = NULL;
UNICODE buf[80]; UNICODE buf[80];
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
SHIP_FRAGMENTPTR FragPtr; SHIP_FRAGMENT *FragPtr;
static const COLOR fade_ship_cycle[] = static const COLOR fade_ship_cycle[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x07, 0x00, 0x00), 0x2F), BUILD_COLOR (MAKE_RGB15 (0x07, 0x00, 0x00), 0x2F),
@@ -467,7 +467,7 @@ UninitEncounter (void)
) ? 0 : 1; ) ? 0 : 1;
hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); 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); hStarShip);
EncounterRace = GET_RACE_ID (FragPtr); EncounterRace = GET_RACE_ID (FragPtr);
if (GetStarShipFromIndex (&GLOBAL (avail_race_q), EncounterRace) == 0) if (GetStarShipFromIndex (&GLOBAL (avail_race_q), EncounterRace) == 0)
@@ -480,7 +480,7 @@ UninitEncounter (void)
Sleepy = TRUE; Sleepy = TRUE;
for (i = 0; i < NUM_SIDES; ++i) for (i = 0; i < NUM_SIDES; ++i)
{ {
PQUEUE pQueue; QUEUE *pQueue;
HSTARSHIP hNextShip; HSTARSHIP hNextShip;
if (i == 0) if (i == 0)
@@ -492,7 +492,7 @@ UninitEncounter (void)
else else
{ {
DrawSISFrame (); DrawSISFrame ();
DrawSISMessage (NULL_PTR); DrawSISMessage (NULL);
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE) if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE)
DrawHyperCoords (GLOBAL (ShipStamp.origin)); DrawHyperCoords (GLOBAL (ShipStamp.origin));
else if (HIWORD (GLOBAL (ShipStamp.frame)) == 0) else if (HIWORD (GLOBAL (ShipStamp.frame)) == 0)
@@ -512,7 +512,7 @@ UninitEncounter (void)
for (hStarShip = GetHeadLink (pQueue); hStarShip; for (hStarShip = GetHeadLink (pQueue); hStarShip;
hStarShip = hNextShip) hStarShip = hNextShip)
{ {
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip (pQueue, hStarShip); FragPtr = (SHIP_FRAGMENT*) LockStarShip (pQueue, hStarShip);
hNextShip = _GetSuccLink (FragPtr); hNextShip = _GetSuccLink (FragPtr);
if (FragPtr->ShipInfo.crew_level == 0 if (FragPtr->ShipInfo.crew_level == 0
@@ -687,7 +687,7 @@ UninitEncounter (void)
} }
} }
DrawStatusMessage (NULL_PTR); DrawStatusMessage (NULL);
} }
if (ships_killed && EncounterRace == THRADDASH_SHIP if (ships_killed && EncounterRace == THRADDASH_SHIP
sc2/src/sc2code/encount.h
+5 -9
View File
@@ -37,7 +37,6 @@ typedef struct
BYTE Type, Index; BYTE Type, Index;
SHIP_INFO ShipList[MAX_HYPER_SHIPS]; SHIP_INFO ShipList[MAX_HYPER_SHIPS];
} EXTENDED_STAR_DESC; } EXTENDED_STAR_DESC;
typedef EXTENDED_STAR_DESC *PEXTENDED_STAR_DESC;
typedef struct typedef struct
{ {
@@ -53,22 +52,19 @@ typedef struct
SDWORD log_x, log_y; SDWORD log_x, log_y;
} ENCOUNTER; } ENCOUNTER;
typedef ENCOUNTER *PENCOUNTER;
#define AllocEncounter() AllocLink (&GLOBAL (encounter_q)) #define AllocEncounter() AllocLink (&GLOBAL (encounter_q))
#define PutEncounter(h) PutQueue (&GLOBAL (encounter_q), h) #define PutEncounter(h) PutQueue (&GLOBAL (encounter_q), h)
#define InsertEncounter(h,i) InsertQueue (&GLOBAL (encounter_q), h, i) #define InsertEncounter(h,i) InsertQueue (&GLOBAL (encounter_q), h, i)
#define GetHeadEncounter() GetHeadLink (&GLOBAL (encounter_q)) #define GetHeadEncounter() GetHeadLink (&GLOBAL (encounter_q))
#define GetTailEncounter() GetTailLink (&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 UnlockEncounter(h) UnlockLink (&GLOBAL (encounter_q), h)
#define RemoveEncounter(h) RemoveQueue (&GLOBAL (encounter_q), h) #define RemoveEncounter(h) RemoveQueue (&GLOBAL (encounter_q), h)
#define FreeEncounter(h) FreeLink (&GLOBAL (encounter_q), h) #define FreeEncounter(h) FreeLink (&GLOBAL (encounter_q), h)
#define GetPredEncounter(l) _GetPredLink (l) #define GetPredEncounter(l) _GetPredLink (l)
#define GetSuccEncounter(l) _GetSuccLink (l) #define GetSuccEncounter(l) _GetSuccLink (l)
#define ENCOUNTERPTR PENCOUNTER
enum enum
{ {
SOL_DEFINED = 1, SOL_DEFINED = 1,
@@ -126,15 +122,15 @@ enum
#define TEXT_Y_OFFS 1 #define TEXT_Y_OFFS 1
#define SIS_TEXT_WIDTH (SIS_SCREEN_WIDTH - (TEXT_X_OFFS << 1)) #define SIS_TEXT_WIDTH (SIS_SCREEN_WIDTH - (TEXT_X_OFFS << 1))
extern STAR_DESCPTR CurStarDescPtr; extern STAR_DESC *CurStarDescPtr;
extern STAR_DESCPTR star_array; extern STAR_DESC *star_array;
#define NUM_SOLAR_SYSTEMS 502 #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); SIZE xbounds, SIZE ybounds);
extern void GetClusterName (STAR_DESCPTR pSD, UNICODE buf[]); extern void GetClusterName (const STAR_DESC *pSD, UNICODE buf[]);
enum enum
{ {
sc2/src/sc2code/galaxy.c
+12 -11
View File
@@ -47,11 +47,12 @@ static POINT log_star_array[NUM_STARS];
typedef struct typedef struct
{ {
COUNT min_star_index, num_stars; COUNT min_star_index;
PPOINT star_array; COUNT num_stars;
PPOINT pmin_star, plast_star; POINT *star_array;
POINT *pmin_star;
POINT *plast_star;
} STAR_BLOCK; } STAR_BLOCK;
typedef STAR_BLOCK *PSTAR_BLOCK;
STAR_BLOCK StarBlock[NUM_STAR_PLANES] = STAR_BLOCK StarBlock[NUM_STAR_PLANES] =
{ {
@@ -73,7 +74,7 @@ STAR_BLOCK StarBlock[NUM_STAR_PLANES] =
}; };
static void static void
SortStarBlock (PSTAR_BLOCK pStarBlock) SortStarBlock (STAR_BLOCK *pStarBlock)
{ {
COUNT i; COUNT i;
@@ -104,10 +105,10 @@ static void
WrapStarBlock (SIZE plane, SIZE dx, SIZE dy) WrapStarBlock (SIZE plane, SIZE dx, SIZE dy)
{ {
COUNT i; COUNT i;
PPOINT ppt; POINT *ppt;
SIZE offs_y; SIZE offs_y;
COUNT num_stars; COUNT num_stars;
PSTAR_BLOCK pStarBlock; STAR_BLOCK *pStarBlock;
pStarBlock = &StarBlock[plane]; pStarBlock = &StarBlock[plane];
@@ -235,7 +236,7 @@ void
InitGalaxy (void) InitGalaxy (void)
{ {
COUNT i, factor; COUNT i, factor;
PPOINT ppt; POINT *ppt;
PRIM_LINKS Links; PRIM_LINKS Links;
log_add (log_Debug, "InitGalaxy(): transition_width = %d, " log_add (log_Debug, "InitGalaxy(): transition_width = %d, "
@@ -286,7 +287,7 @@ InitGalaxy (void)
} }
static BOOLEAN 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) SIZE reduction)
{ {
if (optMeleeScale == TFB_SCALE_STEP) if (optMeleeScale == TFB_SCALE_STEP)
@@ -304,7 +305,7 @@ CmpMovePoints (const PPOINT pt1, const PPOINT pt2, SIZE dx, SIZE dy,
void void
MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy) MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy)
{ {
PPRIMITIVE pprim; PRIMITIVE *pprim;
static const COUNT star_counts[] = static const COUNT star_counts[] =
{ {
BIG_STAR_COUNT, BIG_STAR_COUNT,
@@ -318,7 +319,7 @@ MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy)
COUNT reduction; COUNT reduction;
COUNT i; COUNT i;
COUNT iss; COUNT iss;
PPOINT ppt; POINT *ppt;
int wrap_around; int wrap_around;
reduction = zoom_out; reduction = zoom_out;
sc2/src/sc2code/gameev.c
+30 -27
View File
@@ -106,11 +106,11 @@ EventHandler (BYTE selector)
else if (GET_GAME_STATE (ZOQFOT_DISTRESS)) else if (GET_GAME_STATE (ZOQFOT_DISTRESS))
{ {
HSTARSHIP hZoqFot; HSTARSHIP hZoqFot;
EXTENDED_SHIP_FRAGMENTPTR ZoqFotPtr; EXTENDED_SHIP_FRAGMENT *ZoqFotPtr;
hZoqFot = GetStarShipFromIndex (&GLOBAL (avail_race_q), hZoqFot = GetStarShipFromIndex (&GLOBAL (avail_race_q),
ZOQFOTPIK_SHIP); ZOQFOTPIK_SHIP);
ZoqFotPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( ZoqFotPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hZoqFot); &GLOBAL (avail_race_q), hZoqFot);
ZoqFotPtr->ShipInfo.actual_strength = 0; ZoqFotPtr->ShipInfo.actual_strength = 0;
ZoqFotPtr->ShipInfo.ship_flags &= ~(GOOD_GUY | BAD_GUY); ZoqFotPtr->ShipInfo.ship_flags &= ~(GOOD_GUY | BAD_GUY);
@@ -137,11 +137,11 @@ EventHandler (BYTE selector)
else else
{ {
HSTARSHIP hSpathi; HSTARSHIP hSpathi;
EXTENDED_SHIP_FRAGMENTPTR SpathiPtr; EXTENDED_SHIP_FRAGMENT *SpathiPtr;
hSpathi = GetStarShipFromIndex ( hSpathi = GetStarShipFromIndex (
&GLOBAL (avail_race_q), SPATHI_SHIP); &GLOBAL (avail_race_q), SPATHI_SHIP);
SpathiPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( SpathiPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hSpathi); &GLOBAL (avail_race_q), hSpathi);
if (SpathiPtr->ShipInfo.actual_strength) if (SpathiPtr->ShipInfo.actual_strength)
@@ -166,15 +166,16 @@ EventHandler (BYTE selector)
case YEHAT_REBEL_EVENT: case YEHAT_REBEL_EVENT:
{ {
HSTARSHIP hRebel, hRoyalist; HSTARSHIP hRebel, hRoyalist;
EXTENDED_SHIP_FRAGMENTPTR RebelPtr, RoyalistPtr; EXTENDED_SHIP_FRAGMENT *RebelPtr;
EXTENDED_SHIP_FRAGMENT *RoyalistPtr;
hRebel = GetStarShipFromIndex (&GLOBAL (avail_race_q), hRebel = GetStarShipFromIndex (&GLOBAL (avail_race_q),
YEHAT_REBEL_SHIP); YEHAT_REBEL_SHIP);
RebelPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( RebelPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hRebel); &GLOBAL (avail_race_q), hRebel);
hRoyalist = GetStarShipFromIndex (&GLOBAL (avail_race_q), hRoyalist = GetStarShipFromIndex (&GLOBAL (avail_race_q),
YEHAT_SHIP); YEHAT_SHIP);
RoyalistPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( RoyalistPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hRoyalist); &GLOBAL (avail_race_q), hRoyalist);
RebelPtr->ShipInfo.actual_strength = RebelPtr->ShipInfo.actual_strength =
RoyalistPtr->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) func_index)
{ {
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; EXTENDED_SHIP_FRAGMENT *TemplatePtr;
hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), which_race); hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), which_race);
TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hStarShip); &GLOBAL (avail_race_q), hStarShip);
TemplatePtr->ShipInfo.dest_loc.x = x; TemplatePtr->ShipInfo.dest_loc.x = x;
@@ -263,9 +264,9 @@ check_race_growth (void)
for (hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); for (hStarShip = GetHeadLink (&GLOBAL (avail_race_q));
hStarShip; hStarShip = hNextShip) 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); &GLOBAL (avail_race_q), hStarShip);
hNextShip = _GetSuccLink (TemplatePtr); hNextShip = _GetSuccLink (TemplatePtr);
@@ -326,11 +327,11 @@ black_urquan_genocide (void)
SIZE best_dx, best_dy; SIZE best_dx, best_dy;
HSTARSHIP hStarShip, hNextShip; HSTARSHIP hStarShip, hNextShip;
HSTARSHIP hBlackUrquan; HSTARSHIP hBlackUrquan;
EXTENDED_SHIP_FRAGMENTPTR BlackUrquanPtr; EXTENDED_SHIP_FRAGMENT *BlackUrquanPtr;
hBlackUrquan = GetStarShipFromIndex ( hBlackUrquan = GetStarShipFromIndex (
&GLOBAL (avail_race_q), BLACK_URQUAN_SHIP); &GLOBAL (avail_race_q), BLACK_URQUAN_SHIP);
BlackUrquanPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( BlackUrquanPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hBlackUrquan); &GLOBAL (avail_race_q), hBlackUrquan);
best_dist = -1; best_dist = -1;
@@ -339,9 +340,9 @@ black_urquan_genocide (void)
for (Index = 0, hStarShip = GetHeadLink (&GLOBAL (avail_race_q)); for (Index = 0, hStarShip = GetHeadLink (&GLOBAL (avail_race_q));
hStarShip; ++Index, hStarShip = hNextShip) 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); &GLOBAL (avail_race_q), hStarShip);
hNextShip = _GetSuccLink (TemplatePtr); hNextShip = _GetSuccLink (TemplatePtr);
@@ -420,10 +421,10 @@ static void
pkunk_mission (void) pkunk_mission (void)
{ {
HSTARSHIP hPkunk; HSTARSHIP hPkunk;
EXTENDED_SHIP_FRAGMENTPTR PkunkPtr; EXTENDED_SHIP_FRAGMENT *PkunkPtr;
hPkunk = GetStarShipFromIndex (&GLOBAL (avail_race_q), PKUNK_SHIP); hPkunk = GetStarShipFromIndex (&GLOBAL (avail_race_q), PKUNK_SHIP);
PkunkPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( PkunkPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hPkunk); &GLOBAL (avail_race_q), hPkunk);
if (PkunkPtr->ShipInfo.actual_strength) if (PkunkPtr->ShipInfo.actual_strength)
@@ -486,10 +487,10 @@ thradd_mission (void)
{ {
BYTE MissionState; BYTE MissionState;
HSTARSHIP hThradd; HSTARSHIP hThradd;
EXTENDED_SHIP_FRAGMENTPTR ThraddPtr; EXTENDED_SHIP_FRAGMENT *ThraddPtr;
hThradd = GetStarShipFromIndex (&GLOBAL (avail_race_q), THRADDASH_SHIP); hThradd = GetStarShipFromIndex (&GLOBAL (avail_race_q), THRADDASH_SHIP);
ThraddPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( ThraddPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hThradd); &GLOBAL (avail_race_q), hThradd);
MissionState = GET_GAME_STATE (THRADD_MISSION); MissionState = GET_GAME_STATE (THRADD_MISSION);
@@ -545,13 +546,14 @@ ilwrath_mission (void)
{ {
BYTE ThraddState; BYTE ThraddState;
HSTARSHIP hIlwrath, hThradd; HSTARSHIP hIlwrath, hThradd;
EXTENDED_SHIP_FRAGMENTPTR IlwrathPtr, ThraddPtr; EXTENDED_SHIP_FRAGMENT *IlwrathPtr;
EXTENDED_SHIP_FRAGMENT *ThraddPtr;
hIlwrath = GetStarShipFromIndex (&GLOBAL (avail_race_q), ILWRATH_SHIP); hIlwrath = GetStarShipFromIndex (&GLOBAL (avail_race_q), ILWRATH_SHIP);
IlwrathPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( IlwrathPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hIlwrath); &GLOBAL (avail_race_q), hIlwrath);
hThradd = GetStarShipFromIndex (&GLOBAL (avail_race_q), THRADDASH_SHIP); hThradd = GetStarShipFromIndex (&GLOBAL (avail_race_q), THRADDASH_SHIP);
ThraddPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( ThraddPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hThradd); &GLOBAL (avail_race_q), hThradd);
if (IlwrathPtr->ShipInfo.loc.x == ((2500 + 2535) >> 1) if (IlwrathPtr->ShipInfo.loc.x == ((2500 + 2535) >> 1)
@@ -625,13 +627,14 @@ utwig_supox_mission (void)
{ {
BYTE MissionState; BYTE MissionState;
HSTARSHIP hUtwig, hSupox; HSTARSHIP hUtwig, hSupox;
EXTENDED_SHIP_FRAGMENTPTR UtwigPtr, SupoxPtr; EXTENDED_SHIP_FRAGMENT *UtwigPtr;
EXTENDED_SHIP_FRAGMENT *SupoxPtr;
hUtwig = GetStarShipFromIndex (&GLOBAL (avail_race_q), UTWIG_SHIP); hUtwig = GetStarShipFromIndex (&GLOBAL (avail_race_q), UTWIG_SHIP);
UtwigPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( UtwigPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hUtwig); &GLOBAL (avail_race_q), hUtwig);
hSupox = GetStarShipFromIndex (&GLOBAL (avail_race_q), SUPOX_SHIP); hSupox = GetStarShipFromIndex (&GLOBAL (avail_race_q), SUPOX_SHIP);
SupoxPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( SupoxPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hSupox); &GLOBAL (avail_race_q), hSupox);
MissionState = GET_GAME_STATE (UTWIG_SUPOX_MISSION); MissionState = GET_GAME_STATE (UTWIG_SUPOX_MISSION);
@@ -716,10 +719,10 @@ static void
mycon_mission (void) mycon_mission (void)
{ {
HSTARSHIP hMycon; HSTARSHIP hMycon;
EXTENDED_SHIP_FRAGMENTPTR MyconPtr; EXTENDED_SHIP_FRAGMENT *MyconPtr;
hMycon = GetStarShipFromIndex (&GLOBAL (avail_race_q), MYCON_SHIP); hMycon = GetStarShipFromIndex (&GLOBAL (avail_race_q), MYCON_SHIP);
MyconPtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( MyconPtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hMycon); &GLOBAL (avail_race_q), hMycon);
if (MyconPtr->ShipInfo.actual_strength) if (MyconPtr->ShipInfo.actual_strength)
sc2/src/sc2code/gameinp.c
+5 -7
View File
@@ -35,10 +35,9 @@ battle_summary_func PlayerInput[NUM_PLAYERS];
typedef struct typedef struct
{ {
BOOLEAN (*InputFunc) (PVOID pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay; COUNT MenuRepeatDelay;
} INPUT_STATE_DESC; } INPUT_STATE_DESC;
typedef INPUT_STATE_DESC *PINPUT_STATE_DESC;
/* These static variables are the values that are set by the controllers. */ /* These static variables are the values that are set by the controllers. */
@@ -296,7 +295,7 @@ FlushInputState (void)
} }
void void
DoInput (PVOID pInputState, BOOLEAN resetInput) DoInput (void *pInputState, BOOLEAN resetInput)
{ {
SetMenuRepeatDelay (ACCELERATION_INCREMENT, MENU_REPEAT_DELAY, ACCELERATION_INCREMENT, FALSE); SetMenuRepeatDelay (ACCELERATION_INCREMENT, MENU_REPEAT_DELAY, ACCELERATION_INCREMENT, FALSE);
if (resetInput) if (resetInput)
@@ -354,8 +353,7 @@ DoInput (PVOID pInputState, BOOLEAN resetInput)
PlaySoundEffect (S, 0, NotPositional (), NULL, 0); PlaySoundEffect (S, 0, NotPositional (), NULL, 0);
} }
} while ((*((PINPUT_STATE_DESC)pInputState)->InputFunc) } while (((INPUT_STATE_DESC*)pInputState)->InputFunc (pInputState));
(pInputState));
if (resetInput) if (resetInput)
{ {
TFB_ResetControls (); TFB_ResetControls ();
@@ -380,7 +378,7 @@ GetMenuSounds (MENU_SOUND_FLAGS *s0, MENU_SOUND_FLAGS *s1)
/* These can really be refactored */ /* These can really be refactored */
BATTLE_INPUT_STATE BATTLE_INPUT_STATE
p1_combat_summary (COUNT player, STARSHIPPTR StarShipPtr) p1_combat_summary (COUNT player, STARSHIP *StarShipPtr)
{ {
BATTLE_INPUT_STATE InputState = 0; BATTLE_INPUT_STATE InputState = 0;
if (CurrentInputState.key[PlayerOne][KEY_UP]) if (CurrentInputState.key[PlayerOne][KEY_UP])
@@ -404,7 +402,7 @@ p1_combat_summary (COUNT player, STARSHIPPTR StarShipPtr)
} }
BATTLE_INPUT_STATE BATTLE_INPUT_STATE
p2_combat_summary (COUNT player, STARSHIPPTR StarShipPtr) p2_combat_summary (COUNT player, STARSHIP *StarShipPtr)
{ {
BATTLE_INPUT_STATE InputState = 0; BATTLE_INPUT_STATE InputState = 0;
if (CurrentInputState.key[PlayerTwo][KEY_UP]) if (CurrentInputState.key[PlayerTwo][KEY_UP])
sc2/src/sc2code/gameopt.c
+24 -24
View File
@@ -45,10 +45,10 @@
#define SUMMARY_SIDE_OFFS 7 #define SUMMARY_SIDE_OFFS 7
#define SAVES_PER_PAGE 5 #define SAVES_PER_PAGE 5
static BOOLEAN DoSettings (PMENU_STATE pMS); static BOOLEAN DoSettings (MENU_STATE *pMS);
static BOOLEAN DoNaming (PMENU_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 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); t.pStr = GAME_STRING (SAVEGAME_STRING_BASE + 0);
else else
t.pStr = GAME_STRING (SAVEGAME_STRING_BASE + 1); t.pStr = GAME_STRING (SAVEGAME_STRING_BASE + 1);
TextRect (&t, &r, NULL_PTR); TextRect (&t, &r, NULL);
r.corner.x -= 4; r.corner.x -= 4;
r.corner.y -= 4; r.corner.y -= 4;
r.extent.width += 8; r.extent.width += 8;
@@ -106,7 +106,7 @@ enum
SETTINGS SETTINGS
}; };
static BOOLEAN DoGameOptions (PMENU_STATE pMS); static BOOLEAN DoGameOptions (MENU_STATE *pMS);
enum enum
{ {
@@ -215,7 +215,7 @@ FeedbackQuit (BYTE which_setting)
#define DDSHS_BLOCKCUR 2 #define DDSHS_BLOCKCUR 2
static BOOLEAN static BOOLEAN
DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state) DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state)
{ {
COUNT rel_index; COUNT rel_index;
RECT r; RECT r;
@@ -297,7 +297,7 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state)
COUNT i; COUNT i;
RECT text_r; RECT text_r;
BYTE char_deltas[MAX_DESC_CHARS]; BYTE char_deltas[MAX_DESC_CHARS];
PBYTE pchar_deltas; BYTE *pchar_deltas;
TextRect (&lf, &text_r, char_deltas); TextRect (&lf, &text_r, char_deltas);
if ((text_r.extent.width + 2) >= r.extent.width) if ((text_r.extent.width + 2) >= r.extent.width)
@@ -353,9 +353,9 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state)
} }
static BOOLEAN 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; COUNT hl = DDSHS_EDIT;
pMS->first_item.x = pTES->CursorPos; pMS->first_item.x = pTES->CursorPos;
@@ -366,7 +366,7 @@ OnNameChange (PTEXTENTRY_STATE pTES)
} }
static BOOLEAN static BOOLEAN
DoNaming (PMENU_STATE pMS) DoNaming (MENU_STATE *pMS)
{ {
GAME_DESC buf; GAME_DESC buf;
TEXTENTRY_STATE tes; TEXTENTRY_STATE tes;
@@ -427,7 +427,7 @@ DoNaming (PMENU_STATE pMS)
} }
static BOOLEAN static BOOLEAN
DoSettings (PMENU_STATE pMS) DoSettings (MENU_STATE *pMS)
{ {
BYTE cur_speed; BYTE cur_speed;
@@ -448,7 +448,7 @@ DoSettings (PMENU_STATE pMS)
&& pMS->CurState == EXIT_MENU_SETTING)) && pMS->CurState == EXIT_MENU_SETTING))
{ {
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
DrawStatusMessage (NULL_PTR); DrawStatusMessage (NULL);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
pMS->CurState = SETTINGS; pMS->CurState = SETTINGS;
@@ -500,7 +500,7 @@ DoSettings (PMENU_STATE pMS)
} }
static BOOLEAN static BOOLEAN
DoQuitMenu (PMENU_STATE pMS) DoQuitMenu (MENU_STATE *pMS)
{ {
if (GLOBAL (CurrentActivity) & CHECK_ABORT) if (GLOBAL (CurrentActivity) & CHECK_ABORT)
return (FALSE); return (FALSE);
@@ -519,7 +519,7 @@ DoQuitMenu (PMENU_STATE pMS)
&& pMS->CurState == NO_QUIT_MENU)) && pMS->CurState == NO_QUIT_MENU))
{ {
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
DrawStatusMessage (NULL_PTR); DrawStatusMessage (NULL);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
pMS->CurState = QUIT_GAME; pMS->CurState = QUIT_GAME;
@@ -845,11 +845,11 @@ ShowSummary (SUMMARY_DESC *pSD)
case IN_STARBASE: case IN_STARBASE:
{ {
BYTE QuasiState; BYTE QuasiState;
STAR_DESCPTR SDPtr; STAR_DESC *SDPtr;
QuasiState = GET_GAME_STATE (ARILOU_SPACE_SIDE); QuasiState = GET_GAME_STATE (ARILOU_SPACE_SIDE);
SET_GAME_STATE (ARILOU_SPACE_SIDE, 0); 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); SET_GAME_STATE (ARILOU_SPACE_SIDE, QuasiState);
if (SDPtr) if (SDPtr)
{ {
@@ -910,7 +910,7 @@ LoadGameDescriptions (SUMMARY_DESC *pSD)
} }
static BOOLEAN static BOOLEAN
DoPickGame (PMENU_STATE pMS) DoPickGame (MENU_STATE *pMS)
{ {
BYTE NewState; BYTE NewState;
SUMMARY_DESC *pSD; SUMMARY_DESC *pSD;
@@ -992,7 +992,7 @@ Restart:
} }
else else
{ {
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL, (FRAME)0);
DrawStamp (&MsgStamp); DrawStamp (&MsgStamp);
DestroyDrawable (ReleaseDrawable (MsgStamp.frame)); DestroyDrawable (ReleaseDrawable (MsgStamp.frame));
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
@@ -1021,10 +1021,10 @@ Restart:
else else
{ {
ConfirmSaveLoad (0); ConfirmSaveLoad (0);
if (LoadGame ((COUNT)pMS->CurState, NULL_PTR)) if (LoadGame ((COUNT)pMS->CurState, NULL))
GLOBAL (CurrentActivity) |= CHECK_LOAD; GLOBAL (CurrentActivity) |= CHECK_LOAD;
} }
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
pMS->ModuleFrame = 0; pMS->ModuleFrame = 0;
@@ -1182,7 +1182,7 @@ ChangeGameSelection:
} }
UnbatchGraphics (); UnbatchGraphics ();
} }
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
} }
@@ -1191,7 +1191,7 @@ ChangeGameSelection:
} }
static BOOLEAN static BOOLEAN
PickGame (PMENU_STATE pMS) PickGame (MENU_STATE *pMS)
{ {
BOOLEAN retval; BOOLEAN retval;
CONTEXT OldContext; CONTEXT OldContext;
@@ -1286,7 +1286,7 @@ PickGame (PMENU_STATE pMS)
} }
static BOOLEAN static BOOLEAN
DoGameOptions (PMENU_STATE pMS) DoGameOptions (MENU_STATE *pMS)
{ {
BOOLEAN force_select = FALSE; BOOLEAN force_select = FALSE;
if (GLOBAL (CurrentActivity) & CHECK_ABORT) if (GLOBAL (CurrentActivity) & CHECK_ABORT)
@@ -1353,7 +1353,7 @@ GameOptions (void)
MenuState.InputFunc = DoGameOptions; MenuState.InputFunc = DoGameOptions;
MenuState.CurState = SAVE_GAME; MenuState.CurState = SAVE_GAME;
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
DoInput ((PVOID)&MenuState, TRUE); DoInput (&MenuState, TRUE);
pLocMenuState = 0; pLocMenuState = 0;
sc2/src/sc2code/getchar.c
+4 -4
View File
@@ -88,7 +88,7 @@ JoyCharFindIn (const joy_char_t *ch, const joy_char_t *set,
} }
static int 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); return 0 <= JoyCharFindIn (ch, pTES->JoyLower, pTES->JoyRegLength);
} }
@@ -104,7 +104,7 @@ JoyCharSwitchReg (joy_char_t *ch, const joy_char_t *from,
static void static void
JoyCharToUpper (joy_char_t *outch, const joy_char_t *ch, JoyCharToUpper (joy_char_t *outch, const joy_char_t *ch,
PTEXTENTRY_STATE pTES) TEXTENTRY_STATE *pTES)
{ {
*outch = *ch; *outch = *ch;
JoyCharSwitchReg (outch, pTES->JoyLower, pTES->JoyUpper, JoyCharSwitchReg (outch, pTES->JoyLower, pTES->JoyUpper,
@@ -113,7 +113,7 @@ JoyCharToUpper (joy_char_t *outch, const joy_char_t *ch,
static void static void
JoyCharToLower (joy_char_t *outch, const joy_char_t *ch, JoyCharToLower (joy_char_t *outch, const joy_char_t *ch,
PTEXTENTRY_STATE pTES) TEXTENTRY_STATE *pTES)
{ {
*outch = *ch; *outch = *ch;
JoyCharSwitchReg (outch, pTES->JoyUpper, pTES->JoyLower, JoyCharSwitchReg (outch, pTES->JoyUpper, pTES->JoyLower,
@@ -121,7 +121,7 @@ JoyCharToLower (joy_char_t *outch, const joy_char_t *ch,
} }
BOOLEAN BOOLEAN
DoTextEntry (PTEXTENTRY_STATE pTES) DoTextEntry (TEXTENTRY_STATE *pTES)
{ {
wchar_t ch; wchar_t ch;
UNICODE *pStr; UNICODE *pStr;
sc2/src/sc2code/globdata.c
+11 -11
View File
@@ -210,35 +210,35 @@ InitSIS (void)
hStarShip = Build (&GLOBAL (avail_race_q), ship_ref, 0, 0); hStarShip = Build (&GLOBAL (avail_race_q), ship_ref, 0, 0);
if (hStarShip) if (hStarShip)
{ {
SHIP_FRAGMENTPTR FragPtr; SHIP_FRAGMENT *FragPtr;
EXTENDED_SHIP_FRAGMENTPTR ExtFragPtr; EXTENDED_SHIP_FRAGMENT *ExtFragPtr;
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( FragPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hStarShip); &GLOBAL (avail_race_q), hStarShip);
if (i < num_ships - 1) if (i < num_ships - 1)
{ {
HSTARSHIP hMasterShip; HSTARSHIP hMasterShip;
STARSHIPPTR MasterShipPtr; STARSHIP *MasterShipPtr;
hMasterShip = FindMasterShip (ship_ref); hMasterShip = FindMasterShip (ship_ref);
MasterShipPtr = LockStarShip (&master_q, hMasterShip); MasterShipPtr = LockStarShip (&master_q, hMasterShip);
FragPtr->ShipInfo = FragPtr->ShipInfo =
((SHIP_FRAGMENTPTR)MasterShipPtr)->ShipInfo; ((SHIP_FRAGMENT*)MasterShipPtr)->ShipInfo;
UnlockStarShip (&master_q, hMasterShip); UnlockStarShip (&master_q, hMasterShip);
} }
else else
{ {
// Ur-Quan probe. // Ur-Quan probe.
load_ship ((STARSHIPPTR)FragPtr, FALSE); load_ship ((STARSHIP*)FragPtr, FALSE);
FragPtr->ShipInfo = FragPtr->RaceDescPtr->ship_info; FragPtr->ShipInfo = FragPtr->RaceDescPtr->ship_info;
FragPtr->RaceDescPtr->ship_info.melee_icon = 0; FragPtr->RaceDescPtr->ship_info.melee_icon = 0;
FragPtr->RaceDescPtr->ship_info.icons = 0; FragPtr->RaceDescPtr->ship_info.icons = 0;
FragPtr->RaceDescPtr->ship_info.race_strings = 0; FragPtr->RaceDescPtr->ship_info.race_strings = 0;
free_ship ((STARSHIPPTR)FragPtr, FALSE); free_ship ((STARSHIP*)FragPtr, FALSE);
} }
FragPtr->ShipInfo.ship_flags = BAD_GUY; FragPtr->ShipInfo.ship_flags = BAD_GUY;
ExtFragPtr = (EXTENDED_SHIP_FRAGMENTPTR)FragPtr; ExtFragPtr = (EXTENDED_SHIP_FRAGMENT*)FragPtr;
ExtFragPtr->ShipInfo.known_strength = 0; ExtFragPtr->ShipInfo.known_strength = 0;
ExtFragPtr->ShipInfo.known_loc = ExtFragPtr->ShipInfo.loc; ExtFragPtr->ShipInfo.known_loc = ExtFragPtr->ShipInfo.loc;
if (FragPtr->ShipInfo.var2 == (BYTE)~0) if (FragPtr->ShipInfo.var2 == (BYTE)~0)
@@ -252,7 +252,7 @@ InitSIS (void)
ExtFragPtr->ShipInfo.growth_err_term = 255 >> 1; ExtFragPtr->ShipInfo.growth_err_term = 255 >> 1;
ExtFragPtr->ShipInfo.energy_level = 0; ExtFragPtr->ShipInfo.energy_level = 0;
ExtFragPtr->ShipInfo.days_left = 0; ExtFragPtr->ShipInfo.days_left = 0;
FragPtr->RaceDescPtr = (RACE_DESCPTR)&ExtFragPtr->ShipInfo; FragPtr->RaceDescPtr = (RACE_DESC*)&ExtFragPtr->ShipInfo;
UnlockStarShip (&GLOBAL (avail_race_q), hStarShip); UnlockStarShip (&GLOBAL (avail_race_q), hStarShip);
} }
@@ -383,7 +383,7 @@ UninitSIS (void)
hStarShip = GetTailLink (&GLOBAL (avail_race_q)); hStarShip = GetTailLink (&GLOBAL (avail_race_q));
if (hStarShip) if (hStarShip)
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
StarShipPtr = LockStarShip (&GLOBAL (avail_race_q), hStarShip); StarShipPtr = LockStarShip (&GLOBAL (avail_race_q), hStarShip);
DestroyDrawable (ReleaseDrawable ( DestroyDrawable (ReleaseDrawable (
@@ -408,7 +408,7 @@ InitGlobData (void)
COUNT i; COUNT i;
i = GLOBAL (glob_flags); i = GLOBAL (glob_flags);
memset ((PBYTE)&GlobData, 0, sizeof (GlobData)); memset (&GlobData, 0, sizeof (GlobData));
GLOBAL (glob_flags) = (BYTE)i; GLOBAL (glob_flags) = (BYTE)i;
GLOBAL (DisplayArray) = DisplayArray; GLOBAL (DisplayArray) = DisplayArray;
sc2/src/sc2code/globdata.h
+2 -12
View File
@@ -60,8 +60,6 @@ typedef struct
DWORD BlockMask; DWORD BlockMask;
} ANIMATION_DESC; } ANIMATION_DESC;
typedef ANIMATION_DESC *PANIMATION_DESC;
#define ANIMATION_DESCPTR PANIMATION_DESC
#define MAX_ANIMATIONS 20 #define MAX_ANIMATIONS 20
@@ -119,8 +117,6 @@ typedef struct
// 0-9, 10-19, ..20-90, ..100-900, etc. // 0-9, 10-19, ..20-90, ..100-900, etc.
SPEECH_DIGIT Digits[MAX_SPEECH_DIGITS]; SPEECH_DIGIT Digits[MAX_SPEECH_DIGITS];
} NUMBER_SPEECH_DESC; } NUMBER_SPEECH_DESC;
typedef NUMBER_SPEECH_DESC *PNUMBER_SPEECH_DESC;
#define NUMBER_SPEECH_DESCPTR PNUMBER_SPEECH_DESC
typedef NUMBER_SPEECH_DESC *NUMBER_SPEECH; typedef NUMBER_SPEECH_DESC *NUMBER_SPEECH;
typedef DWORD LDAS_FLAGS; typedef DWORD LDAS_FLAGS;
@@ -158,8 +154,6 @@ typedef struct
NUMBER_SPEECH AlienNumberSpeech; NUMBER_SPEECH AlienNumberSpeech;
} LOCDATA; } LOCDATA;
typedef LOCDATA *PLOCDATA;
#define LOCDATAPTR PLOCDATA
enum enum
{ {
@@ -936,7 +930,7 @@ typedef struct
BYTE ModuleCost[NUM_MODULES]; BYTE ModuleCost[NUM_MODULES];
BYTE ElementWorth[NUM_ELEMENT_CATEGORIES]; BYTE ElementWorth[NUM_ELEMENT_CATEGORIES];
PPRIMITIVE DisplayArray; PRIMITIVE *DisplayArray;
ACTIVITY CurrentActivity; ACTIVITY CurrentActivity;
CLOCK_STATE GameClock; CLOCK_STATE GameClock;
@@ -957,21 +951,17 @@ typedef struct
BYTE GameState[(NUM_GAME_STATE_BITS + 7) >> 3]; BYTE GameState[(NUM_GAME_STATE_BITS + 7) >> 3];
} GAME_STATE; } GAME_STATE;
typedef GAME_STATE *PGAME_STATE;
typedef struct typedef struct
{ {
SIS_STATE SIS_state; SIS_STATE SIS_state;
GAME_STATE Game_state; GAME_STATE Game_state;
} GLOBDATA; } GLOBDATA;
typedef GLOBDATA *PGLOBDATA;
extern GLOBDATA GlobData; extern GLOBDATA GlobData;
#define GLOBAL(f) GlobData.Game_state.f #define GLOBAL(f) GlobData.Game_state.f
#define GLOBAL_SIS(f) GlobData.SIS_state.f #define GLOBAL_SIS(f) GlobData.SIS_state.f
#define GLOBDATAPTR PGLOBDATA
//#define STATE_DEBUG //#define STATE_DEBUG
@@ -1010,7 +1000,7 @@ extern void setGameState32 (int startBit, DWORD val
extern CONTEXT RadarContext; extern CONTEXT RadarContext;
extern void DiscardStarMap (PVOID CodeRef); extern void DiscardStarMap (void *CodeRef);
extern void RetrieveStarMap (void); extern void RetrieveStarMap (void);
extern void FreeSC2Data (void); extern void FreeSC2Data (void);
sc2/src/sc2code/gravity.c
+5 -5
View File
@@ -24,7 +24,7 @@
//#define DEBUG_GRAVITY //#define DEBUG_GRAVITY
BOOLEAN BOOLEAN
CalculateGravity (PELEMENT ElementPtr) CalculateGravity (ELEMENT *ElementPtr)
{ {
BOOLEAN retval, HasGravity; BOOLEAN retval, HasGravity;
HELEMENT hTestElement, hSuccElement; HELEMENT hTestElement, hSuccElement;
@@ -36,7 +36,7 @@ CalculateGravity (PELEMENT ElementPtr)
hTestElement != 0; hTestElement = hSuccElement) hTestElement != 0; hTestElement = hSuccElement)
{ {
BOOLEAN TestHasGravity; BOOLEAN TestHasGravity;
ELEMENTPTR TestElementPtr; ELEMENT *TestElementPtr;
LockElement (hTestElement, &TestElementPtr); LockElement (hTestElement, &TestElementPtr);
if (TestElementPtr != ElementPtr if (TestElementPtr != ElementPtr
@@ -130,7 +130,7 @@ CalculateGravity (PELEMENT ElementPtr)
SINE (angle, WORLD_TO_VELOCITY (1))); SINE (angle, WORLD_TO_VELOCITY (1)));
if (TestElementPtr->state_flags & PLAYER_SHIP) if (TestElementPtr->state_flags & PLAYER_SHIP)
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
GetElementStarShip (TestElementPtr, &StarShipPtr); GetElementStarShip (TestElementPtr, &StarShipPtr);
StarShipPtr->cur_status_flags &= ~SHIP_AT_MAX_SPEED; StarShipPtr->cur_status_flags &= ~SHIP_AT_MAX_SPEED;
@@ -149,7 +149,7 @@ CalculateGravity (PELEMENT ElementPtr)
} }
BOOLEAN BOOLEAN
TimeSpaceMatterConflict (ELEMENTPTR ElementPtr) TimeSpaceMatterConflict (ELEMENT *ElementPtr)
{ {
HELEMENT hTestElement, hSuccElement; HELEMENT hTestElement, hSuccElement;
INTERSECT_CONTROL ElementControl; INTERSECT_CONTROL ElementControl;
@@ -165,7 +165,7 @@ TimeSpaceMatterConflict (ELEMENTPTR ElementPtr)
for (hTestElement = GetHeadElement (); for (hTestElement = GetHeadElement ();
hTestElement != 0; hTestElement = hSuccElement) hTestElement != 0; hTestElement = hSuccElement)
{ {
ELEMENTPTR TestElementPtr; ELEMENT *TestElementPtr;
LockElement (hTestElement, &TestElementPtr); LockElement (hTestElement, &TestElementPtr);
hSuccElement = GetSuccElement (TestElementPtr); hSuccElement = GetSuccElement (TestElementPtr);
sc2/src/sc2code/grpinfo.c
+18 -19
View File
@@ -62,7 +62,7 @@ typedef struct
} GROUP_HEADER; } GROUP_HEADER;
static void static void
ReadGroupHeader (PVOID fp, GROUP_HEADER* pGH) ReadGroupHeader (void *fp, GROUP_HEADER *pGH)
{ {
sread_8 (fp, &pGH->NumGroups); sread_8 (fp, &pGH->NumGroups);
sread_8 (fp, &pGH->day_index); sread_8 (fp, &pGH->day_index);
@@ -74,7 +74,7 @@ ReadGroupHeader (PVOID fp, GROUP_HEADER* pGH)
} }
static void static void
WriteGroupHeader (PVOID fp, GROUP_HEADER* pGH) WriteGroupHeader (void *fp, const GROUP_HEADER *pGH)
{ {
swrite_8 (fp, pGH->NumGroups); swrite_8 (fp, pGH->NumGroups);
swrite_8 (fp, pGH->day_index); swrite_8 (fp, pGH->day_index);
@@ -86,7 +86,7 @@ WriteGroupHeader (PVOID fp, GROUP_HEADER* pGH)
} }
static void static void
ReadShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr) ReadShipFragment (void *fp, SHIP_FRAGMENT *FragPtr)
{ {
BYTE tmpb; BYTE tmpb;
@@ -109,7 +109,7 @@ ReadShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr)
} }
static void static void
WriteShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr) WriteShipFragment (void *fp, const SHIP_FRAGMENT *FragPtr)
{ {
// Write SHIP_FRAGMENT elements // Write SHIP_FRAGMENT elements
swrite_16 (fp, FragPtr->s.Player); swrite_16 (fp, FragPtr->s.Player);
@@ -130,7 +130,7 @@ WriteShipFragment (PVOID fp, SHIP_FRAGMENTPTR FragPtr)
void void
InitGroupInfo (BOOLEAN FirstTime) InitGroupInfo (BOOLEAN FirstTime)
{ {
PVOID fp; void *fp;
fp = OpenStateFile (RANDGRPINFO_FILE, "wb"); fp = OpenStateFile (RANDGRPINFO_FILE, "wb");
if (fp) if (fp)
@@ -212,9 +212,9 @@ BuildGroups (void)
hTemplate; hTemplate = hNextShip, ++Index) hTemplate; hTemplate = hNextShip, ++Index)
{ {
COUNT i, encounter_radius; 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); &GLOBAL (avail_race_q), hTemplate);
hNextShip = _GetSuccLink (TemplatePtr); hNextShip = _GetSuccLink (TemplatePtr);
@@ -329,11 +329,11 @@ FoundHome:
} }
static void 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; BYTE RaceType, NumShips;
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
SHIP_FRAGMENTPTR FragPtr; SHIP_FRAGMENT *FragPtr;
if (which_group == GROUP_LIST) if (which_group == GROUP_LIST)
{ {
@@ -351,7 +351,7 @@ FlushGroupInfo (GROUP_HEADER *pGH, DWORD offset, BYTE which_group, PVOID fp)
{ {
COUNT crew_level; COUNT crew_level;
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( FragPtr = (SHIP_FRAGMENT*) LockStarShip (
&temp_q, hStarShip); &temp_q, hStarShip);
hNextShip = _GetSuccLink (FragPtr); hNextShip = _GetSuccLink (FragPtr);
crew_level = FragPtr->ShipInfo.crew_level; 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); pGH->GroupOffset[which_group] = LengthStateFile (fp);
hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q));
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( FragPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip); &GLOBAL (npc_built_ship_q), hStarShip);
RaceType = GET_RACE_ID (FragPtr); RaceType = GET_RACE_ID (FragPtr);
SeekStateFile (fp, pGH->GroupOffset[which_group], SEEK_SET); 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; HSTARSHIP hNextShip;
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( FragPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip &GLOBAL (npc_built_ship_q), hStarShip);
);
hNextShip = _GetSuccLink (FragPtr); hNextShip = _GetSuccLink (FragPtr);
RaceType = GET_RACE_ID (FragPtr); RaceType = GET_RACE_ID (FragPtr);
@@ -439,7 +438,7 @@ FlushGroupInfo (GROUP_HEADER *pGH, DWORD offset, BYTE which_group, PVOID fp)
BOOLEAN BOOLEAN
GetGroupInfo (DWORD offset, BYTE which_group) GetGroupInfo (DWORD offset, BYTE which_group)
{ {
PVOID fp; void *fp;
if (offset != GROUPS_RANDOM && which_group != GROUP_LIST) if (offset != GROUPS_RANDOM && which_group != GROUP_LIST)
fp = OpenStateFile (DEFGRPINFO_FILE, "r+b"); fp = OpenStateFile (DEFGRPINFO_FILE, "r+b");
@@ -451,7 +450,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
BYTE RaceType, NumShips; BYTE RaceType, NumShips;
GROUP_HEADER GH; GROUP_HEADER GH;
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
SHIP_FRAGMENTPTR FragPtr; SHIP_FRAGMENT *FragPtr;
SeekStateFile (fp, offset, SEEK_SET); SeekStateFile (fp, offset, SEEK_SET);
ReadGroupHeader (fp, &GH); ReadGroupHeader (fp, &GH);
@@ -510,7 +509,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
hStarShip = CloneShipFragment (RaceType, hStarShip = CloneShipFragment (RaceType,
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( FragPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip); &GLOBAL (npc_built_ship_q), hStarShip);
OwnStarShip (FragPtr, BAD_GUY, 0); OwnStarShip (FragPtr, BAD_GUY, 0);
SET_GROUP_ID (FragPtr, which_group); SET_GROUP_ID (FragPtr, which_group);
@@ -630,7 +629,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
hStarShip = CloneShipFragment (RaceType, hStarShip = CloneShipFragment (RaceType,
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
FragPtr = (SHIP_FRAGMENTPTR)LockStarShip ( FragPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip); &GLOBAL (npc_built_ship_q), hStarShip);
ReadShipFragment (fp, FragPtr); ReadShipFragment (fp, FragPtr);
@@ -689,7 +688,7 @@ GetGroupInfo (DWORD offset, BYTE which_group)
DWORD DWORD
PutGroupInfo (DWORD offset, BYTE which_group) PutGroupInfo (DWORD offset, BYTE which_group)
{ {
PVOID fp; void *fp;
if (offset != GROUPS_RANDOM && which_group != GROUP_LIST) if (offset != GROUPS_RANDOM && which_group != GROUP_LIST)
fp = OpenStateFile (DEFGRPINFO_FILE, "r+b"); fp = OpenStateFile (DEFGRPINFO_FILE, "r+b");
sc2/src/sc2code/hyper.c
+59 -65
View File
@@ -43,7 +43,7 @@ static BYTE fuel_ticks;
static COUNT hyper_dx, hyper_dy, hyper_extra; static COUNT hyper_dx, hyper_dy, hyper_extra;
void void
MoveSIS (PSIZE pdx, PSIZE pdy) MoveSIS (SIZE *pdx, SIZE *pdy)
{ {
SIZE new_dx, new_dy; SIZE new_dx, new_dy;
@@ -81,7 +81,7 @@ MoveSIS (PSIZE pdx, PSIZE pdy)
for (hElement = GetTailElement (); for (hElement = GetTailElement ();
hElement != 0; hElement = hNextElement) hElement != 0; hElement = hNextElement)
{ {
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
LockElement (hElement, &ElementPtr); LockElement (hElement, &ElementPtr);
@@ -156,12 +156,10 @@ check_hyperspace_encounter (void)
hStarShip = hNextShip, ++Type) hStarShip = hNextShip, ++Type)
{ {
COUNT encounter_radius; COUNT encounter_radius;
EXTENDED_SHIP_FRAGMENTPTR TemplatePtr; EXTENDED_SHIP_FRAGMENT *TemplatePtr;
TemplatePtr = (EXTENDED_SHIP_FRAGMENTPTR)LockStarShip ( TemplatePtr = (EXTENDED_SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), &GLOBAL (avail_race_q), hStarShip);
hStarShip
);
hNextShip = _GetSuccLink (TemplatePtr); hNextShip = _GetSuccLink (TemplatePtr);
encounter_radius = TemplatePtr->ShipInfo.actual_strength; encounter_radius = TemplatePtr->ShipInfo.actual_strength;
@@ -171,7 +169,7 @@ check_hyperspace_encounter (void)
SIZE dx, dy; SIZE dx, dy;
COUNT percent; COUNT percent;
HENCOUNTER hEncounter; HENCOUNTER hEncounter;
ENCOUNTERPTR EncounterPtr; ENCOUNTER *EncounterPtr;
encounter_flags = 0; encounter_flags = 0;
percent = EncounterPercent[Type]; percent = EncounterPercent[Type];
@@ -322,7 +320,7 @@ LoadHyperspace (void)
RepairSISBorder (); RepairSISBorder ();
} }
} }
DrawSISMessage (NULL_PTR); DrawSISMessage (NULL);
SetContext (RadarContext); SetContext (RadarContext);
SetContextBackGroundColor ( SetContextBackGroundColor (
@@ -370,7 +368,7 @@ FreeHyperspace (void)
} }
static void static void
ElementToUniverse (ELEMENTPTR ElementPtr, PPOINT pPt) ElementToUniverse (ELEMENT *ElementPtr, POINT *pPt)
{ {
SDWORD log_x, log_y; SDWORD log_x, log_y;
@@ -390,13 +388,13 @@ cleanup_hyperspace (void)
for (hEncounter = GetHeadEncounter (); for (hEncounter = GetHeadEncounter ();
hEncounter != 0; hEncounter = hNextEncounter) hEncounter != 0; hEncounter = hNextEncounter)
{ {
ENCOUNTERPTR EncounterPtr; ENCOUNTER *EncounterPtr;
LockEncounter (hEncounter, &EncounterPtr); LockEncounter (hEncounter, &EncounterPtr);
hNextEncounter = GetSuccEncounter (EncounterPtr); hNextEncounter = GetSuccEncounter (EncounterPtr);
if (EncounterPtr->hElement) if (EncounterPtr->hElement)
{ {
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
LockElement (EncounterPtr->hElement, &ElementPtr); LockElement (EncounterPtr->hElement, &ElementPtr);
@@ -421,7 +419,7 @@ typedef enum
} TRANSITION_TYPE; } TRANSITION_TYPE;
static void static void
unhyper_transition (PELEMENT ElementPtr) unhyper_transition (ELEMENT *ElementPtr)
{ {
COUNT frame_index; COUNT frame_index;
@@ -459,7 +457,7 @@ unhyper_transition (PELEMENT ElementPtr)
GLOBAL (autopilot.y) = ~0; GLOBAL (autopilot.y) = ~0;
ElementToUniverse (ElementPtr, &pt); ElementToUniverse (ElementPtr, &pt);
CurStarDescPtr = FindStar (NULL_PTR, &pt, 5, 5); CurStarDescPtr = FindStar (NULL, &pt, 5, 5);
if (CurStarDescPtr->star_pt.x == ARILOU_HOME_X if (CurStarDescPtr->star_pt.x == ARILOU_HOME_X
&& CurStarDescPtr->star_pt.y == ARILOU_HOME_Y) && CurStarDescPtr->star_pt.y == ARILOU_HOME_Y)
{ {
@@ -488,7 +486,7 @@ unhyper_transition (PELEMENT ElementPtr)
}; };
index = CurStarDescPtr index = CurStarDescPtr
- ((STAR_DESCPTR)&star_array[NUM_SOLAR_SYSTEMS + 1]); - &star_array[NUM_SOLAR_SYSTEMS + 1];
GLOBAL_SIS (log_x) = GLOBAL_SIS (log_x) =
UNIVERSE_TO_LOGX (portal_pt[index].x); UNIVERSE_TO_LOGX (portal_pt[index].x);
GLOBAL_SIS (log_y) = GLOBAL_SIS (log_y) =
@@ -548,11 +546,11 @@ unhyper_transition (PELEMENT ElementPtr)
} }
static void static void
init_transition (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1, init_transition (ELEMENT *ElementPtr0, ELEMENT *ElementPtr1,
TRANSITION_TYPE which_transition) TRANSITION_TYPE which_transition)
{ {
SIZE dx, dy, num_turns; SIZE dx, dy, num_turns;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
dx = WORLD_TO_VELOCITY (ElementPtr0->next.location.x dx = WORLD_TO_VELOCITY (ElementPtr0->next.location.x
- ElementPtr1->next.location.x); - ElementPtr1->next.location.x);
@@ -561,7 +559,7 @@ init_transition (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1,
ElementPtr1->state_flags |= NONSOLID; ElementPtr1->state_flags |= NONSOLID;
ElementPtr1->preprocess_func = unhyper_transition; ElementPtr1->preprocess_func = unhyper_transition;
ElementPtr1->postprocess_func = NULL_PTR; ElementPtr1->postprocess_func = NULL;
ElementPtr1->turn_wait = (BYTE) which_transition; ElementPtr1->turn_wait = (BYTE) which_transition;
GetElementStarShip (ElementPtr1, &StarShipPtr); GetElementStarShip (ElementPtr1, &StarShipPtr);
@@ -576,7 +574,7 @@ init_transition (ELEMENTPTR ElementPtr0, ELEMENTPTR ElementPtr1,
} }
BOOLEAN BOOLEAN
hyper_transition (PELEMENT ElementPtr) hyper_transition (ELEMENT *ElementPtr)
{ {
if (ElementPtr->state_flags & APPEARING) if (ElementPtr->state_flags & APPEARING)
{ {
@@ -596,7 +594,7 @@ hyper_transition (PELEMENT ElementPtr)
ElementPtr->preprocess_func = ElementPtr->preprocess_func =
(void (*) (struct element (void (*) (struct element
*ElementPtr))hyper_transition; *ElementPtr))hyper_transition;
ElementPtr->postprocess_func = NULL_PTR; ElementPtr->postprocess_func = NULL;
ElementPtr->state_flags |= NONSOLID; ElementPtr->state_flags |= NONSOLID;
ElementPtr->next.image.frame = ElementPtr->next.image.frame =
SetAbsFrameIndex (ElementPtr->current.image.frame, SetAbsFrameIndex (ElementPtr->current.image.frame,
@@ -610,7 +608,7 @@ hyper_transition (PELEMENT ElementPtr)
frame_index = GetFrameIndex (ElementPtr->current.image.frame); frame_index = GetFrameIndex (ElementPtr->current.image.frame);
if (frame_index-- <= ANGLE_TO_FACING (FULL_CIRCLE)) if (frame_index-- <= ANGLE_TO_FACING (FULL_CIRCLE))
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
if (frame_index == ANGLE_TO_FACING (FULL_CIRCLE) - 1) if (frame_index == ANGLE_TO_FACING (FULL_CIRCLE) - 1)
frame_index = 0; frame_index = 0;
@@ -644,20 +642,20 @@ hyper_transition (PELEMENT ElementPtr)
} }
static void static void
hyper_collision (PELEMENT ElementPtr0, PPOINT hyper_collision (ELEMENT *ElementPtr0, POINT *pPt0,
pPt0, PELEMENT ElementPtr1, PPOINT pPt1) ELEMENT *ElementPtr1, POINT *pPt1)
{ {
if ((ElementPtr1->state_flags & PLAYER_SHIP) if ((ElementPtr1->state_flags & PLAYER_SHIP)
&& GET_GAME_STATE (PORTAL_COUNTER) == 0) && GET_GAME_STATE (PORTAL_COUNTER) == 0)
{ {
SIZE dx, dy; SIZE dx, dy;
POINT pt; POINT pt;
STAR_DESCPTR SDPtr; STAR_DESC *SDPtr;
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
ElementToUniverse (ElementPtr0, &pt); ElementToUniverse (ElementPtr0, &pt);
SDPtr = FindStar (NULL_PTR, &pt, 5, 5); SDPtr = FindStar (NULL, &pt, 5, 5);
GetElementStarShip (ElementPtr1, &StarShipPtr); GetElementStarShip (ElementPtr1, &StarShipPtr);
GetCurrentVelocityComponents (&ElementPtr1->velocity, &dx, &dy); GetCurrentVelocityComponents (&ElementPtr1->velocity, &dx, &dy);
@@ -687,7 +685,7 @@ hyper_collision (PELEMENT ElementPtr0, PPOINT
} }
static void static void
hyper_death (PELEMENT ElementPtr) hyper_death (ELEMENT *ElementPtr)
{ {
if (!(ElementPtr->state_flags & DEFY_PHYSICS) if (!(ElementPtr->state_flags & DEFY_PHYSICS)
&& (GLOBAL (CurrentActivity) & IN_BATTLE)) && (GLOBAL (CurrentActivity) & IN_BATTLE))
@@ -695,7 +693,7 @@ hyper_death (PELEMENT ElementPtr)
} }
static void static void
arilou_space_death (PELEMENT ElementPtr) arilou_space_death (ELEMENT *ElementPtr)
{ {
if (!(ElementPtr->state_flags & DEFY_PHYSICS) if (!(ElementPtr->state_flags & DEFY_PHYSICS)
|| GET_GAME_STATE (ARILOU_SPACE_COUNTER) == 0) || GET_GAME_STATE (ARILOU_SPACE_COUNTER) == 0)
@@ -712,9 +710,8 @@ arilou_space_death (PELEMENT ElementPtr)
} }
static void static void
arilou_space_collision (PELEMENT ElementPtr0, arilou_space_collision (ELEMENT *ElementPtr0,
PPOINT pPt0, PELEMENT ElementPtr1, PPOINT POINT *pPt0, ELEMENT *ElementPtr1, POINT *pPt1)
pPt1)
{ {
COUNT which_side; COUNT which_side;
@@ -740,14 +737,14 @@ arilou_space_collision (PELEMENT ElementPtr0,
} }
static HELEMENT static HELEMENT
AllocHyperElement (STAR_DESCPTR SDPtr) AllocHyperElement (STAR_DESC *SDPtr)
{ {
HELEMENT hHyperSpaceElement; HELEMENT hHyperSpaceElement;
hHyperSpaceElement = AllocElement (); hHyperSpaceElement = AllocElement ();
if (hHyperSpaceElement) if (hHyperSpaceElement)
{ {
ELEMENTPTR HyperSpaceElementPtr; ELEMENT *HyperSpaceElementPtr;
LockElement (hHyperSpaceElement, &HyperSpaceElementPtr); LockElement (hHyperSpaceElement, &HyperSpaceElementPtr);
HyperSpaceElementPtr->state_flags = CHANGING | FINITE_LIFE; HyperSpaceElementPtr->state_flags = CHANGING | FINITE_LIFE;
@@ -788,7 +785,7 @@ AddAmbientElement (void)
{ {
SIZE dx, dy; SIZE dx, dy;
DWORD rand_val; DWORD rand_val;
ELEMENTPTR HyperSpaceElementPtr; ELEMENT *HyperSpaceElementPtr;
LockElement (hHyperSpaceElement, &HyperSpaceElementPtr); LockElement (hHyperSpaceElement, &HyperSpaceElementPtr);
HyperSpaceElementPtr->state_flags = HyperSpaceElementPtr->state_flags =
@@ -828,7 +825,7 @@ AddAmbientElement (void)
#define VORTEX_WAIT 1 #define VORTEX_WAIT 1
static void static void
encounter_transition (PELEMENT ElementPtr) encounter_transition (ELEMENT *ElementPtr)
{ {
ElementPtr->state_flags &= ~DISAPPEARING; ElementPtr->state_flags &= ~DISAPPEARING;
ElementPtr->life_span = 1; ElementPtr->life_span = 1;
@@ -851,7 +848,7 @@ encounter_transition (PELEMENT ElementPtr)
if (f != ElementPtr->current.image.farray[0]) if (f != ElementPtr->current.image.farray[0])
ElementPtr->next.image.frame = f; ElementPtr->next.image.frame = f;
else else
ElementPtr->death_func = NULL_PTR; ElementPtr->death_func = NULL;
} }
ElementPtr->turn_wait = VORTEX_WAIT; ElementPtr->turn_wait = VORTEX_WAIT;
@@ -859,8 +856,8 @@ encounter_transition (PELEMENT ElementPtr)
} }
static void static void
encounter_collision (PELEMENT ElementPtr0, PPOINT encounter_collision (ELEMENT *ElementPtr0, POINT *pPt0,
pPt0, PELEMENT ElementPtr1, PPOINT pPt1) ELEMENT *ElementPtr1, POINT *pPt1)
{ {
if ((ElementPtr1->state_flags & PLAYER_SHIP) if ((ElementPtr1->state_flags & PLAYER_SHIP)
@@ -873,13 +870,13 @@ encounter_collision (PELEMENT ElementPtr0, PPOINT
for (hEncounter = GetHeadEncounter (); for (hEncounter = GetHeadEncounter ();
hEncounter != 0; hEncounter = hNextEncounter) hEncounter != 0; hEncounter = hNextEncounter)
{ {
ENCOUNTERPTR EncounterPtr; ENCOUNTER *EncounterPtr;
LockEncounter (hEncounter, &EncounterPtr); LockEncounter (hEncounter, &EncounterPtr);
hNextEncounter = GetSuccEncounter (EncounterPtr); hNextEncounter = GetSuccEncounter (EncounterPtr);
if (EncounterPtr->hElement) if (EncounterPtr->hElement)
{ {
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
LockElement (EncounterPtr->hElement, &ElementPtr); LockElement (EncounterPtr->hElement, &ElementPtr);
@@ -898,8 +895,7 @@ encounter_collision (PELEMENT ElementPtr0, PPOINT
} }
static HELEMENT static HELEMENT
AddEncounterElement (ENCOUNTERPTR EncounterPtr, AddEncounterElement (ENCOUNTER *EncounterPtr, POINT *puniverse)
PPOINT puniverse)
{ {
BOOLEAN NewEncounter; BOOLEAN NewEncounter;
HELEMENT hElement; HELEMENT hElement;
@@ -956,10 +952,10 @@ AddEncounterElement (ENCOUNTERPTR EncounterPtr,
for (i = 0; i < NumShips; ++i) for (i = 0; i < NumShips; ++i)
{ {
HSTARSHIP hStarShip; HSTARSHIP hStarShip;
SHIP_FRAGMENTPTR TemplatePtr; SHIP_FRAGMENT *TemplatePtr;
hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), Type); hStarShip = GetStarShipFromIndex (&GLOBAL (avail_race_q), Type);
TemplatePtr = (SHIP_FRAGMENTPTR)LockStarShip ( TemplatePtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (avail_race_q), hStarShip); &GLOBAL (avail_race_q), hStarShip);
EncounterPtr->SD.ShipList[i] = TemplatePtr->ShipInfo; EncounterPtr->SD.ShipList[i] = TemplatePtr->ShipInfo;
EncounterPtr->SD.ShipList[i].var1 = Type; EncounterPtr->SD.ShipList[i].var1 = Type;
@@ -999,8 +995,7 @@ AddEncounterElement (ENCOUNTERPTR EncounterPtr,
if (hElement) if (hElement)
{ {
SIZE i; SIZE i;
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
LockElement (hElement, &ElementPtr); LockElement (hElement, &ElementPtr);
@@ -1025,8 +1020,8 @@ AddEncounterElement (ENCOUNTERPTR EncounterPtr,
} }
ElementPtr->turn_wait = VORTEX_WAIT; ElementPtr->turn_wait = VORTEX_WAIT;
ElementPtr->preprocess_func = NULL_PTR; ElementPtr->preprocess_func = NULL;
ElementPtr->postprocess_func = NULL_PTR; ElementPtr->postprocess_func = NULL;
ElementPtr->collision_func = encounter_collision; ElementPtr->collision_func = encounter_collision;
SetUpElement (ElementPtr); SetUpElement (ElementPtr);
@@ -1098,8 +1093,7 @@ DrawHyperGrid (COORD ux, COORD uy, COORD ox,
static void static void
ProcessEncounters (PPOINT puniverse, COORD ox, ProcessEncounters (POINT *puniverse, COORD ox, COORD oy)
COORD oy)
{ {
STAMP s; STAMP s;
HENCOUNTER hEncounter, hNextEncounter; HENCOUNTER hEncounter, hNextEncounter;
@@ -1109,7 +1103,7 @@ ProcessEncounters (PPOINT puniverse, COORD ox,
hEncounter; hEncounter = hNextEncounter) hEncounter; hEncounter = hNextEncounter)
{ {
COORD ex, ey; COORD ex, ey;
ENCOUNTERPTR EncounterPtr; ENCOUNTER *EncounterPtr;
LockEncounter (hEncounter, &EncounterPtr); LockEncounter (hEncounter, &EncounterPtr);
hNextEncounter = GetSuccEncounter (EncounterPtr); hNextEncounter = GetSuccEncounter (EncounterPtr);
@@ -1126,7 +1120,7 @@ DeleteEncounter:
} }
{ {
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
LockElement (EncounterPtr->hElement, &ElementPtr); LockElement (EncounterPtr->hElement, &ElementPtr);
@@ -1142,7 +1136,7 @@ DeleteEncounter:
else if (EncounterPtr->transition_state == else if (EncounterPtr->transition_state ==
-NUM_VORTEX_TRANSITIONS) -NUM_VORTEX_TRANSITIONS)
{ {
ElementPtr->death_func = NULL_PTR; ElementPtr->death_func = NULL;
UnlockElement (EncounterPtr->hElement); UnlockElement (EncounterPtr->hElement);
goto DeleteEncounter; goto DeleteEncounter;
} }
@@ -1234,7 +1228,7 @@ DeleteEncounter:
} }
else else
{ {
ElementPtr->death_func = NULL_PTR; ElementPtr->death_func = NULL;
UnlockElement (EncounterPtr->hElement); UnlockElement (EncounterPtr->hElement);
goto DeleteEncounter; goto DeleteEncounter;
} }
@@ -1276,7 +1270,7 @@ DeleteEncounter:
|| ey - puniverse->y > YOFFS) || ey - puniverse->y > YOFFS)
{ {
ElementPtr->life_span = 0; ElementPtr->life_span = 0;
ElementPtr->death_func = NULL_PTR; ElementPtr->death_func = NULL;
UnlockElement (EncounterPtr->hElement); UnlockElement (EncounterPtr->hElement);
goto DeleteEncounter; goto DeleteEncounter;
@@ -1307,9 +1301,9 @@ SeedUniverse (void)
POINT universe; POINT universe;
FRAME blip_frame; FRAME blip_frame;
STAMP s; STAMP s;
STAR_DESCPTR SDPtr; STAR_DESC *SDPtr;
HELEMENT hHyperSpaceElement; HELEMENT hHyperSpaceElement;
ELEMENTPTR HyperSpaceElementPtr; ELEMENT *HyperSpaceElementPtr;
ClockTick (); ClockTick ();
@@ -1440,7 +1434,7 @@ SeedUniverse (void)
if (ex <= (XOFFS / NUM_RADAR_SCREENS) if (ex <= (XOFFS / NUM_RADAR_SCREENS)
&& ey <= (YOFFS / NUM_RADAR_SCREENS) && ey <= (YOFFS / NUM_RADAR_SCREENS)
&& (hHyperSpaceElement = && (hHyperSpaceElement =
AllocHyperElement ((STAR_DESCPTR)&SD[i])) != 0) AllocHyperElement (&SD[i])) != 0)
{ {
LockElement (hHyperSpaceElement, &HyperSpaceElementPtr); LockElement (hHyperSpaceElement, &HyperSpaceElementPtr);
HyperSpaceElementPtr->current.image.frame = SetAbsFrameIndex ( HyperSpaceElementPtr->current.image.frame = SetAbsFrameIndex (
@@ -1448,7 +1442,7 @@ SeedUniverse (void)
SD[i].Index SD[i].Index
); );
HyperSpaceElementPtr->preprocess_func = HyperSpaceElementPtr->preprocess_func =
HyperSpaceElementPtr->postprocess_func = NULL_PTR; HyperSpaceElementPtr->postprocess_func = NULL;
HyperSpaceElementPtr->collision_func = arilou_space_collision; HyperSpaceElementPtr->collision_func = arilou_space_collision;
SetUpElement (HyperSpaceElementPtr); SetUpElement (HyperSpaceElementPtr);
@@ -1457,7 +1451,7 @@ SeedUniverse (void)
HyperSpaceElementPtr->death_func = arilou_space_death; HyperSpaceElementPtr->death_func = arilou_space_death;
else else
{ {
HyperSpaceElementPtr->death_func = NULL_PTR; HyperSpaceElementPtr->death_func = NULL;
HyperSpaceElementPtr->IntersectControl.IntersectStamp.frame = HyperSpaceElementPtr->IntersectControl.IntersectStamp.frame =
DecFrameIndex (stars_in_space); DecFrameIndex (stars_in_space);
} }
@@ -1496,7 +1490,7 @@ SeedUniverse (void)
+ STAR_COLOR (star_type) + STAR_COLOR (star_type)
); );
HyperSpaceElementPtr->preprocess_func = HyperSpaceElementPtr->preprocess_func =
HyperSpaceElementPtr->postprocess_func = NULL_PTR; HyperSpaceElementPtr->postprocess_func = NULL;
HyperSpaceElementPtr->collision_func = hyper_collision; HyperSpaceElementPtr->collision_func = hyper_collision;
SetUpElement (HyperSpaceElementPtr); SetUpElement (HyperSpaceElementPtr);
@@ -1506,7 +1500,7 @@ SeedUniverse (void)
HyperSpaceElementPtr->death_func = hyper_death; HyperSpaceElementPtr->death_func = hyper_death;
else else
{ {
HyperSpaceElementPtr->death_func = NULL_PTR; HyperSpaceElementPtr->death_func = NULL;
HyperSpaceElementPtr->IntersectControl.IntersectStamp.frame = HyperSpaceElementPtr->IntersectControl.IntersectStamp.frame =
DecFrameIndex (stars_in_space); DecFrameIndex (stars_in_space);
} }
@@ -1589,7 +1583,7 @@ UnbatchGraphics ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
SuspendGameClock (); SuspendGameClock ();
memset ((PMENU_STATE)&MenuState, 0, sizeof (MenuState)); memset (&MenuState, 0, sizeof (MenuState));
MenuState.InputFunc = DoFlagshipCommands; MenuState.InputFunc = DoFlagshipCommands;
MenuState.Initialized = 1; MenuState.Initialized = 1;
MenuState.CurState = STARMAP + 1; MenuState.CurState = STARMAP + 1;
@@ -1600,10 +1594,10 @@ UnbatchGraphics ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
DoInput ((PVOID)&MenuState, TRUE); DoInput (&MenuState, TRUE);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL, (FRAME)0);
SetContext (SpaceContext); SetContext (SpaceContext);
sc2/src/sc2code/init.c
+26 -17
View File
@@ -35,28 +35,37 @@ FRAME explosion[NUM_VIEWS];
BOOLEAN 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) sml_res)
{ {
DRAWABLE d; DRAWABLE d;
if ((d = LoadGraphic (big_res)) == (DRAWABLE)NULL_PTR) d = LoadGraphic (big_res);
return (FALSE); if (!d)
return FALSE;
pixarray[0] = CaptureDrawable (d); pixarray[0] = CaptureDrawable (d);
if (med_res != 0L && (d = LoadGraphic (med_res)) == (DRAWABLE)NULL_PTR) if (med_res != 0L)
return (FALSE); {
d = LoadGraphic (med_res);
if (!d)
return FALSE;
}
pixarray[1] = CaptureDrawable (d); pixarray[1] = CaptureDrawable (d);
if (sml_res != 0L && (d = LoadGraphic (sml_res)) == (DRAWABLE)NULL_PTR) if (sml_res != 0L)
return (FALSE); {
d = LoadGraphic (sml_res);
if (!d)
return FALSE;
}
pixarray[2] = CaptureDrawable (d); pixarray[2] = CaptureDrawable (d);
return (TRUE); return TRUE;
} }
BOOLEAN BOOLEAN
free_image (PFRAME pixarray) free_image (FRAME *pixarray)
{ {
BOOLEAN retval; BOOLEAN retval;
COUNT i; COUNT i;
@@ -64,11 +73,11 @@ free_image (PFRAME pixarray)
retval = TRUE; retval = TRUE;
for (i = 0; i < NUM_VIEWS; ++i) for (i = 0; i < NUM_VIEWS; ++i)
{ {
if (pixarray[i] != (FRAME)NULL_PTR) if (pixarray[i] != NULL)
{ {
if (!DestroyDrawable (ReleaseDrawable (pixarray[i]))) if (!DestroyDrawable (ReleaseDrawable (pixarray[i])))
retval = FALSE; retval = FALSE;
pixarray[i] = (FRAME)NULL_PTR; pixarray[i] = NULL;
} }
} }
@@ -179,7 +188,7 @@ InitShips (void)
{ {
#define NUM_ASTEROIDS 5 #define NUM_ASTEROIDS 5
for (i = 0; i < NUM_ASTEROIDS; ++i) for (i = 0; i < NUM_ASTEROIDS; ++i)
spawn_asteroid (NULL_PTR); spawn_asteroid (NULL);
#define NUM_PLANETS 1 #define NUM_PLANETS 1
for (i = 0; i < NUM_PLANETS; ++i) for (i = 0; i < NUM_PLANETS; ++i)
spawn_planet (); spawn_planet ();
@@ -197,7 +206,7 @@ UninitShips (void)
BYTE crew_retrieved; BYTE crew_retrieved;
SIZE i; SIZE i;
HELEMENT hElement, hNextElement; HELEMENT hElement, hNextElement;
STARSHIPPTR SPtr[NUM_PLAYERS]; STARSHIP *SPtr[NUM_PLAYERS];
StopSound (); StopSound ();
@@ -211,7 +220,7 @@ UninitShips (void)
for (hElement = GetHeadElement (); for (hElement = GetHeadElement ();
hElement != 0; hElement = hNextElement) hElement != 0; hElement = hNextElement)
{ {
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
LockElement (hElement, &ElementPtr); LockElement (hElement, &ElementPtr);
hNextElement = GetSuccElement (ElementPtr); hNextElement = GetSuccElement (ElementPtr);
if (ElementPtr->state_flags & CREW_OBJECT) if (ElementPtr->state_flags & CREW_OBJECT)
@@ -222,15 +231,15 @@ UninitShips (void)
for (hElement = GetHeadElement (); for (hElement = GetHeadElement ();
hElement != 0; hElement = hNextElement) hElement != 0; hElement = hNextElement)
{ {
ELEMENTPTR ElementPtr; ELEMENT *ElementPtr;
extern void new_ship (PELEMENT ElementPtr); extern void new_ship (ELEMENT *ElementPtr);
LockElement (hElement, &ElementPtr); LockElement (hElement, &ElementPtr);
hNextElement = GetSuccElement (ElementPtr); hNextElement = GetSuccElement (ElementPtr);
if ((ElementPtr->state_flags & PLAYER_SHIP) if ((ElementPtr->state_flags & PLAYER_SHIP)
|| ElementPtr->death_func == new_ship) || ElementPtr->death_func == new_ship)
{ {
STARSHIPPTR StarShipPtr; STARSHIP *StarShipPtr;
GetElementStarShip (ElementPtr, &StarShipPtr); GetElementStarShip (ElementPtr, &StarShipPtr);
sc2/src/sc2code/intel.c
+1 -1
View File
@@ -29,7 +29,7 @@
SIZE cur_player; SIZE cur_player;
BATTLE_INPUT_STATE BATTLE_INPUT_STATE
computer_intelligence (COUNT player, STARSHIPPTR StarShipPtr) computer_intelligence (COUNT player, STARSHIP *StarShipPtr)
{ {
BATTLE_INPUT_STATE InputState; BATTLE_INPUT_STATE InputState;
sc2/src/sc2code/intel.h
+11 -28
View File
@@ -23,23 +23,6 @@
#include "element.h" #include "element.h"
#include "races.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 MANEUVERABILITY(pi) ((pi)->ManeuverabilityIndex)
#define WEAPON_RANGE(pi) ((pi)->WeaponRange) #define WEAPON_RANGE(pi) ((pi)->WeaponRange)
@@ -60,23 +43,23 @@ enum
FIRST_EMPTY_INDEX FIRST_EMPTY_INDEX
}; };
extern STARSHIPPTR CyborgDescPtr; extern STARSHIP *CyborgDescPtr;
extern SIZE cur_player; extern SIZE cur_player;
extern BATTLE_INPUT_STATE computer_intelligence (COUNT player, extern BATTLE_INPUT_STATE computer_intelligence (COUNT player,
STARSHIPPTR StarShipPtr); STARSHIP *StarShipPtr);
extern BATTLE_INPUT_STATE tactical_intelligence (COUNT player, extern BATTLE_INPUT_STATE tactical_intelligence (COUNT player,
STARSHIPPTR StarShipPtr); STARSHIP *StarShipPtr);
extern void ship_intelligence (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR extern void ship_intelligence (ELEMENT *ShipPtr,
ObjectsOfConcern, COUNT ConcernCounter); EVALUATE_DESC *ObjectsOfConcern, COUNT ConcernCounter);
extern BOOLEAN ship_weapons (ELEMENTPTR ShipPtr, ELEMENTPTR OtherPtr, extern BOOLEAN ship_weapons (ELEMENT *ShipPtr, ELEMENT *OtherPtr,
COUNT margin_of_error); COUNT margin_of_error);
extern void Pursue (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr); extern void Pursue (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr);
extern void Entice (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr); extern void Entice (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr);
extern void Avoid (ELEMENTPTR ShipPtr, EVALUATE_DESCPTR EvalDescPtr); extern void Avoid (ELEMENT *ShipPtr, EVALUATE_DESC *EvalDescPtr);
extern BOOLEAN TurnShip (ELEMENTPTR ShipPtr, COUNT angle); extern BOOLEAN TurnShip (ELEMENT *ShipPtr, COUNT angle);
extern BOOLEAN ThrustShip (ELEMENTPTR ShipPtr, COUNT angle); extern BOOLEAN ThrustShip (ELEMENT *ShipPtr, COUNT angle);
#define HUMAN_CONTROL (BYTE)(1 << 0) #define HUMAN_CONTROL (BYTE)(1 << 0)
sc2/src/sc2code/intro.c
+6 -6
View File
@@ -37,7 +37,7 @@
typedef struct typedef struct
{ {
/* standard state required by DoInput */ /* standard state required by DoInput */
BOOLEAN (*InputFunc) (PVOID pInputState); BOOLEAN (*InputFunc) (void *pInputState);
COUNT MenuRepeatDelay; COUNT MenuRepeatDelay;
/* Presentation state */ /* Presentation state */
@@ -66,10 +66,10 @@ typedef struct
COUNT LinesCount; COUNT LinesCount;
char Buffer[512]; char Buffer[512];
} PRESENTATION_INPUT_STATE, *PPRESENTATION_INPUT_STATE; } PRESENTATION_INPUT_STATE;
static BOOLEAN DoPresentation (PVOID pIS); static BOOLEAN DoPresentation (void *pIS);
BOOLEAN BOOLEAN
@@ -204,7 +204,7 @@ Present_GenerateSIS (PRESENTATION_INPUT_STATE* pPIS)
WANT_PIXMAP, r.extent.width, r.extent.height, 1 WANT_PIXMAP, r.extent.width, r.extent.height, 1
)); ));
SetContextFGFrame (SisFrame); SetContextFGFrame (SisFrame);
SetContextClipRect (NULL_PTR); SetContextClipRect (NULL);
SisBack = BUILD_COLOR (MAKE_RGB15 (0x01, 0x01, 0x01), 0x07); SisBack = BUILD_COLOR (MAKE_RGB15 (0x01, 0x01, 0x01), 0x07);
SetContextBackGroundColor (SisBack); SetContextBackGroundColor (SisBack);
ClearDrawable (); ClearDrawable ();
@@ -274,7 +274,7 @@ ShowPresentationFile (const char *name)
} }
static BOOLEAN static BOOLEAN
DoPresentation (PVOID pIS) DoPresentation (void *pIS)
{ {
PRESENTATION_INPUT_STATE* pPIS = (PRESENTATION_INPUT_STATE*) pIS; PRESENTATION_INPUT_STATE* pPIS = (PRESENTATION_INPUT_STATE*) pIS;
@@ -353,7 +353,7 @@ DoPresentation (PVOID pIS)
utf8StringCopy (pPIS->Buffer, sizeof (pPIS->Buffer), pStr); utf8StringCopy (pPIS->Buffer, sizeof (pPIS->Buffer), pStr);
if (pPIS->Frame) if (pPIS->Frame)
DestroyDrawable (ReleaseDrawable (pPIS->Frame)); DestroyDrawable (ReleaseDrawable (pPIS->Frame));
pPIS->Frame = CaptureDrawable (LoadCelFile (pPIS->Buffer)); pPIS->Frame = CaptureDrawable (LoadGraphicFile (pPIS->Buffer));
} }
else if (strcmp (Opcode, "MUSIC") == 0) else if (strcmp (Opcode, "MUSIC") == 0)
{ /* set music */ { /* set music */
sc2/src/sc2code/ipdisp.c
+19 -19
View File
@@ -32,9 +32,9 @@ NotifyOthers (COUNT which_race, BYTE target_loc)
for (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); for (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q));
hStarShip; hStarShip = hNextShip) hStarShip; hStarShip = hNextShip)
{ {
SHIP_FRAGMENTPTR StarShipPtr; SHIP_FRAGMENT *StarShipPtr;
StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip); &GLOBAL (npc_built_ship_q), hStarShip);
hNextShip = _GetSuccLink (StarShipPtr); hNextShip = _GetSuccLink (StarShipPtr);
@@ -79,7 +79,7 @@ NotifyOthers (COUNT which_race, BYTE target_loc)
} }
static void static void
ip_group_preprocess (PELEMENT ElementPtr) ip_group_preprocess (ELEMENT *ElementPtr)
{ {
#define TRACK_WAIT 5 #define TRACK_WAIT 5
BYTE task; BYTE task;
@@ -87,10 +87,10 @@ ip_group_preprocess (PELEMENT ElementPtr)
SIZE radius; SIZE radius;
POINT dest_pt; POINT dest_pt;
SIZE vdx, vdy; SIZE vdx, vdy;
ELEMENTPTR EPtr; ELEMENT *EPtr;
SHIP_FRAGMENTPTR StarShipPtr; SHIP_FRAGMENT *StarShipPtr;
EPtr = (ELEMENTPTR)ElementPtr; EPtr = ElementPtr;
EPtr->state_flags &= EPtr->state_flags &=
~(DISAPPEARING | NONSOLID); /* "I'm not quite dead." */ ~(DISAPPEARING | NONSOLID); /* "I'm not quite dead." */
++EPtr->life_span; /* so that it will 'die' ++EPtr->life_span; /* so that it will 'die'
@@ -399,7 +399,7 @@ CheckGetAway:
ZeroVelocityComponents (&EPtr->velocity); ZeroVelocityComponents (&EPtr->velocity);
if (group_loc != 0) if (group_loc != 0)
{ {
PPLANET_DESC pCurDesc; PLANET_DESC *pCurDesc;
pCurDesc = &pSolarSysState->PlanetDesc[group_loc - 1]; pCurDesc = &pSolarSysState->PlanetDesc[group_loc - 1];
XFormIPLoc ( XFormIPLoc (
@@ -494,8 +494,8 @@ ExitIPProcess:
} }
static void static void
flag_ship_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT flag_ship_collision (ELEMENT *ElementPtr0, POINT *pPt0,
ElementPtr1, PPOINT pPt1) ELEMENT *ElementPtr1, POINT *pPt1)
{ {
if ((GLOBAL (CurrentActivity) & START_ENCOUNTER) if ((GLOBAL (CurrentActivity) & START_ENCOUNTER)
|| pSolarSysState->MenuState.CurState || pSolarSysState->MenuState.CurState
@@ -514,10 +514,10 @@ flag_ship_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT
} }
static void static void
ip_group_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ip_group_collision (ELEMENT *ElementPtr0, POINT *pPt0,
ElementPtr1, PPOINT pPt1) ELEMENT *ElementPtr1, POINT *pPt1)
{ {
SHIP_FRAGMENTPTR StarShipPtr; SHIP_FRAGMENT *StarShipPtr;
if ((GLOBAL (CurrentActivity) & START_ENCOUNTER) if ((GLOBAL (CurrentActivity) & START_ENCOUNTER)
|| pSolarSysState->MenuState.CurState || pSolarSysState->MenuState.CurState
@@ -574,7 +574,7 @@ ip_group_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT
} }
static void static void
spawn_ip_group (SHIP_FRAGMENTPTR StarShipPtr) spawn_ip_group (SHIP_FRAGMENT *StarShipPtr)
{ {
HELEMENT hIPSHIPElement; HELEMENT hIPSHIPElement;
@@ -582,7 +582,7 @@ spawn_ip_group (SHIP_FRAGMENTPTR StarShipPtr)
if (hIPSHIPElement) if (hIPSHIPElement)
{ {
BYTE task; BYTE task;
ELEMENTPTR IPSHIPElementPtr; ELEMENT *IPSHIPElementPtr;
LockElement (hIPSHIPElement, &IPSHIPElementPtr); LockElement (hIPSHIPElement, &IPSHIPElementPtr);
IPSHIPElementPtr->turn_wait = GET_GROUP_ID (StarShipPtr); IPSHIPElementPtr->turn_wait = GET_GROUP_ID (StarShipPtr);
@@ -660,7 +660,7 @@ spawn_ip_group (SHIP_FRAGMENTPTR StarShipPtr)
#define FLIP_WAIT 42 #define FLIP_WAIT 42
static void static void
flag_ship_preprocess (PELEMENT ElementPtr) flag_ship_preprocess (ELEMENT *ElementPtr)
{ {
if (--ElementPtr->thrust_wait == 0) if (--ElementPtr->thrust_wait == 0)
/* juggle list after flagship */ /* juggle list after flagship */
@@ -671,7 +671,7 @@ flag_ship_preprocess (PELEMENT ElementPtr)
&& hSuccElement != GetTailElement ()) && hSuccElement != GetTailElement ())
{ {
HELEMENT hPredElement; HELEMENT hPredElement;
ELEMENTPTR TailPtr; ELEMENT *TailPtr;
LockElement (GetTailElement (), &TailPtr); LockElement (GetTailElement (), &TailPtr);
hPredElement = _GetPredLink (TailPtr); hPredElement = _GetPredLink (TailPtr);
@@ -779,7 +779,7 @@ spawn_flag_ship (void)
hFlagShipElement = AllocElement (); hFlagShipElement = AllocElement ();
if (hFlagShipElement) if (hFlagShipElement)
{ {
ELEMENTPTR FlagShipElementPtr; ELEMENT *FlagShipElementPtr;
LockElement (hFlagShipElement, &FlagShipElementPtr); LockElement (hFlagShipElement, &FlagShipElementPtr);
FlagShipElementPtr->hit_points = 1; FlagShipElementPtr->hit_points = 1;
@@ -834,9 +834,9 @@ DoMissions (void)
for (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q)); for (hStarShip = GetHeadLink (&GLOBAL (npc_built_ship_q));
hStarShip; hStarShip = hNextShip) hStarShip; hStarShip = hNextShip)
{ {
SHIP_FRAGMENTPTR StarShipPtr; SHIP_FRAGMENT *StarShipPtr;
StarShipPtr = (SHIP_FRAGMENTPTR)LockStarShip ( StarShipPtr = (SHIP_FRAGMENT*) LockStarShip (
&GLOBAL (npc_built_ship_q), hStarShip); &GLOBAL (npc_built_ship_q), hStarShip);
hNextShip = _GetSuccLink (StarShipPtr); hNextShip = _GetSuccLink (StarShipPtr);
sc2/src/sc2code/libs/cdp/cdpapi.c
+3 -3
View File
@@ -225,7 +225,7 @@ cdp_UninitApi (void)
{ {
itf->used = false; itf->used = false;
if (itf->name) if (itf->name)
HFree ((void*) itf->name); HFree (itf->name);
itf->name = NULL; itf->name = NULL;
itf->itfvtbl = NULL; itf->itfvtbl = NULL;
itf->module = NULL; itf->module = NULL;
@@ -449,7 +449,7 @@ cdp_Host_UnregisterItf (cdp_ItfReg* itfreg)
if (!itfreg->builtin) if (!itfreg->builtin)
{ {
HFree ((void*) itfreg->name); HFree (itfreg->name);
} }
itfreg->module = NULL; itfreg->module = NULL;
itfreg->name = NULL; itfreg->name = NULL;
@@ -682,7 +682,7 @@ cdp_Host_UnregisterEvent (cdp_EventReg* evtreg)
if (!evtreg->builtin) if (!evtreg->builtin)
{ {
HFree ((void*) evtreg->name); HFree (evtreg->name);
} }
evtreg->module = NULL; evtreg->module = NULL;
evtreg->name = NULL; evtreg->name = NULL;
sc2/src/sc2code/libs/compiler.h
-17
View File
@@ -22,40 +22,23 @@
#include "types.h" #include "types.h"
typedef uint8 BYTE; typedef uint8 BYTE;
typedef BYTE *PBYTE;
typedef uint8 UBYTE; typedef uint8 UBYTE;
typedef UBYTE *PUBYTE;
typedef sint8 SBYTE; typedef sint8 SBYTE;
typedef SBYTE *PSBYTE;
typedef uint16 UWORD; typedef uint16 UWORD;
typedef UWORD *PUWORD;
typedef sint16 SWORD; typedef sint16 SWORD;
typedef SWORD *PSWORD;
typedef uint32 DWORD; typedef uint32 DWORD;
typedef DWORD *PDWORD;
typedef sint32 SDWORD; typedef sint32 SDWORD;
typedef SDWORD *PSDWORD;
typedef SBYTE *PSTR;
typedef void *PVOID;
typedef const void *PCVOID;
typedef UWORD COUNT; typedef UWORD COUNT;
typedef COUNT *PCOUNT;
typedef SWORD SIZE; typedef SWORD SIZE;
typedef SIZE *PSIZE;
typedef unsigned char UNICODE; typedef unsigned char UNICODE;
#define NULL_PTR 0L
typedef enum typedef enum
{ {
FALSE = 0, FALSE = 0,
TRUE TRUE
} BOOLEAN; } BOOLEAN;
typedef BOOLEAN *PBOOLEAN;
typedef void (*PVOIDFUNC) (void); typedef void (*PVOIDFUNC) (void);
typedef BOOLEAN (*PBOOLFUNC) (void); typedef BOOLEAN (*PBOOLFUNC) (void);
sc2/src/sc2code/libs/declib.h
+8 -14
View File
@@ -20,7 +20,7 @@
#define _DECLIB_H #define _DECLIB_H
#include "libs/compiler.h" #include "libs/compiler.h"
#define DECODE_REF PVOID typedef struct _LZHCODE_DESC* DECODE_REF;
enum enum
{ {
@@ -36,19 +36,13 @@ enum
}; };
typedef BYTE STREAM_MODE; typedef BYTE STREAM_MODE;
#endif /* _DECLIB_H */ extern DECODE_REF copen (void *InStream, STREAM_TYPE SType,
STREAM_MODE SMode);
#ifndef _DEC_PROTOS
#define _DEC_PROTOS
extern DECODE_REF copen (PVOID InStream, STREAM_TYPE SType, STREAM_MODE
SMode);
extern DWORD cclose (DECODE_REF DecodeRef); extern DWORD cclose (DECODE_REF DecodeRef);
extern void cfilelength (DECODE_REF DecodeRef, DWORD *pfilelen); extern void cfilelength (DECODE_REF DecodeRef, DWORD *pfilelen);
extern COUNT cread (PVOID pStr, COUNT size, COUNT count, DECODE_REF extern COUNT cread (void *pStr, COUNT size, COUNT count,
DecodeRef); DECODE_REF DecodeRef);
extern COUNT cwrite (PVOID pStr, COUNT size, COUNT count, DECODE_REF extern COUNT cwrite (const void *pStr, COUNT size, COUNT count,
DecodeRef); DECODE_REF DecodeRef);
#endif /* _DEC_PROTOS */
#endif /* _DECLIB_H */
sc2/src/sc2code/libs/decomp/lzdecode.c
+6 -7
View File
@@ -32,7 +32,7 @@
PLZHCODE_DESC _lpCurCodeDesc; PLZHCODE_DESC _lpCurCodeDesc;
STREAM_TYPE _StreamType; STREAM_TYPE _StreamType;
PBYTE _Stream; BYTE* _Stream;
UWORD _workbuf; UWORD _workbuf;
BYTE _workbuflen; BYTE _workbuflen;
@@ -101,7 +101,7 @@ StartHuff (void)
} }
DECODE_REF DECODE_REF
copen (PVOID InStream, STREAM_TYPE SType, STREAM_MODE SMode) copen (void *InStream, STREAM_TYPE SType, STREAM_MODE SMode)
{ {
MEM_HANDLE h; MEM_HANDLE h;
DWORD StreamLength; DWORD StreamLength;
@@ -148,7 +148,7 @@ copen (PVOID InStream, STREAM_TYPE SType, STREAM_MODE SMode)
_lpCurCodeDesc->StreamMode = SMode; _lpCurCodeDesc->StreamMode = SMode;
_lpCurCodeDesc->StreamLength = StreamLength; _lpCurCodeDesc->StreamLength = StreamLength;
_lpCurCodeDesc->buf_index = N - F; _lpCurCodeDesc->buf_index = N - F;
memset ((PBYTE)&_lpCurCodeDesc->text_buf[0], ' ', N - F); memset (&_lpCurCodeDesc->text_buf[0], ' ', N - F);
StartHuff (); StartHuff ();
} }
@@ -292,11 +292,10 @@ static const BYTE d_len[256] =
} }
COUNT COUNT
cread (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC cread (void *buf, COUNT size, COUNT count, PLZHCODE_DESC lpCodeDesc)
lpCodeDesc)
{ {
COUNT r, j, i; COUNT r, j, i;
PBYTE lpStr; BYTE *lpStr;
if ((_lpCurCodeDesc = lpCodeDesc) == 0) if ((_lpCurCodeDesc = lpCodeDesc) == 0)
return (0); return (0);
@@ -314,7 +313,7 @@ cread (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC
if (size == 0) if (size == 0)
return (0); return (0);
lpStr = (PBYTE)buf; lpStr = (BYTE*)buf;
_StreamType = lpCodeDesc->StreamType; _StreamType = lpCodeDesc->StreamType;
_Stream = lpCodeDesc->Stream; _Stream = lpCodeDesc->Stream;
sc2/src/sc2code/libs/decomp/lzencode.c
+12 -11
View File
@@ -28,7 +28,9 @@
#include "lzh.h" #include "lzh.h"
static UWORD match_position, match_length; static UWORD match_position, match_length;
static PSWORD lson, rson, dad; static SWORD *lson;
static SWORD *rson;
static SWORD *dad;
#define AllocEncodeArrays() \ #define AllocEncodeArrays() \
mem_allocate ( \ mem_allocate ( \
@@ -36,7 +38,7 @@ static PSWORD lson, rson, dad;
* sizeof (lson[0]) + sizeof (MEM_HANDLE)), \ * sizeof (lson[0]) + sizeof (MEM_HANDLE)), \
MEM_ZEROINIT, DEFAULT_MEM_PRIORITY, MEM_SIMPLE \ MEM_ZEROINIT, DEFAULT_MEM_PRIORITY, MEM_SIMPLE \
) )
#define LockCodeArrays (PSWORD)mem_lock #define LockCodeArrays (SWORD*)mem_lock
#define UnlockCodeArrays mem_unlock #define UnlockCodeArrays mem_unlock
#define FreeCodeArrays mem_release #define FreeCodeArrays mem_release
@@ -56,7 +58,7 @@ InitTree (void)
SWORD i; SWORD i;
*(MEM_HANDLE *)lson = h; *(MEM_HANDLE *)lson = h;
lson = (PSWORD)((PBYTE)lson + sizeof (h)); lson = (SWORD*)((BYTE*)lson + sizeof (h));
rson = lson + (N + 1); rson = lson + (N + 1);
dad = rson + (N + 257); dad = rson + (N + 257);
@@ -73,7 +75,7 @@ static void
InsertNode (SWORD r) InsertNode (SWORD r)
{ {
SWORD p, cmp; SWORD p, cmp;
PBYTE lpBuf; BYTE *lpBuf;
cmp = 1; cmp = 1;
lpBuf = _lpCurCodeDesc->text_buf; lpBuf = _lpCurCodeDesc->text_buf;
@@ -284,7 +286,7 @@ UninitTree (void)
++_lpCurCodeDesc->StreamIndex; ++_lpCurCodeDesc->StreamIndex;
} }
lson = (PSWORD)((PBYTE)lson - sizeof (h)); lson = (SWORD*)((BYTE*)lson - sizeof (h));
h = *(MEM_HANDLE *)lson; h = *(MEM_HANDLE *)lson;
UnlockCodeArrays (h); UnlockCodeArrays (h);
FreeCodeArrays (h); FreeCodeArrays (h);
@@ -334,8 +336,7 @@ _encode_cleanup (void)
SeekResFile ((uio_Stream *)_Stream, SeekResFile ((uio_Stream *)_Stream,
-(int)_lpCurCodeDesc->StreamIndex, SEEK_CUR); -(int)_lpCurCodeDesc->StreamIndex, SEEK_CUR);
else /* _lpCurCodeDesc->StreamType == MEMORY_STREAM */ else /* _lpCurCodeDesc->StreamType == MEMORY_STREAM */
_Stream = (PBYTE)((BYTE *)_Stream _Stream = (BYTE*)_Stream - _lpCurCodeDesc->StreamIndex;
- _lpCurCodeDesc->StreamIndex);
loword = LOWORD (_lpCurCodeDesc->StreamLength); loword = LOWORD (_lpCurCodeDesc->StreamLength);
lobyte = LOBYTE (loword); lobyte = LOBYTE (loword);
@@ -371,11 +372,11 @@ _encode_cleanup (void)
} }
COUNT COUNT
cwrite (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC cwrite (const void *buf, COUNT size, COUNT count, PLZHCODE_DESC lpCodeDesc)
lpCodeDesc)
{ {
UWORD r, s, last_match_length; UWORD r, s, last_match_length;
PBYTE lpBuf, lpStr; BYTE *lpBuf;
BYTE *lpStr;
if ((_lpCurCodeDesc = lpCodeDesc) == 0 if ((_lpCurCodeDesc = lpCodeDesc) == 0
|| (size *= count) == 0) || (size *= count) == 0)
@@ -385,7 +386,7 @@ cwrite (PVOID buf, COUNT size, COUNT count, PLZHCODE_DESC
_Stream = lpCodeDesc->Stream; _Stream = lpCodeDesc->Stream;
_workbuf = lpCodeDesc->workbuf; _workbuf = lpCodeDesc->workbuf;
_workbuflen = lpCodeDesc->workbuflen; _workbuflen = lpCodeDesc->workbuflen;
lpStr = (PBYTE)buf; lpStr = (BYTE*)buf;
lpBuf = lpCodeDesc->text_buf; lpBuf = lpCodeDesc->text_buf;
r = lpCodeDesc->buf_index; r = lpCodeDesc->buf_index;
sc2/src/sc2code/libs/decomp/lzh.h
+6 -10
View File
@@ -20,7 +20,6 @@
#define _LZH_H #define _LZH_H
#include "reslib.h" #include "reslib.h"
#define _DEC_PROTOS
#include "declib.h" #include "declib.h"
/* LZSS Parameters */ /* LZSS Parameters */
@@ -40,7 +39,7 @@
#define MAX_FREQ 0x8000 #define MAX_FREQ 0x8000
/* update when cumulative frequency */ /* update when cumulative frequency */
typedef struct struct _LZHCODE_DESC
{ {
MEM_HANDLE fh; MEM_HANDLE fh;
@@ -60,12 +59,14 @@ typedef struct
STREAM_TYPE StreamType; STREAM_TYPE StreamType;
PVOID Stream; void *Stream;
DWORD StreamIndex, StreamLength; DWORD StreamIndex, StreamLength;
STREAM_MODE StreamMode; STREAM_MODE StreamMode;
PVOIDFUNC CleanupFunc; PVOIDFUNC CleanupFunc;
} LZHCODE_DESC; };
typedef struct _LZHCODE_DESC LZHCODE_DESC;
typedef LZHCODE_DESC *PLZHCODE_DESC; typedef LZHCODE_DESC *PLZHCODE_DESC;
#define InChar() (_StreamType == FILE_STREAM ? \ #define InChar() (_StreamType == FILE_STREAM ? \
@@ -86,14 +87,9 @@ typedef LZHCODE_DESC *PLZHCODE_DESC;
extern void _update (COUNT c); extern void _update (COUNT c);
extern void StartHuff (void); extern void StartHuff (void);
#undef DECODE_REF
#define DECODE_REF PLZHCODE_DESC
#undef _DEC_PROTOS
#include "declib.h"
extern PLZHCODE_DESC _lpCurCodeDesc; extern PLZHCODE_DESC _lpCurCodeDesc;
extern STREAM_TYPE _StreamType; extern STREAM_TYPE _StreamType;
extern PBYTE _Stream; extern BYTE* _Stream;
extern UWORD _workbuf; extern UWORD _workbuf;
extern BYTE _workbuflen; extern BYTE _workbuflen;
sc2/src/sc2code/libs/gfxlib.h
+25 -45
View File
@@ -29,21 +29,13 @@ typedef CONTEXT_DESC *CONTEXT;
typedef FRAME_DESC *FRAME; typedef FRAME_DESC *FRAME;
typedef FONT_DESC *FONT; typedef FONT_DESC *FONT;
typedef CONTEXT *PCONTEXT;
typedef FRAME *PFRAME;
typedef FONT *PFONT;
typedef UWORD TIME_VALUE; typedef UWORD TIME_VALUE;
typedef TIME_VALUE *PTIME_VALUE;
#define TIME_SHIFT 8 #define TIME_SHIFT 8
#define MAX_TIME_VALUE ((1 << TIME_SHIFT) + 1) #define MAX_TIME_VALUE ((1 << TIME_SHIFT) + 1)
typedef SWORD COORD; typedef SWORD COORD;
typedef COORD *PCOORD;
typedef DWORD COLOR; typedef DWORD COLOR;
typedef COLOR *PCOLOR;
#define BUILD_COLOR(c32k,c256) \ #define BUILD_COLOR(c32k,c256) \
(COLOR)(((DWORD)(c32k)<<8)|(BYTE)(c256)) (COLOR)(((DWORD)(c32k)<<8)|(BYTE)(c256))
@@ -74,33 +66,28 @@ typedef struct extent
{ {
COORD width, height; COORD width, height;
} EXTENT; } EXTENT;
typedef EXTENT *PEXTENT;
typedef struct point typedef struct point
{ {
COORD x, y; COORD x, y;
} POINT; } POINT;
typedef POINT *PPOINT;
typedef struct stamp typedef struct stamp
{ {
POINT origin; POINT origin;
FRAME frame; FRAME frame;
} STAMP; } STAMP;
typedef STAMP *PSTAMP;
typedef struct rect typedef struct rect
{ {
POINT corner; POINT corner;
EXTENT extent; EXTENT extent;
} RECT; } RECT;
typedef RECT *PRECT;
typedef struct line typedef struct line
{ {
POINT first, second; POINT first, second;
} LINE; } LINE;
typedef LINE *PLINE;
typedef enum typedef enum
{ {
@@ -123,7 +110,6 @@ typedef struct text
TEXT_ALIGN align; TEXT_ALIGN align;
COUNT CharCount; COUNT CharCount;
} TEXT; } TEXT;
typedef TEXT *PTEXT;
#include "strlib.h" #include "strlib.h"
@@ -144,18 +130,13 @@ typedef struct
POINT EndPoint; POINT EndPoint;
STAMP IntersectStamp; STAMP IntersectStamp;
} INTERSECT_CONTROL; } INTERSECT_CONTROL;
typedef INTERSECT_CONTROL *PINTERSECT_CONTROL;
typedef MEM_HANDLE CONTEXT_REF; typedef MEM_HANDLE CONTEXT_REF;
typedef CONTEXT_REF *PCONTEXT_REF;
typedef DWORD DRAWABLE; typedef DWORD DRAWABLE;
typedef DRAWABLE *PDRAWABLE;
#define BUILD_DRAWABLE(h,i) ((DRAWABLE)MAKE_DWORD(h,i)) #define BUILD_DRAWABLE(h,i) ((DRAWABLE)MAKE_DWORD(h,i))
typedef MEM_HANDLE FONT_REF; typedef MEM_HANDLE FONT_REF;
typedef FONT_REF *PFONT_REF;
typedef BYTE INTERSECT_CODE; typedef BYTE INTERSECT_CODE;
@@ -173,9 +154,8 @@ typedef POINT HOT_SPOT;
extern HOT_SPOT MAKE_HOT_SPOT (COORD, COORD); extern HOT_SPOT MAKE_HOT_SPOT (COORD, COORD);
extern INTERSECT_CODE BoxIntersect (PRECT pr1, PRECT pr2, PRECT extern INTERSECT_CODE BoxIntersect (RECT *pr1, RECT *pr2, RECT *printer);
printer); extern void BoxUnion (RECT *pr1, RECT *pr2, RECT *punion);
extern void BoxUnion (PRECT pr1, PRECT pr2, PRECT punion);
enum enum
{ {
@@ -198,48 +178,48 @@ extern COLOR SetContextForeGroundColor (COLOR Color);
extern COLOR SetContextBackGroundColor (COLOR Color); extern COLOR SetContextBackGroundColor (COLOR Color);
extern FRAME SetContextFGFrame (FRAME Frame); extern FRAME SetContextFGFrame (FRAME Frame);
extern BOOLEAN SetContextClipping (BOOLEAN ClipStatus); extern BOOLEAN SetContextClipping (BOOLEAN ClipStatus);
extern BOOLEAN SetContextClipRect (PRECT pRect); extern BOOLEAN SetContextClipRect (RECT *pRect);
extern BOOLEAN GetContextClipRect (PRECT pRect); extern BOOLEAN GetContextClipRect (RECT *pRect);
extern TIME_VALUE DrawablesIntersect (PINTERSECT_CONTROL pControl0, extern TIME_VALUE DrawablesIntersect (INTERSECT_CONTROL *pControl0,
PINTERSECT_CONTROL pControl1, TIME_VALUE max_time_val); INTERSECT_CONTROL *pControl1, TIME_VALUE max_time_val);
extern void DrawStamp (PSTAMP pStamp); extern void DrawStamp (STAMP *pStamp);
extern void DrawFilledStamp (PSTAMP pStamp); extern void DrawFilledStamp (STAMP *pStamp);
extern void DrawPoint (PPOINT pPoint); extern void DrawPoint (POINT *pPoint);
extern void DrawRectangle (PRECT pRect); extern void DrawRectangle (RECT *pRect);
extern void DrawFilledRectangle (PRECT pRect); extern void DrawFilledRectangle (RECT *pRect);
extern void DrawLine (PLINE pLine); extern void DrawLine (LINE *pLine);
extern void font_DrawText (PTEXT pText); extern void font_DrawText (TEXT *pText);
extern void DrawBatch (PPRIMITIVE pBasePrim, PRIM_LINKS PrimLinks, extern void DrawBatch (PRIMITIVE *pBasePrim, PRIM_LINKS PrimLinks,
BATCH_FLAGS BatchFlags); BATCH_FLAGS BatchFlags);
extern void BatchGraphics (void); extern void BatchGraphics (void);
extern void UnbatchGraphics (void); extern void UnbatchGraphics (void);
extern void FlushGraphics (void); extern void FlushGraphics (void);
extern void ClearBackGround (PRECT pClipRect); extern void ClearBackGround (RECT *pClipRect);
extern void ClearDrawable (void); extern void ClearDrawable (void);
extern CONTEXT_REF CreateContext (void); extern CONTEXT_REF CreateContext (void);
extern BOOLEAN DestroyContext (CONTEXT_REF ContextRef); extern BOOLEAN DestroyContext (CONTEXT_REF ContextRef);
extern DRAWABLE CreateDisplay (CREATE_FLAGS CreateFlags, PSIZE pwidth, extern DRAWABLE CreateDisplay (CREATE_FLAGS CreateFlags, SIZE *pwidth,
PSIZE pheight); SIZE *pheight);
extern DRAWABLE CreateDrawable (CREATE_FLAGS CreateFlags, SIZE width, extern DRAWABLE CreateDrawable (CREATE_FLAGS CreateFlags, SIZE width,
SIZE height, COUNT num_frames); SIZE height, COUNT num_frames);
extern BOOLEAN DestroyDrawable (DRAWABLE Drawable); 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 SetFrameHot (FRAME Frame, HOT_SPOT HotSpot);
extern HOT_SPOT GetFrameHot (FRAME Frame); extern HOT_SPOT GetFrameHot (FRAME Frame);
extern BOOLEAN InstallGraphicResTypes (COUNT cel_type, COUNT font_type); extern BOOLEAN InstallGraphicResTypes (COUNT cel_type, COUNT font_type);
extern DWORD LoadCelFile (PVOID pStr); extern DWORD LoadGraphicFile (const char *pStr);
extern DWORD LoadFontFile (PVOID pStr); extern DWORD LoadFontFile (const char *pStr);
extern DWORD LoadGraphicInstance (DWORD res); 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 FRAME SetContextFontEffect (FRAME EffectFrame);
extern FONT SetContextFont (FONT Font); extern FONT SetContextFont (FONT Font);
extern BOOLEAN DestroyFont (FONT_REF FontRef); extern BOOLEAN DestroyFont (FONT_REF FontRef);
extern FONT CaptureFont (FONT_REF FontRef); extern FONT CaptureFont (FONT_REF FontRef);
extern FONT_REF ReleaseFont (FONT Font); extern FONT_REF ReleaseFont (FONT Font);
extern BOOLEAN TextRect (PTEXT pText, PRECT pRect, PBYTE pdelta); extern BOOLEAN TextRect (TEXT *pText, RECT *pRect, BYTE *pdelta);
extern BOOLEAN GetContextFontLeading (PSIZE pheight); extern BOOLEAN GetContextFontLeading (SIZE *pheight);
extern BOOLEAN GetContextFontLeadingWidth (PSIZE pwidth); extern BOOLEAN GetContextFontLeadingWidth (SIZE *pwidth);
extern COUNT GetFrameCount (FRAME Frame); extern COUNT GetFrameCount (FRAME Frame);
extern COUNT GetFrameIndex (FRAME Frame); extern COUNT GetFrameIndex (FRAME Frame);
extern FRAME SetAbsFrameIndex (FRAME Frame, COUNT FrameIndex); extern FRAME SetAbsFrameIndex (FRAME Frame, COUNT FrameIndex);
@@ -273,7 +253,7 @@ extern void FlushColorXForms (void);
#define GetColorMapAddress GetStringAddress #define GetColorMapAddress GetStringAddress
#define GetColorMapContents GetStringContents #define GetColorMapContents GetStringContents
void SetSystemRect (PRECT pRect); void SetSystemRect (RECT *pRect);
void ClearSystemRect (void); void ClearSystemRect (void);
#endif /* _GFXLIB_H */ #endif /* _GFXLIB_H */
sc2/src/sc2code/libs/graphics/boxint.c
+2 -2
View File
@@ -24,7 +24,7 @@
#define MAX(a, b) (((a) >= (b)) ? (a) : (b)) #define MAX(a, b) (((a) >= (b)) ? (a) : (b))
INTERSECT_CODE INTERSECT_CODE
BoxIntersect (PRECT pr1, PRECT pr2, PRECT pinter) BoxIntersect (RECT *pr1, RECT *pr2, RECT *pinter)
{ {
INTERSECT_CODE intersect_code; INTERSECT_CODE intersect_code;
COORD x1; COORD x1;
@@ -102,7 +102,7 @@ BoxIntersect (PRECT pr1, PRECT pr2, PRECT pinter)
} }
void void
BoxUnion (PRECT pr1, PRECT pr2, PRECT punion) BoxUnion (RECT *pr1, RECT *pr2, RECT *punion)
{ {
#if NEVER // Part of lower FIXME. #if NEVER // Part of lower FIXME.
COORD x2, y2, w2, h2; COORD x2, y2, w2, h2;
sc2/src/sc2code/libs/graphics/clipline.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include "gfxintrn.h" #include "gfxintrn.h"
INTERSECT_CODE INTERSECT_CODE
_clip_line (PRECT pClipRect, PBRESENHAM_LINE pLine) _clip_line (RECT *pClipRect, BRESENHAM_LINE *pLine)
{ {
COORD p; COORD p;
COORD x0, y0, xmin, ymin, xmax, ymax; COORD x0, y0, xmin, ymin, xmax, ymax;
sc2/src/sc2code/libs/graphics/context.c
+2 -2
View File
@@ -188,7 +188,7 @@ SetContextClipping (BOOLEAN ClipStatus)
} }
BOOLEAN BOOLEAN
SetContextClipRect (PRECT lpRect) SetContextClipRect (RECT *lpRect)
{ {
if (!ContextActive ()) if (!ContextActive ())
return (FALSE); return (FALSE);
@@ -202,7 +202,7 @@ SetContextClipRect (PRECT lpRect)
} }
BOOLEAN BOOLEAN
GetContextClipRect (PRECT lpRect) GetContextClipRect (RECT *lpRect)
{ {
if (!ContextActive ()) if (!ContextActive ())
return (FALSE); return (FALSE);
sc2/src/sc2code/libs/graphics/display.h
+3 -5
View File
@@ -29,15 +29,13 @@ typedef struct
DRAWABLE (*alloc_image) (COUNT NumFrames, DRAWABLE_TYPE DrawableType, DRAWABLE (*alloc_image) (COUNT NumFrames, DRAWABLE_TYPE DrawableType,
CREATE_FLAGS flags, SIZE width, SIZE height); CREATE_FLAGS flags, SIZE width, SIZE height);
void (*read_display) (PRECT pRect, FRAME DstFramePtr); void (*read_display) (RECT *pRect, FRAME DstFramePtr);
} DISPLAY_INTERFACE; } DISPLAY_INTERFACE;
typedef DISPLAY_INTERFACE *PDISPLAY_INTERFACE;
extern PDISPLAY_INTERFACE _pCurDisplay; extern DISPLAY_INTERFACE *_pCurDisplay;
extern void (* mask_func_array[]) (PRECT pClipRect, extern void (* mask_func_array[]) (RECT *pClipRect, PRIMITIVE *PrimPtr);
PRIMITIVEPTR PrimPtr);
#define AllocDrawableImage (*_pCurDisplay->alloc_image) #define AllocDrawableImage (*_pCurDisplay->alloc_image)
#define ReadDisplay (*_pCurDisplay->read_display) #define ReadDisplay (*_pCurDisplay->read_display)
sc2/src/sc2code/libs/graphics/drawable.c
+4 -4
View File
@@ -49,7 +49,7 @@ SetContextFGFrame (FRAME Frame)
} }
DRAWABLE DRAWABLE
CreateDisplay (CREATE_FLAGS CreateFlags, PSIZE pwidth, PSIZE pheight) CreateDisplay (CREATE_FLAGS CreateFlags, SIZE *pwidth, SIZE *pheight)
{ {
DRAWABLE Drawable; DRAWABLE Drawable;
@@ -88,7 +88,7 @@ AllocDrawable (COUNT n)
DRAWABLE_PRIORITY, MEM_SIMPLE); DRAWABLE_PRIORITY, MEM_SIMPLE);
if (Drawable) if (Drawable)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
int i; int i;
DrawablePtr = LockDrawable (Drawable); DrawablePtr = LockDrawable (Drawable);
DrawablePtr->Frame = (FRAME)HMalloc ((MEM_SIZE)(sizeof (FRAME_DESC) * n)); DrawablePtr->Frame = (FRAME)HMalloc ((MEM_SIZE)(sizeof (FRAME_DESC) * n));
@@ -142,7 +142,7 @@ CreateDrawable (CREATE_FLAGS CreateFlags, SIZE width, SIZE height, COUNT
BOOLEAN BOOLEAN
DestroyDrawable (DRAWABLE Drawable) DestroyDrawable (DRAWABLE Drawable)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
if (LOWORD (Drawable) == GetFrameHandle (_CurFramePtr)) if (LOWORD (Drawable) == GetFrameHandle (_CurFramePtr))
SetContextFGFrame ((FRAME)0); SetContextFGFrame ((FRAME)0);
@@ -160,7 +160,7 @@ DestroyDrawable (DRAWABLE Drawable)
} }
BOOLEAN BOOLEAN
GetFrameRect (FRAME FramePtr, PRECT pRect) GetFrameRect (FRAME FramePtr, RECT *pRect)
{ {
if (FramePtr) if (FramePtr)
{ {
sc2/src/sc2code/libs/graphics/drawable.h
+4 -19
View File
@@ -32,7 +32,6 @@ typedef struct bresenham_line
BOOLEAN end_points_exchanged; BOOLEAN end_points_exchanged;
INTERSECT_CODE intersect_code; INTERSECT_CODE intersect_code;
} BRESENHAM_LINE; } BRESENHAM_LINE;
typedef BRESENHAM_LINE *PBRESENHAM_LINE;
typedef UWORD DRAWABLE_TYPE; typedef UWORD DRAWABLE_TYPE;
#define ROM_DRAWABLE 0 #define ROM_DRAWABLE 0
@@ -57,7 +56,6 @@ typedef struct drawable_desc
UWORD MaxIndex; UWORD MaxIndex;
FRAME_DESC *Frame; FRAME_DESC *Frame;
} DRAWABLE_DESC; } DRAWABLE_DESC;
typedef DRAWABLE_DESC *PDRAWABLE_DESC;
#define GetFrameWidth(f) ((f)->Bounds.width) #define GetFrameWidth(f) ((f)->Bounds.width)
#define GetFrameHeight(f) ((f)->Bounds.height) #define GetFrameHeight(f) ((f)->Bounds.height)
@@ -67,19 +65,14 @@ typedef DRAWABLE_DESC *PDRAWABLE_DESC;
#define DRAWABLE_PRIORITY DEFAULT_MEM_PRIORITY #define DRAWABLE_PRIORITY DEFAULT_MEM_PRIORITY
#define DRAWABLEPTR PDRAWABLE_DESC
#define COUNTPTR PCOUNT
extern DRAWABLE AllocDrawable (COUNT num_frames); 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 UnlockDrawable(D) mem_unlock (GetDrawableHandle (D))
#define FreeDrawable(D) _ReleaseCelData (GetDrawableHandle (D)) #define FreeDrawable(D) _ReleaseCelData (GetDrawableHandle (D))
#define GetDrawableHandle(D) ((MEM_HANDLE)LOWORD (D)) #define GetDrawableHandle(D) ((MEM_HANDLE)LOWORD (D))
#define GetDrawableIndex(D) ((COUNT)HIWORD (D)) #define GetDrawableIndex(D) ((COUNT)HIWORD (D))
#define GetFrameParentDrawable(F) (F)->parent #define GetFrameParentDrawable(F) (F)->parent
#define NULL_DRAWABLE (DRAWABLE)NULL_PTR
#define TYPE_GET(f) ((f) & FTYPE_MASK) #define TYPE_GET(f) ((f) & FTYPE_MASK)
#define INDEX_GET(f) ((f) & FINDEX_MASK) #define INDEX_GET(f) ((f) & FINDEX_MASK)
#define TYPE_SET(f,t) ((f)|=t) #define TYPE_SET(f,t) ((f)|=t)
@@ -90,27 +83,19 @@ typedef struct
RECT Box; RECT Box;
FRAME FramePtr; FRAME FramePtr;
} IMAGE_BOX; } IMAGE_BOX;
typedef IMAGE_BOX *PIMAGE_BOX;
extern DRAWABLE _request_drawable (COUNT NumFrames, DRAWABLE_TYPE extern DRAWABLE _request_drawable (COUNT NumFrames, DRAWABLE_TYPE
DrawableType, CREATE_FLAGS flags, SIZE width, SIZE height); DrawableType, CREATE_FLAGS flags, SIZE width, SIZE height);
extern INTERSECT_CODE _clip_line (PRECT pClipRect, PBRESENHAM_LINE extern INTERSECT_CODE _clip_line (RECT *pClipRect, BRESENHAM_LINE *pLine);
pLine);
extern MEM_HANDLE _GetCelData (uio_Stream *fp, DWORD length); extern MEM_HANDLE _GetCelData (uio_Stream *fp, DWORD length);
extern BOOLEAN _ReleaseCelData (MEM_HANDLE handle); 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 STAMP _save_stamp;
extern FRAME _CurFramePtr; extern FRAME _CurFramePtr;
extern void _rect_blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr); extern void _rect_blt (RECT *pClipRect, PRIMITIVE *PrimPtr);
extern void _text_blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr); extern void _text_blt (RECT *pClipRect, PRIMITIVE *PrimPtr);
#endif /* _DRAWABLE_H */ #endif /* _DRAWABLE_H */
sc2/src/sc2code/libs/graphics/filegfx.c
+2 -2
View File
@@ -22,7 +22,7 @@
DWORD DWORD
LoadCelFile (PVOID pStr) LoadGraphicFile (const char *pStr)
{ {
uio_Stream *fp; uio_Stream *fp;
@@ -47,7 +47,7 @@ LoadCelFile (PVOID pStr)
} }
DWORD DWORD
LoadFontFile (PVOID pStr) LoadFontFile (const char *pStr)
{ {
uio_Stream *fp; uio_Stream *fp;
sc2/src/sc2code/libs/graphics/font.c
+6 -6
View File
@@ -85,7 +85,7 @@ ReleaseFont (FONT Font)
} }
void void
font_DrawText (PTEXT lpText) font_DrawText (TEXT *lpText)
{ {
FixContextFontEffect (); FixContextFontEffect ();
SetPrimType (&_locPrim, TEXT_PRIM); SetPrimType (&_locPrim, TEXT_PRIM);
@@ -94,7 +94,7 @@ font_DrawText (PTEXT lpText)
} }
BOOLEAN BOOLEAN
GetContextFontLeading (PSIZE pheight) GetContextFontLeading (SIZE *pheight)
{ {
if (_CurFontPtr != 0) if (_CurFontPtr != 0)
{ {
@@ -107,7 +107,7 @@ GetContextFontLeading (PSIZE pheight)
} }
BOOLEAN BOOLEAN
GetContextFontLeadingWidth (PSIZE pwidth) GetContextFontLeadingWidth (SIZE *pwidth)
{ {
if (_CurFontPtr != 0) if (_CurFontPtr != 0)
{ {
@@ -120,7 +120,7 @@ GetContextFontLeadingWidth (PSIZE pwidth)
} }
BOOLEAN BOOLEAN
TextRect (PTEXT lpText, PRECT pRect, PBYTE pdelta) TextRect (TEXT *lpText, RECT *pRect, BYTE *pdelta)
{ {
FONT FontPtr; FONT FontPtr;
@@ -235,14 +235,14 @@ TextRect (PTEXT lpText, PRECT pRect, PBYTE pdelta)
} }
void void
_text_blt (PRECT pClipRect, PRIMITIVEPTR PrimPtr) _text_blt (RECT *pClipRect, PRIMITIVE *PrimPtr)
{ {
FONT FontPtr; FONT FontPtr;
COUNT num_chars; COUNT num_chars;
wchar_t next_ch; wchar_t next_ch;
const unsigned char *pStr; const unsigned char *pStr;
TEXTPTR TextPtr; TEXT *TextPtr;
POINT origin; POINT origin;
TFB_Palette color; TFB_Palette color;
TFB_Image *backing; TFB_Image *backing;
sc2/src/sc2code/libs/graphics/font.h
-3
View File
@@ -30,7 +30,6 @@ typedef struct FontPage
size_t numChars; size_t numChars;
TFB_Char *charDesc; TFB_Char *charDesc;
} FONT_PAGE; } FONT_PAGE;
typedef FONT_PAGE *PFONT_PAGE;
static inline FONT_PAGE * static inline FONT_PAGE *
AllocFontPage (int numChars) AllocFontPage (int numChars)
@@ -67,8 +66,6 @@ struct font_desc
#define UnlockFont(h) mem_unlock (h) #define UnlockFont(h) mem_unlock (h)
#define FreeFont _ReleaseFontData #define FreeFont _ReleaseFontData
#define NULL_FONT (FONT)NULL_PTR
extern FONT _CurFontPtr; extern FONT _CurFontPtr;
extern MEM_HANDLE _GetFontData (uio_Stream *fp, DWORD length); extern MEM_HANDLE _GetFontData (uio_Stream *fp, DWORD length);
sc2/src/sc2code/libs/graphics/frame.c
+13 -16
View File
@@ -32,6 +32,7 @@ MAKE_HOT_SPOT (COORD x, COORD y)
return hs; return hs;
} }
// XXX: INTERNAL_PRIMITIVE and INTERNAL_PRIM_DESC are not used
typedef union typedef union
{ {
POINT Point; POINT Point;
@@ -40,9 +41,6 @@ typedef union
TEXT Text; TEXT Text;
RECT Rect; RECT Rect;
} INTERNAL_PRIM_DESC; } INTERNAL_PRIM_DESC;
typedef INTERNAL_PRIM_DESC *PINTERNAL_PRIM_DESC;
typedef PINTERNAL_PRIM_DESC INTERNAL_PRIM_DESCPTR;
typedef struct typedef struct
{ {
@@ -51,12 +49,11 @@ typedef struct
COLOR Color; COLOR Color;
INTERNAL_PRIM_DESC Object; INTERNAL_PRIM_DESC Object;
} INTERNAL_PRIMITIVE; } INTERNAL_PRIMITIVE;
typedef INTERNAL_PRIMITIVE *PINTERNAL_PRIMITIVE;
STAMP _save_stamp; STAMP _save_stamp;
static BOOLEAN static BOOLEAN
GetFrameValidRect (PRECT pValidRect, HOT_SPOT *pOldHot) GetFrameValidRect (RECT *pValidRect, HOT_SPOT *pOldHot)
{ {
COORD hx, hy; COORD hx, hy;
HOT_SPOT OldHot; HOT_SPOT OldHot;
@@ -86,7 +83,7 @@ GetFrameValidRect (PRECT pValidRect, HOT_SPOT *pOldHot)
} }
void void
ClearBackGround (PRECT pClipRect) ClearBackGround (RECT *pClipRect)
{ {
TFB_Palette color; TFB_Palette color;
@@ -95,7 +92,7 @@ ClearBackGround (PRECT pClipRect)
} }
void void
DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
BATCH_FLAGS BatchFlags) BATCH_FLAGS BatchFlags)
{ {
RECT ValidRect; RECT ValidRect;
@@ -105,7 +102,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks,
{ {
COUNT CurIndex; COUNT CurIndex;
PRIM_LINKS OldLinks; PRIM_LINKS OldLinks;
PPRIMITIVE lpPrim; PRIMITIVE *lpPrim;
BatchFlags &= BATCH_SINGLE BatchFlags &= BATCH_SINGLE
| BATCH_BUILD_PAGE | BATCH_BUILD_PAGE
@@ -138,7 +135,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks,
for (; CurIndex != END_OF_LIST; CurIndex = GetSuccLink (GetPrimLinks (lpPrim))) for (; CurIndex != END_OF_LIST; CurIndex = GetSuccLink (GetPrimLinks (lpPrim)))
{ {
GRAPHICS_PRIM PrimType; GRAPHICS_PRIM PrimType;
PPRIMITIVE lpWorkPrim; PRIMITIVE *lpWorkPrim;
RECT ClipRect; RECT ClipRect;
TFB_Palette color; TFB_Palette color;
@@ -168,7 +165,7 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks,
break; break;
case TEXT_PRIM: case TEXT_PRIM:
if (!TextRect (&lpWorkPrim->Object.Text, if (!TextRect (&lpWorkPrim->Object.Text,
&ClipRect, NULL_PTR)) &ClipRect, NULL))
continue; continue;
_save_stamp.origin = ClipRect.corner; _save_stamp.origin = ClipRect.corner;
@@ -215,7 +212,7 @@ ClearDrawable (void)
} }
void void
DrawPoint (PPOINT lpPoint) DrawPoint (POINT *lpPoint)
{ {
RECT ValidRect; RECT ValidRect;
HOT_SPOT OldHot; HOT_SPOT OldHot;
@@ -231,7 +228,7 @@ DrawPoint (PPOINT lpPoint)
} }
void void
DrawRectangle (PRECT lpRect) DrawRectangle (RECT *lpRect)
{ {
RECT ValidRect; RECT ValidRect;
HOT_SPOT OldHot; HOT_SPOT OldHot;
@@ -247,7 +244,7 @@ DrawRectangle (PRECT lpRect)
} }
void void
DrawFilledRectangle (PRECT lpRect) DrawFilledRectangle (RECT *lpRect)
{ {
RECT ValidRect; RECT ValidRect;
HOT_SPOT OldHot; HOT_SPOT OldHot;
@@ -263,7 +260,7 @@ DrawFilledRectangle (PRECT lpRect)
} }
void void
DrawLine (PLINE lpLine) DrawLine (LINE *lpLine)
{ {
RECT ValidRect; RECT ValidRect;
HOT_SPOT OldHot; HOT_SPOT OldHot;
@@ -279,7 +276,7 @@ DrawLine (PLINE lpLine)
} }
void void
DrawStamp (PSTAMP stmp) DrawStamp (STAMP *stmp)
{ {
RECT ValidRect; RECT ValidRect;
HOT_SPOT OldHot; HOT_SPOT OldHot;
@@ -292,7 +289,7 @@ DrawStamp (PSTAMP stmp)
} }
void void
DrawFilledStamp (PSTAMP stmp) DrawFilledStamp (STAMP *stmp)
{ {
RECT ValidRect; RECT ValidRect;
HOT_SPOT OldHot; HOT_SPOT OldHot;
sc2/src/sc2code/libs/graphics/gfx_common.c
+4 -5
View File
@@ -21,10 +21,9 @@
#include "libs/graphics/gfx_common.h" #include "libs/graphics/gfx_common.h"
#include "libs/graphics/drawcmd.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[]) void (*mask_func_array[]) (RECT *pClipRect, PRIMITIVE *PrimPtr)
(PRECT pClipRect, PRIMITIVEPTR PrimPtr)
= { 0 }; = { 0 };
int ScreenWidth; int ScreenWidth;
@@ -52,13 +51,13 @@ SetGraphicGrabOther (int grab_other)
} }
void void
DrawFromExtraScreen (PRECT r) DrawFromExtraScreen (RECT *r)
{ {
TFB_DrawScreen_Copy(r, TFB_SCREEN_EXTRA, TFB_SCREEN_MAIN); TFB_DrawScreen_Copy(r, TFB_SCREEN_EXTRA, TFB_SCREEN_MAIN);
} }
void void
LoadIntoExtraScreen (PRECT r) LoadIntoExtraScreen (RECT *r)
{ {
TFB_DrawScreen_Copy(r, TFB_SCREEN_MAIN, TFB_SCREEN_EXTRA); TFB_DrawScreen_Copy(r, TFB_SCREEN_MAIN, TFB_SCREEN_EXTRA);
} }
sc2/src/sc2code/libs/graphics/gfx_common.h
+4 -4
View File
@@ -63,14 +63,14 @@ void TFB_ProcessEvents (void);
#define GSCALE_IDENTITY 256 #define GSCALE_IDENTITY 256
void LoadIntoExtraScreen (PRECT r); void LoadIntoExtraScreen (RECT *r);
void DrawFromExtraScreen (PRECT r); void DrawFromExtraScreen (RECT *r);
void SetGraphicGrabOther (int grab_other); void SetGraphicGrabOther (int grab_other);
void SetGraphicScale (int scale); void SetGraphicScale (int scale);
int GetGraphicScale (void); int GetGraphicScale (void);
void SetGraphicUseOtherExtra (int other); void SetGraphicUseOtherExtra (int other);
void SetTransitionSource (PRECT pRect); void SetTransitionSource (RECT *pRect);
void ScreenTransition (int transition, PRECT pRect); void ScreenTransition (int transition, RECT *pRect);
extern float FrameRate; extern float FrameRate;
extern int FrameRateTickBase; extern int FrameRateTickBase;
sc2/src/sc2code/libs/graphics/intersec.c
+6 -7
View File
@@ -22,8 +22,8 @@
//#define DEBUG_INTERSEC //#define DEBUG_INTERSEC
static TIME_VALUE static TIME_VALUE
frame_intersect (PINTERSECT_CONTROL pControl0, PRECT pr0, frame_intersect (INTERSECT_CONTROL *pControl0, RECT *pr0,
PINTERSECT_CONTROL pControl1, PRECT pr1, TIME_VALUE t0, INTERSECT_CONTROL *pControl1, RECT *pr1, TIME_VALUE t0,
TIME_VALUE t1) TIME_VALUE t1)
{ {
SIZE time_error0, time_error1; 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 * separated by a pixel, the shapes wouldn't be touching
* each other. * each other.
*/ */
BOOLEAN _image_intersect (PIMAGE_BOX pImageBox0, PIMAGE_BOX extern BOOLEAN _image_intersect (IMAGE_BOX *pImageBox0,
pImageBox1, PRECT pIRect); IMAGE_BOX *pImageBox1, RECT *pIRect);
CheckFirstIntersection: CheckFirstIntersection:
if (BoxIntersect (&IB0.Box, &IB1.Box, &r_intersect) if (BoxIntersect (&IB0.Box, &IB1.Box, &r_intersect)
@@ -228,9 +228,8 @@ CheckFirstIntersection:
} }
TIME_VALUE TIME_VALUE
DrawablesIntersect (PINTERSECT_CONTROL pControl0, DrawablesIntersect (INTERSECT_CONTROL *pControl0,
PINTERSECT_CONTROL pControl1, TIME_VALUE INTERSECT_CONTROL *pControl1, TIME_VALUE max_time_val)
max_time_val)
{ {
SIZE dy; SIZE dy;
SIZE time_y_0, time_y_1; SIZE time_y_0, time_y_1;
sc2/src/sc2code/libs/graphics/loaddisp.c
+1 -1
View File
@@ -34,7 +34,7 @@
DRAWABLE DRAWABLE
LoadDisplayPixmap (PRECT area, FRAME frame) LoadDisplayPixmap (RECT *area, FRAME frame)
{ {
DRAWABLE buffer; DRAWABLE buffer;
sc2/src/sc2code/libs/graphics/pixmap.c
+11 -11
View File
@@ -21,7 +21,7 @@
FRAME FRAME
CaptureDrawable (DRAWABLE Drawable) CaptureDrawable (DRAWABLE Drawable)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
DrawablePtr = LockDrawable (Drawable); DrawablePtr = LockDrawable (Drawable);
if (DrawablePtr) if (DrawablePtr)
@@ -41,7 +41,7 @@ ReleaseDrawable (FRAME FramePtr)
if (FramePtr != 0) if (FramePtr != 0)
{ {
DRAWABLE Drawable; DRAWABLE Drawable;
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
DrawablePtr = GetFrameParentDrawable (FramePtr); DrawablePtr = GetFrameParentDrawable (FramePtr);
Drawable = BUILD_DRAWABLE (DrawablePtr->hDrawable, FramePtr->Index); Drawable = BUILD_DRAWABLE (DrawablePtr->hDrawable, FramePtr->Index);
@@ -56,7 +56,7 @@ ReleaseDrawable (FRAME FramePtr)
MEM_HANDLE MEM_HANDLE
GetFrameHandle (FRAME FramePtr) GetFrameHandle (FRAME FramePtr)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
if (FramePtr == 0) if (FramePtr == 0)
return (0); return (0);
@@ -68,7 +68,7 @@ GetFrameHandle (FRAME FramePtr)
COUNT COUNT
GetFrameCount (FRAME FramePtr) GetFrameCount (FRAME FramePtr)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
if (FramePtr == 0) if (FramePtr == 0)
return (0); return (0);
@@ -91,7 +91,7 @@ SetAbsFrameIndex (FRAME FramePtr, COUNT FrameIndex)
{ {
if (FramePtr != 0) if (FramePtr != 0)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
DrawablePtr = GetFrameParentDrawable (FramePtr); DrawablePtr = GetFrameParentDrawable (FramePtr);
@@ -108,7 +108,7 @@ SetRelFrameIndex (FRAME FramePtr, SIZE FrameOffs)
if (FramePtr != 0) if (FramePtr != 0)
{ {
COUNT num_frames; COUNT num_frames;
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
DrawablePtr = GetFrameParentDrawable (FramePtr); DrawablePtr = GetFrameParentDrawable (FramePtr);
num_frames = DrawablePtr->MaxIndex + 1; num_frames = DrawablePtr->MaxIndex + 1;
@@ -130,9 +130,9 @@ SetEquFrameIndex (FRAME DstFramePtr, FRAME SrcFramePtr)
{ {
if (DstFramePtr && SrcFramePtr) if (DstFramePtr && SrcFramePtr)
return ((FRAME)( return ((FRAME)(
(PBYTE)((GetFrameParentDrawable (DstFramePtr))->Frame) (BYTE*)((GetFrameParentDrawable (DstFramePtr))->Frame)
+ ((PBYTE)SrcFramePtr - + ((BYTE*)SrcFramePtr -
(PBYTE)((GetFrameParentDrawable (SrcFramePtr))->Frame)) (BYTE*)((GetFrameParentDrawable (SrcFramePtr))->Frame))
)); ));
return (0); return (0);
@@ -141,7 +141,7 @@ SetEquFrameIndex (FRAME DstFramePtr, FRAME SrcFramePtr)
FRAME FRAME
IncFrameIndex (FRAME FramePtr) IncFrameIndex (FRAME FramePtr)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
if (FramePtr == 0) if (FramePtr == 0)
return (0); return (0);
@@ -163,7 +163,7 @@ DecFrameIndex (FRAME FramePtr)
return --FramePtr; return --FramePtr;
else else
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
DrawablePtr = GetFrameParentDrawable (FramePtr); DrawablePtr = GetFrameParentDrawable (FramePtr);
return &DrawablePtr->Frame[DrawablePtr->MaxIndex]; return &DrawablePtr->Frame[DrawablePtr->MaxIndex];
sc2/src/sc2code/libs/graphics/prim.h
+2 -4
View File
@@ -38,7 +38,6 @@ typedef union
TEXT Text; TEXT Text;
RECT Rect; RECT Rect;
} PRIM_DESC; } PRIM_DESC;
typedef PRIM_DESC *PPRIM_DESC;
typedef DWORD PRIM_LINKS; typedef DWORD PRIM_LINKS;
@@ -49,7 +48,6 @@ typedef struct
COLOR Color; COLOR Color;
PRIM_DESC Object; PRIM_DESC Object;
} PRIMITIVE; } PRIMITIVE;
typedef PRIMITIVE *PPRIMITIVE;
#define END_OF_LIST ((COUNT)0xFFFF) #define END_OF_LIST ((COUNT)0xFFFF)
@@ -64,14 +62,14 @@ typedef PRIMITIVE *PPRIMITIVE;
#define GetPrimColor(pPrim) ((pPrim)->Color) #define GetPrimColor(pPrim) ((pPrim)->Color)
static inline void static inline void
SetPrimNextLink (PPRIMITIVE pPrim, COUNT Link) SetPrimNextLink (PRIMITIVE *pPrim, COUNT Link)
{ {
SetPrimLinks (pPrim, END_OF_LIST, Link); SetPrimLinks (pPrim, END_OF_LIST, Link);
} }
static inline COUNT static inline COUNT
GetPrimNextLink (PPRIMITIVE pPrim) GetPrimNextLink (PRIMITIVE *pPrim)
{ {
return GetSuccLink (GetPrimLinks (pPrim)); return GetSuccLink (GetPrimLinks (pPrim));
} }
sc2/src/sc2code/libs/graphics/sdl/3do_blt.c
+2 -2
View File
@@ -37,7 +37,7 @@ GetGraphicScale ()
} }
static void static void
read_screen (PRECT lpRect, FRAME DstFramePtr) read_screen (RECT *lpRect, FRAME DstFramePtr)
{ {
if (_CurFramePtr->Type != SCREEN_DRAWABLE if (_CurFramePtr->Type != SCREEN_DRAWABLE
|| DstFramePtr->Type == SCREEN_DRAWABLE || DstFramePtr->Type == SCREEN_DRAWABLE
@@ -78,7 +78,7 @@ static DISPLAY_INTERFACE DisplayInterface =
}; };
void void
LoadDisplay (PDISPLAY_INTERFACE *pDisplay) LoadDisplay (DISPLAY_INTERFACE **pDisplay)
{ {
*pDisplay = &DisplayInterface; *pDisplay = &DisplayInterface;
} }
sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c
+4 -4
View File
@@ -84,7 +84,7 @@ FlushGraphics ()
} }
static void static void
ExpandRect (PRECT rect, int expansion) ExpandRect (RECT *rect, int expansion)
{ {
if (rect->corner.x - expansion >= 0) if (rect->corner.x - expansion >= 0)
{ {
@@ -120,7 +120,7 @@ ExpandRect (PRECT rect, int expansion)
} }
void void
SetTransitionSource (PRECT pRect) SetTransitionSource (RECT *pRect)
{ {
RECT ActualRect; RECT ActualRect;
@@ -135,7 +135,7 @@ SetTransitionSource (PRECT pRect)
// Status: Implemented // Status: Implemented
void void
ScreenTransition (int TransType, PRECT pRect) ScreenTransition (int TransType, RECT *pRect)
{ {
const float DURATION = (31.0f / 60.0f); // in seconds const float DURATION = (31.0f / 60.0f); // in seconds
Uint32 last_time = 0, current_time, delta_time, add_amount; Uint32 last_time = 0, current_time, delta_time, add_amount;
@@ -183,7 +183,7 @@ ScreenTransition (int TransType, PRECT pRect)
} }
BOOLEAN BOOLEAN
_image_intersect (PIMAGE_BOX box1, PIMAGE_BOX box2, PRECT rect) _image_intersect (IMAGE_BOX *box1, IMAGE_BOX *box2, RECT *rect)
{ {
BOOLEAN ret; BOOLEAN ret;
SDL_Surface *img1, *img2; SDL_Surface *img1, *img2;
sc2/src/sc2code/libs/graphics/sdl/3do_getbody.c
+3 -3
View File
@@ -438,7 +438,7 @@ _GetCelData (uio_Stream *fp, DWORD length)
Drawable = 0; Drawable = 0;
if (cel_ct && (Drawable = AllocDrawable (cel_ct))) if (cel_ct && (Drawable = AllocDrawable (cel_ct)))
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
if ((DrawablePtr = LockDrawable (Drawable)) == 0) if ((DrawablePtr = LockDrawable (Drawable)) == 0)
{ {
@@ -473,7 +473,7 @@ _GetCelData (uio_Stream *fp, DWORD length)
BOOLEAN BOOLEAN
_ReleaseCelData (MEM_HANDLE handle) _ReleaseCelData (MEM_HANDLE handle)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
int cel_ct; int cel_ct;
FRAME FramePtr = NULL; FRAME FramePtr = NULL;
@@ -738,7 +738,7 @@ _request_drawable (COUNT NumFrames, DRAWABLE_TYPE DrawableType,
); );
if (Drawable) if (Drawable)
{ {
DRAWABLEPTR DrawablePtr; DRAWABLE_DESC *DrawablePtr;
if ((DrawablePtr = LockDrawable (Drawable)) == 0) if ((DrawablePtr = LockDrawable (Drawable)) == 0)
{ {
sc2/src/sc2code/libs/graphics/sdl/bbox.c
+1 -1
View File
@@ -105,7 +105,7 @@ TFB_BBox_RegisterPoint (int x, int y)
} }
void 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->corner.y);
TFB_BBox_RegisterPoint (r->corner.x + r->extent.width, r->corner.y + r->extent.height); TFB_BBox_RegisterPoint (r->corner.x + r->extent.width, r->corner.y + r->extent.height);
sc2/src/sc2code/libs/graphics/sdl/bbox.h
+1 -1
View File
@@ -37,7 +37,7 @@ typedef struct {
extern TFB_BoundingBox TFB_BBox; extern TFB_BoundingBox TFB_BBox;
void TFB_BBox_RegisterPoint (int x, int y); 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_RegisterCanvas (TFB_Canvas c, int x, int y);
void TFB_BBox_Reset (void); void TFB_BBox_Reset (void);
sc2/src/sc2code/libs/graphics/sdl/canvas.c
+4 -4
View File
@@ -55,7 +55,7 @@ TFB_DrawCanvas_Line (int x1, int y1, int x2, int y2, int r, int g, int b, TFB_Ca
} }
void 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_Surface *dst = target;
SDL_PixelFormat *fmt = dst->format; SDL_PixelFormat *fmt = dst->format;
@@ -709,7 +709,7 @@ TFB_DrawCanvas_SetTransparentColor (TFB_Canvas canvas, int r, int g, int b, BOOL
void void
TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT src_hs, TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT src_hs,
TFB_Canvas src_mipmap, HOT_SPOT mm_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; SDL_Surface *src = (SDL_Surface *)src_canvas;
@@ -747,7 +747,7 @@ TFB_DrawCanvas_GetScaledExtent (TFB_Canvas src_canvas, HOT_SPOT src_hs,
} }
void void
TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, PEXTENT size) TFB_DrawCanvas_GetExtent (TFB_Canvas canvas, EXTENT *size)
{ {
SDL_Surface *src = (SDL_Surface *)canvas; SDL_Surface *src = (SDL_Surface *)canvas;
@@ -1338,7 +1338,7 @@ TFB_DrawCanvas_Rotate (TFB_Canvas src_canvas, TFB_Canvas dst_canvas, int angle,
} }
void 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; int dstw, dsth;
SDL_Surface *src = (SDL_Surface *)src_canvas; SDL_Surface *src = (SDL_Surface *)src_canvas;
sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+1 -1
View File
@@ -218,7 +218,7 @@ static BOOLEAN system_box_active = 0;
static SDL_Rect system_box; static SDL_Rect system_box;
void void
SetSystemRect (PRECT r) SetSystemRect (RECT *r)
{ {
system_box_active = TRUE; system_box_active = TRUE;
system_box.x = r->corner.x; system_box.x = r->corner.x;
sc2/src/sc2code/libs/graphics/sdl/sdl_common.h
+1 -1
View File
@@ -55,7 +55,7 @@ extern volatile int TransitionAmount;
extern SDL_Rect TransitionClipRect; extern SDL_Rect TransitionClipRect;
void ScreenOrigin (FRAME Display, COORD sx, COORD sy); 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); void TFB_SwapBuffers (int force_full_redraw);
SDL_Surface* TFB_DisplayFormatAlpha (SDL_Surface *surface); SDL_Surface* TFB_DisplayFormatAlpha (SDL_Surface *surface);
sc2/src/sc2code/libs/graphics/sdl/sdluio.c
+1 -1
View File
@@ -125,7 +125,7 @@ sdluio_makeRWops (uio_Stream *stream) {
result->read = sdluio_read; result->read = sdluio_read;
result->write = sdluio_write; result->write = sdluio_write;
result->close = sdluio_close; result->close = sdluio_close;
result->hidden.unknown.data1 = (void *) stream; result->hidden.unknown.data1 = stream;
return result; return result;
} }

Some files were not shown because too many files have changed in this diff Show More