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

Moved code resources into starcon.ls2 as well.

Browse Source 
SetResourceIndex is no longer used after main program init,
and RES_INDEX is for all practical purposes defunct.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2958 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2008-04-06 00:52:14 +00:00
parent 356a2106e9
commit 32940bb214
77 changed files with 252 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/build.c
+6 -6
View File
@@ -27,7 +27,7 @@
// Allocate a new STARSHIP or SHIP_FRAGMENT and put it in the queue
HLINK
Build (QUEUE *pQueue, DWORD RaceResIndex)
Build (QUEUE *pQueue, SPECIES_ID SpeciesID)
{
HLINK hNewShip;
SHIP_BASE *ShipPtr;
@@ -41,7 +41,7 @@ Build (QUEUE *pQueue, DWORD RaceResIndex)
ShipPtr = (SHIP_BASE *) LockLink (pQueue, hNewShip);
memset (ShipPtr, 0, GetLinkSize (pQueue));
ShipPtr->RaceResIndex = RaceResIndex;
ShipPtr->SpeciesID = SpeciesID;
UnlockLink (pQueue, hNewShip);
PutQueue (pQueue, hNewShip);
@@ -320,7 +320,7 @@ GetIndexFromStarShip (QUEUE *pShipQ, HLINK hStarShip)
}
BYTE
NameCaptain (QUEUE *pQueue, DWORD RaceResIndex)
NameCaptain (QUEUE *pQueue, SPECIES_ID SpeciesID)
{
BYTE name_index;
HLINK hStarShip;
@@ -341,7 +341,7 @@ NameCaptain (QUEUE *pQueue, DWORD RaceResIndex)
ShipPtr = (SHIP_BASE *) LockLink (pQueue, hStarShip);
hNextShip = _GetSuccLink (ShipPtr);
if (ShipPtr->RaceResIndex == RaceResIndex)
if (ShipPtr->SpeciesID == SpeciesID)
test_name_index = ShipPtr->captains_name_index;
UnlockLink (pQueue, hStarShip);
@@ -374,8 +374,8 @@ CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level)
captains_name_index = 0;
else
captains_name_index = NameCaptain (pDstQueue,
TemplatePtr->RaceResIndex);
hBuiltShip = Build (pDstQueue, TemplatePtr->RaceResIndex);
TemplatePtr->SpeciesID);
hBuiltShip = Build (pDstQueue, TemplatePtr->SpeciesID);
if (hBuiltShip)
{
SHIP_FRAGMENT *ShipFragPtr;
sc2/src/sc2code/build.h
+3 -3
View File
@@ -37,11 +37,11 @@
& (NUM_CAPTAINS_NAMES - 1)) \
+ NAME_OFFSET)
extern HLINK Build (QUEUE *pQueue, DWORD RaceResIndex);
extern HLINK Build (QUEUE *pQueue, SPECIES_ID SpeciesID);
extern HSHIPFRAG CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue,
COUNT crew_level);
extern HLINK GetStarShipFromIndex (QUEUE *pShipQ, COUNT Index);
extern BYTE NameCaptain (QUEUE *pQueue, DWORD RaceResIndex);
extern BYTE NameCaptain (QUEUE *pQueue, SPECIES_ID SpeciesID);
/* Possible values for the 'state' argument of
* COUNT ActivateStarShip (COUNT which_ship, SIZE state)
@@ -63,7 +63,7 @@ extern COUNT GetIndexFromStarShip (QUEUE *pShipQ, HLINK hStarShip);
extern int SetEscortCrewComplement (COUNT which_ship, COUNT crew_level,
BYTE captain);
extern RACE_DESC *load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData);
extern RACE_DESC *load_ship (SPECIES_ID SpeciesID, BOOLEAN LoadBattleData);
extern void free_ship (RACE_DESC *RaceDescPtr, BOOLEAN FreeIconData,
BOOLEAN FreeBattleData);
sc2/src/sc2code/corecode.h
+49
View File
@@ -0,0 +1,49 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef CORECODE_H_
#define CORECODE_H_
#include "ships/androsyn/icode.h"
#include "ships/arilou/icode.h"
#include "ships/blackurq/icode.h"
#include "ships/chenjesu/icode.h"
#include "ships/chmmr/icode.h"
#include "ships/druuge/icode.h"
#include "ships/human/icode.h"
#include "ships/ilwrath/icode.h"
#include "ships/lastbat/icode.h"
#include "ships/melnorme/icode.h"
#include "ships/mmrnmhrm/icode.h"
#include "ships/mycon/icode.h"
#include "ships/orz/icode.h"
#include "ships/pkunk/icode.h"
#include "ships/probe/icode.h"
#include "ships/shofixti/icode.h"
#include "ships/sis_ship/icode.h"
#include "ships/slylandr/icode.h"
#include "ships/spathi/icode.h"
#include "ships/supox/icode.h"
#include "ships/syreen/icode.h"
#include "ships/thradd/icode.h"
#include "ships/umgah/icode.h"
#include "ships/urquan/icode.h"
#include "ships/utwig/icode.h"
#include "ships/vux/icode.h"
#include "ships/yehat/icode.h"
#include "ships/zoqfot/icode.h"
#endif /* CORECODE_H_ */
sc2/src/sc2code/encount.c
+2 -2
View File
@@ -132,7 +132,7 @@ BuildBattle (COUNT which_player)
hBuiltShip = Build (&race_q[which_player],
FragPtr->race_id == SAMATRA_SHIP ?
SAMATRA_RES_INDEX : FragPtr->RaceResIndex);
SA_MATRA_ID : FragPtr->SpeciesID);
if (hBuiltShip)
{
BuiltShipPtr = LockStarShip (&race_q[which_player], hBuiltShip);
@@ -156,7 +156,7 @@ BuildBattle (COUNT which_player)
}
if (which_player == 0
&& (hBuiltShip = Build (&race_q[0], SIS_RES_INDEX)))
&& (hBuiltShip = Build (&race_q[0], SIS_SHIP_ID)))
{
BuiltShipPtr = LockStarShip (&race_q[0], hBuiltShip);
BuiltShipPtr->captains_name_index = 0;
sc2/src/sc2code/globdata.c
+8 -14
View File
@@ -194,36 +194,30 @@ InitSIS (void)
{
COUNT num_ships;
RES_TYPE rt;
RES_INSTANCE ri;
RES_PACKAGE rp;
SPECIES_ID s_id = ARILOU_ID;
rt = GET_TYPE (ARILOU_SHIP_INDEX);
ri = GET_INSTANCE (ARILOU_SHIP_INDEX);
rp = GET_PACKAGE (ARILOU_SHIP_INDEX);
num_ships = (GET_PACKAGE (BLACKURQ_SHIP_INDEX) - rp + 1)
num_ships = KOHR_AH_ID - s_id + 1
+ 2; /* Yehat Rebels and Ur-Quan probe */
InitQueue (&GLOBAL (avail_race_q), num_ships, sizeof (FLEET_INFO));
for (i = 0; i < num_ships; ++i)
{
DWORD ship_ref;
SPECIES_ID ship_ref;
HFLEETINFO hFleet;
FLEET_INFO *FleetPtr;
if (i < num_ships - 2)
ship_ref = MAKE_RESOURCE (rp++, rt, ri++);
ship_ref = s_id++;
else if (i == num_ships - 2)
ship_ref = YEHAT_SHIP_INDEX;
ship_ref = YEHAT_ID;
else /* (i == num_ships - 1) */
ship_ref = PROBE_RES_INDEX;
ship_ref = UR_QUAN_PROBE_ID;
hFleet = AllocLink (&GLOBAL (avail_race_q));
if (!hFleet)
continue;
FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hFleet);
FleetPtr->RaceResIndex = ship_ref;
FleetPtr->SpeciesID = ship_ref;
if (i < num_ships - 1)
{
@@ -240,7 +234,7 @@ InitSIS (void)
else
{
// Ur-Quan probe.
RACE_DESC *RDPtr = load_ship (FleetPtr->RaceResIndex,
RACE_DESC *RDPtr = load_ship (FleetPtr->SpeciesID,
FALSE);
if (RDPtr)
{ // Grab a copy of loaded icons and strings
sc2/src/sc2code/init.c
+1 -1
View File
@@ -156,7 +156,7 @@ BuildSIS (void)
HSTARSHIP hStarShip;
STARSHIP *StarShipPtr;
hStarShip = Build (&race_q[0], SIS_RES_INDEX);
hStarShip = Build (&race_q[0], SIS_SHIP_ID);
if (!hStarShip)
return 0;
StarShipPtr = LockStarShip (&race_q[0], hStarShip);
sc2/src/sc2code/ires_ind.h
-32
View File
@@ -1,32 +0,0 @@
/* This file was auto-generated by the gen_resfiles utility and
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define ARILOU_SHIP_INDEX 0x00600007L
#define CHMMR_SHIP_INDEX 0x00800107L
#define EARTHLING_SHIP_INDEX 0x00a00207L
#define ORZ_SHIP_INDEX 0x00c00307L
#define PKUNK_SHIP_INDEX 0x00e00407L
#define SHOFIXTI_SHIP_INDEX 0x01000507L
#define SPATHI_SHIP_INDEX 0x01200607L
#define SUPOX_SHIP_INDEX 0x01400707L
#define THRADD_SHIP_INDEX 0x01600807L
#define UTWIG_SHIP_INDEX 0x01800907L
#define VUX_SHIP_INDEX 0x01a00a07L
#define YEHAT_SHIP_INDEX 0x01c00b07L
#define MELNORME_SHIP_INDEX 0x01e00c07L
#define DRUUGE_SHIP_INDEX 0x02000d07L
#define ILWRATH_SHIP_INDEX 0x02200e07L
#define MYCON_SHIP_INDEX 0x02400f07L
#define SLYLANDRO_SHIP_INDEX 0x02601007L
#define UMGAH_SHIP_INDEX 0x02801107L
#define URQUAN_SHIP_INDEX 0x02a01207L
#define ZOQFOTPIK_SHIP_INDEX 0x02c01307L
#define SYREEN_SHIP_INDEX 0x02e01407L
#define BLACKURQ_SHIP_INDEX 0x03001507L
#define ANDROSYN_SHIP_INDEX 0x03201607L
#define CHENJESU_SHIP_INDEX 0x03401707L
#define MMRNMHRM_SHIP_INDEX 0x03601807L
#define SIS_RES_INDEX 0x17c03107L
#define SAMATRA_RES_INDEX 0x17e03207L
#define PROBE_RES_INDEX 0x18003307L
sc2/src/sc2code/loadship.c
+38 -16
View File
@@ -18,30 +18,54 @@
#include "build.h"
#include "coderes.h"
#include "corecode.h"
#include "globdata.h"
#include "nameref.h"
#include "races.h"
static RESOURCE code_resources[] = {
NULL_RESOURCE,
ARILOU_CODE,
CHMMR_CODE,
HUMAN_CODE,
ORZ_CODE,
PKUNK_CODE,
SHOFIXTI_CODE,
SPATHI_CODE,
SUPOX_CODE,
THRADDASH_CODE,
UTWIG_CODE,
VUX_CODE,
YEHAT_CODE,
MELNORME_CODE,
DRUUGE_CODE,
ILWRATH_CODE,
MYCON_CODE,
SLYLANDRO_CODE,
UMGAH_CODE,
URQUAN_CODE,
ZOQFOTPIK_CODE,
SYREEN_CODE,
KOHR_AH_CODE,
ANDROSYNTH_CODE,
CHENJESU_CODE,
MMRNMHRM_CODE,
SIS_CODE,
SAMATRA_CODE,
PROBE_CODE };
RACE_DESC *
load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData)
load_ship (SPECIES_ID SpeciesID, BOOLEAN LoadBattleData)
{
RESOURCE_INDEX h, hOldIndex;
RACE_DESC *RDPtr = 0;
#define INITIAL_CODE_RES MAKE_RESOURCE (1, CODE, 0)
void *CodeRef;
h = OpenResourceIndexInstance (RaceResIndex);
if (!h)
return 0;
hOldIndex = SetResourceIndex (h);
CodeRef = CaptureCodeRes (LoadCodeRes (INITIAL_CODE_RES),
&GlobData, &RDPtr);
SetResourceIndex (hOldIndex);
if (SpeciesID >= NUM_SPECIES_ID)
return NULL;
CodeRef = CaptureCodeRes (LoadCodeRes (code_resources[SpeciesID]),
&GlobData, (void **)(&RDPtr));
if (!CodeRef)
goto BadLoad;
RDPtr->CodeRef = CodeRef;
@@ -120,8 +144,6 @@ load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData)
}
ExitFunc:
CloseResourceIndex (h);
return RDPtr;
// TODO: We should really free the resources that did load here
sc2/src/sc2code/master.c
+8 -14
View File
@@ -30,14 +30,8 @@ void
LoadMasterShipList (void (* YieldProcessing)(void))
{
COUNT num_entries;
RES_TYPE rt;
RES_INSTANCE ri;
RES_PACKAGE rp;
rt = GET_TYPE (ARILOU_SHIP_INDEX);
ri = GET_INSTANCE (ARILOU_SHIP_INDEX);
rp = GET_PACKAGE (ARILOU_SHIP_INDEX);
num_entries = NUM_MELEE_SHIPS;
SPECIES_ID s_id = ARILOU_ID;
num_entries = LAST_MELEE_ID - ARILOU_ID + 1;
InitQueue (&master_q, num_entries, sizeof (MASTER_SHIP_INFO));
while (num_entries--)
{
@@ -57,8 +51,8 @@ LoadMasterShipList (void (* YieldProcessing)(void))
YieldProcessing ();
BuiltPtr = LockMasterShip (&master_q, hBuiltShip);
BuiltPtr->RaceResIndex = MAKE_RESOURCE (rp++, rt, ri++);
RDPtr = load_ship (BuiltPtr->RaceResIndex, FALSE);
BuiltPtr->SpeciesID = s_id++;
RDPtr = load_ship (BuiltPtr->SpeciesID, FALSE);
if (!RDPtr)
{
UnlockMasterShip (&master_q, hBuiltShip);
@@ -123,7 +117,7 @@ FreeMasterShipList (void)
}
HMASTERSHIP
FindMasterShip (DWORD ship_ref)
FindMasterShip (SPECIES_ID ship_ref)
{
HMASTERSHIP hStarShip, hNextShip;
@@ -134,7 +128,7 @@ FindMasterShip (DWORD ship_ref)
MasterPtr = LockMasterShip (&master_q, hStarShip);
hNextShip = _GetSuccLink (MasterPtr);
ref = MasterPtr->RaceResIndex;
ref = MasterPtr->SpeciesID;
UnlockMasterShip (&master_q, hStarShip);
if (ref == ship_ref)
@@ -145,7 +139,7 @@ FindMasterShip (DWORD ship_ref)
}
int
FindMasterShipIndex (DWORD ship_ref)
FindMasterShipIndex (SPECIES_ID ship_ref)
{
HMASTERSHIP hStarShip, hNextShip;
int index;
@@ -158,7 +152,7 @@ FindMasterShipIndex (DWORD ship_ref)
MasterPtr = LockMasterShip (&master_q, hStarShip);
hNextShip = _GetSuccLink (MasterPtr);
ref = MasterPtr->RaceResIndex;
ref = MasterPtr->SpeciesID;
UnlockMasterShip (&master_q, hStarShip);
if (ref == ship_ref)
sc2/src/sc2code/master.h
+3 -3
View File
@@ -28,7 +28,7 @@ typedef struct
HMASTERSHIP pred;
HMASTERSHIP succ;
DWORD RaceResIndex;
SPECIES_ID SpeciesID;
SHIP_INFO ShipInfo;
FLEET_STUFF Fleet;
@@ -52,8 +52,8 @@ LockMasterShip (const QUEUE *pq, HMASTERSHIP h)
extern void LoadMasterShipList (void (* YieldProcessing)(void));
extern void FreeMasterShipList (void);
extern HMASTERSHIP FindMasterShip (DWORD ship_ref);
extern int FindMasterShipIndex (DWORD ship_ref);
extern HMASTERSHIP FindMasterShip (SPECIES_ID ship_ref);
extern int FindMasterShipIndex (SPECIES_ID ship_ref);
COUNT GetShipCostFromIndex (unsigned Index);
FRAME GetShipIconsFromIndex (unsigned Index);
FRAME GetShipMeleeIconsFromIndex (unsigned Index);
sc2/src/sc2code/melee.c
+2 -2
View File
@@ -1648,8 +1648,8 @@ BuildAndDrawShipList (MELEE_STATE *pMS)
MasterPtr = LockMasterShip (&master_q, hMasterShip);
captains_name_index = NameCaptain (&race_q[side],
MasterPtr->RaceResIndex);
hBuiltShip = Build (&race_q[side], MasterPtr->RaceResIndex);
MasterPtr->SpeciesID);
hBuiltShip = Build (&race_q[side], MasterPtr->SpeciesID);
// Draw the icon.
row = GetShipRow (index);
sc2/src/sc2code/pickmele.c
+4 -4
View File
@@ -60,7 +60,7 @@ MeleeShipByQueueIndex (const QUEUE *queue, COUNT index)
if (StarShipPtr->index == index)
{
hNextShip = hShip;
if (StarShipPtr->RaceResIndex == 0)
if (StarShipPtr->SpeciesID == NO_ID)
hShip = 0;
UnlockStarShip (queue, hNextShip);
break;
@@ -82,7 +82,7 @@ MeleeShipByUsedIndex (const QUEUE *queue, COUNT index)
for (hShip = GetHeadLink (queue); hShip != 0; hShip = hNextShip)
{
STARSHIP *StarShipPtr = LockStarShip (queue, hShip);
if (StarShipPtr->RaceResIndex && index-- == 0)
if ((StarShipPtr->SpeciesID != NO_ID) && index-- == 0)
{
UnlockStarShip (queue, hShip);
break;
@@ -369,7 +369,7 @@ GetRaceQueueValue (const QUEUE *queue) {
STARSHIP *StarShipPtr = LockStarShip (queue, hBattleShip);
hNextShip = _GetSuccLink (StarShipPtr);
if (StarShipPtr->RaceResIndex == 0)
if (StarShipPtr->SpeciesID == NO_ID)
continue; // Not active any more.
result += StarShipPtr->ship_cost;
@@ -506,7 +506,7 @@ MeleeShipDeath (STARSHIP *ship, COUNT which_player) {
FRAME frame;
// Deactivate fleet position.
ship->RaceResIndex = 0;
ship->SpeciesID = NO_ID;
frame = SetAbsFrameIndex (PickMeleeFrame, which_player);
CrossOutShip (frame, ship->index);
sc2/src/sc2code/pickship.c
+4 -4
View File
@@ -147,7 +147,7 @@ ChangeSelection:
{
StarShipPtr = LockStarShip (&race_q[0], hBattleShip);
if (StarShipPtr->index == ship_index
&& StarShipPtr->RaceResIndex)
&& (StarShipPtr->SpeciesID != NO_ID))
{
UnlockStarShip (&race_q[0], hBattleShip);
break;
@@ -388,7 +388,7 @@ GetEncounterStarShip (STARSHIP *LastStarShipPtr, COUNT which_player)
/* Record crew left after the battle */
FragPtr->crew_level = SPtr->crew_level;
if (GLOBAL (CurrentActivity) & IN_BATTLE)
SPtr->RaceResIndex = 0;
SPtr->SpeciesID = NO_ID;
// deactivates the ship
}
else /* if infinite ships */
@@ -523,10 +523,10 @@ DrawArmadaPickShip (BOOLEAN draw_salvage_frame, RECT *pPickRect)
r.corner = s.origin;
SetContextForeGroundColor (BLACK_COLOR);
DrawFilledRectangle (&r);
if (StarShipPtr->RaceResIndex || StarShipPtr->crew_level == 0)
if ((StarShipPtr->SpeciesID != NO_ID) || (StarShipPtr->crew_level == 0))
{
DrawStamp (&s);
if (StarShipPtr->RaceResIndex == 0)
if (StarShipPtr->SpeciesID == NO_ID)
{
/* Dead ship - mark with an X. */
s.origin.x -= 1;
sc2/src/sc2code/races.h
+37 -2
View File
@@ -55,6 +55,41 @@ typedef HLINK HSTARSHIP;
#define PLAYER_CAPTAIN (1 << 13)
/* The protagonist himself is on board. He gets a different color. */
/* These track the old resource package orderings for the ship resource indices */
typedef enum
{
NO_ID,
ARILOU_ID,
CHMMR_ID,
EARTHLING_ID,
ORZ_ID,
PKUNK_ID,
SHOFIXTI_ID,
SPATHI_ID,
SUPOX_ID,
THRADDASH_ID,
UTWIG_ID,
VUX_ID,
YEHAT_ID,
MELNORME_ID,
DRUUGE_ID,
ILWRATH_ID,
MYCON_ID,
SLYLANDRO_ID,
UMGAH_ID,
UR_QUAN_ID,
ZOQFOTPIK_ID,
SYREEN_ID,
KOHR_AH_ID,
ANDROSYNTH_ID,
CHENJESU_ID,
MMRNMHRM_ID,
LAST_MELEE_ID = MMRNMHRM_ID,
SIS_SHIP_ID,
SA_MATRA_ID,
UR_QUAN_PROBE_ID,
NUM_SPECIES_ID
} SPECIES_ID;
typedef struct captain_stuff
{
@@ -178,7 +213,7 @@ struct race_desc
HLINK pred; \
HLINK succ; \
\
DWORD RaceResIndex; \
SPECIES_ID SpeciesID; \
BYTE captains_name_index \
/* Also used in full-game to detect if a STARSHIP is an escort
* or the flagship (captains_name_index == 0) */
@@ -283,7 +318,7 @@ typedef struct
HFLEETINFO pred;
HFLEETINFO succ;
DWORD RaceResIndex;
SPECIES_ID SpeciesID;
UWORD ship_flags; /* 0, GOOD_GUY, or BAD_GUY */
BYTE days_left; /* Days left before the fleet reachers 'dest_loc'. */
sc2/src/sc2code/resinst.h
-1
View File
@@ -22,4 +22,3 @@
#include "istrtab.h"
#include "isndres.h"
#include "imusicre.h"
#include "ires_ind.h"
sc2/src/sc2code/ship.c
+1 -1
View File
@@ -381,7 +381,7 @@ spawn_ship (STARSHIP *StarShipPtr)
HELEMENT hShip;
RACE_DESC *RDPtr;
RDPtr = load_ship (StarShipPtr->RaceResIndex, TRUE);
RDPtr = load_ship (StarShipPtr->SpeciesID, TRUE);
if (!RDPtr)
return FALSE;
sc2/src/sc2code/ships/androsyn/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define ANDROSYNTH_CODE 0x00200008L
#define ANDROSYNTH_CODE 0x57800008L
sc2/src/sc2code/ships/arilou/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define ARILOU_CODE 0x00200008L
#define ARILOU_CODE 0x57a00008L
sc2/src/sc2code/ships/blackurq/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define KOHR_AH_CODE 0x00200008L
#define KOHR_AH_CODE 0x57c00008L
sc2/src/sc2code/ships/chenjesu/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define CHENJESU_CODE 0x00200008L
#define CHENJESU_CODE 0x57e00008L
sc2/src/sc2code/ships/chmmr/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define CHMMR_CODE 0x00200008L
#define CHMMR_CODE 0x58000008L
sc2/src/sc2code/ships/druuge/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define DRUUGE_CODE 0x00200008L
#define DRUUGE_CODE 0x58200008L
sc2/src/sc2code/ships/human/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define HUMAN_CODE 0x00200008L
#define HUMAN_CODE 0x58400008L
sc2/src/sc2code/ships/ilwrath/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define ILWRATH_CODE 0x00200008L
#define ILWRATH_CODE 0x58600008L
sc2/src/sc2code/ships/lastbat/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define SAMATRA_CODE 0x00200008L
#define SAMATRA_CODE 0x58800008L
sc2/src/sc2code/ships/melnorme/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define MELNORME_CODE 0x00200008L
#define MELNORME_CODE 0x58a00008L
sc2/src/sc2code/ships/mmrnmhrm/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define MMRNMHRM_CODE 0x00200008L
#define MMRNMHRM_CODE 0x58c00008L
sc2/src/sc2code/ships/mycon/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define MYCON_CODE 0x00200008L
#define MYCON_CODE 0x58e00008L
sc2/src/sc2code/ships/orz/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define ORZ_CODE 0x00200008L
#define ORZ_CODE 0x59000008L
sc2/src/sc2code/ships/pkunk/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define PKUNK_CODE 0x00200008L
#define PKUNK_CODE 0x59200008L
sc2/src/sc2code/ships/probe/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define PROBE_CODE 0x00200008L
#define PROBE_CODE 0x59400008L
sc2/src/sc2code/ships/shofixti/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define SHOFIXTI_CODE 0x00200008L
#define SHOFIXTI_CODE 0x59600008L
sc2/src/sc2code/ships/sis_ship/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define SIS_CODE 0x00200008L
#define SIS_CODE 0x59800008L
sc2/src/sc2code/ships/slylandr/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define SLYLANDRO_CODE 0x00200008L
#define SLYLANDRO_CODE 0x59a00008L
sc2/src/sc2code/ships/spathi/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define SPATHI_CODE 0x00200008L
#define SPATHI_CODE 0x59c00008L
sc2/src/sc2code/ships/supox/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define SUPOX_CODE 0x00200008L
#define SUPOX_CODE 0x59e00008L
sc2/src/sc2code/ships/syreen/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define SYREEN_CODE 0x00200008L
#define SYREEN_CODE 0x5a000008L
sc2/src/sc2code/ships/thradd/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define THRADDASH_CODE 0x00200008L
#define THRADDASH_CODE 0x5a200008L
sc2/src/sc2code/ships/umgah/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define UMGAH_CODE 0x00200008L
#define UMGAH_CODE 0x5a400008L
sc2/src/sc2code/ships/urquan/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define URQUAN_CODE 0x00200008L
#define URQUAN_CODE 0x5a600008L
sc2/src/sc2code/ships/utwig/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define UTWIG_CODE 0x00200008L
#define UTWIG_CODE 0x5a800008L
sc2/src/sc2code/ships/vux/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define VUX_CODE 0x00200008L
#define VUX_CODE 0x5aa00008L
sc2/src/sc2code/ships/yehat/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define YEHAT_CODE 0x00200008L
#define YEHAT_CODE 0x5ac00008L
sc2/src/sc2code/ships/zoqfot/icode.h
+1 -1
View File
@@ -2,4 +2,4 @@
should not be edited directly. Modify the master resource list
instead and regenerate. */
#define ZOQFOTPIK_CODE 0x00200008L
#define ZOQFOTPIK_CODE 0x5ae00008L
sc2/src/sc2code/shipyard.c
+1 -1
View File
@@ -130,7 +130,7 @@ SpinStarShip (HFLEETINFO hStarShip)
FLEET_INFO *FleetPtr;
FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip);
Index = FindMasterShipIndex (FleetPtr->RaceResIndex);
Index = FindMasterShipIndex (FleetPtr->SpeciesID);
UnlockFleetInfo (&GLOBAL (avail_race_q), hStarShip);
if (Index >= 0 && Index < NUM_MELEE_SHIPS)