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

Communications resource information has been folded into starcon.ls2.

Browse Source 
The comm/*.ls2 files have been retired.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2927 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2008-02-25 05:19:49 +00:00
parent 9f577a4abe
commit b3dcf06737
35 changed files with 343 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm.c
+13 -22
View File
@@ -1431,10 +1431,10 @@ HailAlien (void)
}
COUNT
InitCommunication (RESOURCE which_comm)
InitCommunication (CONVERSATION which_comm)
{
COUNT status;
RESOURCE_INDEX hOldIndex, hIndex;
RESOURCE_INDEX hOldIndex;
LOCDATA *LocDataPtr;
#ifdef DEBUG
@@ -1470,7 +1470,7 @@ InitCommunication (RESOURCE which_comm)
}
}
if (which_comm == 0)
if (which_comm == URQUAN_PROBE_CONVERSATION)
{
status = URQUAN_PROBE_SHIP;
which_comm = URQUAN_CONVERSATION;
@@ -1484,8 +1484,10 @@ InitCommunication (RESOURCE which_comm)
}
else
{
status = GET_PACKAGE (which_comm)
- GET_PACKAGE (ARILOU_CONVERSATION) + ARILOU_SHIP;
COUNT commToShip[] = {
RACE_SHIP_FOR_COMM
};
status = commToShip[which_comm];
if (status >= YEHAT_REBEL_SHIP) {
/* conversation exception, set to self */
status = HUMAN_SHIP;
@@ -1504,22 +1506,12 @@ InitCommunication (RESOURCE which_comm)
}
hOldIndex = SetResourceIndex (hResIndex);
hIndex = OpenResourceIndexInstance (which_comm);
if (hIndex == 0)
{
SET_GAME_STATE (BATTLE_SEGUE, 1);
LocDataPtr = 0;
}
else
{
SetResourceIndex (hIndex);
LocDataPtr = init_race (
status != YEHAT_REBEL_SHIP ? which_comm :
YEHAT_REBEL_CONVERSATION);
if (LocDataPtr)
CommData = *LocDataPtr;
}
LocDataPtr = init_race (
status != YEHAT_REBEL_SHIP ? which_comm :
YEHAT_REBEL_CONVERSATION);
if (LocDataPtr)
CommData = *LocDataPtr;
UnlockMutex (GraphicsLock);
@@ -1557,7 +1549,6 @@ InitCommunication (RESOURCE which_comm)
}
SetResourceIndex (hOldIndex);
CloseResourceIndex (hIndex);
UnlockMutex (GraphicsLock);
@@ -1595,7 +1586,7 @@ RaceCommunication (void)
HSHIPFRAG hStarShip;
SHIP_FRAGMENT *FragPtr;
HENCOUNTER hEncounter = 0;
RESOURCE RaceComm[] =
CONVERSATION RaceComm[] =
{
RACE_COMMUNICATION
};
sc2/src/sc2code/commglue.c
+1 -1
View File
@@ -293,7 +293,7 @@ construct_response (UNICODE *buf, int R /* promoted from RESPONSE_REF */, ...)
}
LOCDATA*
init_race (RESOURCE comm_id)
init_race (CONVERSATION comm_id)
{
switch (comm_id)
{
sc2/src/sc2code/commglue.h
+30 -1
View File
@@ -23,6 +23,35 @@
#include "resinst.h"
#include "libs/sound/trackplayer.h"
typedef enum {
ARILOU_CONVERSATION,
CHMMR_CONVERSATION,
COMMANDER_CONVERSATION,
ORZ_CONVERSATION,
PKUNK_CONVERSATION,
SHOFIXTI_CONVERSATION,
SPATHI_CONVERSATION,
SUPOX_CONVERSATION,
THRADD_CONVERSATION,
UTWIG_CONVERSATION,
VUX_CONVERSATION,
YEHAT_CONVERSATION,
MELNORME_CONVERSATION,
DRUUGE_CONVERSATION,
ILWRATH_CONVERSATION,
MYCON_CONVERSATION,
SLYLANDRO_CONVERSATION,
UMGAH_CONVERSATION,
URQUAN_CONVERSATION,
ZOQFOTPIK_CONVERSATION,
SYREEN_CONVERSATION,
BLACKURQ_CONVERSATION,
TALKING_PET_CONVERSATION,
SLYLANDRO_HOME_CONVERSATION,
URQUAN_PROBE_CONVERSATION,
YEHAT_REBEL_CONVERSATION,
INVALID_CONVERSATION,
} CONVERSATION;
extern LOCDATA CommData;
extern int cur_comm;
@@ -69,7 +98,7 @@ extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1);
extern void construct_response (UNICODE *buf, int R /* promoted from
RESPONSE_REF */, ...);
extern LOCDATA* init_race (RESOURCE comm_id);
extern LOCDATA* init_race (CONVERSATION comm_id);
extern LOCDATA* init_arilou_comm (void);
sc2/src/sc2code/credits.c
+2 -1
View File
@@ -23,6 +23,7 @@
#include "options.h"
#include "oscill.h"
#include "comm.h"
#include "commglue.h"
#include "resinst.h"
#include "nameref.h"
#include "settings.h"
@@ -587,7 +588,7 @@ static void
OutTakes (void)
{
#define NUM_OUTTAKES 15
static long outtake_list[NUM_OUTTAKES] =
static CONVERSATION outtake_list[NUM_OUTTAKES] =
{
ZOQFOTPIK_CONVERSATION,
TALKING_PET_CONVERSATION,
sc2/src/sc2code/encount.h
+2 -1
View File
@@ -19,6 +19,7 @@
#ifndef _ENCOUNT_H
#define _ENCOUNT_H
#include "commglue.h"
#include "displist.h"
#include "libs/gfxlib.h"
#include "planets/planets.h"
@@ -148,7 +149,7 @@ extern void EncounterBattle (void);
extern void BuildBattle (COUNT which_player);
extern COUNT InitEncounter (void);
extern COUNT UninitEncounter (void);
extern COUNT InitCommunication (RESOURCE which_comm);
extern COUNT InitCommunication (CONVERSATION which_comm);
extern void RaceCommunication (void);
extern void GenerateSOL (BYTE control);
sc2/src/sc2code/ires_ind.h
-24
View File
@@ -27,30 +27,6 @@
#define ANDROSYN_SHIP_INDEX 0x03201607L
#define CHENJESU_SHIP_INDEX 0x03401707L
#define MMRNMHRM_SHIP_INDEX 0x03601807L
#define ARILOU_CONVERSATION 0x14a01907L
#define CHMMR_CONVERSATION 0x14c01a07L
#define COMMANDER_CONVERSATION 0x14e01b07L
#define ORZ_CONVERSATION 0x15001c07L
#define PKUNK_CONVERSATION 0x15201d07L
#define SHOFIXTI_CONVERSATION 0x15401e07L
#define SPATHI_CONVERSATION 0x15601f07L
#define SUPOX_CONVERSATION 0x15802007L
#define THRADD_CONVERSATION 0x15a02107L
#define UTWIG_CONVERSATION 0x15c02207L
#define VUX_CONVERSATION 0x15e02307L
#define YEHAT_CONVERSATION 0x16002407L
#define MELNORME_CONVERSATION 0x16202507L
#define DRUUGE_CONVERSATION 0x16402607L
#define ILWRATH_CONVERSATION 0x16602707L
#define MYCON_CONVERSATION 0x16802807L
#define SLYLANDRO_CONVERSATION 0x16a02907L
#define UMGAH_CONVERSATION 0x16c02a07L
#define URQUAN_CONVERSATION 0x16e02b07L
#define ZOQFOTPIK_CONVERSATION 0x17002c07L
#define SYREEN_CONVERSATION 0x17202d07L
#define BLACKURQ_CONVERSATION 0x17402e07L
#define TALKING_PET_CONVERSATION 0x17602f07L
#define SLYLANDRO_HOME_CONVERSATION 0x17803007L
#define SIS_RES_INDEX 0x17c03107L
#define SAMATRA_RES_INDEX 0x17e03207L
#define PROBE_RES_INDEX 0x18003307L
sc2/src/sc2code/races.h
+32 -5
View File
@@ -360,12 +360,10 @@ enum
NUM_AVAILABLE_RACES
};
#define YEHAT_REBEL_CONVERSATION ((RESOURCE)(~0L))
#define RACE_COMMUNICATION \
ARILOU_CONVERSATION, /* ARILOU_SHIP */ \
CHMMR_CONVERSATION, /* CHMMR_SHIP */ \
NULL_RESOURCE, /* HUMAN_SHIP */ \
INVALID_CONVERSATION, /* HUMAN_SHIP */ \
ORZ_CONVERSATION, /* ORZ_SHIP */ \
PKUNK_CONVERSATION, /* PKUNK_SHIP */ \
SHOFIXTI_CONVERSATION, /* SHOFIXTI_SHIP */ \
@@ -383,11 +381,40 @@ enum
UMGAH_CONVERSATION, /* UMGAH_SHIP */ \
URQUAN_CONVERSATION, /* URQUAN_SHIP */ \
ZOQFOTPIK_CONVERSATION, /* ZOQFOTPIK_SHIP */ \
NULL_RESOURCE, /* SYREEN_SHIP */ \
INVALID_CONVERSATION, /* SYREEN_SHIP */ \
BLACKURQ_CONVERSATION, /* BLACK_URQUAN_SHIP */ \
YEHAT_REBEL_CONVERSATION, /* YEHAT_REBEL_SHIP */ \
NULL_RESOURCE, /* URQUAN_PROBE_SHIP */
URQUAN_PROBE_CONVERSATION, /* URQUAN_PROBE_SHIP */
#define RACE_SHIP_FOR_COMM \
ARILOU_SHIP, /* ARILOU_CONVERSATION */ \
CHMMR_SHIP, /* CHMMR_CONVERSATION */ \
HUMAN_SHIP, /* COMMANDER_CONVERSATION */ \
ORZ_SHIP, /* ORZ_CONVERSATION */ \
PKUNK_SHIP, /* PKUNK_CONVERSATION */ \
SHOFIXTI_SHIP, /* SHOFIXTI_CONVERSATION */ \
SPATHI_SHIP, /* SPATHI_CONVERSATION */ \
SUPOX_SHIP, /* SUPOX_CONVERSATION */ \
THRADDASH_SHIP, /* THRADD_CONVERSATION */ \
UTWIG_SHIP, /* UTWIG_CONVERSATION */ \
VUX_SHIP, /* VUX_CONVERSATION */ \
YEHAT_SHIP, /* YEHAT_CONVERSATION */ \
MELNORME_SHIP, /* MELNORME_CONVERSATION */ \
DRUUGE_SHIP, /* DRUUGE_CONVERSATION */ \
ILWRATH_SHIP, /* ILWRATH_CONVERSATION */ \
MYCON_SHIP, /* MYCON_CONVERSATION */ \
SLYLANDRO_SHIP, /* SLYLANDRO_CONVERSATION */ \
UMGAH_SHIP, /* UMGAH_CONVERSATION */ \
URQUAN_SHIP, /* URQUAN_CONVERSATION */ \
ZOQFOTPIK_SHIP, /* ZOQFOTPIK_CONVERSATION */ \
SYREEN_SHIP, /* SYREEN_CONVERSATION */ \
BLACK_URQUAN_SHIP, /* BLACKURQ_CONVERSATION */ \
UMGAH_SHIP, /* TALKING_PET_CONVERSATION */ \
SLYLANDRO_SHIP, /* SLYLANDRO_HOME_CONVERSATION */ \
URQUAN_PROBE_SHIP, /* URQUAN_PROBE_CONVERSATION */ \
YEHAT_SHIP, /* YEHAT_REBEL_CONVERSATION */ \
HUMAN_SHIP /* INVALID_CONVERSATION */
#define RACE_SHIP_COST \
1600, /* ARILOU_SHIP */ \
3000, /* CHMMR_SHIP */ \